From 944d1a37fb28d832cac1cdf512dada061edea792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20G=C3=BCnnewig?= Date: Thu, 29 Jun 2017 08:20:51 +0200 Subject: [PATCH 1/2] Bump version --- lib/aruba/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/aruba/version.rb b/lib/aruba/version.rb index 4fa7a044c..40ad26b4d 100644 --- a/lib/aruba/version.rb +++ b/lib/aruba/version.rb @@ -1,3 +1,3 @@ module Aruba - VERSION = '0.14.1'.freeze + VERSION = '1.0.0-alpha.1'.freeze end From 0807d95c574b518a2b822cd15df19d5bbe4b82f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20G=C3=BCnnewig?= Date: Thu, 29 Jun 2017 08:23:52 +0200 Subject: [PATCH 2/2] Mv bin/ to exec/ to use new scheme proposed by bundler --- .travis.yml | 4 +- CONTRIBUTING.md | 12 ++--- aruba.gemspec | 51 ++++++++++--------- {script => bin}/bootstrap | 0 {script => bin}/build | 0 {script => bin}/console | 0 {script => bin}/release | 0 {script => bin}/test | 0 {bin => exec}/aruba | 0 .../bootstrap-aruba.feature | 2 +- .../run-aruba-console.feature | 2 +- .../run-test-suite.feature | 2 +- fixtures/cli-app/README.md | 2 +- 13 files changed, 39 insertions(+), 36 deletions(-) rename {script => bin}/bootstrap (100%) rename {script => bin}/build (100%) rename {script => bin}/console (100%) rename {script => bin}/release (100%) rename {script => bin}/test (100%) rename {bin => exec}/aruba (100%) diff --git a/.travis.yml b/.travis.yml index adf45f4de..db21d2590 100644 --- a/.travis.yml +++ b/.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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7f95a56b7..4f5a1dd96 100644 --- a/CONTRIBUTING.md +++ b/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 diff --git a/aruba.gemspec b/aruba.gemspec index 9ed553fa1..792cf7d93 100644 --- a/aruba.gemspec +++ b/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 diff --git a/script/bootstrap b/bin/bootstrap similarity index 100% rename from script/bootstrap rename to bin/bootstrap diff --git a/script/build b/bin/build similarity index 100% rename from script/build rename to bin/build diff --git a/script/console b/bin/console similarity index 100% rename from script/console rename to bin/console diff --git a/script/release b/bin/release similarity index 100% rename from script/release rename to bin/release diff --git a/script/test b/bin/test similarity index 100% rename from script/test rename to bin/test diff --git a/bin/aruba b/exec/aruba similarity index 100% rename from bin/aruba rename to exec/aruba diff --git a/features/07_development_of_aruba/bootstrap-aruba.feature b/features/07_development_of_aruba/bootstrap-aruba.feature index 4c86ed0d0..3ea19848e 100644 --- a/features/07_development_of_aruba/bootstrap-aruba.feature +++ b/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 diff --git a/features/07_development_of_aruba/run-aruba-console.feature b/features/07_development_of_aruba/run-aruba-console.feature index da56fffb0..9afbc65cb 100644 --- a/features/07_development_of_aruba/run-aruba-console.feature +++ b/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 diff --git a/features/07_development_of_aruba/run-test-suite.feature b/features/07_development_of_aruba/run-test-suite.feature index 10f8f7311..7df73509a 100644 --- a/features/07_development_of_aruba/run-test-suite.feature +++ b/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 diff --git a/fixtures/cli-app/README.md b/fixtures/cli-app/README.md index 020023eef..69c924350 100644 --- a/fixtures/cli-app/README.md +++ b/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