aruba 1.0.0.pre.alpha.2 → 1.0.1

data/Rakefile

@@ -1,4 +1,4 @@
-$LOAD_PATH << File.expand_path('../', __FILE__)
+$LOAD_PATH << File.expand_path(__dir__)
 
 require 'aruba/tasks/docker_helpers'
 require 'aruba/platform'
@@ -6,83 +6,55 @@ require 'aruba/platform'
 require 'bundler'
 Bundler.setup
 
-task :default => :test
+task default: %w(spec cucumber cucumber:wip lint)
 
-desc 'Run the whole test suite. Any failure will stop rake going on'
-task :test => %w(lint:travis lint:coding_guidelines lint:licenses test:rspec test:cucumber test:cucumber_wip)
+desc 'Run all linters.'
+task lint: %w(lint:coding_guidelines lint:licenses)
 
-task :cucumber do
-  Aruba.platform.deprecated 'The use of task "cucumber" is deprecated. Please use "test:cucumber"'
-  Rake::Task['test:cucumber'].invoke
-end
+desc 'Run the whole test suite.'
+task test: %w(spec cucumber cucumber:wip)
 
-task :cucumber_wip do
-  Aruba.platform.deprecated 'The use of task "cucumber_wip" is deprecated. Please use "test:cucumber_wip"'
-  Rake::Task['test:cucumber_wip'].invoke
-end
+require 'cucumber/rake/task'
+require 'rspec/core/rake_task'
 
-task :spec do
-  Aruba.platform.deprecated 'The use of task "spec" is deprecated. Please use "test:rspec"'
-  Rake::Task['test:rspec'].invoke
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = %w(--format progress)
 end
 
-task :rubocop do
-  Aruba.platform.deprecated 'The use of task "rubocop" is deprecated. Please use "lint:coding_guidelines"'
-  Rake::Task['test:coding_guidelines'].invoke
+Cucumber::Rake::Task.new('cucumber:wip', 'Run Cucumber features '\
+                         'which are "WORK IN PROGRESS" and '\
+                         'are allowed to fail') do |t|
+  t.cucumber_opts = %w(--format progress)
+  t.profile = 'wip'
 end
 
-namespace :test do
-  desc 'Run cucumber tests'
-  task :cucumber do
-    sh 'bundle exec cucumber'
-  end
-
-  desc 'Run cucumber tests which are "WORK IN PROGRESS" and are allowed to fail'
-  task :cucumber_wip do
-    sh 'bundle exec cucumber -p wip'
-  end
-
-  desc 'Run rspec tests'
-  task :rspec do
-    sh 'bundle exec rspec'
-  end
-end
+RSpec::Core::RakeTask.new
 
 namespace :lint do
-  desc 'Lint our .travis.yml'
-  task :travis do
-    begin
-      require 'travis/yaml'
-
-      puts 'Linting .travis.yml ... No output is good!'
-      Travis::Yaml.parse! File.read('.travis.yml')
-    rescue LoadError => e
-      $stderr.puts "You ruby is not supported for linting the .travis.yml: #{e.message}"
-    end
-  end
-
   desc 'Lint our code with "rubocop"'
   task :coding_guidelines do
-    sh 'bundle exec rubocop --fail-level E'
+    sh 'bundle exec rubocop'
   end
 
   desc 'Check for relevant licenses in project'
   task :licenses do
     sh 'bundle exec license_finder'
   end
-end
 
-namespace :rubygem do
-  Bundler::GemHelper.install_tasks
+  require 'yard-junk/rake'
+  YardJunk::Rake.define_task
 end
 
+Bundler::GemHelper.install_tasks
+
 namespace :docker do
   desc 'Build docker image'
   task :build, :cache, :version do |_, args|
-    args.with_defaults(:version => 'latest')
-    args.with_defaults(:cache => true)
+    args.with_defaults(version: 'latest')
+    args.with_defaults(cache: true)
 
