hobo 2.0.0.pre4 → 2.0.0.pre5

data/VERSION

@@ -1 +1 @@
-2.0.0.pre4
+2.0.0.pre5

data/lib/generators/hobo/setup_wizard/setup_wizard_generator.rb

@@ -79,28 +79,6 @@ module Hobo
       invoke 'hobo:assets'
     end
 
-    def choose_test_framework
-      if wizard?
-        say_title 'Test Framework'
-        return unless yes_no? "Do you want to customize the test_framework?"
-        require 'generators/hobo/test_framework/test_framework_generator'
-        f = Hobo::TestFrameworkGenerator::FRAMEWORKS * '|'
-        test_framework = choose("Choose your preferred test framework: [<enter>=#{f}]:", /^(#{f})$/, 'test_unit')
-        fixtures = yes_no?("Do you want the test framework to generate the fixtures?")
-        fixture_replacement = ask("Type your preferred fixture replacement or <enter> for no replacement:")
-      else
-        # return if it is all default so no invoke is needed
-        return if (options[:test_framework].to_s == 'test_unit' && options[:fixtures] && options[:fixture_replacement].blank?)
-        test_framework = options[:test_framework]
-        fixtures = options[:fixtures]
-        fixture_replacement = options[:fixture_replacement]
-      end
-      invoke 'hobo:test_framework', [test_framework],
-                                    :fixture_replacement => fixture_replacement,
-                                    :fixtures => fixtures,
-                                    :update => true
-    end
-
     def user_options
       if wizard?
         say_title 'User Resource'
@@ -172,6 +150,28 @@ EOI
       gem_with_comments('will_paginate', :git => "git://github.com/Hobo/will_paginate.git", :comments => "\n# Hobo's version of will_paginate is required.")
     end
 
+    def choose_test_framework
+      if wizard?
+        say_title 'Test Framework'
+        return unless yes_no? "Do you want to customize the test_framework?"
+        require 'generators/hobo/test_framework/test_framework_generator'
+        f = Hobo::TestFrameworkGenerator::FRAMEWORKS * '|'
+        test_framework = choose("Choose your preferred test framework: [<enter>=#{f}]:", /^(#{f})$/, 'test_unit')
+        fixtures = yes_no?("Do you want the test framework to generate the fixtures?")
+        fixture_replacement = ask("Type your preferred fixture replacement or <enter> for no replacement:")
+      else
+        # return if it is all default so no invoke is needed
+        return if (options[:test_framework].to_s == 'test_unit' && options[:fixtures] && options[:fixture_replacement].blank?)
+        test_framework = options[:test_framework]
+        fixtures = options[:fixtures]
+        fixture_replacement = options[:fixture_replacement]
+      end
+      invoke 'hobo:test_framework', [test_framework],
+                                    :fixture_replacement => fixture_replacement,
+                                    :fixtures => fixtures,
+                                    :update => true
+    end
+
     def front_controller
       if wizard?
         say_title 'Front Controller'
@@ -238,7 +238,7 @@ EOI
 
     def active_reload_dryml
       environment "#", :env => :development
-      environment "config.watchable_dirs[File.join(config.root, 'app/view')] = ['dryml']", :env => :development
+      environment "config.watchable_dirs[File.join(config.root, 'app/views')] = ['dryml']", :env => :development
       environment "# Hobo: tell ActiveReload about dryml", :env => :development
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hobo
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre4
+  version: 2.0.0.pre5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hobo_support
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre4
+        version: 2.0.0.pre5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre4
+        version: 2.0.0.pre5
 - !ruby/object:Gem::Dependency
   name: hobo_fields
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre4
+        version: 2.0.0.pre5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre4
+        version: 2.0.0.pre5
 - !ruby/object:Gem::Dependency
   name: dryml
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre4
+        version: 2.0.0.pre5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre4
+        version: 2.0.0.pre5
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement