cucumber 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,12 @@
+== 0.2.2 2009-03-25
+
+This release includes some minor changes to make Cucumber work with pure Java. Cucumber
+has already worked with Java for a while (using JRuby and step definitions in Ruby),
+but now you can write step definitions in pure Java!
+
+Check out the Cucumber Java project for more details:
+http://github.com/aslakhellesoy/cucumber_java/tree/master
+
 == 0.2.1 2009-03-25
 
 This release fixes a few minor bugs and adds a couple of new features.

data/Manifest.txt

@@ -124,15 +124,7 @@ examples/java/features/step_definitons/hello_steps.rb
 examples/java/features/step_definitons/tree_steps.rb
 examples/java/features/tree.feature
 examples/java/src/cucumber/demo/Hello.java
-examples/jbehave/README.textile
-examples/jbehave/features/support/env.rb
-examples/jbehave/features/trading.feature
-examples/jbehave/pom.xml
-examples/jbehave/src/main/java/cukes/jbehave/examples/trader/converters/TraderConverter.java
-examples/jbehave/src/main/java/cukes/jbehave/examples/trader/model/Stock.java
-examples/jbehave/src/main/java/cukes/jbehave/examples/trader/model/Trader.java
-examples/jbehave/src/main/java/cukes/jbehave/examples/trader/persistence/TraderPersister.java
-examples/jbehave/src/main/java/cukes/jbehave/examples/trader/scenarios/TraderSteps.java
+examples/pure_java/README.textile
 examples/selenium/Rakefile
 examples/selenium/features/search.feature
 examples/selenium/features/step_definitons/search_steps.rb
@@ -255,7 +247,6 @@ lib/cucumber/formatter/rerun.rb
 lib/cucumber/formatter/unicode.rb
 lib/cucumber/formatter/usage.rb
 lib/cucumber/formatters/unicode.rb
-lib/cucumber/jbehave.rb
 lib/cucumber/languages.yml
 lib/cucumber/parser.rb
 lib/cucumber/parser/basic.rb

data/examples/pure_java/README.textile

@@ -0,0 +1,5 @@
+h1. Cucumber with pure Java
+
+You can use Cucumber with step definitions in pure Java.
+
+See http://github.com/aslakhellesoy/cucumber_java/tree/master

data/lib/cucumber/core_ext/exception.rb

@@ -20,7 +20,7 @@
 #
 class Exception
   CUCUMBER_FILTER_PATTERNS = [
-    /vendor\/rails|lib\/cucumber|lib\/rspec|gems\//
+    /vendor\/rails|lib\/cucumber|bin\/cucumber:|lib\/rspec|gems\//
   ]
 
   INSTANCE_EXEC_OFFSET = (Cucumber::RUBY_1_9 || Cucumber::JRUBY) ? -3 : -4

data/lib/cucumber/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -211,15 +211,7 @@ files:
 - examples/java/features/step_definitons/tree_steps.rb
 - examples/java/features/tree.feature
 - examples/java/src/cucumber/demo/Hello.java
-- examples/jbehave/README.textile
-- examples/jbehave/features/support/env.rb
-- examples/jbehave/features/trading.feature
-- examples/jbehave/pom.xml
-- examples/jbehave/src/main/java/cukes/jbehave/examples/trader/converters/TraderConverter.java
-- examples/jbehave/src/main/java/cukes/jbehave/examples/trader/model/Stock.java
-- examples/jbehave/src/main/java/cukes/jbehave/examples/trader/model/Trader.java
-- examples/jbehave/src/main/java/cukes/jbehave/examples/trader/persistence/TraderPersister.java
-- examples/jbehave/src/main/java/cukes/jbehave/examples/trader/scenarios/TraderSteps.java
+- examples/pure_java/README.textile
 - examples/selenium/Rakefile
 - examples/selenium/features/search.feature
 - examples/selenium/features/step_definitons/search_steps.rb
@@ -342,7 +334,6 @@ files:
 - lib/cucumber/formatter/unicode.rb
 - lib/cucumber/formatter/usage.rb
 - lib/cucumber/formatters/unicode.rb
-- lib/cucumber/jbehave.rb
 - lib/cucumber/languages.yml
 - lib/cucumber/parser.rb
 - lib/cucumber/parser/basic.rb

data/examples/jbehave/README.textile

