rails_apps_composer 2.1.5 → 2.1.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/recipes/frontend.rb +0 -3
  2. data/recipes/gems.rb +12 -3
  3. data/version.rb +1 -1
  4. metadata +3 -3
data/recipes/frontend.rb CHANGED
@@ -32,9 +32,6 @@ after_bundler do
32
32
  body { padding-top: 60px; }
33
33
  @import "bootstrap-responsive";
34
34
  RUBY
35
- elsif prefer :frontend, 'foundation'
36
- insert_into_file 'app/assets/javascripts/application.js', "//= require foundation\n", :after => "jquery_ujs\n"
37
- insert_into_file 'app/assets/stylesheets/application.css.scss', " *= require foundation\n", :after => "require_self\n"
38
35
  elsif prefer :frontend, 'skeleton'
39
36
  copy_from 'https://raw.github.com/necolas/normalize.css/master/normalize.css', 'app/assets/stylesheets/normalize.css'
40
37
  copy_from 'https://raw.github.com/dhgamache/Skeleton/master/stylesheets/base.css', 'app/assets/stylesheets/base.css'
data/recipes/gems.rb CHANGED
@@ -21,8 +21,15 @@ gem 'pg', '>= 0.14.0' if prefer :database, 'postgresql'
21
21
  gem 'mysql2', '>= 0.3.11' if prefer :database, 'mysql'
22
22
  copy_from_repo 'config/database-postgresql.yml', :prefs => 'postgresql'
23
23
  copy_from_repo 'config/database-mysql.yml', :prefs => 'mysql'
24
- gsub_file "config/database.yml", /myapp/, "#{app_name}" unless prefer :orm, 'mongoid'
25
- gsub_file "config/database.yml", /root/, "#{app_name}" unless prefer :orm, 'mongoid'
24
+ gsub_file "config/database.yml", /username: .*/, "username: #{app_name}" unless prefer :orm, 'mongoid'
25
+ gsub_file "config/database.yml", /password: .*/, "password: #{app_name}" unless prefer :orm, 'mongoid'
26
+ begin
27
+ run "createuser #{app_name}" if prefer :database, 'postgresql'
28
+ run 'bundle exec rake db:drop' if prefer :database, 'postgresql'
29
+ run 'bundle exec rake db:create:all' if prefer :database, 'postgresql'
30
+ rescue StandardError
31
+ raise "unable to create a user and database for PostgreSQL"
32
+ end
26
33
 
27
34
  ## Template Engine
28
35
  if prefer :templates, 'haml'
@@ -65,7 +72,7 @@ gem 'machinist', '>= 2.0', :group => :test if prefer :fixtures, 'machinist'
65
72
 
66
73
  ## Front-end Framework
67
74
  gem 'bootstrap-sass', '>= 2.0.4.0' if prefer :bootstrap, 'sass'
68
- gem 'zurb-foundation', '>= 3.0.8' if prefer :frontend, 'foundation'
75
+ gem 'zurb-foundation', '>= 3.0.8', :group => :assets if prefer :frontend, 'foundation'
69
76
  if prefer :bootstrap, 'less'
70
77
  gem 'twitter-bootstrap-rails', '>= 2.1.1', :group => :assets
71
78
  # install gem 'therubyracer' to use Less
@@ -115,6 +122,8 @@ after_bundler do
115
122
  ## Database
116
123
  generate 'mongoid:config' if prefer :orm, 'mongoid'
117
124
  remove_file 'config/database.yml' if prefer :orm, 'mongoid'
125
+ ## Front-end Framework
126
+ generate 'foundation:install' if prefer :frontend, 'foundation'
118
127
  ## Git
119
128
  git :add => '.' if prefer :git, true
120
129
  git :commit => "-aqm 'rails_apps_composer: generators'" if prefer :git, true
data/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RailsWizard
2
- VERSION = "2.1.5"
2
+ VERSION = "2.1.6"
3
3
  end
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.5
4
+ version: 2.1.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -202,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
202
202
  version: '0'
203
203
  segments:
204
204
  - 0
205
- hash: -4029375207027802136
205
+ hash: -1555427350048369200
206
206
  required_rubygems_version: !ruby/object:Gem::Requirement
207
207
  none: false
208
208
  requirements:
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
211
211
  version: '0'
212
212
  segments:
213
213
  - 0
214
- hash: -4029375207027802136
214
+ hash: -1555427350048369200
215
215
  requirements: []
216
216
  rubyforge_project: rails_apps_composer
217
217
  rubygems_version: 1.8.24