aruba 0.1.9 → 0.2.0

data/.gitignore

@@ -20,4 +20,3 @@ pkg
 
 ## PROJECT::SPECIFIC
 tmp
-*.gemspec

data/History.txt

@@ -1,3 +1,35 @@
+== 0.2.0
+
+=== New Features
+* Added aruba.gemspec. (David Chelimsky)
+
+=== Changed features
+* Several step definitions regarding output have changed. (#1 Aslak Hellesøy)
+
+  - /^I should see "([^\"]*)"$/
+  + /^the output should contain "([^"]*)"$/
+
+  - /^I should not see "([^\"]*)"$/
+  + /^the output should not contain "([^"]*)"$/
+
+  - /^I should see:$/
+  + /^the output should contain:$/
+
+  - /^I should not see:$/
+  + /^the output should not contain:$/
+
+  - /^I should see exactly "([^\"]*)"$/
+  + /^the output should contain exactly "([^"]*)"$/
+
+  - /^I should see exactly:$/
+  + /^the output should contain exactly:$/
+
+  - /^I should see matching \/([^\/]*)\/$/
+  + /^the output should match \/([^\/]*)\/$/
+
+  - /^I should see matching:$/
+  + /^the output should match:$/
+
 == 0.1.9
 * If the GOTGEMS environment variable is set, bundler won't run (faster). (Aslak Hellesøy)
 

data/README.rdoc

@@ -23,8 +23,8 @@ with specific versions of Ruby (regardless of what Ruby version you're using to
 
 This is done with the follwoing step definitions:
 
-  /^I am using rvm "([^\"]*)"$/
-  /^I am using rvm gemset "([^\"]*)"$/
+  /^I am using rvm "([^"]*)"$/
+  /^I am using rvm gemset "([^"]*)"$/
 
 Then, if you use the step definition:
 

data/Rakefile

@@ -5,15 +5,15 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.version = "0.1.9"
+    gem.version = "0.2.0"
     gem.name = "aruba"
     gem.summary = %Q{CLI Steps for Cucumber}
     gem.description = %Q{CLI Steps for Cucumber, hand-crafted for you in Aruba}
     gem.email = "cukes@googlegroups.com"
     gem.homepage = "http://github.com/aslakhellesoy/aruba"
     gem.authors = ["Aslak Hellesøy", "David Chelimsky"]
-    gem.add_development_dependency "rspec", ">= 1.3.0"
-    gem.add_development_dependency "cucumber", ">= 0.7.0.beta.6"
+    gem.add_development_dependency "rspec", ">= 2.0.0.beta.15"
+    gem.add_development_dependency "cucumber", ">= 0.8.2"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/aruba.gemspec