@@ -1,20 +0,0 @@
-h1. Cucumber and JBehave
-
-Look ma - no Ruby!
-
-h2. Running the example
-
-First, compile the java code (and JBehave steps)
-
-<code>mvn compile jar:jar</code>
-
-Second, set your CLASSPATH
-<code>export CLASSPATH=~/.m2/repository/cucumber/cucumber-support/0.2/cucumber-support-0.2.jar:~/.m2/repository/org/jbehave/jbehave-core/2.1.1/jbehave-core-2.1.1.jar:~/.m2/repository/org/hamcrest/hamcrest-all/1.1/hamcrest-all-1.1.jar:~/.m2/repository/junit/junit/4.4/junit-4.4.jar</code>
-
-Third, run Cucumber:
-
-<code>jruby -S cucumber features</code>
-
-Or if you got the source with Git:
-
-<code>jruby ../../bin/cucumber features</code>

data/examples/jbehave/features/support/env.rb

@@ -1,7 +0,0 @@
-require 'cucumber/jbehave'
-
-project_code = File.expand_path(File.dirname(__FILE__) + '/../../target/jbehave-example-0.2-SNAPSHOT.jar')
-require project_code
-
-import 'cukes.jbehave.examples.trader.scenarios.TraderSteps'
-JBehave(TraderSteps.new)

data/examples/jbehave/features/trading.feature

@@ -1,28 +0,0 @@
-Feature: Trading
-  In order to avoid lost trades
-  Traders should be alerted about stocks
-
-  Scenario: Status alert can be activated
-    Given a stock of prices 0.5,1.0 and a threshold of 10.0
-    When the stock is traded at 5.0
-    Then the alert status should be OFF
-    When the stock is traded at 11.0
-    Then the alert status should be ON
-
-  Scenario: Status alert is never activated
-    Given a stock of prices 0.5,1.0 and a threshold of 15.0
-    When the stock is traded at 5.0
-    Then the alert status should be OFF
-    When the stock is traded at 11.0
-    Then the alert status should be OFF
-
-  Scenario: Trader sells all stocks
-    # Given the following table
-    #   | a | b |
-    #   | 1 | 2 |
-    #   | 3 | 4 |
-    Given a trader of name Mauro
-    Given a stock of prices 0.5,1.0 and a threshold of 1.5
-    When the stock is traded at 2.0
-    Then the trader sells all stocks
-    And the trader gets a bonus

data/examples/jbehave/pom.xml

@@ -1,53 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>cukes</groupId>
-  <artifactId>jbehave-example</artifactId>
-  <packaging>jar</packaging>
-  <version>0.2-SNAPSHOT</version>
-  <name>Cucumber JBehave Example</name>
-  <url>http://cukes.info/</url>
-
-  <repositories>
-    <repository>
-      <id>codehaus</id>
-      <url>http://repository.codehaus.org</url>
-    </repository>
-  </repositories>
-
-  <dependencies>
-    <dependency>
-      <groupId>cucumber</groupId>
-      <artifactId>cucumber-support</artifactId>
-      <version>0.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jbehave</groupId>
-      <artifactId>jbehave-core</artifactId>
-      <version>2.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.4</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.0.2</version>
-          <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>

data/examples/jbehave/src/main/java/cukes/jbehave/examples/trader/converters/TraderConverter.java

@@ -1,32 +0,0 @@
-package cukes.jbehave.examples.trader.converters;
-
-import java.lang.reflect.Type;
-
-import cukes.jbehave.examples.trader.model.Trader;
-import cukes.jbehave.examples.trader.persistence.TraderPersister;
-import org.jbehave.scenario.steps.ParameterConverters.InvalidParameterException;
-import org.jbehave.scenario.steps.ParameterConverters.ParameterConverter;
-
-public class TraderConverter implements ParameterConverter {
-    private TraderPersister persister;
-
-    public TraderConverter(TraderPersister persister) {
-        this.persister = persister;
-    }
-
-    public boolean accept(Type type) {
-        if (type instanceof Class) {
-            return Trader.class.isAssignableFrom((Class<?>) type);
-        }
-        return false;
-    }
-
-    public Object convertValue(String value, Type type) {
-        Trader trader = persister.retrieveTrader(value);
-        if (trader == null) {
-            throw new InvalidParameterException("Trader not found for name " + value, null);
-        }
-        return trader;
-    }
-
-}

data/examples/jbehave/src/main/java/cukes/jbehave/examples/trader/model/Stock.java

