aslakhellesoy-cucumber 0.3.3.6 → 0.3.4

data/History.txt

@@ -1,8 +1,10 @@
-== 0.3.4 (In Git)
+== 0.3.4 2009-05-14
 
 A couple of great new features in this release. Running with Rake is faster than before,
 and there is a brand new JUnit formatter - great for Continuous Integration reports!
 
+This release was made especially for the Oslo XP Meetup today.
+
 ** IMPORTANT UPGRADE NOTES FOR RAILS USERS **
 
 Running Cucumber features in the same Ruby interpreter as Rake doesn't seem to work,
@@ -22,6 +24,7 @@ Alternatively you can omit forking and run features like this:
 However, setting the RAILS_ENV is easy to forget, so I don't recommend relying on this.
 
 === Bugfixes
+* Hooks (World, Before, After) are no longer executed when --dry-run (Aslak Hellesøy)
 * Proper UTF8 use in HTML formatter (Herminio Torres)
 * Problem with multiple terms in languages.yml (#321 Aslak Hellesøy)
 
@@ -32,6 +35,7 @@ However, setting the RAILS_ENV is easy to forget, so I don't recommend relying o
 * Support for Catalan (Francesc Esplugas)
 
 === Changed features
+* The Java example under examples/java uses Ant instead of Rake - and the new JUnit formatter.
 * Rake task should not shell out (#297 Aslak Hellesøy)
   The Cucumber Rake task will run Cucumber in the same Ruby interpreter as Rake itself
   unless explicitly told to fork a new interpreter. This is to increase speed. You can

data/Manifest.txt

@@ -151,7 +151,7 @@ examples/i18n/zh-TW/features/division.feature
 examples/i18n/zh-TW/features/step_definitons/calculator_steps.rb
 examples/i18n/zh-TW/lib/calculator.rb
 examples/java/README.textile
-examples/java/Rakefile
+examples/java/build.xml
 examples/java/features/hello.feature
 examples/java/features/step_definitons/hello_steps.rb
 examples/java/features/step_definitons/tree_steps.rb

data/examples/cs/features/addition.feature

@@ -3,13 +3,13 @@ Feature: Addition
   As a math idiot 
   I want to be told the sum of two numbers
 
-  Scenario: Add two numbers
-    Given I have entered 50 into the calculator
-    And I have entered 70 into the calculator
+  Scenario Outline: Add two numbers
+    Given I have entered <input_1> into the calculator
+    And I have entered <input_2> into the calculator
     When I press add
-    Then the result should be 120 on the screen
+    Then the result should be <output> on the screen
 
-  More Examples:
+  Examples:
     | input_1 | input_2 | output |
     | 20      | 30      | 50     |
     | 2       | 5       | 7      |

data/examples/cs/features/step_definitons/calculator_steps.rb

@@ -1,9 +1,9 @@
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'Calculator'
+require 'Calculator' # Calculator.dll
 
 Before do
-  @calc = Demo::Calculator.new
+  @calc = Demo::Calculator.new # A .NET class in Calculator.dll
 end
 
 Given "I have entered $n into the calculator" do |n|

data/examples/java/README.textile

@@ -1,11 +1,10 @@
 h1. Using Cucumber with Java
 
 This directory contains code to demonstrate how Cucumber can be used to develop Java code.
-You need JRuby 1.1.3 or higher installed and JRuby's bin directory on your PATH.
 
 h2. Installing required gems
 
-jruby -S gem install aslakhellesoy-cucumber
+jruby -S gem install cucumber
 jruby -S gem install diff-lcs
 
 h2. Running the scenarios
@@ -13,10 +12,7 @@ h2. Running the scenarios
 Open a shell in this directory (java) and execute the following command:
 
 <pre><code>
-jruby -S rake features
+ant
 </code></pre>
 
-This will compile the java code and package it in a jar file, and then run Cucumber against
-that code.
-
 There is a deliberate error. See if you can fix it!

data/examples/java/build.xml

@@ -0,0 +1,26 @@
+<project name="Cucumber Demo" default="cucumber" basedir=".">
+  <target name ="compile" description="Compile classes">
+    <mkdir dir="build" />
+    <javac srcdir="src" destdir="build" />
+  </target>
+
+  <target name="cucumber" depends="compile" description="Run Cucumber">
+    <property environment="ENV" />
+    <java classname="org.jruby.Main" fork="true" failonerror="true">
+      <classpath>
+        <pathelement path="${ENV.JRUBY_HOME}/lib/jruby.jar"/>
+        <pathelement path="build"/>
+      </classpath>
+      <jvmarg value="-Djruby.home=${ENV.JRUBY_HOME}"/>
+      <arg value="-S"/>
+      <arg value="cucumber"/>
+      <arg value="--format"/>
+      <arg value="pretty"/>
+      <arg value="--format"/>
+      <arg value="junit"/>
+      <arg value="--out"/>
+      <arg value="build"/>
+      <arg value="features"/>
+    </java>
+  </target>
+</project>

data/examples/java/features/step_definitons/hello_steps.rb

@@ -1,6 +1,4 @@
 require 'spec/expectations' # so we can call .should
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../src') # so the jar is found
-require 'cucumber_demo' # puts the jar on the classpath
 include_class 'cucumber.demo.Hello'
 
 Given /my name is (\w+)/ do |name|

data/lib/cucumber/core_ext/proc.rb

@@ -2,15 +2,15 @@
 class Proc
   PROC_PATTERN = /[\d\w]+@(.*):(.*)>/
   
-  if Proc.new{}.to_s =~ PROC_PATTERN
-    def backtrace_line(name)
-      "#{file_colon_line}:in `#{name}'"
-    end
+  def to_comment_line
+    "# #{file_colon_line}"
+  end
 
-    def to_comment_line
-      "# #{file_colon_line}"
-    end
+  def backtrace_line(name)
+    "#{file_colon_line}:in `#{name}'"
+  end
 
+  if Proc.new{}.to_s =~ PROC_PATTERN
     def file_colon_line
       path, line = *to_s.match(PROC_PATTERN)[1..2]
       path = File.expand_path(path)
@@ -22,12 +22,8 @@ class Proc
     # This Ruby implementation doesn't implement Proc#to_s correctly
     STDERR.puts "*** THIS RUBY IMPLEMENTATION DOESN'T REPORT FILE AND LINE FOR PROCS ***"
     
-    def backtrace_line
-      nil
-    end
-
-    def to_comment_line
-      ""
+    def file_colon_line
+      "UNKNOWN:-1"
     end
   end
 end 

data/lib/cucumber/formatter/junit.rb

@@ -66,7 +66,7 @@ module Cucumber
       private
 
       def convert_to_file_name(feature_name)
-        @reportdir + "TEST-" + feature_name.gsub(/[^\w_\.]/, '_') + ".xml"
+        File.join(@reportdir, "TEST-" + feature_name.gsub(/[^\w_\.]/, '_') + ".xml")
       end
 
       def format_exception(exception)

data/lib/cucumber/step_mother.rb

@@ -262,6 +262,7 @@ module Cucumber
 
     # Creates a new world instance
     def new_world!
+      return if options[:dry_run]
       create_world!
       extend_world
       connect_world
@@ -309,12 +310,14 @@ module Cucumber
     end
 
     def execute_before(scenario)
+      return if options[:dry_run]
       hooks_for(:before, scenario).each do |hook|
         hook.execute_in(@current_world, scenario, 'Before')
       end
     end
 
     def execute_after(scenario)
+      return if options[:dry_run]
       hooks_for(:after, scenario).each do |hook|
         hook.execute_in(@current_world, scenario, 'After')
       end

data/lib/cucumber/version.rb

@@ -2,8 +2,8 @@ module Cucumber #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 3
-    PATCH = 6 # Set to nil for official release
+    TINY  = 4
+    PATCH = nil # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.3.6
+  version: 0.3.4
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -228,7 +228,7 @@ files:
 - examples/i18n/zh-TW/features/step_definitons/calculator_steps.rb
 - examples/i18n/zh-TW/lib/calculator.rb
 - examples/java/README.textile
-- examples/java/Rakefile
+- examples/java/build.xml
 - examples/java/features/hello.feature
 - examples/java/features/step_definitons/hello_steps.rb
 - examples/java/features/step_definitons/tree_steps.rb

data/examples/java/Rakefile

@@ -1,13 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + '/../../lib')
-require 'cucumber/rake/task'
-
-raise "This example only works with JRuby" unless Cucumber::JRUBY
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = %w{--format pretty}
-end
-
-task :features => :compile
-
-task :compile do
-  sh "javac src/cucumber/demo/Hello.java && jar cf src/cucumber_demo.jar -C src cucumber/demo/Hello.class"
-end