@@ -0,0 +1,60 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{aruba}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Aslak Helles\303\270y", "David Chelimsky"]
+  s.date = %q{2010-07-07}
+  s.description = %q{CLI Steps for Cucumber, hand-crafted for you in Aruba}
+  s.email = %q{cukes@googlegroups.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "History.txt",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "aruba.gemspec",
+     "config/.gitignore",
+     "features/exit_statuses.feature",
+     "features/file_system_commands.feature",
+     "features/output.feature",
+     "features/running_ruby.feature",
+     "features/step_definitions/aruba_dev_steps.rb",
+     "features/support/env.rb",
+     "lib/aruba.rb",
+     "lib/aruba/api.rb",
+     "lib/aruba/cucumber.rb"
+  ]
+  s.homepage = %q{http://github.com/aslakhellesoy/aruba}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{CLI Steps for Cucumber}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.15"])
+      s.add_development_dependency(%q<cucumber>, [">= 0.8.2"])
+    else
+      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.15"])
+      s.add_dependency(%q<cucumber>, [">= 0.8.2"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.15"])
+    s.add_dependency(%q<cucumber>, [">= 0.8.2"])
+  end
+end
+

data/features/file_system_commands.feature

@@ -15,7 +15,7 @@ Feature: file system commands
       puts "hello world"
       """
     When I run "ruby foo/bar/example.rb"
-    Then I should see "hello world"
+    Then the output should contain "hello world"
 
   Scenario: append to a file
     Given a file named "foo/bar/example.rb" with:
@@ -27,13 +27,13 @@ Feature: file system commands
       puts "this was appended"
       """
     When I run "ruby foo/bar/example.rb"
-    Then I should see "hello world"
-    And I should see "this was appended"
+    Then the output should contain "hello world"
+    And the output should contain "this was appended"
 
   Scenario: clean up files generated in previous scenario
     When I run "ruby foo/bar/example.rb"
     Then the exit status should be 1
-    And I should see "No such file or directory -- foo/bar/example.rb"
+    And the output should contain "No such file or directory -- foo/bar/example.rb"
   
   Scenario: change to a subdir
     Given a file named "foo/bar/example.rb" with:
@@ -42,7 +42,7 @@ Feature: file system commands
       """
     When I cd to "foo/bar"
     And I run "ruby example.rb"
-    Then I should see "hello world"
+    Then the output should contain "hello world"
 
   Scenario: Reset current directory from previous scenario
     When I run "ruby example.rb"
@@ -67,6 +67,13 @@ Feature: file system commands
   Scenario: Check for absence of files
     Then the following files should not exist:
       | lorem/ipsum/dolor |
+      
+  Scenario: Check for presence of a subset of directories
+    Given a directory named "foo/bar"
+    Given a directory named "foo/bla"
+    Then the following directories should exist:
+      | foo/bar |
+      | foo/bla |
 
   Scenario: Check file contents
     Given a file named "foo" with:

data/features/output.feature

@@ -2,41 +2,48 @@ Feature: Output
 
   In order to specify expected output
   As a developer using Cucumber
-  I want to use the "I should see" step
+  I want to use the "the output should contain" step
+
+  Scenario: Run unknown command
+    When I run "neverever gonna work"
+    Then the output should contain:
+    """
+    sh: neverever: command not found
+    """
 
   Scenario: Detect subset of one-line output
     When I run "ruby -e 'puts \"hello world\"'"
-    Then I should see "hello world"
+    Then the output should contain "hello world"
 
   Scenario: Detect subset of one-line output
     When I run "echo 'hello world'"
-    Then I should see "hello world"
+    Then the output should contain "hello world"
 
   Scenario: Detect absence of one-line output
     When I run "ruby -e 'puts \"hello world\"'"
-    Then I should not see "good-bye"
+    Then the output should not contain "good-bye"
 
   Scenario: Detect subset of multiline output
     When I run "ruby -e 'puts \"hello\\nworld\"'"
-    Then I should see:
+    Then the output should contain:
       """
       hello
       """
 
   Scenario: Detect subset of multiline output
     When I run "ruby -e 'puts \"hello\\nworld\"'"
-    Then I should not see:
+    Then the output should not contain:
       """
       good-bye
       """
 
   Scenario: Detect exact one-line output
     When I run "ruby -e 'puts \"hello world\"'"
-    Then I should see exactly "hello world\n"
+    Then the output should contain exactly "hello world\n"
 
   Scenario: Detect exact multiline output
     When I run "ruby -e 'puts \"hello\\nworld\"'"
-    Then I should see exactly:
+    Then the output should contain exactly:
       """
       hello
       world
@@ -46,13 +53,13 @@ Feature: Output
   @announce
   Scenario: Detect subset of one-line output with regex
     When I run "ruby --version"
-    Then I should see "ruby"
-    And I should see matching /ruby ([\d]+\.[\d]+\.[\d]+)(p\d+)? \(.*$/
+    Then the output should contain "ruby"
+    And the output should match /ruby ([\d]+\.[\d]+\.[\d]+)(p\d+)? \(.*$/
 
   @announce
   Scenario: Detect subset of multiline output with regex
     When I run "ruby -e 'puts \"hello\\nworld\\nextra line1\\nextra line2\\nimportant line\"'"
-    Then I should see matching:
+    Then the output should match:
       """
       he..o
       wor.d

data/features/running_ruby.feature

@@ -7,51 +7,46 @@ Feature: Running ruby
   Scenario: Run with ruby 1.9.1
     Given I am using rvm "1.9.1"
     When I run "ruby -e 'puts RUBY_VERSION'"
-    Then I should see "ruby-1.9.1-p378"
-    And I should not see "rvm usage"
+    Then the output should contain "ruby-1.9.1-p378"
+    And the output should not contain "rvm usage"
 
   Scenario: Run with ruby JRuby
-    Given I am using rvm "jruby-1.4.0"
+    Given I am using rvm "jruby"
     When I run "ruby -e 'puts JRUBY_VERSION'"
-    Then I should see "1.4.0"
-    And I should not see "rvm usage"
+    Then the output should contain "1.5.1"
+    And the output should not contain "rvm usage"
 
   Scenario: Install gems with bundler
     Given I am using rvm "1.9.1"
     And I am using rvm gemset "a-new-gemset-where-no-gems-are-installed" with Gemfile:
       """
+      source :gemcutter
       gem 'diff-lcs', '1.1.2'
       """
     When I run "gem list"
-    Then I should see matching:
+    Then the output should match:
       """
       bundler \(\d+\.+\d+\.+\d+\)
       diff-lcs \(\d+\.+\d+\.+\d+\)
       """
 
-  Scenario: Specify both rvm and gemset
-    Given I am using rvm "1.9.1"
-    And I am using an empty rvm gemset "a-new-gemset-where-no-gems-are-installed"
-    When I run "gem list | wc -l"
-    Then I should see exactly "       2\n"
-
   Scenario: Find the version of ruby 1.9.1
     Given I am using rvm "1.9.1"
     When I run "ruby --version"
-    Then I should see "1.9.1"
+    Then the output should contain "1.9.1"
 
   Scenario: Find the version of cucumber on ruby 1.9.1
     Given I am using rvm "1.9.1"
     When I run "cucumber --version"
-    Then I should see matching /\d+\.+\d+\.+\d+/
+    Then the output should match /\d+\.+\d+\.+\d+/
 
   Scenario: Use current ruby
     When I run "ruby --version"
-    Then I should see the current Ruby version
+    Then the output should contain the current Ruby version
 
   Scenario: Use current ruby and a gem bin file
     When I run "rake --version"
-    Then I should see "rake, version"
+    Then the output should contain "rake, version"
 
   # I have trouble running rvm 1.8.7 in OS X Leopard, which is
   # ruby-1.8.7-p249 (It segfaults rather often). However, a previous
@@ -70,7 +65,7 @@ Feature: Running ruby
       """
     And I am using rvm "1.8.7"
     When I run "ruby --version"
-    Then I should see "patchlevel 174"
+    Then the output should contain "patchlevel 174"
 
   # To verify this, make sure current rvm is *not* JRuby and run:
   #
@@ -78,4 +73,4 @@ Feature: Running ruby
   @jruby
   Scenario: Don't use rvm, but default to same Ruby as the one that launched Cucumber
     When I run "ruby -e 'puts JRUBY_VERSION if defined?(JRUBY_VERSION)'"
-    Then I should see the JRuby version
+    Then the output should contain the JRuby version

data/features/step_definitions/aruba_dev_steps.rb

@@ -1,4 +1,4 @@
-Given /^I have a local file named "([^\"]*)" with:$/ do |filename, content|
+Given /^I have a local file named "([^"]*)" with:$/ do |filename, content|
   File.open(filename, 'w') {|io| io.write(content)}
 end
 
@@ -10,15 +10,15 @@ When /^I do aruba (.*)$/ do |aruba_step|
   end
 end
 
-Then /^I should see the JRuby version$/ do
+Then /^the output should contain the JRuby version$/ do
   pending "This must be manually run in JRuby" unless defined?(JRUBY_VERSION)
-  Then %{I should see "#{JRUBY_VERSION}"}
+  Then %{the output should contain "#{JRUBY_VERSION}"}
 end
 
-Then /^I should see the current Ruby version$/ do
-  Then %{I should see "#{RUBY_VERSION}"}
+Then /^the output should contain the current Ruby version$/ do
+  Then %{the output should contain "#{RUBY_VERSION}"}
 end
 
-Then /^aruba should fail with "([^\"]*)"$/ do |error_message|
+Then /^aruba should fail with "([^"]*)"$/ do |error_message|
   @aruba_exception.message.should =~ compile_and_escape(error_message)
 end

data/lib/aruba/api.rb

@@ -63,6 +63,18 @@ module Api
       end
     end
   end
+  
+  def check_directory_presence(paths, expect_presence)
+    in_current_dir do
+      paths.each do |path|
+        if expect_presence
+          File.should be_directory(path)
+        else
+          File.should_not be_directory(path)
+        end
+      end
+    end
+  end
 
   def _mkdir(dir_name)
     FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
@@ -118,7 +130,7 @@ module Api
     cmd = detect_ruby_script(cmd)
     cmd = detect_ruby(cmd)
 
-    announce("$ #{cmd}") if @announce_cmd
+    announce_or_puts("$ #{cmd}") if @announce_cmd
 
     stderr_file = Tempfile.new('cucumber')
     stderr_file.close
@@ -127,14 +139,14 @@ module Api
       IO.popen("#{cmd} 2> #{stderr_file.path}", mode) do |io|
         @last_stdout = io.read
 
-        announce(@last_stdout) if @announce_stdout
+        announce_or_puts(@last_stdout) if @announce_stdout
       end
 
       @last_exit_status = $?.exitstatus
     end
     @last_stderr = IO.read(stderr_file.path)
 
-    announce(@last_stderr) if @announce_stderr
+    announce_or_puts(@last_stderr) if @announce_stderr
 
     if(@last_exit_status != 0 && fail_on_error)
       fail("Exit status was #{@last_exit_status}. Output:\n#{combined_output}")
@@ -143,6 +155,14 @@ module Api
     @last_stderr
   end
 
+  def announce_or_puts(msg)
+    if(@puts)
+      puts(msg)
+    else
+      announce(msg)
+    end
+  end
+
   def detect_ruby(cmd)
     if cmd =~ /^ruby\s/
       cmd.gsub(/^ruby\s/, "#{current_ruby} ")

data/lib/aruba/cucumber.rb

@@ -6,6 +6,10 @@ Before do
   FileUtils.rm_rf(current_dir)
 end
 
+Before('@puts') do
+  @puts = true
+end
+
 Before('@announce-cmd') do
   @announce_cmd = true
 end
@@ -24,36 +28,40 @@ Before('@announce') do
   @announce_cmd = true
 end
 
-Given /^I am using rvm "([^\"]*)"$/ do |rvm_ruby_version|
+Given /^I am using rvm "([^"]*)"$/ do |rvm_ruby_version|
   use_rvm(rvm_ruby_version)
 end
 
