aruba 0.3.0 → 0.3.1

data/History.txt

@@ -1,3 +1,11 @@
+== 0.3.1
+
+=== Bugfixes
+* Broken 0.3.0 release (#43, #44 Mike Sassak)
+
+=== Changed Features
+* Quotes (") and newline (\n) in step arguments are no longer unescaped. (Aslak Hellesøy)
+
 == 0.3.0
 
 === Bugfixes

data/aruba.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'aruba'
-  s.version     = '0.3.0'
+  s.version     = '0.3.1'
   s.authors     = ["Aslak Hellesøy", "David Chelimsky", "Mike Sassak"]
   s.description = 'CLI Steps for Cucumber, hand-crafted for you in Aruba'
   s.summary     = "aruba-#{s.version}"

data/features/output.feature

@@ -39,7 +39,11 @@ Feature: Output
 
   Scenario: Detect exact one-line output
     When I run "ruby -e 'puts \"hello world\"'"
-    Then the output should contain exactly "hello world\n"
+    Then the output should contain exactly:
+      """
+      hello world
+      
+      """
 
   Scenario: Detect exact multiline output
     When I run "ruby -e 'puts "hello\nworld"'"
@@ -150,15 +154,31 @@ Feature: Output
     When I run "ruby -e 'puts \"hello world!\"'"
     And I run "ruby -e 'puts gets.chomp.reverse'" interactively
     And I type "hello"
-    Then the stdout should contain "hello world!\nolleh"
-    And the stderr should not contain "hello world!\nolleh"
+    Then the stdout should contain:
+      """
+      hello world!
+      olleh
+      """
+    And the stderr should not contain:
+      """
+      hello world!
+      olleh
+      """
 
   Scenario: Detect stderr from all processes
     When I run "ruby -e 'STDERR.puts \"hello world!\"'"
     And I run "ruby -e 'STDERR.puts gets.chomp.reverse'" interactively
     And I type "hello"
-    Then the stderr should contain "hello world!\nolleh"
-    And the stdout should not contain "hello world!\nolleh"
+    Then the stderr should contain:
+      """
+      hello world!
+      olleh
+      """
+    And the stdout should not contain:
+      """
+      hello world!
+      olleh
+      """
 
   Scenario: Detect output from named source
     When I run "ruby -e 'puts :simple'"

data/lib/aruba/api.rb

@@ -22,7 +22,15 @@ module Aruba
       @dirs ||= ['tmp/aruba']
     end
 
-    def create_file(file_name, file_content, check_presence = false)
+    def write_file(file_name, file_content)
+      _create_file(file_name, file_content, false)
+    end
+
+    def overwrite_file(file_name, file_content)
+      _create_file(file_name, file_content, true)
+    end
+
+    def _create_file(file_name, file_content, check_presence)
       in_current_dir do
         raise "expected #{file_name} to be present" if check_presence && !File.file?(file_name)
         _mkdir(File.dirname(file_name))
@@ -98,8 +106,7 @@ module Aruba
     end
 
     def unescape(string)
-      string.gsub('\n', "\n")
-            .gsub('\"', '"')
+      string.gsub('\n', "\n").gsub('\"', '"')
     end
 
     def regexp(string_or_regexp)
@@ -171,14 +178,6 @@ module Aruba
       end
     end
     
-    def install_gems(gemfile)
-      create_file("Gemfile", gemfile)
-      if ENV['GOTGEMS'].nil?
-        run("gem install bundler")
-        run("bundle --no-color install")
-      end
-    end
-
     def processes
       @processes ||= {}
     end
@@ -234,10 +233,18 @@ module Aruba
       @interactive = run(cmd)
     end
 
-    def write_interactive(input)
+    def type(input)
+      _write_interactive(_ensure_newline(input))
+    end
+
+    def _write_interactive(input)
       @interactive.stdin.write(input)
     end
 
+    def _ensure_newline(str)
+      str.chomp << "\n"
+    end
+
     def announce_or_puts(msg)
       if(@puts)
         puts(msg)
@@ -297,9 +304,5 @@ module Aruba
     def original_env
       @original_env ||= {}
     end
-
-    def ensure_newline(str)
-      str.chomp << "\n"
-    end
   end
 end

data/lib/aruba/cucumber.rb

@@ -64,19 +64,19 @@ Given /^a directory named "([^"]*)"$/ do |dir_name|
 end
 
 Given /^a file named "([^"]*)" with:$/ do |file_name, file_content|
-  create_file(file_name, file_content)
+  write_file(file_name, file_content)
 end
 
 Given /^an empty file named "([^"]*)"$/ do |file_name|
-  create_file(file_name, "")
+  write_file(file_name, "")
 end
 
 When /^I write to "([^"]*)" with:$/ do |file_name, file_content|
-  create_file(file_name, file_content, false)
+  write_file(file_name, file_content)
 end
 
 When /^I overwrite "([^"]*)" with:$/ do |file_name, file_content|
-  create_file(file_name, file_content, true)
+  overwrite_file(file_name, file_content, true)
 end
 
 When /^I append to "([^"]*)" with:$/ do |file_name, file_content|