-    docker_compose_file = Aruba::DockerComposeFile.new(File.expand_path('../docker-compose.yml', __FILE__))
+    docker_compose_file =
+      Aruba::DockerComposeFile.new(File.expand_path('docker-compose.yml', __dir__))
     docker_run_instance = Aruba::DockerRunInstance.new(docker_compose_file, :base)
 
     builder = Aruba::DockerBuildCommandLineBuilder.new(
@@ -96,7 +68,8 @@ namespace :docker do
 
   desc 'Run docker container'
   task :run, :command do |_, args|
-    docker_compose_file = Aruba::DockerComposeFile.new(File.expand_path('../docker-compose.yml', __FILE__))
+    docker_compose_file =
+      Aruba::DockerComposeFile.new(File.expand_path('docker-compose.yml', __dir__))
     docker_run_instance = Aruba::DockerRunInstance.new(docker_compose_file, :base)
 
     builder = Aruba::DockerRunCommandLineBuilder.new(

data/appveyor.yml

@@ -1,8 +1,8 @@
 version: "{build}"
 
-# This will build all PRs targetting matching branches.
+# This will build all PRs targeting matching branches.
 # Without this, each PR builds twice -- once for the PR branch HEAD,
-# and once for the merge commit that github creates for each mergable PR.
+# and once for the merge commit that github creates for each mergeable PR.
 branches:
   only:
     - master
@@ -14,18 +14,15 @@ install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - ruby --version
   - gem --version
-  - gem install bundler
   - bundler --version
   - bundle install
-  - cinst ansicon
 
 test_script:
-  - bundle exec rake test --trace
+  - bundle exec rake spec --trace
 
 environment:
   matrix:
-    - ruby_version: '19'
-    - ruby_version: '20'
-    - ruby_version: '21'
-    - ruby_version: '22'
-
+    - ruby_version: '24'
+    - ruby_version: '25'
+    - ruby_version: '26'
+    # Note: ruby version 2.7 is not available as of 2019-12-31

data/aruba.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 lib = ::File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'aruba/version'
@@ -6,33 +5,53 @@ require 'aruba/version'
 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.author      = 'Aslak Hellesøy, Matt Wynne and other Aruba Contributors'
+  spec.description = <<~TEXT
+    Extension for popular TDD and BDD frameworks like "Cucumber", "RSpec" and "Minitest",
+    to make testing commandline applications meaningful, easy and fun.
+  TEXT
   spec.summary     = "aruba-#{spec.version}"
   spec.license     = 'MIT'
   spec.email       = 'cukes@googlegroups.com'
-  spec.homepage    = 'http://github.com/cucumber/aruba'
+  spec.homepage    = 'https://github.com/cucumber/aruba'
 
-  spec.add_runtime_dependency 'cucumber', '~> 2.4', '>= 2.4.0'
-  spec.add_runtime_dependency 'childprocess', '~> 0.7.1'
-  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'
+  spec.metadata    = {
+    'bug_tracker_uri' => 'https://github.com/cucumber/aruba/issues',
+    'changelog_uri' => 'https://www.rubydoc.info/gems/aruba/file/CHANGELOG.md',
+    'documentation_uri' => 'https://www.rubydoc.info/gems/aruba',
+    'homepage_uri' => spec.homepage,
+    'source_code_uri' => 'https://github.com/cucumber/aruba'
+  }
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.rubygems_version = ">= 1.6.1"
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.add_runtime_dependency 'childprocess', '~> 3.0'
+  spec.add_runtime_dependency 'contracts', '~> 0.16.0'
+  spec.add_runtime_dependency 'cucumber', ['>= 2.4', '< 5.0']
+  spec.add_runtime_dependency 'ffi', '~> 1.9'
+  spec.add_runtime_dependency 'rspec-expectations', '~> 3.4'
+  spec.add_runtime_dependency 'thor', '~> 1.0'
 
-  # spec.post_install_message = <<-EOS
-  # EOS
+  spec.add_development_dependency 'json', '~> 2.1'
+  spec.add_development_dependency 'license_finder', '~> 6.0'
+  spec.add_development_dependency 'minitest', '~> 5.10'
+  spec.add_development_dependency 'pry-doc', '~> 1.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.6'
+  spec.add_development_dependency 'rubocop', '~> 0.84.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.5'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.39'
+  spec.add_development_dependency 'simplecov', '~> 0.18.0'
+  spec.add_development_dependency 'yard-junk', '~> 0.0.7'
+
+  spec.rubygems_version = '>= 1.6.1'
+  spec.required_ruby_version = '>= 2.4'
 
   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"]
+  spec.executables      = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.rdoc_options     = ['--charset', 'UTF-8', '--main', 'README.md']
+  spec.extra_rdoc_files = ['CHANGELOG.md', 'CONTRIBUTING.md', 'README.md', 'LICENSE']
+  spec.bindir           = 'exe'
+  spec.require_paths    = ['lib']
 end

data/bin/console

@@ -1,16 +1,7 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 
-require 'pry'
+require 'aruba/console'
 
-require 'aruba/api'
-
-module Aruba
-  class MyConsole
-    include Aruba::Api
-  end
-end
-
-include Aruba
-Pry.start MyConsole.new
+Aruba::Console.new.start

data/cucumber.yml

@@ -1,24 +1,6 @@
 <%
-$LOAD_PATH << ::File.expand_path('../lib', __FILE__)
-require 'aruba/version'
-require 'ffi'
-
-java_version = (RUBY_DESCRIPTION.match(/.*?on.*?(1\.[\d]\..*? )/))[1] if defined?(JRUBY_VERSION)
-
-std_opts          = "--format pretty --color --exclude features/fixtures --require features --tags ~@unsupported-on"
-java_default_opts = "--tags ~@wip-jruby-java-1.6" if defined?(JRUBY_VERSION) && (java_version < '1.7.0')
-java_wip_opts     = "--tags @wip-jruby-java-1.6:3" if defined?(JRUBY_VERSION) && (java_version < '1.7.0')
-
-ignore_opts = []
-ignore_opts <<  '--tags ~@ignore'
-ignore_opts <<  '--tags ~@unsupported-on-platform-java'    if RUBY_PLATFORM.include? 'java'
-ignore_opts <<  '--tags ~@unsupported-on-platform-mri'     if !RUBY_PLATFORM.include? 'java'
-ignore_opts <<  '--tags ~@unsupported-on-platform-windows' if FFI::Platform.windows?
-ignore_opts <<  '--tags ~@unsupported-on-platform-unix'    if FFI::Platform.unix?
-ignore_opts <<  '--tags ~@unsupported-on-platform-mac'     if FFI::Platform.mac?
-ignore_opts <<  '--tags ~@unsupported-on-ruby-older-2'     if RUBY_VERSION < '2'
-ignore_opts <<  '--tags ~@requires-aruba-version-1'        if Aruba::VERSION < '1'
-ignore_opts = ignore_opts.join(' ')
+std_opts = "--format pretty --color --exclude features/fixtures --require features --tags 'not @unsupported-on'"
+ignore_opts = "--tags 'not @ignore'"
 %>
-default: <%= std_opts %> --tags ~@wip <%= java_default_opts %> <%= ignore_opts %>
-wip: <%= std_opts %> --wip --tags @wip:3 <%= java_wip_opts %> <%= ignore_opts %>
+default: <%= std_opts %> --tags 'not @wip' <%= ignore_opts %>
+wip: <%= std_opts %> --wip --tags @wip:3 <%= ignore_opts %>

data/exe/aruba

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH << File.expand_path('../../lib', __FILE__)
+$LOAD_PATH << File.expand_path('../lib', __dir__)
 
 require 'aruba/cli'
 

data/fixtures/cli-app/README.md

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

data/fixtures/cli-app/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/fixtures/cli-app/bin/aruba-test-cli

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH << File.expand_path('../../lib', __FILE__)
+$LOAD_PATH << File.expand_path('../lib', __dir__)
 require 'cli/app'
 
 exit 0

data/fixtures/cli-app/cli-app.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cli/app/version'
 
@@ -16,11 +15,12 @@ Gem::Specification.new do |spec|
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0")
+                                        .reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.9'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
 end

data/fixtures/cli-app/lib/cli/app.rb

@@ -1,6 +1,6 @@
 require 'cli/app/version'
 
-::Dir.glob(File.expand_path('../**/*.rb', __FILE__)).each { |f| require_relative f }
+::Dir.glob(File.expand_path('**/*.rb', __dir__)).each { |f| require_relative f }
 
 module Cli
   module App

data/fixtures/cli-app/lib/cli/app/suppress_simple_cov_output.rb

@@ -2,12 +2,12 @@ module SimpleCov
   module Formatter
     class HTMLFormatter
       def format(result)
-        Dir[File.join(File.dirname(__FILE__), "../public/*")].each do |path|
+        Dir[File.join(File.dirname(__FILE__), '../public/*')].each do |path|
           FileUtils.cp_r(path, asset_output_path)
         end
 
-        File.open(File.join(output_path, "index.html"), "wb") do |file|
-          file.puts template("layout").result(binding)
+        File.open(File.join(output_path, 'index.html'), 'wb') do |file|
+          file.puts template('layout').result(binding)
         end
       end
     end

data/fixtures/cli-app/lib/cli/app/version.rb

@@ -1,5 +1,5 @@
 module Cli
   module App
-    VERSION = "0.1.0".freeze
+    VERSION = '0.1.0'.freeze
   end
 end

data/fixtures/cli-app/spec/spec_helper.rb

@@ -1,7 +1,8 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 
 require 'cli/app'
 
 require_relative 'support/aruba'
 
-::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require_relative f }
+::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__))
+     .each { |f| require_relative f }