@@ -1,42 +0,0 @@
-package cukes.jbehave.examples.trader.model;
-
-import static cukes.jbehave.examples.trader.model.Stock.AlertStatus.OFF;
-import static cukes.jbehave.examples.trader.model.Stock.AlertStatus.ON;
-
-import java.util.List;
-
-public class Stock {
-
-    public enum AlertStatus {
-        ON, OFF
-    };
-
-    private List<Double> prices;
-    private double alertPrice;
-    private AlertStatus status = OFF;
-
-    public Stock(List<Double> prices, double alertPrice) {
-        this.prices = prices;
-        this.alertPrice = alertPrice;
-    }
-
-    public List<Double> getPrices() {
-        return prices;
-    }
-
-    public void tradeAt(double price) {
-        this.prices.add(price);
-        if (price > alertPrice) {
-            status = ON;
-        }
-    }
-
-    public void resetAlert() {
-        status = OFF;
-    }
-
-    public AlertStatus getStatus() {
-        return status;
-    }
-
-}

data/examples/jbehave/src/main/java/cukes/jbehave/examples/trader/model/Trader.java

@@ -1,29 +0,0 @@
-package cukes.jbehave.examples.trader.model;
-
-import static java.util.Arrays.asList;
-
-import java.util.List;
-
-public class Trader {
-
-    private final String name;
-    private List<Stock> stocks;
-
-    public Trader(String name, List<Stock> stocks) {
-        this.name = name;
-        this.stocks = stocks;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public List<Stock> getStocks() {
-        return stocks;
-    }
-
-    public void sellAllStocks(){
-        this.stocks = asList(new Stock[]{});
-    }
-
-}

data/examples/jbehave/src/main/java/cukes/jbehave/examples/trader/persistence/TraderPersister.java

@@ -1,22 +0,0 @@
-package cukes.jbehave.examples.trader.persistence;
-
-import cukes.jbehave.examples.trader.model.Trader;
-
-public class TraderPersister {
-
-    private Trader[] traders;
-
-    public TraderPersister(Trader... traders) {
-        this.traders = traders;
-    }
-
-    public Trader retrieveTrader(String name) {
-        for (Trader trader : traders) {
-            if (trader.getName().equals(name)) {
-                return trader;
-            }
-        }
-        return null;
-    }
-
-}

data/examples/jbehave/src/main/java/cukes/jbehave/examples/trader/scenarios/TraderSteps.java

@@ -1,70 +0,0 @@
-package cukes.jbehave.examples.trader.scenarios;
-
-import static java.util.Arrays.asList;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.Ensure.ensureThat;
-
-import java.util.List;
-
-import cukes.jbehave.examples.trader.converters.TraderConverter;
-import cukes.jbehave.examples.trader.model.Stock;
-import cukes.jbehave.examples.trader.model.Trader;
-import cukes.jbehave.examples.trader.persistence.TraderPersister;
-import org.jbehave.scenario.annotations.Given;
-import org.jbehave.scenario.annotations.Then;
-import org.jbehave.scenario.annotations.When;
-import org.jbehave.scenario.parser.PrefixCapturingPatternBuilder;
-import org.jbehave.scenario.steps.ParameterConverters;
-import org.jbehave.scenario.steps.SilentStepMonitor;
-import org.jbehave.scenario.steps.Steps;
-import org.jbehave.scenario.steps.StepsConfiguration;
-import cucumber.ast.Table;
-
-public class TraderSteps extends Steps {
-
-	private static final StepsConfiguration configuration = new StepsConfiguration();
-    private Stock stock;
-    private Trader trader;
-
-    public TraderSteps() {
-        super(configuration);
-        configuration.useParameterConverters(new ParameterConverters(
-        		new SilentStepMonitor(), new TraderConverter(mockTradePersister())));
-        configuration.usePatternBuilder(new PrefixCapturingPatternBuilder("%"));
-    }
-
-    private TraderPersister mockTradePersister() {
-        return new TraderPersister(new Trader("Mauro", asList(new Stock(asList(1.0d), 10.d))));
-    }
-
-    @Given("a trader of name %trader")
-    public void aTrader(Trader trader) {
-        this.trader = trader;
-    }
-
-    @Given("a stock of prices %prices and a threshold of %threshold")
-    public void aStockOfPrice(List<Double> prices, double threshold) {
-        stock = new Stock(prices, threshold);
-    }
-
-    @Given("the following table")
-    public void theFollowingTable(Table table) {
-        System.out.println("My table:" + table);
-    }
-
-    @When("the stock is traded at %price")
-    public void theStockIsTradedAt(double price) {
-        stock.tradeAt(price);
-    }
-
-    @Then("the alert status should be %status")
-    public void theAlertStatusShouldBe(String status) {
-        ensureThat(stock.getStatus().name(), equalTo(status));
-    }
-
-    @Then("the trader sells all stocks")
-    public void theTraderSellsAllStocks() {
-        trader.sellAllStocks();
-        ensureThat(trader.getStocks().size(), equalTo(0));
-    }
-}

data/lib/cucumber/jbehave.rb

@@ -1,98 +0,0 @@
-if defined?(JRUBY_VERSION)
-  require 'java'
-
-  Exception::CUCUMBER_FILTER_PATTERNS.unshift(/^org\/jruby|^org\/jbehave|^org\/junit|^java\/|^sun\/|^\$_dot_dot_/)
-
-  module Cucumber
-    module JBehave
-      # Register an instance of org.jbehave.scenario.steps.Steps
-      def JBehave(jbehave_steps)
-        jbehave_steps.getSteps.each do |jbehave_candidate_step|
-          step_definitions << JBehaveStepDefinition.new(jbehave_steps, jbehave_candidate_step)
-        end
-      end
-    
-      # Open up so we can get the pattern....
-      JBehaveCandidateStep = org.jbehave.scenario.steps.CandidateStep
-      class JBehaveCandidateStep
-        field_reader :pattern
-      end
-    
-      # Adapter for JBehave org.jbehave.scenario.steps.CandidateStep
-      class JBehaveStepDefinition
-        def initialize(jbehave_steps, jbehave_candidate_step)
-          @jbehave_steps = jbehave_steps
-          @jbehave_candidate_step = jbehave_candidate_step
-          @regexp = Regexp.new(jbehave_candidate_step.pattern.pattern)
-        end
-
-        def step_match(name_to_match, name_to_report)
-          raise "FIXME"
-          if(match = name_to_match.match(@regexp))
-            StepMatch.new(self, name_to_match, name_to_report, match.captures)
-          else
-            nil
-          end
-        end
-
-        def file_colon_line
-          @jbehave_steps.java_class.name
-        end
-
-        def format_args(step_name, format)
-          step_name.gzub(@regexp, format)
-        end
-
-        def invoke(world, args, step_name)
-          step = @jbehave_candidate_step.createFrom("Given #{step_name}") # JBehave doesn't care about the adverb.
-          step = @jbehave_candidate_step.__send__(:createStep, "Given #{step_name}", args) # JBehave doesn't care about the adverb.
-
-          result = step.perform
-          result.describeTo(Reporter)
-        end
-      end
-
-      # Implements the org.jbehave.scenario.reporters.ScenarioReporter methods
-      class Reporter
-        def self.successful(step_text)
-          # noop
-        end
-
-        def self.failed(step, java_exception)
-          raise java_exception_to_ruby_exception(java_exception)
-        end
-
-        private
-      
-        def self.java_exception_to_ruby_exception(java_exception)
-          # OK, this is a little funky - JRuby weirdness
-          ruby_exception = org.jruby.NativeException.new(JRuby.runtime, JBehaveException, java_exception)
-          ruby_exception.set_backtrace([]) # work around backtrace bug in jruby
-          exception = JBehaveException.new("#{java_exception.getClass.getName}: #{java_exception.getMessage}")
-          bt = ruby_exception.backtrace
-          Exception.cucumber_strip_backtrace!(bt, nil, nil)
-          exception.set_backtrace(bt)
-          exception
-        end
-      end
-
-      class JBehaveException < Exception
-      end
-
-      def self.snippet_text(step_keyword, step_name)
-        camel = step_name.gsub(/(\s.)/) {$1.upcase.strip}
-        method = camel[0..0].downcase + camel[1..-1]
-        snippet = %{    @#{step_keyword}("#{step_name}")
-    public void #{method}() {
-        throw new RuntimeException("pending");
-    }}
-      end
-    end
-  end
-
-  self.extend(Cucumber::JBehave)
-  self.snippet_generator = Cucumber::JBehave
-else
-  STDERR.puts "ERROR: cucumber/jbehave only works with JRuby"
-  Kernel.exit(1)
-end