-Given /^I am using( an empty)? rvm gemset "([^\"]*)"$/ do |empty_gemset, rvm_gemset|
+Given /^I am using( an empty)? rvm gemset "([^"]*)"$/ do |empty_gemset, rvm_gemset|
   use_rvm_gemset(rvm_gemset, empty_gemset)
 end
 
-Given /^I am using rvm gemset "([^\"]*)" with Gemfile:$/ do |rvm_gemset, gemfile|
+Given /^I am using rvm gemset "([^"]*)" with Gemfile:$/ do |rvm_gemset, gemfile|
   use_rvm_gemset(rvm_gemset, true)
   install_gems(gemfile)
 end
 
-Given /^a directory named "([^\"]*)"$/ do |dir_name|
+Given /^a directory named "([^"]*)"$/ do |dir_name|
   create_dir(dir_name)
 end
 
-Given /^a file named "([^\"]*)" with:$/ do |file_name, file_content|
+Given /^a file named "([^"]*)" with:$/ do |file_name, file_content|
   create_file(file_name, file_content)
 end
 
-Given /^an empty file named "([^\"]*)"$/ do |file_name|
+Given /^an empty file named "([^"]*)"$/ do |file_name|
   create_file(file_name, "")
 end
 
-When /^I append to "([^\"]*)" with:$/ do |file_name, file_content|
+When /^I write to "([^"]*)" with:$/ do |file_name, file_content|
+  create_file(file_name, file_content)
+end
+
+When /^I append to "([^"]*)" with:$/ do |file_name, file_content|
   append_to_file(file_name, file_content)
 end
 
