aruba 0.8.0 → 0.8.1

data/lib/aruba/api/command.rb

@@ -27,8 +27,13 @@ module Aruba
       # @param [String] path
       #   The PATH, a string concatenated with ":", e.g. /usr/bin/:/bin on a
       #   UNIX-system
-      def which(program, path = ENV['PATH'])
-        Aruba::Platform.which(program, path)
+      def which(program, path = nil)
+        with_environment do
+          # ENV is set within this block
+          path = ENV['PATH'] if path.nil?
+
+          Aruba::Platform.which(program, path)
+        end
       end
 
       # Pipe data in file
@@ -255,6 +260,7 @@ module Aruba
         announcer.announce(:directory, Dir.pwd)
         announcer.announce(:command, cmd)
         announcer.announce(:timeout, 'exit', aruba.config.exit_timeout)
+        announcer.announce(:full_environment, aruba.environment.to_h)
 
         mode = if Aruba.process
                  # rubocop:disable Metrics/LineLength
@@ -273,7 +279,6 @@ module Aruba
                      else
                        aruba.config.main_class
                      end
-
         command = Command.new(
           cmd,
           :mode              => mode,
@@ -338,7 +343,7 @@ module Aruba
       #   Timeout for execution
       def run_simple(cmd, fail_on_error = true, timeout = nil)
         command = run(cmd, timeout)
-        @last_exit_status = command.stop(announcer)
+        @last_exit_status = process_monitor.stop_process(command)
 
         @timed_out = command.timed_out?
 
@@ -362,6 +367,11 @@ module Aruba
         last_command.close_io(:stdin)
       end
 
+      # Only processes
+      def only_processes
+        process_monitor.only_processes
+      end
+
       # TODO: move some more methods under here!
 
       private
@@ -371,7 +381,7 @@ module Aruba
       end
 
       def stop_process(process)
-        process_monitor.stop_process(process)
+        @last_exit_status = process_monitor.stop_process(process)
       end
 
       def terminate_process(process)

data/lib/aruba/api/core.rb

@@ -132,15 +132,17 @@ module Aruba
         if aruba.config.fixtures_path_prefix == prefix
           File.join aruba.fixtures_directory, rest
         elsif '~' == prefix
-          with_environment do
-            path = File.join(ENV['HOME'], aruba.current_directory.relative_path_from(Pathname.new(aruba.config.working_directory)))
+          path = with_environment do
+            ArubaPath.new(File.expand_path(file_name))
+          end
 
-            fail 'Expanding "~/" to "/" is not allowed' if path == '/'
+          fail 'Expanding "~/" to "/" is not allowed' if path.to_s == '/'
+          fail %(Expanding "~/" to a relative path "#{path}" is not allowed) unless path.absolute?
 
-            Aruba::Platform.chdir(path) { Aruba::Platform.expand_path(file_name, dir_string) }
-          end
+          path.to_s
         else
-          Aruba::Platform.chdir(File.join(aruba.root_directory,aruba.current_directory)) { Aruba::Platform.expand_path(file_name, dir_string) }
+          directory = File.join(aruba.root_directory, aruba.current_directory)
+          ArubaPath.new(File.join(*[directory, dir_string, file_name].compact)).expand_path.to_s
         end
       end
       # rubocop:enable Metrics/MethodLength

data/lib/aruba/api/environment.rb

@@ -1,7 +1,5 @@
 require 'aruba/platform'
 
-Aruba::Platform.require_matching_files('../matchers/environment/*.rb', __FILE__)
-
 module Aruba
   module Api
     # Environment methods of aruba
@@ -18,6 +16,8 @@ module Aruba
         value = value.to_s
 
         announcer.announce(:environment, name, value)
+        announcer.announce(:modified_environment, name, value)
+
         aruba.environment[name] = value
 
         self
@@ -36,6 +36,7 @@ module Aruba
 
         aruba.environment.append name, value
         announcer.announce(:environment, name, aruba.environment[name])
+        announcer.announce(:modified_environment, name, aruba.environment[name])
 
         self
       end
@@ -53,6 +54,7 @@ module Aruba
 
         aruba.environment.prepend name, value
         announcer.announce(:environment, name, aruba.environment[name])
+        announcer.announce(:modified_environment, name, aruba.environment[name])
 
         self
       end

data/lib/aruba/config.rb

@@ -1,17 +1,23 @@
 require 'contracts'
+
+require 'aruba/version'
 require 'aruba/basic_configuration'
 require 'aruba/config_wrapper'
 require 'aruba/hooks'
 require 'aruba/contracts/relative_path'
+require 'aruba/contracts/absolute_path'
 require 'aruba/contracts/enum'
 require 'aruba/contracts/is_a'
 
 module Aruba
   # Aruba Configuration
   class Configuration < BasicConfiguration
-    # As of 1.0.0 root_directory is read-only
-    # option_reader   :root_directory, :contract => { None => String }, :default => Dir.getwd
-    option_accessor   :root_directory, :contract => { String => String }, :default => Dir.getwd
+    if Aruba::VERSION >= '1.0.0'
+      option_reader :root_directory, :contract => { None => String }, :default => Dir.getwd
+    else
+      option_accessor :root_directory, :contract => { String => String }, :default => Dir.getwd
+    end
+
     option_accessor :working_directory, :contract => { Aruba::Contracts::RelativePath => Aruba::Contracts::RelativePath }, :default => 'tmp/aruba'
 
     if RUBY_VERSION < '1.9'
@@ -32,6 +38,17 @@ module Aruba
     option_accessor :command_launcher, :contract => { Aruba::Contracts::Enum[:in_process, :spawn, :debug] => Aruba::Contracts::Enum[:in_process, :spawn, :debug] }, :default => :spawn
     # rubocop:enable Metrics/LineLength
     option_accessor :main_class, :contract => { Aruba::Contracts::IsA[Class] => Or[Aruba::Contracts::IsA[Class], Eq[nil]] }, :default => nil
+    # rubocop:disable Metrics/LineLength
+
+    # rubocop:disable Metrics/LineLength
+    if Aruba::VERSION >= '1.0.0'
+      option_accessor :home_directory, :contract => { Or[Aruba::Contracts::AbsolutePath, Aruba::Contracts::RelativePath] => Or[Aruba::Contracts::AbsolutePath, Aruba::Contracts::RelativePath] } do |config|
+        File.join(config.root_directory.value, config.working_directory.value)
+      end
+    else
+      option_accessor :home_directory, :contract => { Or[Aruba::Contracts::AbsolutePath, Aruba::Contracts::RelativePath] => Or[Aruba::Contracts::AbsolutePath, Aruba::Contracts::RelativePath] }, :default => ENV['HOME']
+    end
+    # rubocop:enable Metrics/LineLength
   end
 end
 

data/lib/aruba/contracts/absolute_path.rb

@@ -0,0 +1,13 @@
+require 'aruba/aruba_path'
+
+module Aruba
+  module Contracts
+    class AbsolutePath
+      def self.valid?(value)
+        ArubaPath.new(value).absolute?
+      rescue
+        false
+      end
+    end
+  end
+end

data/lib/aruba/cucumber.rb

@@ -1,9 +1,17 @@
+require 'aruba/version'
+
 require 'aruba/api'
 World(Aruba::Api)
 
 require 'aruba/cucumber/hooks'
 require 'aruba/reporting'
 
+if Aruba::VERSION >= '1.0.0'
+  Aruba.configure do |config|
+    config.working_directory = 'tmp/cucumber'
+  end
+end
+
 Given /the default aruba timeout is (\d+) seconds/ do |seconds|
   aruba.config.exit_timeout = seconds.to_i
 end

data/lib/aruba/cucumber/hooks.rb

@@ -2,26 +2,30 @@ require 'aruba/aruba_path'
 require 'aruba/api'
 World(Aruba::Api)
 
-# Activate on 1.0.0
-#
-# Around do |_, block|
-#   begin
-#     if RUBY_VERSION < '1.9'
-#       old_env = ENV.to_hash
-#     else
-#       old_env = ENV.to_h
-#     end
-#
-#     block.call
-#   ensure
-#     ENV.clear
-#     ENV.update old_env
-#   end
-# end
+if Aruba::VERSION >= '1.0.0'
+  Around do |_, block|
+    begin
+      if RUBY_VERSION < '1.9'
+        old_env = ENV.to_hash
+      else
+        old_env = ENV.to_h
+      end
+
+      block.call
+    ensure
+      ENV.clear
+      ENV.update old_env
+    end
+  end
+end
 
 Before do
+  # this is ENV by default ...
   aruba.environment.update aruba.config.command_runtime_environment
+
+  # ... so every change needs to be done later
   prepend_environment_variable 'PATH', aruba.config.command_search_paths.join(':') + ':'
+  set_environment_variable 'HOME', aruba.config.home_directory
 end
 
 After do
@@ -67,13 +71,23 @@ Before('@announce-directory') do
 end
 
 Before('@announce-env') do
-  Aruba::Platform.deprecated 'The use of "@announce-env"-hook is deprecated. Please use "@announce-environment"'
+  Aruba::Platform.deprecated 'The use of "@announce-env"-hook is deprecated. Please use "@announce-modified-environment"'
 
   announcer.activate :environment
 end
 
 Before('@announce-environment') do
-  announcer.activate :environment
+  Aruba::Platform.deprecated '@announce-environment is deprecated. Use @announce-modified-environment instead'
+
+  announcer.activate :modified_environment
+end
+
+Before('@announce-full-environment') do
+  announcer.activate :full_environment
+end
+
+Before('@announce-modified-environment') do
+  announcer.activate :modified_environment
 end
 
 Before('@announce-timeout') do
@@ -85,6 +99,7 @@ Before('@announce') do
   announcer.activate :stdout
   announcer.activate :stderr
   announcer.activate :directory
+  announcer.activate :modified_environment
   announcer.activate :environment
   announcer.activate :timeout
 end

data/lib/aruba/matchers/environment.rb

@@ -0,0 +1 @@
+Aruba::Platform.require_matching_files('../matchers/environment/*.rb', __FILE__)

data/lib/aruba/process_monitor.rb

@@ -27,7 +27,7 @@ module Aruba
 
     def stop_processes!
       processes.each do |_, process|
-        stop_process(process)
+        @last_exit_status = stop_process(process)
       end
     end
 

data/lib/aruba/rspec.rb

@@ -2,10 +2,18 @@ require 'rspec/core'
 
 require 'aruba'
 require 'aruba/api'
+require 'aruba/version'
+
+if Aruba::VERSION >= '1.0.0'
+  Aruba.configure do |config|
+    config.working_directory = 'tmp/rspec'
+  end
+end
 
 RSpec.configure do |config|
   config.include Aruba::Api, :type => :aruba
 
+  # Setup environment for aruba
   config.before :each do
     next unless self.class.include? Aruba::Api
 
@@ -13,43 +21,41 @@ RSpec.configure do |config|
     setup_aruba
   end
 
-  # Activate on 1.0.0
-  # config.around :each do |example|
-  #   old_env = ENV.to_hash
-  #   example.run
-  #   ENV.update old_env
-  # end
-
-  config.around :each do |example|
-    project_bin = Aruba::ArubaPath.new(Aruba.config.root_directory)
-    project_bin << 'bin'
-
-    old_path    = ENV.fetch 'PATH', ''
-
-    paths = old_path.split(File::PATH_SEPARATOR)
-    paths.unshift project_bin
-
-    ENV['PATH'] = paths.join(File::PATH_SEPARATOR)
-
-    example.run
-
-    ENV['PATH'] = old_path
+  if Aruba::VERSION >= '1.0.0'
+    config.around :each do |example|
+      begin
+        old_env = ENV.to_hash
+        example.run
+      ensure
+        ENV.clear
+        ENV.update old_env
+      end
+    end
   end
 
+  # Use rspec metadata as option for aruba
   config.before :each do |example|
     next unless self.class.include? Aruba::Api
 
     example.metadata.each { |k, v| aruba.config.set_if_option(k, v) }
   end
 
+  # Activate announcers based on rspec metadata
   config.before :each do |example|
     next unless self.class.include?(Aruba::Api)
 
-    announcer.activate(:environment) if example.metadata[:announce_environment]
-    announcer.activate(:command)     if example.metadata[:announce_command]
-    announcer.activate(:directory)   if example.metadata[:announce_directory]
-    announcer.activate(:stdout)      if example.metadata[:announce_stdout]
-    announcer.activate(:stderr)      if example.metadata[:announce_stderr]
+    if example.metadata[:announce_environment]
+      Aruba::Platform.deprecated 'announce_environment is deprecated. Use announce_modified_environment instead'
+
+      announcer.activate(:modified_environment)
+    end
+
+    announcer.activate(:full_environment)     if example.metadata[:announce_full_environment]
+    announcer.activate(:modified_environment) if example.metadata[:announce_modified_environment]
+    announcer.activate(:command)              if example.metadata[:announce_command]
+    announcer.activate(:directory)            if example.metadata[:announce_directory]
+    announcer.activate(:stdout)               if example.metadata[:announce_stdout]
+    announcer.activate(:stderr)               if example.metadata[:announce_stderr]
 
     if example.metadata[:announce_output]
       announcer.activate(:stderr)
@@ -60,15 +66,25 @@ RSpec.configure do |config|
       announcer.activate(:stderr)
       announcer.activate(:stdout)
       announcer.activate(:environment)
+      announcer.activate(:modified_environment)
+      announcer.activate(:full_environment)
       announcer.activate(:command)
       announcer.activate(:directory)
     end
   end
 
+  # Modify PATH to include project/bin
   config.before :each do
     next unless self.class.include? Aruba::Api
 
     aruba.environment.update aruba.config.command_runtime_environment
     aruba.environment.prepend 'PATH', aruba.config.command_search_paths.join(':') + ':'
   end
+
+  # Use configured home directory as HOME
+  config.before :each do |example|
+    next unless self.class.include? Aruba::Api
+
+    aruba.environment['HOME'] =  aruba.config.home_directory
+  end
 end

data/lib/aruba/version.rb

@@ -0,0 +1,3 @@
+module Aruba
+  VERSION = '0.8.1'
+end

data/script/test

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-bundle exec rake test
+bundle exec rake test $*

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -107,6 +107,7 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- appveyor.yml
 - aruba.gemspec
 - config/.gitignore
 - cucumber.yml
@@ -114,12 +115,14 @@ files:
 - features/api/cd.feature
 - features/api/command/run.feature
 - features/api/command/which.feature
+- features/api/core/expand_path.feature
 - features/api/environment/append_environment_variable.feature
 - features/api/environment/prepend_environment_variable.feature
 - features/api/environment/set_environment_variable.feature
 - features/configuration/exit_timeout.feature
 - features/configuration/fixtures_directories.feature
 - features/configuration/fixtures_path_prefix.feature
+- features/configuration/home_directory.feature
 - features/configuration/io_timeout.feature
 - features/configuration/keep_ansi.feature
 - features/configuration/root_directory.feature
@@ -139,11 +142,22 @@ files:
 - features/fixtures/cli-app/spec/cli/app_spec.rb
 - features/fixtures/cli-app/spec/spec_helper.rb
 - features/fixtures/copy/file.txt
+- features/fixtures/empty-app/.gitignore
+- features/fixtures/empty-app/.rspec
+- features/fixtures/empty-app/README.md
+- features/fixtures/empty-app/Rakefile
+- features/fixtures/empty-app/bin/cli
+- features/fixtures/empty-app/cli-app.gemspec
+- features/fixtures/empty-app/lib/cli/app.rb
+- features/fixtures/empty-app/lib/cli/app/version.rb
+- features/fixtures/empty-app/script/console
+- features/fixtures/empty-app/spec/spec_helper.rb
 - features/fixtures/fixtures-app/test.txt
 - features/fixtures/spawn_process/stderr.sh
 - features/flushing.feature
 - features/hooks/after/command.feature
 - features/hooks/before/command.feature
+- features/integration/rspec/getting_started.feature
 - features/interactive.feature
 - features/matchers/directory/have_sub_directory.feature
 - features/matchers/file/be_existing_file.feature
@@ -183,6 +197,7 @@ files:
 - lib/aruba/config.rb
 - lib/aruba/config/jruby.rb
 - lib/aruba/config_wrapper.rb
+- lib/aruba/contracts/absolute_path.rb
 - lib/aruba/contracts/enum.rb
 - lib/aruba/contracts/is_a.rb
 - lib/aruba/contracts/relative_path.rb
@@ -203,6 +218,7 @@ files:
 - lib/aruba/matchers/directory.rb
 - lib/aruba/matchers/directory/be_an_existing_directory.rb
 - lib/aruba/matchers/directory/have_sub_directory.rb
+- lib/aruba/matchers/environment.rb
 - lib/aruba/matchers/file.rb
 - lib/aruba/matchers/file/be_an_existing_file.rb
 - lib/aruba/matchers/file/have_file_content.rb
@@ -226,6 +242,7 @@ files:
 - lib/aruba/rspec.rb
 - lib/aruba/runtime.rb
 - lib/aruba/spawn_process.rb
+- lib/aruba/version.rb
 - script/bootstrap
 - script/console
 - script/test
@@ -281,28 +298,7 @@ post_install_message: |
 
     gem 'cucumber', ~> '1.3.20'
 
-  With aruba >= 1.0
-    * "ruby 1.8.7"-support is discontinued.
-    * aruba requires "cucumber 2" for the feature steps. The rest of aruba should
-      be usable by whatever testing framework you are using.
-    * Overwriting methods for configuration is discontinued. You need to use
-      `aruba.config.<variable>` or `Aruba.configure { |config| config.<variable>`
-      instead.
-    * "aruba/reporting" will be removed. Please use `@debug`-tag + `byebug`,
-      `debugger`, `pry` to troubleshoot your feature tests.
-    * Set environment variables will have only effect on `#run` and the like +
-      `#with_environment { }`.
-    * The process environment will be fully resetted between tests. Sharing state
-      via ENV['VAR'] = 'shared state' between tests will not be possible anymore.
-      Please make that obvious by using explicit steps or use the aruba API for
-      that.
-    * There will be a major cleanup for command execution. There will be only
-      `run` and `run_simple` left. `run_interactive` is replaced by `run`.
-    * Setting the root directory of aruba via method overwrite or configuration -
-      this should be your project root directory where the test suite is run.
-    * The direct use of "InProcess", "DebugProcess" and "SpawnProcess" is not
-      supported anymore. You need to use "Command" instead. But be careful, it has
-      a different API.
+  With aruba >= 1.0 there will be breaking changes. Make sure to read https://github.com/cucumber/aruba/blob/master/History.md for 1.0.0
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -322,17 +318,19 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: aruba-0.8.0
+summary: aruba-0.8.1
 test_files:
 - features/api/cd.feature
 - features/api/command/run.feature
 - features/api/command/which.feature
+- features/api/core/expand_path.feature
 - features/api/environment/append_environment_variable.feature
 - features/api/environment/prepend_environment_variable.feature
 - features/api/environment/set_environment_variable.feature
 - features/configuration/exit_timeout.feature
 - features/configuration/fixtures_directories.feature
 - features/configuration/fixtures_path_prefix.feature
+- features/configuration/home_directory.feature
 - features/configuration/io_timeout.feature
 - features/configuration/keep_ansi.feature
 - features/configuration/root_directory.feature
@@ -352,11 +350,22 @@ test_files:
 - features/fixtures/cli-app/spec/cli/app_spec.rb
 - features/fixtures/cli-app/spec/spec_helper.rb
 - features/fixtures/copy/file.txt
+- features/fixtures/empty-app/.gitignore
+- features/fixtures/empty-app/.rspec
+- features/fixtures/empty-app/README.md
+- features/fixtures/empty-app/Rakefile
+- features/fixtures/empty-app/bin/cli
+- features/fixtures/empty-app/cli-app.gemspec
+- features/fixtures/empty-app/lib/cli/app.rb
+- features/fixtures/empty-app/lib/cli/app/version.rb
+- features/fixtures/empty-app/script/console
+- features/fixtures/empty-app/spec/spec_helper.rb
 - features/fixtures/fixtures-app/test.txt
 - features/fixtures/spawn_process/stderr.sh
 - features/flushing.feature
 - features/hooks/after/command.feature
 - features/hooks/before/command.feature
+- features/integration/rspec/getting_started.feature
 - features/interactive.feature
 - features/matchers/directory/have_sub_directory.feature
 - features/matchers/file/be_existing_file.feature