aruba 1.0.0.pre.alpha.4 → 1.0.0.pre.alpha.5

data/CONTRIBUTING.md

@@ -129,11 +129,11 @@ Or use these Rake tasks:
 # Run the whole test suite
 rake test
 # Run RSpec tests
-rake test:rspec
+rake spec
 # Run Cucumber features
-rake test:cucumber
+rake cucumber
 # Run Cucumber features which are "WORK IN PROGRESS" and are allowed to fail
-rake test:cucumber_wip
+rake cucumber:wip
 ```
 
 If you have problems because our assumptions about your local setup are wrong,
@@ -195,11 +195,11 @@ You can use the following Rake tasks to build and install your work-in-progress
 
 ```bash
 # Build your copy
-bundle exec rake rubygem:build
+bundle exec rake build
 # Build and install your copy
-bundle exec rake rubygem:install
+bundle exec rake install
 # Build and install your copy without network access
-bundle exec rake rubygem:install:local
+bundle exec rake install:local
 ```
 
 ## Getting started as a "Maintainer"
@@ -225,7 +225,7 @@ bin/test
 
 # Release gem
 git commit -m "Version bump"
-bin/release
+bundle exec rake release
 
 # If it's a major relase:
 # Merge changes back to have correct documentation

data/Gemfile

@@ -4,60 +4,12 @@ source 'https://rubygems.org'
 gemspec
 
 # Load local Gemfile
-load File.expand_path('../Gemfile.local', __FILE__) if File.file? File.expand_path('../Gemfile.local', __FILE__)
+load File.expand_path('Gemfile.local', __dir__) if File.file? File.expand_path('Gemfile.local', __dir__)
 
 # Debug aruba
 group :debug do
   unless RUBY_PLATFORM.include?('java')
-    if RUBY_VERSION >= '2.3.0'
-      gem 'byebug', '~> 11.0'
-    else
-      gem 'byebug', '~> 10.0'
-    end
-
+    gem 'byebug', '~> 11.0'
     gem 'pry-byebug', '~> 3.4'
   end
-
-  gem 'pry-doc', '~> 1.0.0'
-end
-
-# Tools to run during development
-group :development do
-  # Needed for lint:yard:junk task
-  if RUBY_VERSION >= '2.3.0'
-    gem 'yard-junk', '~> 0'
-  end
-end
-
-group :development, :test do
-  # we use this to demonstrate interactive debugging within our feature tests
-  gem 'pry', '~> 0.12.2'
-
-  # Run development and test tasks
-  gem 'rake', '~> 12.3'
-
-  # Lint travis yaml
-  gem 'travis-yaml'
-
-  # Code Coverage
-  gem 'simplecov', '~> 0.10'
-
-  # API docs generation
-  gem 'yard', '~>0.9.9'
-
-  # Test api
-  gem 'fuubar', '~> 2.2'
-  gem 'rspec', '~> 3.4'
-
-  # Make aruba compliant to ruby community guide
-  gem 'rubocop', '~> 0.64.0'
-
-  # License compliance
-  if RUBY_VERSION >= '2.3'
-    gem 'license_finder', '~> 5.0'
-  end
-
-  gem 'minitest', '~> 5.8'
-
-  gem 'json', '~> 2.1'
 end

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,33 +6,30 @@ require 'aruba/platform'
 require 'bundler'
 Bundler.setup
 
-task default: [:lint, :test]
+task default: %w(spec cucumber cucumber:wip lint)
 
 desc 'Run all linters.'
 task lint: %w(lint:travis lint:coding_guidelines lint:licenses)
 
 desc 'Run the whole test suite.'
-task test: %w(test:rspec test:cucumber test:cucumber_wip)
+task test: %w(spec cucumber cucumber:wip)
 
 require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
 
-namespace :test do
-  Cucumber::Rake::Task.new do |t|
-    t.cucumber_opts = %w{--format progress}
-  end
-
-  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
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = %w{--format progress}
+end
 
-  desc 'Run RSpec tests'
-  RSpec::Core::RakeTask.new(:rspec)
+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
 
+RSpec::Core::RakeTask.new
+
 namespace :lint do
   desc 'Lint our .travis.yml'
   task :travis do
@@ -48,33 +45,19 @@ namespace :lint do
 
   desc 'Lint our code with "rubocop"'
   task :coding_guidelines do
-    if RUBY_VERSION >= '2'
-      sh 'bundle exec rubocop --fail-level E'
-    else
-      warn 'Your ruby version is not supported for code linting'
-    end
+    sh 'bundle exec rubocop --fail-level E'
   end
 
   desc 'Check for relevant licenses in project'
   task :licenses do
-    if RUBY_VERSION >= '2.3'
-      sh 'bundle exec license_finder'
-    else
-      warn 'Your ruby version is not supported for license checking'
-    end
+    sh 'bundle exec license_finder'
   end
 
-  begin
-    require 'yard-junk/rake'
-    YardJunk::Rake.define_task
-  rescue LoadError
-    warn 'yard-junk requires Ruby 2.3.0. Rake task lint:yard:junk not loaded.'
-  end
+  require 'yard-junk/rake'
+  YardJunk::Rake.define_task
 end
 
-namespace :rubygem do
-  Bundler::GemHelper.install_tasks
-end
+Bundler::GemHelper.install_tasks
 
 namespace :docker do
   desc 'Build docker image'
@@ -82,7 +65,7 @@ namespace :docker do
     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 +79,7 @@ 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
@@ -20,13 +20,11 @@ install:
   - cinst ansicon
 
 test_script:
-  - bundle exec rake test:rspec --trace
+  - bundle exec rake spec --trace
 
 environment:
   matrix:
-    - ruby_version: '22'
     - ruby_version: '23'
     - ruby_version: '24'
     - ruby_version: '25'
     - ruby_version: '26'
-

data/aruba.gemspec

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 lib = ::File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'aruba/version'
@@ -8,22 +6,34 @@ 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.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    = 'https://github.com/cucumber/aruba'
 
-  spec.add_runtime_dependency 'childprocess', '~> 1.0'
+  spec.add_runtime_dependency 'childprocess', '~> 3.0'
   spec.add_runtime_dependency 'contracts', '~> 0.13'
   spec.add_runtime_dependency 'cucumber', ['>= 2.4', '< 4.0']
   spec.add_runtime_dependency 'ffi', '~> 1.9'
   spec.add_runtime_dependency 'rspec-expectations', '~> 3.4'
   spec.add_runtime_dependency 'thor', '~> 0.19'
 
-  spec.add_development_dependency 'bundler', ['>= 1.7.0', '< 3.0']
+  spec.add_development_dependency 'json', '~> 2.1'
+  spec.add_development_dependency 'license_finder', '~> 5.3'
+  spec.add_development_dependency 'minitest', '~> 5.10'
+  spec.add_development_dependency 'pry-doc', '~> 1.0.0'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rspec', '~> 3.6'
+  spec.add_development_dependency 'rubocop', '~> 0.69.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.1'
+  spec.add_development_dependency 'simplecov', '~> 0.15'
+  spec.add_development_dependency 'travis-yaml', '~> 0.2'
+  spec.add_development_dependency 'yard-junk', '~> 0.0.7'
+
   spec.rubygems_version = '>= 1.6.1'
-  spec.required_ruby_version = '>= 2.2'
+  spec.required_ruby_version = '>= 2.3'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})

data/bin/console

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

data/cucumber.yml

@@ -1,17 +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 = ignore_opts.join(' ')
+std_opts = "--format pretty --color --exclude features/fixtures --require features --tags ~@unsupported-on"
+ignore_opts = '--tags ~@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 ~@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/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,6 +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'
 

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/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 
 require 'cli/app'
 

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

@@ -1,6 +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'
 

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/getting-started-app/Gemfile

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

data/lib/aruba/api.rb

@@ -19,11 +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::Text
-    include Aruba::Api::Bundler
+    include Core
+    include Commands
+    include Environment
+    include Filesystem
+    include Text
+    include Bundler
   end
 end

data/lib/aruba/api/commands.rb

@@ -92,6 +92,30 @@ module Aruba
         self
       end
 
+      # Get stdout of all processes
+      #
+      # @return [String]
+      #   The stdout of all processes which have run before
+      def all_stdout
+        aruba.command_monitor.all_stdout
+      end
+
+      # Get stderr of all processes
+      #
+      # @return [String]
+      #   The stderr of all processes which have run before
+      def all_stderr
+        aruba.command_monitor.all_stderr
+      end
+
+      # Get stderr and stdout of all processes
+      #
+      # @return [String]
+      #   The stderr and stdout of all processes which have run before
+      def all_output
+        aruba.command_monitor.all_output
+      end
+
       # Find a started command
       #
       # @param [String, Command] commandline
@@ -128,7 +152,7 @@ module Aruba
 
         unless command.interactive?
           raise NotImplementedError,
-            'Running interactively is not supported with this process launcher.'
+                'Running interactively is not supported with this process launcher.'
         end
 
         start_command(command)

data/lib/aruba/api/core.rb

@@ -3,8 +3,6 @@ require 'aruba/runtime'
 require 'aruba/errors'
 require 'aruba/setup'
 
-require 'aruba/config/jruby'
-
 # Aruba
 module Aruba
   # Api
@@ -17,6 +15,8 @@ module Aruba
 
       # Aruba Runtime
       def aruba
+        # TODO: Check this variable being accessed inconsistently. Should only be using the memo!
+        # Renaming this to `aruba` causes 100's of rspec failures. Needs a deeper dive, approach with caution!
         @_aruba_runtime ||= Runtime.new
       end
 
@@ -31,6 +31,15 @@ module Aruba
         self
       end
 
+      # Execute block in Aruba's current directory
+      #
+      # @yield
+      #   The block which should be run in current directory
+      def in_current_directory(&block)
+        create_directory '.' unless directory?('.')
+        cd('.', &block)
+      end
+
       # Switch to directory
       #
       # @param [String] dir
@@ -49,7 +58,9 @@ module Aruba
       def cd(dir, &block)
         if block_given?
           begin
-            fail ArgumentError, "#{expand_path(dir)} is not a directory or does not exist." unless Aruba.platform.directory? expand_path(dir)
+            unless Aruba.platform.directory? expand_path(dir)
+              fail ArgumentError, "#{expand_path(dir)} is not a directory or does not exist."
+            end
 
             old_directory = expand_path('.')
             aruba.current_directory << dir
@@ -74,7 +85,9 @@ module Aruba
           return result
         end
 
-        fail ArgumentError, "#{expand_path(dir)} is not a directory or does not exist." unless Aruba.platform.directory? expand_path(dir)
+        unless Aruba.platform.directory? expand_path(dir)
+          fail ArgumentError, "#{expand_path(dir)} is not a directory or does not exist."
+        end
 
         old_directory = expand_path('.')
         aruba.current_directory << dir