-When /^I cd to "([^\"]*)"$/ do |dir|
+When /^I cd to "([^"]*)"$/ do |dir|
   cd(dir)
 end
 
@@ -65,39 +73,39 @@ When /^I successfully run "(.*)"$/ do |cmd|
   run(unescape(cmd))
 end
 
-Then /^I should see "([^\"]*)"$/ do |partial_output|
+Then /^the output should contain "([^"]*)"$/ do |partial_output|
   combined_output.should =~ compile_and_escape(partial_output)
 end
 
-Then /^I should not see "([^\"]*)"$/ do |partial_output|
+Then /^the output should not contain "([^"]*)"$/ do |partial_output|
   combined_output.should_not =~ compile_and_escape(partial_output)
 end
 
-Then /^I should see:$/ do |partial_output|
+Then /^the output should contain:$/ do |partial_output|
   combined_output.should =~ compile_and_escape(partial_output)
 end
 
-Then /^I should not see:$/ do |partial_output|
+Then /^the output should not contain:$/ do |partial_output|
   combined_output.should_not =~ compile_and_escape(partial_output)
 end
 
-Then /^I should see exactly "([^\"]*)"$/ do |exact_output|
+Then /^the output should contain exactly "([^"]*)"$/ do |exact_output|
   combined_output.should == unescape(exact_output)
 end
 