data/fixtures/empty-app/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/fixtures/empty-app/cli-app.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cli/app/version'
 
@@ -16,11 +15,12 @@ Gem::Specification.new do |spec|
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0")
+                                        .reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.9'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
 end

data/fixtures/empty-app/lib/cli/app.rb

@@ -1,7 +1,5 @@
 require 'cli/app/version'
 
-::Dir.glob(File.expand_path('../**/*.rb', __FILE__)).each { |f| require_relative f }
-
 module Cli
   module App
     # Your code goes here...

data/fixtures/empty-app/lib/cli/app/version.rb

@@ -1,5 +1,5 @@
 module Cli
   module App
-    VERSION = "0.1.0".freeze
+    VERSION = '0.1.0'.freeze
   end
 end

data/fixtures/getting-started-app/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
+gem 'aruba', path: File.expand_path('../../..', __dir__)
 gem 'cucumber'
-gem 'aruba', path: File.expand_path('../../../../', __FILE__)

data/lib/aruba/api.rb

@@ -6,16 +6,12 @@ require 'aruba/extensions/string/strip'
 
 require 'aruba/platform'
 require 'aruba/api/core'
-require 'aruba/api/command'
-
-if Aruba::VERSION <= '1.1.0'
-  require 'aruba/api/deprecated'
-end
+require 'aruba/api/commands'
 
 require 'aruba/api/environment'
 require 'aruba/api/filesystem'
 require 'aruba/api/text'
-require 'aruba/api/rvm'
+require 'aruba/api/bundler'
 
 Aruba.platform.require_matching_files('../matchers/**/*.rb', __FILE__)
 
@@ -23,14 +19,11 @@ Aruba.platform.require_matching_files('../matchers/**/*.rb', __FILE__)
 module Aruba
   # Api
   module Api
-    include Aruba::Api::Core
-    include Aruba::Api::Commands
-    include Aruba::Api::Environment
-    include Aruba::Api::Filesystem
-    include Aruba::Api::Rvm
-    if Aruba::VERSION <= '1.1.0'
-      include Aruba::Api::Deprecated
-    end
-    include Aruba::Api::Text
+    include Core
+    include Commands
+    include Environment
+    include Filesystem
+    include Text
+    include Bundler
   end
 end