@@ -104,39 +104,39 @@ When /^I run "([^"]*)" interactively$/ do |cmd|
 end
 
 When /^I type "([^"]*)"$/ do |input|
-  write_interactive(ensure_newline(input))
+  type(input)
 end
 
 Then /^the output should contain "([^"]*)"$/ do |partial_output|
-  assert_partial_output(unescape(partial_output))
+  assert_partial_output(partial_output)
 end
 
 Then /^the output from "([^"]*)" should contain "([^"]*)"$/ do |cmd, partial_output|
-  output_from(cmd).should include(unescape(partial_output))
+  output_from(cmd).should include(partial_output)
 end
 
 Then /^the output from "([^"]*)" should not contain "([^"]*)"$/ do |cmd, partial_output|
-  output_from(cmd).should_not include(unescape(partial_output))
+  output_from(cmd).should_not include(partial_output)
 end
 
 Then /^the output should not contain "([^"]*)"$/ do |partial_output|
-  all_output.should_not include(unescape(partial_output))
+  all_output.should_not include(partial_output)
 end
 
 Then /^the output should contain:$/ do |partial_output|
-  all_output.should include(unescape(partial_output))
+  all_output.should include(partial_output)
 end
 
 Then /^the output should not contain:$/ do |partial_output|
-  all_output.should_not include(unescape(partial_output))
+  all_output.should_not include(partial_output)
 end
 
 Then /^the output should contain exactly "([^"]*)"$/ do |exact_output|
-  all_output.should == unescape(exact_output)
+  all_output.should == exact_output
 end
 
 Then /^the output should contain exactly:$/ do |exact_output|
-  all_output.should == unescape(exact_output)
+  all_output.should == exact_output
 end
 
 # "the output should match" allows regex in the partial_output, if
@@ -177,7 +177,11 @@ Then /^it should (pass|fail) with regexp?:$/ do |pass_fail, partial_output|
 end
 
 Then /^the stderr should contain "([^"]*)"$/ do |partial_output|
-  all_stderr.should include(unescape(partial_output))
+  all_stderr.should include(partial_output)
+end
+
+Then /^the stderr should contain:$/ do |partial_output|
+  all_stderr.should include(partial_output)
 end
 
 Then /^the stderr should contain exactly:$/ do |exact_output|
@@ -185,11 +189,11 @@ Then /^the stderr should contain exactly:$/ do |exact_output|
 end
 
 Then /^the stdout should contain "([^"]*)"$/ do |partial_output|
-  all_stdout.should include(unescape(partial_output))
+  all_stdout.should include(partial_output)
 end
 
 Then /^the stdout should contain:$/ do |partial_output|
-  all_stdout.should include(unescape(partial_output))
+  all_stdout.should include(partial_output)
 end
 
 Then /^the stdout should contain exactly:$/ do |exact_output|
@@ -197,27 +201,35 @@ Then /^the stdout should contain exactly:$/ do |exact_output|
 end
 
 Then /^the stderr should not contain "([^"]*)"$/ do |partial_output|
-  all_stderr.should_not include(unescape(partial_output))
+  all_stderr.should_not include(partial_output)
+end
+
+Then /^the stderr should not contain:$/ do |partial_output|
+  all_stderr.should_not include(partial_output)
 end
 
 Then /^the stdout should not contain "([^"]*)"$/ do |partial_output|
-  all_stdout.should_not include(unescape(partial_output))
+  all_stdout.should_not include(partial_output)
+end
+
+Then /^the stdout should not contain:$/ do |partial_output|
+  all_stdout.should_not include(partial_output)
 end
 
 Then /^the stdout from "([^"]*)" should contain "([^"]*)"$/ do |cmd, partial_output|
-  stdout_from(cmd).should include(unescape(partial_output))
+  stdout_from(cmd).should include(partial_output)
 end
 
 Then /^the stdout from "([^"]*)" should not contain "([^"]*)"$/ do |cmd, partial_output|
-  stdout_from(cmd).should_not include(unescape(partial_output))
+  stdout_from(cmd).should_not include(partial_output)
 end
 
 Then /^the stderr from "([^"]*)" should contain "([^"]*)"$/ do |cmd, partial_output|
-  stderr_from(cmd).should include(unescape(partial_output))
+  stderr_from(cmd).should include(partial_output)
 end
 
 Then /^the stderr from "([^"]*)" should not contain "([^"]*)"$/ do |cmd, partial_output|
-  stderr_from(cmd).should_not include(unescape(partial_output))
+  stderr_from(cmd).should_not include(partial_output)
 end
 
 Then /^the file "([^"]*)" should not exist$/ do |file_name|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-28 00:00:00 -06:00
+date: 2010-12-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -686975627344897443
+      hash: -2425231353977914913
       segments: 
       - 0
       version: "0"
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -686975627344897443
+      hash: -2425231353977914913
       segments: 
       - 0
       version: "0"
@@ -131,7 +131,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: aruba-0.3.0
+summary: aruba-0.3.1
 test_files: 
 - features/exit_statuses.feature
 - features/file_system_commands.feature