-Then /^I should see exactly:$/ do |exact_output|
+Then /^the output should contain exactly:$/ do |exact_output|
   combined_output.should == exact_output
 end
 
-# "I should see matching" allows regex in the partial_output, if
-# you don't need regex, use "I should see" instead since
+# "the output should match" allows regex in the partial_output, if
+# you don't need regex, use "the output should contain" instead since
 # that way, you don't have to escape regex characters that
 # appear naturally in the output
-Then /^I should see matching \/([^\/]*)\/$/ do |partial_output|
+Then /^the output should match \/([^\/]*)\/$/ do |partial_output|
   combined_output.should =~ /#{partial_output}/
 end
  
-Then /^I should see matching:$/ do |partial_output|
+Then /^the output should match:$/ do |partial_output|
   combined_output.should =~ /#{partial_output}/m
 end
 
@@ -110,7 +118,7 @@ Then /^the exit status should not be (\d+)$/ do |exit_status|
 end
 
 Then /^it should (pass|fail) with:$/ do |pass_fail, partial_output|
-  Then "I should see:", partial_output
+  Then "the output should contain:", partial_output
   if pass_fail == 'pass'
     @last_exit_status.should == 0
   else
@@ -118,19 +126,19 @@ Then /^it should (pass|fail) with:$/ do |pass_fail, partial_output|
   end
 end
 
-Then /^the stderr should contain "([^\"]*)"$/ do |partial_output|
+Then /^the stderr should contain "([^"]*)"$/ do |partial_output|
   @last_stderr.should =~ compile_and_escape(partial_output)
 end
 
-Then /^the stdout should contain "([^\"]*)"$/ do |partial_output|
+Then /^the stdout should contain "([^"]*)"$/ do |partial_output|
   @last_stdout.should =~ compile_and_escape(partial_output)
 end
 
-Then /^the stderr should not contain "([^\"]*)"$/ do |partial_output|
+Then /^the stderr should not contain "([^"]*)"$/ do |partial_output|
   @last_stderr.should_not =~ compile_and_escape(partial_output)
 end
 
-Then /^the stdout should not contain "([^\"]*)"$/ do |partial_output|
+Then /^the stdout should not contain "([^"]*)"$/ do |partial_output|
   @last_stdout.should_not =~ compile_and_escape(partial_output)
 end
 
@@ -142,10 +150,18 @@ Then /^the following files should not exist:$/ do |files|
   check_file_presence(files.raw.map{|file_row| file_row[0]}, false)
 end
 
-Then /^the file "([^\"]*)" should contain "([^\"]*)"$/ do |file, partial_content|
+Then /^the following directories should exist:$/ do |directories|
+  check_directory_presence(directories.raw.map{|directory_row| directory_row[0]}, true)
+end
+
+Then /^the following directories should not exist:$/ do |directories|
+  check_file_presence(directories.raw.map{|directory_row| directory_row[0]}, false)
+end
+
+Then /^the file "([^"]*)" should contain "([^"]*)"$/ do |file, partial_content|
   check_file_content(file, partial_content, true)
 end
 
-Then /^the file "([^\"]*)" should not contain "([^\"]*)"$/ do |file, partial_content|
+Then /^the file "([^"]*)" should not contain "([^"]*)"$/ do |file, partial_content|
   check_file_content(file, partial_content, false)
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aruba
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 9
-  version: 0.1.9
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -15,37 +16,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 +02:00
+date: 2010-07-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 62196477
         segments: 
-        - 1
-        - 3
+        - 2
+        - 0
         - 0
-        version: 1.3.0
+        - beta
+        - 15
+        version: 2.0.0.beta.15
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 0
-        - 7
-        - 0
-        - beta
-        - 6
-        version: 0.7.0.beta.6
+        - 8
+        - 2
+        version: 0.8.2
   type: :development
   version_requirements: *id002
 description: CLI Steps for Cucumber, hand-crafted for you in Aruba
@@ -64,6 +69,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- aruba.gemspec
 - config/.gitignore
 - features/exit_statuses.feature
 - features/file_system_commands.feature
@@ -84,23 +90,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: CLI Steps for Cucumber