rails_apps_composer 2.1.1 → 2.1.2
Sign up to get free protection for your applications and to get access to all the features.
- data/README.textile +3 -3
- data/lib/rails_wizard/command.rb +1 -1
- data/recipes/auth.rb +1 -1
- data/recipes/gems.rb +2 -2
- data/recipes/git.rb +1 -1
- data/recipes/railsapps.rb +10 -10
- data/recipes/setup.rb +8 -1
- data/templates/helpers.erb +1 -1
- data/version.rb +1 -1
- metadata +3 -3
data/README.textile
CHANGED
@@ -157,7 +157,7 @@ You'll be prompted for recipes and gems:
|
|
157
157
|
$ rails_apps_composer new myapp
|
158
158
|
|
159
159
|
Would you like to skip Test::Unit? (yes for RSpec) (y/n)
|
160
|
-
Would you like to skip Active Record? (yes for
|
160
|
+
Would you like to skip Active Record? (yes for MongoDB) (y/n)
|
161
161
|
|
162
162
|
Available Recipes:
|
163
163
|
auth: auth
|
@@ -188,7 +188,7 @@ Provide a list of recipes using the @-r@ flag:
|
|
188
188
|
$ rails_apps_composer new myapp -r git setup readme gems testing auth email models controllers views routes frontend database extras
|
189
189
|
|
190
190
|
Would you like to skip Test::Unit? (yes for RSpec) (y/n)
|
191
|
-
Would you like to skip Active Record? (yes for
|
191
|
+
Would you like to skip Active Record? (yes for MongoDB) (y/n)
|
192
192
|
What gem would you like to add? (blank to finish)
|
193
193
|
|
194
194
|
Generating basic application, using:
|
@@ -209,7 +209,7 @@ Use the @my_defaults.yaml@ file to specify a list of recipes, preferences, and e
|
|
209
209
|
|
210
210
|
h3. Generate an Application Template Interactively
|
211
211
|
|
212
|
-
You may want an application template to share with others. For an example of an application template, see the "Rails Composer":http://railsapps.github.com/rails-composer/
|
212
|
+
You may want an application template to share with others. For an example of an application template, see the "Rails Composer":http://railsapps.github.com/rails-composer/ project.
|
213
213
|
|
214
214
|
Specify a filename for the template:
|
215
215
|
|
data/lib/rails_wizard/command.rb
CHANGED
@@ -123,7 +123,7 @@ module RailsWizard
|
|
123
123
|
break
|
124
124
|
end
|
125
125
|
end
|
126
|
-
question = "#{bold}Would you like to skip Active Record? (yes for
|
126
|
+
question = "#{bold}Would you like to skip Active Record? (yes for MongoDB) \033[33m(y/n)\033[0m#{clear}"
|
127
127
|
while getO = ask(question)
|
128
128
|
case getO.downcase
|
129
129
|
when "yes", "y"
|
data/recipes/auth.rb
CHANGED
@@ -57,7 +57,7 @@ RUBY
|
|
57
57
|
### CANCAN ###
|
58
58
|
if prefer :authorization, 'cancan'
|
59
59
|
generate 'cancan:ability'
|
60
|
-
if prefer :starter_app, '
|
60
|
+
if prefer :starter_app, 'admin_app'
|
61
61
|
# Limit access to the users#index page
|
62
62
|
inject_into_file 'app/models/ability.rb', :after => "def initialize(user)\n" do <<-RUBY
|
63
63
|
user ||= User.new # guest user (not logged in)
|
data/recipes/gems.rb
CHANGED
@@ -12,7 +12,7 @@ gem 'unicorn', '>= 4.3.1', :group => [:development, :test] if prefer :dev_webser
|
|
12
12
|
gem 'puma', '>= 1.5.0', :group => [:development, :test] if prefer :dev_webserver, 'puma'
|
13
13
|
gem 'thin', '>= 1.4.1', :group => :production if prefer :prod_webserver, 'thin'
|
14
14
|
gem 'unicorn', '>= 4.3.1', :group => :production if prefer :prod_webserver, 'unicorn'
|
15
|
-
gem 'puma', '>= 1.
|
15
|
+
gem 'puma', '>= 1.6.1', :group => :production if prefer :prod_webserver, 'puma'
|
16
16
|
|
17
17
|
## Database Adapter
|
18
18
|
gem 'mongoid', '>= 3.0.3' if prefer :orm, 'mongoid'
|
@@ -23,7 +23,7 @@ copy_from_repo 'config/database-mysql.yml', :prefs => 'mysql'
|
|
23
23
|
|
24
24
|
## Template Engine
|
25
25
|
if prefer :templates, 'haml'
|
26
|
-
gem 'haml', '>= 3.1.
|
26
|
+
gem 'haml', '>= 3.1.7'
|
27
27
|
gem 'haml-rails', '>= 0.3.4', :group => :development
|
28
28
|
# hpricot and ruby_parser are needed for conversion of HTML to Haml
|
29
29
|
gem 'hpricot', '>= 0.8.6', :group => :development
|
data/recipes/git.rb
CHANGED
@@ -7,7 +7,7 @@ prefs[:git] = true unless prefs.has_key? :git
|
|
7
7
|
if prefer :git, true
|
8
8
|
begin
|
9
9
|
remove_file '.gitignore'
|
10
|
-
get 'https://raw.github.com/RailsApps/
|
10
|
+
get 'https://raw.github.com/RailsApps/rails-composer/master/files/gitignore.txt', '.gitignore'
|
11
11
|
rescue OpenURI::HTTPError
|
12
12
|
say_wizard "Unable to obtain gitignore file from the repo"
|
13
13
|
end
|
data/recipes/railsapps.rb
CHANGED
@@ -3,39 +3,39 @@
|
|
3
3
|
|
4
4
|
prefs[:railsapps] = multiple_choice "Install an example application?",
|
5
5
|
[["No, let me build my own application", "none"],
|
6
|
-
["rails3-devise-rspec-cucumber", "rails3-devise-rspec-cucumber"],
|
7
6
|
["rails3-bootstrap-devise-cancan", "rails3-bootstrap-devise-cancan"],
|
7
|
+
["rails3-devise-rspec-cucumber", "rails3-devise-rspec-cucumber"],
|
8
8
|
["rails3-mongoid-devise", "rails3-mongoid-devise"],
|
9
9
|
["rails3-mongoid-omniauth", "rails3-mongoid-omniauth"],
|
10
10
|
["rails3-subdomains", "rails3-subdomains"]] unless prefs.has_key? :railsapps
|
11
11
|
|
12
12
|
case prefs[:railsapps]
|
13
|
-
when 'rails3-devise-
|
13
|
+
when 'rails3-bootstrap-devise-cancan'
|
14
14
|
prefs[:database] = 'sqlite'
|
15
15
|
prefs[:templates] = 'erb'
|
16
16
|
prefs[:unit_test] = 'rspec'
|
17
17
|
prefs[:integration] = 'cucumber'
|
18
18
|
prefs[:fixtures] = 'factory_girl'
|
19
|
-
prefs[:frontend] = '
|
19
|
+
prefs[:frontend] = 'bootstrap'
|
20
|
+
prefs[:bootstrap] = 'sass'
|
20
21
|
prefs[:email] = 'gmail'
|
21
22
|
prefs[:authentication] = 'devise'
|
22
23
|
prefs[:devise_modules] = 'default'
|
23
|
-
prefs[:authorization] = '
|
24
|
-
prefs[:starter_app] = '
|
24
|
+
prefs[:authorization] = 'cancan'
|
25
|
+
prefs[:starter_app] = 'admin_app'
|
25
26
|
prefs[:form_builder] = 'none'
|
26
|
-
when 'rails3-
|
27
|
+
when 'rails3-devise-rspec-cucumber'
|
27
28
|
prefs[:database] = 'sqlite'
|
28
29
|
prefs[:templates] = 'erb'
|
29
30
|
prefs[:unit_test] = 'rspec'
|
30
31
|
prefs[:integration] = 'cucumber'
|
31
32
|
prefs[:fixtures] = 'factory_girl'
|
32
|
-
prefs[:frontend] = '
|
33
|
-
prefs[:bootstrap] = 'sass'
|
33
|
+
prefs[:frontend] = 'none'
|
34
34
|
prefs[:email] = 'gmail'
|
35
35
|
prefs[:authentication] = 'devise'
|
36
36
|
prefs[:devise_modules] = 'default'
|
37
|
-
prefs[:authorization] = '
|
38
|
-
prefs[:starter_app] = '
|
37
|
+
prefs[:authorization] = 'none'
|
38
|
+
prefs[:starter_app] = 'users_app'
|
39
39
|
prefs[:form_builder] = 'none'
|
40
40
|
when 'rails3-mongoid-devise'
|
41
41
|
prefs[:database] = 'mongodb'
|
data/recipes/setup.rb
CHANGED
@@ -35,7 +35,14 @@ case prefs[:database]
|
|
35
35
|
unless sqlite_detected
|
36
36
|
prefs[:orm] = multiple_choice "How will you connect to MongoDB?", [["Mongoid","mongoid"]] unless prefs.has_key? :orm
|
37
37
|
else
|
38
|
-
|
38
|
+
say_wizard "WARNING! SQLite gem detected in the Gemfile"
|
39
|
+
say_wizard "If you wish to use MongoDB you must skip Active Record."
|
40
|
+
say_wizard "When launching rails_apps_composer, choose 'skip Active Record'."
|
41
|
+
say_wizard "If using an application template, use the '-O' flag as in 'rails new foo -O'."
|
42
|
+
prefs[:fail] = multiple_choice "Abort or continue?", [["abort", "abort"], ["continue", "continue"]]
|
43
|
+
if prefer :fail, 'abort'
|
44
|
+
raise StandardError.new "SQLite detected in the Gemfile. Use '-O' or '--skip-activerecord' as in 'rails new foo -O' if you don't want ActiveRecord and SQLite"
|
45
|
+
end
|
39
46
|
end
|
40
47
|
end
|
41
48
|
|
data/templates/helpers.erb
CHANGED
@@ -50,7 +50,7 @@ def after_everything(&block); @after_everything_blocks << [@current_recipe, bloc
|
|
50
50
|
def before_config(&block); @before_configs[@current_recipe] = block; end
|
51
51
|
|
52
52
|
def copy_from_repo(filename, opts = {})
|
53
|
-
repo = 'https://raw.github.com/RailsApps/
|
53
|
+
repo = 'https://raw.github.com/RailsApps/rails-composer/master/files/'
|
54
54
|
repo = opts[:repo] unless opts[:repo].nil?
|
55
55
|
if (!opts[:prefs].nil?) && (!prefs.has_value? opts[:prefs])
|
56
56
|
return
|
data/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rails_apps_composer
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.1.
|
4
|
+
version: 2.1.2
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -201,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
201
201
|
version: '0'
|
202
202
|
segments:
|
203
203
|
- 0
|
204
|
-
hash:
|
204
|
+
hash: -3622496980535914871
|
205
205
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
206
206
|
none: false
|
207
207
|
requirements:
|
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
210
210
|
version: '0'
|
211
211
|
segments:
|
212
212
|
- 0
|
213
|
-
hash:
|
213
|
+
hash: -3622496980535914871
|
214
214
|
requirements: []
|
215
215
|
rubyforge_project: rails_apps_composer
|
216
216
|
rubygems_version: 1.8.24
|