Merge pull request #439 from cucumber/feature/mv-bin-to-exec

Use new proposed structure for gems by bundler

.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
-script: script/test
-install: script/bootstrap --without development debug
+script: bin/test
+install: bin/bootstrap --without development debug
 rvm:
   - 1.9.3
   - 2.0.0

CONTRIBUTING.md

@@ -86,7 +86,7 @@ running the following command.
 
 ~~~bash
 # Bootstrap environment
-script/bootstrap
+bin/bootstrap
 ~~~
 
 ### Running tests
@@ -96,7 +96,7 @@ to run the test suite.
 
 ~~~bash
 # Run the test suite
-script/test
+bin/test
 ~~~
 
 If you have problems because our assumptions about your local setup are wrong.
@@ -108,10 +108,10 @@ your local system.
 bundle exec rake docker:build
 
 # Run the whole test suite in "docker"-container
-RUN_IN_DOCKER=1 script/test
+RUN_IN_DOCKER=1 bin/test
 
 # Run only selected scenario
-RUN_IN_DOCKER=1 script/test cucumber features/steps/command/shell.feature:14
+RUN_IN_DOCKER=1 bin/test cucumber features/steps/command/shell.feature:14
 ~~~
 
 ## Installing your own gems used for development
@@ -143,11 +143,11 @@ Now release it
 bundle update
 
 # Run test suite
-script/test
+bin/test
 
 # Release gem
 git commit -m "Version bump"
-script/release
+bin/release
 
 # If it's a major relase:
 # Merge changes back to have an correct documentation

aruba.gemspec

@@ -3,33 +3,36 @@ lib = ::File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'aruba/version'
 
-Gem::Specification.new do |s|
-  s.name        = 'aruba'
-  s.version     = Aruba::VERSION
-  s.author      = "Aslak Hellesøy, Matt Wynne and other Aruba Contributors"
-  s.description = 'Extension for popular TDD and BDD frameworks like "Cucumber", "RSpec" and "Minitest" to make testing commandline applications meaningful, easy and fun.'
-  s.summary     = "aruba-#{s.version}"
-  s.license     = 'MIT'
-  s.email       = 'cukes@googlegroups.com'
-  s.homepage    = 'http://github.com/cucumber/aruba'
+Gem::Specification.new do |spec|
+  spec.name        = 'aruba'
+  spec.version     = Aruba::VERSION
+  spec.author      = "Aslak Hellesøy, Matt Wynne and other Aruba Contributors"
+  spec.description = 'Extension for popular TDD and BDD frameworks like "Cucumber", "RSpec" and "Minitest" to make testing commandline applications meaningful, easy and fun.'
+  spec.summary     = "aruba-#{spec.version}"
+  spec.license     = 'MIT'
+  spec.email       = 'cukes@googlegroups.com'
+  spec.homepage    = 'http://github.com/cucumber/aruba'
 
-  s.add_runtime_dependency 'cucumber', '~> 2.4.0'
-  s.add_runtime_dependency 'childprocess', '~> 0.5.6'
-  s.add_runtime_dependency 'ffi', '~> 1.9.10'
-  s.add_runtime_dependency 'rspec-expectations', '~> 3.4.0'
-  s.add_runtime_dependency 'contracts', '~> 0.14'
-  s.add_runtime_dependency 'thor', '~> 0.19'
+  spec.add_runtime_dependency 'cucumber', '~> 2.4', '>= 2.4.0'
+  spec.add_runtime_dependency 'childprocess', '~> 0.5.6'
+  spec.add_runtime_dependency 'ffi', '~> 1.9', '>= 1.9.10'
+  spec.add_runtime_dependency 'rspec-expectations', '~> 3.4', '>= 3.4.0'
+  spec.add_runtime_dependency 'contracts', '~> 0.14'
+  spec.add_runtime_dependency 'thor', '~> 0.19'
 
-  s.add_development_dependency 'bundler', '~> 1.11'
-  s.rubygems_version = ">= 1.6.1"
-  s.required_ruby_version = '>= 1.9.3'
+  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.rubygems_version = ">= 1.6.1"
+  spec.required_ruby_version = '>= 1.9.3'
 
-  # s.post_install_message = <<-EOS
+  # spec.post_install_message = <<-EOS
   # EOS
 
-  s.files            = `git ls-files`.split("\n")
-  s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
-  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.rdoc_options     = ["--charset=UTF-8"]
-  s.require_path     = "lib"
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.rdoc_options  = ["--charset=UTF-8"]
+  spec.bindir        = "exe"
+  spec.require_paths = ["lib"]
 end

features/07_development_of_aruba/bootstrap-aruba.feature

@@ -6,7 +6,7 @@ Feature: Bootstrap "aruba"
 
   Scenario: Run the bootstrap script
 
-    When I successfully run `script/bootstrap`
+    When I successfully run `bin/bootstrap`
     Then the output should contain:
     """
     [INFO] Checking if ruby installed? OK

features/07_development_of_aruba/run-aruba-console.feature

@@ -8,6 +8,6 @@ Feature: Running the interactive "aruba" developer console
 
     This starts a pry console with "aruba"'s api loaded.
 
-    When I run `script/console` interactively
+    When I run `bin/console` interactively
     And I type "exit"
     Then the exit status should be 0

features/07_development_of_aruba/run-test-suite.feature

@@ -43,7 +43,7 @@ Feature: Run test suite
   @ignore
   Scenario: Run whole test suite via "test"-script
 
-    When I successfully run `script/test`
+    When I successfully run `bin/test`
     Then the output should contain:
     """
     rake test

fixtures/cli-app/README.md

@@ -31,7 +31,7 @@ cli
 
 ### Library
 
-You can use `script/console` to load your library.
+You can use `bin/console` to load your library.
 
 ### Fixture
 

lib/aruba/version.rb

@@ -1,3 +1,3 @@
 module Aruba
-  VERSION = '0.14.1'.freeze
+  VERSION = '1.0.0-alpha.1'.freeze
 end