Release 0.4.4

cucumber-attic · May 11, 2011 · 0ecbcba · 0ecbcba
1 parent fd4410f
commit 0ecbcba
Show file tree

Hide file tree

Showing 22 changed files with 71 additions and 65 deletions.
diff --git a/README.textile b/README.textile
@@ -16,8 +16,8 @@ Using RVM:
 <pre>
 mkdir -p ~/.m2/repository/.jruby
 GEM_HOME=~/.m2/repository/.jruby GEM_PATH=~/.m2/repository/.jruby gem install bundler
-GEM_HOME=~/.m2/repository/.jruby GEM_PATH=~/.m2/repository/.jruby bundle install
-GEM_HOME=~/.m2/repository/.jruby GEM_PATH=~/.m2/repository/.jruby rake install
+GEM_HOME=~/.m2/repository/.jruby GEM_PATH=~/.m2/repository/.jruby ~/.m2/repository/.jruby/bin/bundle install
+GEM_HOME=~/.m2/repository/.jruby GEM_PATH=~/.m2/repository/.jruby ~/.m2/repository/.jruby/bin/rake install
 </pre>
 
 Not using RVM:
@@ -31,7 +31,7 @@ GEM_HOME=~/.m2/repository/.jruby GEM_PATH=~/.m2/repository/.jruby jruby -S rake
 With the gems installed, build the whole shebang (including the examples):
 
 Using RVM:
-<pre>rake build_all</pre>
+<pre>GEM_HOME=~/.m2/repository/.jruby GEM_PATH=~/.m2/repository/.jruby ~/.m2/repository/.jruby/bin/rake build_all</pre>
 
 Not using RVM:
 <pre>jruby -S rake build_all</pre>

diff --git a/cuke4duke-maven-plugin/pom.xml b/cuke4duke-maven-plugin/pom.xml
@@ -8,7 +8,7 @@
     <groupId>cuke4duke</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <artifactId>cuke4duke-maven-plugin</artifactId>

diff --git a/cuke4duke.gemspec b/cuke4duke.gemspec
@@ -7,18 +7,17 @@ Gem::Specification.new do |s|
   s.version     = Cuke4Duke::VERSION
   s.authors     = ["Aslak Hellesøy"]
   s.description = 'Write Cucumber Step Definitions in Java, Scala, Groovy, Rhino Javascript, Clojure or Ioke'
-  s.summary     = "cuke4duke-#{s.version}"
+  s.summary     = "#{s.name}-#{s.version}"
   s.email       = 'cukes@googlegroups.com'
   s.homepage    = 'http://cukes.info'
 
-  s.add_dependency 'cucumber', '~> 0.10.0'
-  s.add_development_dependency 'rspec', '>= 2.3.0'
-  s.add_development_dependency 'celerity', '>= 0.8.7'
-  s.add_development_dependency 'jruby-openssl', '>= 0.7.2'
-  s.add_development_dependency 'bundler', '>= 1.0.7'
+  s.add_dependency 'cucumber', '>= 0.10.2'
+  s.add_development_dependency 'rspec', '>= 2.5.0'
+  s.add_development_dependency 'celerity', '>= 0.8.9'
+  s.add_development_dependency 'jruby-openssl', '>= 0.7.4'
+  s.add_development_dependency 'bundler', '>= 1.0.13'
   s.add_development_dependency 'rake', '>= 0.8.7'
 
-  s.rubygems_version   = "1.3.7"
   s.files            = `git ls-files -- lib`.split("\n") + ["lib/#{Cuke4Duke::JAR_NAME}", 'pom.xml']
   s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.extra_rdoc_files = ["LICENCE", "README.textile"]

diff --git a/cuke4duke/pom.xml b/cuke4duke/pom.xml
@@ -8,7 +8,7 @@
     <groupId>cuke4duke</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <artifactId>cuke4duke</artifactId>

diff --git a/cuke4duke/src/main/java/cuke4duke/annotation/I18n.java b/cuke4duke/src/main/java/cuke4duke/annotation/I18n.java
@@ -1474,7 +1474,7 @@ public class RO {
         @Retention(RetentionPolicy.RUNTIME)
         @Target(ElementType.METHOD)
         @StepDef("ro")
-        public static @interface Daca {
+        public static @interface Când {
             public abstract String value();
         }
 
@@ -1488,44 +1488,55 @@ public class RO {
         @Retention(RetentionPolicy.RUNTIME)
         @Target(ElementType.METHOD)
         @StepDef("ro")
-        public static @interface Si {
+        public static @interface Datfiind {
             public abstract String value();
         }
-    }
 
-    public class RO_RO {
+        @Retention(RetentionPolicy.RUNTIME)
+        @Target(ElementType.METHOD)
+        @StepDef("ro")
+        public static @interface Datefiind {
+            public abstract String value();
+        }
 
         @Retention(RetentionPolicy.RUNTIME)
         @Target(ElementType.METHOD)
-        @StepDef("ro-RO")
-        public static @interface Atunci {
+        @StepDef("ro")
+        public static @interface Datifiind {
             public abstract String value();
         }
 
         @Retention(RetentionPolicy.RUNTIME)
         @Target(ElementType.METHOD)
-        @StepDef("ro-RO")
-        public static @interface Când {
+        @StepDef("ro")
+        public static @interface Daţifiind {
             public abstract String value();
         }
 
         @Retention(RetentionPolicy.RUNTIME)
         @Target(ElementType.METHOD)
-        @StepDef("ro-RO")
-        public static @interface Dacă {
+        @StepDef("ro")
+        public static @interface Dațifiind {
             public abstract String value();
         }
 
         @Retention(RetentionPolicy.RUNTIME)
         @Target(ElementType.METHOD)
-        @StepDef("ro-RO")
-        public static @interface Dar {
+        @StepDef("ro")
+        public static @interface Si {
             public abstract String value();
         }
 
         @Retention(RetentionPolicy.RUNTIME)
         @Target(ElementType.METHOD)
-        @StepDef("ro-RO")
+        @StepDef("ro")
+        public static @interface Şi {
+            public abstract String value();
+        }
+
+        @Retention(RetentionPolicy.RUNTIME)
+        @Target(ElementType.METHOD)
+        @StepDef("ro")
         public static @interface Și {
             public abstract String value();
         }

diff --git a/cuke4duke/src/main/scala/cuke4duke/I18n.scala b/cuke4duke/src/main/scala/cuke4duke/I18n.scala
@@ -293,16 +293,15 @@ trait RO {
   this: ScalaDsl =>
   val Atunci = new Step("Atunci")
   val Cand = new Step("Cand")
-  val Daca = new Step("Daca")
-  val Dar = new Step("Dar")
-  val Si = new Step("Si")
-}
-trait RO_RO {
-  this: ScalaDsl =>
-  val Atunci = new Step("Atunci")
   val Când = new Step("Când")
-  val Dacă = new Step("Dacă")
   val Dar = new Step("Dar")
+  val Datfiind = new Step("Datfiind")
+  val Datefiind = new Step("Datefiind")
+  val Datifiind = new Step("Datifiind")
+  val Daţifiind = new Step("Daţifiind")
+  val Dațifiind = new Step("Dațifiind")
+  val Si = new Step("Si")
+  val Şi = new Step("Şi")
   val Și = new Step("Și")
 }
 trait RU {

diff --git a/cuke4duke/src/test/scala/cuke4duke/ScalaDslTest.scala b/cuke4duke/src/test/scala/cuke4duke/ScalaDslTest.scala
@@ -165,7 +165,7 @@ class ScalaDslTest extends ScalaDsl with EN with NO {
     } catch {
       case e:RaiseException if rubyClassName(e) == "Cucumber::Pending" => e.getMessage
     }
-    assertEquals("comment", comment)
+    assertEquals("(Cucumber::Pending) comment", comment)
   }
 
   When("pending no comment"){
@@ -180,7 +180,7 @@ class ScalaDslTest extends ScalaDsl with EN with NO {
     } catch {
       case e:RaiseException if rubyClassName(e) == "Cucumber::Pending" => e.getMessage
     }
-    assertEquals("TODO", comment)
+    assertEquals("(Cucumber::Pending) TODO", comment)
   }
 
   When("when f2 -> unit"){ (s: String, i: Int) =>

diff --git a/examples/celerity/pom.xml b/examples/celerity/pom.xml
@@ -8,7 +8,7 @@
     <groupId>cuke4duke</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../../pom.xml</relativePath>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <artifactId>cuke4duke-celerity-example</artifactId>

diff --git a/examples/clojure/pom.xml b/examples/clojure/pom.xml
@@ -8,12 +8,12 @@
     <groupId>cuke4duke</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../../pom.xml</relativePath>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <groupId>cuke4duke</groupId>
   <artifactId>cuke4duke-clojure-example</artifactId>
-  <version>0.4.3</version>
+  <version>0.4.4</version>
   <packaging>jar</packaging>
   <name>Cuke4Duke: Clojure Example</name>
 

diff --git a/examples/groovy-webdriver/pom.xml b/examples/groovy-webdriver/pom.xml
@@ -8,7 +8,7 @@
     <groupId>cuke4duke</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../../pom.xml</relativePath>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <artifactId>cuke4duke-groovy-webdriver-example</artifactId>

diff --git a/examples/groovy/pom.xml b/examples/groovy/pom.xml
@@ -8,7 +8,7 @@
     <groupId>cuke4duke</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../../pom.xml</relativePath>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <artifactId>cuke4duke-groovy-example</artifactId>

diff --git a/examples/guice/pom.xml b/examples/guice/pom.xml
@@ -8,7 +8,7 @@
     <groupId>cuke4duke</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../../pom.xml</relativePath>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <artifactId>cuke4duke-guice-example</artifactId>

diff --git a/examples/ioke/pom.xml b/examples/ioke/pom.xml
@@ -8,7 +8,7 @@
     <groupId>cuke4duke</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../../pom.xml</relativePath>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <artifactId>cuke4duke-ioke-example</artifactId>

diff --git a/examples/java-ejb3/pom.xml b/examples/java-ejb3/pom.xml
@@ -8,7 +8,7 @@
     <groupId>cuke4duke</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../../pom.xml</relativePath>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <artifactId>cuke4duke-ejb3-example</artifactId>

diff --git a/examples/java-webdriver/pom.xml b/examples/java-webdriver/pom.xml
@@ -8,7 +8,7 @@
     <groupId>cuke4duke</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../../pom.xml</relativePath>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <artifactId>cuke4duke-java-webdriver-example</artifactId>

diff --git a/examples/java/build.xml b/examples/java/build.xml
@@ -24,7 +24,7 @@
 
   <target name="-install-gems" depends="-define-paths" if="gems">
     <taskdef name="gem" classname="cuke4duke.ant.GemTask" classpathref="compile.classpath"/>
-    <gem args="install cuke4duke --version 0.4.2"/>
+    <gem args="install cuke4duke --version 0.4.4"/>
   </target>
 
   <target name="-define-paths" depends="-download-jars">

diff --git a/examples/java/ivy.xml b/examples/java/ivy.xml
@@ -1,9 +1,9 @@
 <ivy-module version="2.0">
   <info organisation="cukes.info" module="java-example"/>
   <dependencies>
-    <dependency org="cuke4duke" name="cuke4duke" rev="0.4.2"/>
-    <dependency org="org.jruby" name="jruby-complete" rev="1.5.3" transitive="false"/>
+    <dependency org="cuke4duke" name="cuke4duke" rev="0.4.4"/>
+    <dependency org="org.jruby" name="jruby-complete" rev="1.6.1" transitive="false"/>
     <dependency org="org.picocontainer" name="picocontainer" rev="2.11.2"/>
-    <dependency org="junit" name="junit" rev="4.8.1"/>
+    <dependency org="junit" name="junit" rev="4.8.2"/>
   </dependencies>
 </ivy-module>
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
@@ -8,12 +8,12 @@
     <groupId>cuke4duke</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../../pom.xml</relativePath>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <groupId>cuke4duke</groupId>
   <artifactId>cuke4duke-java-example</artifactId>
-  <version>0.4.2</version>
+  <version>0.4.4</version>
   <packaging>jar</packaging>
   <name>Cuke4Duke: Java Example</name>
 
@@ -39,19 +39,16 @@
     <dependency>
       <groupId>cuke4duke</groupId>
       <artifactId>cuke4duke</artifactId>
-      <version>0.4.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.picocontainer</groupId>
       <artifactId>picocontainer</artifactId>
-      <version>2.11.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -89,7 +86,7 @@
       <plugin>
         <groupId>cuke4duke</groupId>
         <artifactId>cuke4duke-maven-plugin</artifactId>
-        <version>0.4.2</version>
+        <version>0.4.4</version>
         <configuration>
           <jvmArgs>
             <!-- Debugging. See http://wiki.github.com/aslakhellesoy/cuke4duke/debug-cuke4duke-steps -->
@@ -121,7 +118,7 @@
             <cucumberArg>${basedir}/src/test/ruby</cucumberArg>
           </cucumberArgs>
           <gems>
-            <gem>install cuke4duke --version 0.4.2</gem>
+            <gem>install cuke4duke --version 0.4.4</gem>
           </gems>
         </configuration>
         <executions>

diff --git a/examples/javascript/pom.xml b/examples/javascript/pom.xml
@@ -8,7 +8,7 @@
     <groupId>cuke4duke</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../../pom.xml</relativePath>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <artifactId>cuke4duke-javascript-example</artifactId>

diff --git a/examples/scala/pom.xml b/examples/scala/pom.xml
@@ -8,7 +8,7 @@
     <groupId>cuke4duke</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../../pom.xml</relativePath>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <artifactId>cuke4duke-scala-example</artifactId>

diff --git a/examples/spring/pom.xml b/examples/spring/pom.xml
@@ -8,7 +8,7 @@
     <groupId>cuke4duke</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../../pom.xml</relativePath>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
   </parent>
 
   <artifactId>cuke4duke-spring-example</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <groupId>cuke4duke</groupId>
   <artifactId>parent</artifactId>
   <packaging>pom</packaging>
-  <version>0.4.3</version>
+  <version>0.4.4</version>
   <name>Cuke4Duke: Parent</name>
   <url>http://cukes.info/</url>
 
@@ -16,22 +16,22 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
     <cuke4duke.version>${project.version}</cuke4duke.version>
-    <gherkin.version>2.3.3</gherkin.version>
-    <jruby.version>1.5.6</jruby.version>
+    <gherkin.version>2.3.7</gherkin.version>
+    <jruby.version>1.6.1</jruby.version>
     <ant.version>1.8.2</ant.version>
     <pico.version>2.11.2</pico.version>
     <spring.version>3.0.5.RELEASE</spring.version>
-    <guice.version>2.0</guice.version>
-    <groovy.version>1.7.6</groovy.version>
+    <guice.version>3.0</guice.version>
+    <groovy.version>1.8.0</groovy.version>
     <scala.version>2.8.1</scala.version>
     <clojure.version>1.2.0</clojure.version>
     <rhino.version>1.7R2</rhino.version>
     <ioke.version>P-0.4.0</ioke.version>
     <junit.version>4.8.2</junit.version>
     <mockito.version>1.8.5</mockito.version>
-    <selenium.version>2.0a7</selenium.version>
+    <selenium.version>2.0b3</selenium.version>
     <log4j.version>1.2.16</log4j.version>
-    <commons-lang.version>2.5</commons-lang.version>
+    <commons-lang.version>2.6</commons-lang.version>
     <javaee-api.version>5.0-1</javaee-api.version>
     <asm.version>3.3</asm.version>
     <cglib.version>2.2</cglib.version>