aruba-jbb 0.2.6.11 → 0.2.6.12

data/.gitignore

@@ -11,13 +11,14 @@ tmtags
 .\#*
 
 ## VIM
-*.swp
+*swp
+*swpo
 
 ## PROJECT::GENERAL
-*.gem
 coverage
-rdoc
+*gem
 pkg
+rdoc
 
 ## PROJECT::SPECIFIC
 tmp

data/Gemfile

@@ -2,9 +2,9 @@ source "http://rubygems.org"
 gemspec
 
 # Use source from sibling folders (if available) instead of gems
-%w[cucumber].each do |g|
-  if File.directory?(File.dirname(__FILE__) + "/../#{g}")
-    @dependencies.reject!{|dep| dep.name == g}
-    gem g, :path => "../#{g}"
-  end
-end
+# %w[cucumber].each do |g|
+#   if File.directory?(File.dirname(__FILE__) + "/../#{g}")
+#     @dependencies.reject!{|dep| dep.name == g}
+#     gem g, :path => "../#{g}"
+#   end
+# end

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.6.12 jbb
+* merged aslak 0.2.4
+* added remove_env to api
+* update api documentation
+* revised run steps
+
+
 == 0.2.6.11 jbb
 * administrative fix to gemspec data and dependencies 
 * added NO_ARUBA_STEPS env var to not load aruba/cucumber_steps.rb library (exp)
@@ -51,9 +58,16 @@
 * Expanded directory and file detection self-test cross-check. (JBB)
 
 
+== 0.2.4
+
+=== New Features
+* Added step definitions for removing files and checking presence of a single file. (Aslak Hellesøy)
+
+
 == 0.2.3 jbb
 * Fixed no directories step error and added scenario to test this
 
+
 == 0.2.3 aslak
 
 === Bug fixes
@@ -72,6 +86,7 @@
 * Forked from Aruba 0.2.1 and renamed to aruba-jbb (JBB)
 * Removed unnecessary dependencies on cucumber and rspec beta versions. (JBB)
 
+
 == 0.2.2 aslak
 
 === New Features

data/aruba-jbb.gemspec

@@ -2,20 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aruba-jbb}
-  s.version = "0.2.6.11"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.version = "0.2.6.12"
   s.authors = ["Aslak Hellesøy", "David Chelimsky", "James B. Byrne", "Mike Sassak"]
