testgen 0.6 → 0.7

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.3-p194
+rvm 1.9.3-p392@testgen --create

data/ChangeLog

@@ -1,3 +1,6 @@
+=== Version 0.7 / 2013-3-24
+* Fixed order of requires when using the --with-lib option
+
 === Version 0.6 / 2012-12-8
 * Removed the require of page-object/page_factory since it is no longer needed
 * Added support for building projects with the mohawk gem using --with-mohawk

data/features/with_gametel_option.feature

@@ -15,12 +15,6 @@ Feature: Adding the --with-gametel flag
     And the file "sample/features/support/env.rb" should contain "require 'gametel'"
     And the file "sample/features/support/env.rb" should contain "World(Gametel::Navigation)"
     
-  Scenario: Adding require all to the env.rb
-    When I run `testgen project sample --with-gametel`
-    Then a file named "sample/features/support/env.rb" should exist
-    And the file "sample/features/support/env.rb" should contain "require 'require_all'"
-    And the file "sample/features/support/env.rb" should contain "require_rel 'screens'"
-    
   Scenario: Creating the keystore
     When I run `testgen project sample --with-gametel`
     Then a file named "sample/features/support/env.rb" should exist

data/features/with_mojawk_option.feature

@@ -1,4 +1,3 @@
-@focus
 Feature: Adding the --with-mohawk flag
 
   Scenario: Adding the childprocess and mohawk gems to Gemfile

data/lib/testgen/generators/project/env.rb.tt

@@ -6,20 +6,25 @@ require 'rspec-expectations'
 <% unless pageobject_driver.downcase == 'none' -%>
 require 'page-object'
 <% end -%>
-<% if with_lib == 'true' -%>
-require 'require_all'
-
-require_all 'lib'
-<% end -%>
 
 <% if with_gametel == 'true' -%>
 require 'brazenhead'
 require 'brazenhead/server'
 require 'gametel'
+<% end -%>
+
+<% if with_mohawk == 'true' -%>
+require 'childprocess'
+require 'mohawk'
+<% end -%>
+
+<% if with_lib == 'true' -%>
 require 'require_all'
 
-require_rel 'screens'
+require_all 'lib'
+<% end -%>
 
+<% if with_gametel == 'true' -%>
 World(Gametel::Navigation)
 
 keystore = {
@@ -50,9 +55,6 @@ World(PageObject::PageFactory)
 <% end -%>
 
 <% if with_mohawk == 'true' -%>
-require 'childprocess'
-require 'mohawk'
-
 World(Mohawk::Navigation)
 
 Before do

data/lib/testgen/version.rb

@@ -1,3 +1,3 @@
 module TestGen
-  VERSION = "0.6"
+  VERSION = "0.7"
 end

data/testgen.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'thor', '>=0.16.0'
+  s.add_dependency 'thor', '>=0.17.0'
   s.add_dependency 'cucumber', '>=1.2.0'
-  s.add_dependency 'rspec', '>=2.11.0'
+  s.add_dependency 'rspec', '>=2.13.0'
   s.add_dependency 'require_all'
 
   s.add_development_dependency 'aruba'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testgen
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4519018053108254225
+      hash: 3275149058949778884
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -148,10 +148,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4519018053108254225
+      hash: 3275149058949778884
 requirements: []
 rubyforge_project: testgen
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Generators for testers using Cucumber