hobo 2.0.0.pre4 → 2.0.0.pre5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/VERSION +1 -1
  2. data/lib/generators/hobo/setup_wizard/setup_wizard_generator.rb +23 -23
  3. metadata +8 -8
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.0.0.pre4
1
+ 2.0.0.pre5
data/lib/generators/hobo/setup_wizard/setup_wizard_generator.rb CHANGED
@@ -79,28 +79,6 @@ module Hobo
79
79
  invoke 'hobo:assets'
80
80
  end
81
81
 
82
- def choose_test_framework
83
- if wizard?
84
- say_title 'Test Framework'
85
- return unless yes_no? "Do you want to customize the test_framework?"
86
- require 'generators/hobo/test_framework/test_framework_generator'
87
- f = Hobo::TestFrameworkGenerator::FRAMEWORKS * '|'
88
- test_framework = choose("Choose your preferred test framework: [<enter>=#{f}]:", /^(#{f})$/, 'test_unit')
89
- fixtures = yes_no?("Do you want the test framework to generate the fixtures?")
90
- fixture_replacement = ask("Type your preferred fixture replacement or <enter> for no replacement:")
91
- else
92
- # return if it is all default so no invoke is needed
93
- return if (options[:test_framework].to_s == 'test_unit' && options[:fixtures] && options[:fixture_replacement].blank?)
94
- test_framework = options[:test_framework]
95
- fixtures = options[:fixtures]
96
- fixture_replacement = options[:fixture_replacement]
97
- end
98
- invoke 'hobo:test_framework', [test_framework],
99
- :fixture_replacement => fixture_replacement,
100
- :fixtures => fixtures,
101
- :update => true
102
- end
103
-
104
82
  def user_options
105
83
  if wizard?
106
84
  say_title 'User Resource'
@@ -172,6 +150,28 @@ EOI
172
150
  gem_with_comments('will_paginate', :git => "git://github.com/Hobo/will_paginate.git", :comments => "\n# Hobo's version of will_paginate is required.")
173
151
  end
174
152
 
153
+ def choose_test_framework
154
+ if wizard?
155
+ say_title 'Test Framework'
156
+ return unless yes_no? "Do you want to customize the test_framework?"
157
+ require 'generators/hobo/test_framework/test_framework_generator'
158
+ f = Hobo::TestFrameworkGenerator::FRAMEWORKS * '|'
159
+ test_framework = choose("Choose your preferred test framework: [<enter>=#{f}]:", /^(#{f})$/, 'test_unit')
160
+ fixtures = yes_no?("Do you want the test framework to generate the fixtures?")
161
+ fixture_replacement = ask("Type your preferred fixture replacement or <enter> for no replacement:")
162
+ else
163
+ # return if it is all default so no invoke is needed
164
+ return if (options[:test_framework].to_s == 'test_unit' && options[:fixtures] && options[:fixture_replacement].blank?)
165
+ test_framework = options[:test_framework]
166
+ fixtures = options[:fixtures]
167
+ fixture_replacement = options[:fixture_replacement]
168
+ end
169
+ invoke 'hobo:test_framework', [test_framework],
170
+ :fixture_replacement => fixture_replacement,
171
+ :fixtures => fixtures,
172
+ :update => true
173
+ end
174
+
175
175
  def front_controller
176
176
  if wizard?
177
177
  say_title 'Front Controller'
@@ -238,7 +238,7 @@ EOI
238
238
 
239
239
  def active_reload_dryml
240
240
  environment "#", :env => :development
241
- environment "config.watchable_dirs[File.join(config.root, 'app/view')] = ['dryml']", :env => :development
241
+ environment "config.watchable_dirs[File.join(config.root, 'app/views')] = ['dryml']", :env => :development
242
242
  environment "# Hobo: tell ActiveReload about dryml", :env => :development
243
243
  end
244
244
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hobo
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.pre4
4
+ version: 2.0.0.pre5
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-10-19 00:00:00.000000000 Z
12
+ date: 2012-11-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: hobo_support
@@ -18,7 +18,7 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 2.0.0.pre4
21
+ version: 2.0.0.pre5
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
26
26
  requirements:
27
27
  - - '='
28
28
  - !ruby/object:Gem::Version
29
- version: 2.0.0.pre4
29
+ version: 2.0.0.pre5
30
30
  - !ruby/object:Gem::Dependency
31
31
  name: hobo_fields
32
32
  requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
34
34
  requirements:
35
35
  - - '='
36
36
  - !ruby/object:Gem::Version
37
- version: 2.0.0.pre4
37
+ version: 2.0.0.pre5
38
38
  type: :runtime
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
42
42
  requirements:
43
43
  - - '='
44
44
  - !ruby/object:Gem::Version
45
- version: 2.0.0.pre4
45
+ version: 2.0.0.pre5
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: dryml
48
48
  requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
50
50
  requirements:
51
51
  - - '='
52
52
  - !ruby/object:Gem::Version
53
- version: 2.0.0.pre4
53
+ version: 2.0.0.pre5
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
58
58
  requirements:
59
59
  - - '='
60
60
  - !ruby/object:Gem::Version
61
- version: 2.0.0.pre4
61
+ version: 2.0.0.pre5
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: will_paginate
64
64
  requirement: !ruby/object:Gem::Requirement