-  s.date = %q{2010-10-26}
+  s.date = %q{2010-11-04}
   s.description = %q{Fork of Aruba, Cucumber steps for testing CLI applications.}
   s.email = %q{cukes@googlegroups.com}
   s.homepage = %q{http://github.com/byrnejb/aruba}
   s.rdoc_options = ["--charset=UTF-8"]
   s.summary = %q{Cucumber steps for testing external processes from the CLI}
 
-  s.add_dependency 'cucumber', '~> 0.9.0'
+  s.add_dependency 'cucumber', '~> 0.9.3'
   s.add_dependency 'background_process' # Can't specify a version - bundler/rubygems chokes on '2.1'
-  s.add_development_dependency 'rspec', '~> 2.0.0'
+  s.add_development_dependency 'rspec', '~> 2.0.1'
 
   s.rubygems_version   = "1.3.7"
   s.files            = `git ls-files`.split("\n")

data/features/file_system_commands.feature

@@ -122,6 +122,7 @@ Feature: file system commands
       HELLO WORLD
       """
 
+
   Scenario: @aruba-tmpdir flag runs scenario in tmp/aruba
     When I run "ruby -e \"require 'fileutils'; puts FileUtils.pwd\""
     Then the stdout should contain "tmp/aruba"
@@ -152,8 +153,8 @@ Feature: file system commands
       And I delete the cwd sub-directory named "rebase_test"
 
 
-  Scenario: Check file contents with regex
-    Given we do have a file named "foo" with:
+  Scenario: Check file contents with regexp
+    Given I do have a file named "foo" with:
       """
       hello world
       """
@@ -161,3 +162,10 @@ Feature: file system commands
     And the file "foo" should not match /HELLO WORLD/
 
 
+  Scenario: Remove file
+    Given I do have a file named "foo" with:
+      """
+      hello world
+      """
+    When I remove the file "foo"
+    Then the file "foo" should not exist

data/features/process_timeout.feature

@@ -1,3 +1,4 @@
+@timeout
 Feature: process should timeout
 
   In order to prevent test runs from suspending indefinitiely

data/features/std_out.feature

@@ -0,0 +1,17 @@
+Feature: run command should not limit size of STDOUT
+
+  In order to specify commands that produce output to STDOUT
+  As a developer using Cucumber
+  I want all output in STDOUT to display  
+
+  @wip @announce
+  Scenario: Handle a large STDOUT data stream
+    #When I run "ruby -e \" 500.times.each { |i| puts %Q(rword #{i+1} ) * 6 }\""
+    #When I run "ruby -e \" 1000.times { puts %Q(rword ) * 12 }\""
+    #Then the stdout should contain "rword"
+    When I run "ruby -e 'puts :a.to_s * 65535'"
+    Then the stdout should contain "aaaaa"
+    When I run "ruby -e 'puts :b.to_s * 65536'"
+    Then the stdout should contain "bbbbb"
+    When I run "ruby -e 'puts :c.to_s * 65537'"
+    Then the stdout should contain "ccccc"

data/lib/aruba/api.rb

@@ -1,6 +1,6 @@
 require 'timeout'
-require 'tempfile'
 require 'rbconfig'
+require 'fileutils'
 require 'background_process'
 
 module Aruba
@@ -181,6 +181,7 @@ module Aruba
       end
     end
 
+
     # check_exact_file_content veries that the specified file contains
     # exactly the provided text.
     #
@@ -489,7 +490,8 @@ module Aruba
     end
 
     # original_env is an internal helper method that returns a hash of the
-    # original env variables and their values for use in restore_original_env
+    # env variables and their values. See: remove_env(), restore_env() and
+    # set_env().
     #
     def original_env
       @original_env ||= {}
@@ -567,8 +569,29 @@ module Aruba
       Regexp === string_or_regexp ? string_or_regexp : Regexp.compile(Regexp.escape(string_or_regexp))
     end
 
-    # restore_env is an internal helper method that restors the user's original
-    # environment at the completion of a scenario using Aruba.
+
+    # remove_env removes (unsets) the given environmental variable from
+    # the original working environment.  See restore_env() and set_env()
+    #
+    # Usage:
+    #   When /(?:delete|unset) the env variable "([^\"]*)"$/ do |var|
+    #     remove_env(var)
+    #   end
+    #
+    def remove_env(key)
+      original_env[key] = ENV.delete(key)
+    end
+
+    # remove file implements the rm command and removes the file whose name
+    # is given as the argument.
+    def remove_file(file_name)
+      in_current_dir do
+        FileUtils.rm(file_name)
+      end
+    end
+
+    # restore_env method restores the user's original environment at the 
+    # completion of a scenario using Aruba.  See set_env().
     #
     def restore_env
       original_env.each do |key, value|
@@ -660,12 +683,17 @@ module Aruba
       end
     end
 
-    # set_env(key, value) is an internal helper method that sets a hash of the
-    # original env variables and their values for restore_original_env
+    # set_env method permits setting of environment variables for aruba
+    # run commands. See restore_env() and remove_env().
     #
+    # Usage:
+    #   When /(?:add|set) the env variable "([^\"]*)" to "(.*)"$/ do |var, val|
+    #     set_env(var, val)
+    #   end
+    #   
     def set_env(key, value)
       announce_or_puts(%{$ export #{key}="#{value}"}) if @announce_env
-      original_env[key] = ENV.delete(key)
+      remove_env(key)
       ENV[key] = value
     end
 

data/lib/aruba/cucumber.rb

@@ -83,6 +83,10 @@ When /^I append to "([^\"]*)" with:$/ do |file_name, file_content|
   append_to_file(file_name, file_content)
 end
 
+When /^I remove the file "([^\"]*)"$/ do |file_name|
+  remove_file(file_name)
+end
+
 When /^I cd to "([^\"]*)"$/ do |dir|
   cd(dir)
 end
@@ -176,6 +180,10 @@ Then /^the stdout should not contain "([^\"]*)"$/ do |partial_output|
   @last_stdout.should_not =~ regexp(partial_output)
 end
 
+Then /^the file "([^\"]*)" should not exist$/ do |file_name|
+  check_file_presence([file_name], false)
+end
+
 Then /^the following files should exist:$/ do |files|
   check_file_presence(files.raw.map{|file_row| file_row[0]}, true)
 end

data/lib/aruba/cucumber_steps.rb

@@ -2,6 +2,25 @@ require 'aruba/api'
 
 World(Aruba::Api)
 
+Before('@disable-bundler') do
+  unset_bundler_env_vars
+end
+
+Before do
+  @__aruba_original_paths = (ENV['PATH'] || '').split(File::PATH_SEPARATOR)
+    ENV['PATH'] = ([File.expand_path('bin')] + 
+      @__aruba_original_paths).join(File::PATH_SEPARATOR)
+end
+
+After do
+  ENV['PATH'] = @__aruba_original_paths.join(File::PATH_SEPARATOR)
+end
+
+
+Before do
+  #FileUtils.rm_rf(current_dir)
+end
+
 
 Before do 
   aruba_working_dir_init
@@ -24,6 +43,16 @@ Before('@announce-cmd') do
 end
 
 
+Before('@announce-dir') do
+  @announce_dir = true
+end
+
+
+Before('@announce-env') do
+  @announce_env = true
+end
+
+
 Before('@announce-stdout') do
   @announce_stdout = true
 end
@@ -37,16 +66,33 @@ end
 Before('@announce') do
   @announce_stdout = true
   @announce_stderr = true
+  @announce_env = true
+  @announce_dir = true
   @announce_cmd = true
 end
 
 
-When /append to "([^\"]*)" with:$/ do |file_name, file_content|
+Before('@puts') do
+  @puts = true
+end
+
+
+After do
+  restore_env
+end
+
+
+When /(?:add|set) the env variable "([^\"]*)" to "(.*)"/ do |var, val|
+  set_env(var, val)
+end
+
+
+When /appends? to "([^\"]*)" with:$/ do |file_name, file_content|
   append_to_file(file_name, file_content)
 end
 
 
-When /cd to "([^\"]*)"$/ do |dir|
+When /(?:cds?|chdirs?) to "([^\"]*)"$/ do |dir|
   cd(dir)
 end
 
@@ -61,11 +107,21 @@ When /display stderr/ do
 end
 
 
+When /(?:delete|unset) the env variable "([^\"]*)"$/ do |var|
+  remove_env(var)
+end
+
+
 When /display stdout/ do
   announce_or_puts(last_stdout)
 end
 
 
+When /using a clean gemset "([^\"]*)"$/ do |gemset|
+  use_clean_gemset(gemset)
+end
+
+
 When /do(?:es)? have (?:a|the) directory named "([^\"]*)"$/ do |dir_name|
   create_dir(dir_name)
 end
@@ -93,32 +149,48 @@ When /exit status should not be (-?\d+)$/ do |exit_status|
 end
 
 
-When /file "([^\"]*)" should contain "([^\"]*)"$/ do |file, partial_content|
+When /file (?:named )?"([^\"]*)" should contain "([^\"]*)"$/\
+  do |file, partial_content|
   check_file_content(file, partial_content, true)
 end
 
 
-When /file "([^\"]*)" should contain:$/ do |file, partial_content|
+When /file (?:named )?"([^\"]*)" should contain:$/\
+  do |file, partial_content|
   check_file_content(file, partial_content, true)
 end
 
 
-When /file "([^\"]*)" should not contain "([^\"]*)"$/ do |file, partial_content|
+When /file (?:named )?"([^\"]*)" should not contain "([^\"]*)"$/\
+  do |file, partial_content|
   check_file_content(file, partial_content, false)
 end
 
 
-When /file "([^\"]*)" should not contain:$/ do |file, partial_content|
+When /file (?:named )?"([^\"]*)" should not contain:$/\
+  do |file, partial_content|
   check_file_content(file, partial_content, false)
 end
 
 
-When /file "([^\"]*)" should not match \/([^\/]*)\/$/ do |file, partial_content|
+When /file (?:named )?"([^\"]*)" should exist$/ do |file|
+  check_file_presence([file_name], true)
+end
+
+
+When /file (?:named )?"([^\"]*)" should not exist$/ do |file|
+  check_file_presence([file], false)
+end
+
+
+When /file (?:named )?"([^\"]*)" should not match \/([^\/]*)\/$/\
+  do |file, partial_content|
   check_file_content(file, /#{partial_content}/, false)
 end
 
 
-When /file "([^\"]*)" should match \/([^\/]*)\/$/ do |file, partial_content|
+When /file (?:named )?"([^\"]*)" should match \/([^\/]*)\/$/\
+  do |file, partial_content|
   check_file_content(file, /#{partial_content}/, true)
 end
 
@@ -146,7 +218,7 @@ end
 
 
 When /output should contain "([^\"]*)"$/ do |partial_output|
-  combined_output.should =~ regexp(partial_output)
+  assert_partial_output(partial_output)
 end
 
 
@@ -189,6 +261,11 @@ When /output should match:$/ do |partial_output|
 end
 
 
+When /overwrites? "([^\"]*)" with:$/ do |file_name, file_content|
+  create_file(file_name, file_content, true)
+end
+
+
 When /rebase the directory "()"$/ do |dir|
   rebase(dir.to_a)
 end
@@ -199,50 +276,45 @@ When /rebase the directory named "([^\"]*)"$/ do |dir|
 end
 
 
-When /run "(.*)"$/ do |cmd|
-  run(unescape(cmd), false)
+When /removes? the file "([^\"]*)"$/ do |file_name|
+  remove_file(file_name)
 end
 
 
-When /run "(.*)" interactively$/ do |cmd|
-  run_interactive(unescape(cmd))
+When /runs? "(.*)"$/ do |cmd|
+  run(unescape(cmd), false)
 end
 
 
-When /run "(.*)" with errors?(?: and timeout of "(\d+\.?\d*)" seconds?)?$/\
+When /runs? "(.*)" with errors?(?: and timeout of "(\d+\.?\d*)" seconds?)?$/\
   do |cmd, time|
   run(unescape(cmd), false, time)
 end
 
-
-When /run "(.*)" with timeout of "(\d+\.?\d*)" seconds?$/ do |cmd, time|
+When /runs? "(.*)" without errors?(?: and timeout of "(\d+\.?\d*)" seconds?)?$/\
+  do |cmd, time|
   run(unescape(cmd), true, time)
 end
 
 
-When /run "(.*)" without errors?(?: and timeout of "(\d+\.?\d*)" seconds?)?$/\
-  do |cmd, time|
-  run(unescape(cmd), true, time)
+When /runs? "([^\"]*)" interactively$/ do |cmd|
+  run_interactive(unescape(cmd))
 end
 
 
-When /set the env variable "([^\"]*)" to "(\d+\.?\d*)" seconds?$/ do |var, val|
-  ENV[var] = val
+When /(?:successfully )?runs? "(.*)" with timeout of "(\d+\.?\d*)" seconds??$/\
+  do |cmd, time|
+  run(unescape(cmd), true, time)
 end
 
 
 When /should (pass|fail) with:$/ do |pass_fail, partial_output|
-  When "output should contain:", partial_output
-  if pass_fail == 'pass'
-    @last_exit_status.should == 0
-  else
-    @last_exit_status.should_not == 0
-  end
+  self.__send__("assert_#{pass_fail}ing_with", partial_output)
 end
 
 
 When /should (pass|fail) with regexp?:$/ do |pass_fail, partial_output|
-  Then "the output should match:", partial_output
+  When "output should match:", partial_output
   if pass_fail == 'pass'
     @last_exit_status.should == 0
   else
@@ -256,6 +328,21 @@ When /stderr should be empty$/ do
 end
 
 
+When /stdout should be empty$/ do
+  @last_stdout.should == ""
+end
+
+
+When /stderr should not be empty$/ do
+  @last_stderr.should != ""
+end
+
+
+When /stdout should not be empty$/ do
+  @last_stdout.should != ""
+end
+
+
 When /stderr should contain "([^\"]*)"$/ do |partial_output|
   @last_stderr.should =~ regexp(partial_output)
 end
@@ -276,7 +363,7 @@ When /stdout should not contain "([^\"]*)"$/ do |partial_output|
 end
 
 
-When /type "([^\"]*)"$/ do |input|
+When /types? "([^\"]*)"$/ do |input|
   write_interactive(ensure_newline(input))
 end
 
@@ -284,3 +371,8 @@ end
 When /(?:use|using) a clean gemset "([^\"]*)"$/ do |gemset|
   use_clean_gemset(gemset)
 end
+  
+
+When /writes? to "([^\"]*)" with:$/ do |file_name, file_content|
+  create_file(file_name, file_content, false)
+end

data/lib/aruba.rb

@@ -1,4 +1,4 @@
-require 'pathname'
+require "pathname"
 lib_path = Pathname.new(File.dirname(__FILE__)).realpath.to_s + '/'
 unless ENV['NO_ARUBA_STEPS']
   require lib_path + 'aruba/cucumber_steps'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: aruba-jbb
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 95
   prerelease: false
   segments: 
   - 0
   - 2
   - 6
-  - 11
-  version: 0.2.6.11
+  - 12
+  version: 0.2.6.12
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -04:00
+date: 2010-11-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,12 +30,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 61
         segments: 
         - 0
         - 9
-        - 0
-        version: 0.9.0
+        - 3
+        version: 0.9.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -60,12 +60,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 2
         - 0
-        - 0
-        version: 2.0.0
+        - 1
+        version: 2.0.1
   type: :development
   version_requirements: *id003
 description: Fork of Aruba, Cucumber steps for testing CLI applications.
@@ -96,6 +96,7 @@ files:
 - features/interactive.feature
 - features/output.feature
 - features/process_timeout.feature
+- features/std_out.feature
 - features/step_definitions/aruba_dev_steps.rb
 - features/support/env.rb
 - lib/aruba.rb
@@ -145,5 +146,6 @@ test_files:
 - features/interactive.feature
 - features/output.feature
 - features/process_timeout.feature
+- features/std_out.feature
 - features/step_definitions/aruba_dev_steps.rb
 - features/support/env.rb