rails_apps_composer 2.4.8 → 2.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af6a4d05807ee4d7e35f22d9e0b6fe50a03be02b
-  data.tar.gz: 9f37f35b34a99804b4c4460f85b069e6daea77d7
+  metadata.gz: 2972cd41bd9ff1210c1436318d20235fa80e5499
+  data.tar.gz: cd40316882e78bd23fbe2ebd188b13f713df5eb1
 SHA512:
-  metadata.gz: 80186f97982bae132ab1db61571c6b509230b1229f82c0b4fb13287ee4b89e719b61452e6da18a2a04004706334a0a4d58e606f6959f655c0e9b5e5673a05761
-  data.tar.gz: f95216033d8f604adf48e276a306306188dfa389fa5b5815446bf625f36ee34ce4a9a84e99208af8f834f4a06bcbcb4400d747e7d4fef41bc26fc97155d11613
+  metadata.gz: dab7f8a0a5e1f1c89e49f83f241c139b86fc5bd85c835da356cf559b88dad4615445fa515b3dd7055d1e7e8cdb7892e338be0e7e68c2d375ee30889087618993
+  data.tar.gz: 85afdfd0d643a7f0cb8830ed8726e128e2834bf5bb53d2e40927ab8a1497c32eeaea2503738f0b17cee18dad68c128ede022015c76c95372705266597dd483ad

data/recipes/gems.rb

@@ -99,7 +99,11 @@ add_gem 'fabrication', :group => [:development, :test] if prefer :fixtures, 'fab
 add_gem 'machinist', :group => :test if prefer :fixtures, 'machinist'
 
 ## Front-end Framework
-add_gem 'bootstrap-sass' if prefer :bootstrap, 'sass'
+if rails_4?
+  add_gem 'bootstrap-sass', github: 'thomas-mcdonald/bootstrap-sass' if prefer :bootstrap, 'sass'
+else
+  add_gem 'bootstrap-sass', '~> 2.3.2.2' if prefer :bootstrap, 'sass'
+end
 if prefer :frontend, 'foundation'
   if rails_4?
     add_gem 'compass-rails', '~> 2.0.alpha.0', :group => assets_group
@@ -182,14 +186,14 @@ after_bundler do
     remove_file 'config/database.yml' if prefer :orm, 'mongoid'
     if prefer :database, 'postgresql'
       begin
-        pg_username = ask_wizard("Username for PostgreSQL? (leave blank to use the app name)")
+        pg_username = prefs[:pg_username] || ask_wizard("Username for PostgreSQL?(leave blank to use the app name)")
         if pg_username.blank?
           say_wizard "Creating a user named '#{app_name}' for PostgreSQL"
           run "createuser #{app_name}" if prefer :database, 'postgresql'
           gsub_file "config/database.yml", /username: .*/, "username: #{app_name}"
         else
           gsub_file "config/database.yml", /username: .*/, "username: #{pg_username}"
-          pg_password = ask_wizard("Password for PostgreSQL user #{pg_username}?")
+          pg_password = prefs[:pg_password] || ask_wizard("Password for PostgreSQL user #{pg_username}?")
           gsub_file "config/database.yml", /password:/, "password: #{pg_password}"
           say_wizard "set config/database.yml for username/password #{pg_username}/#{pg_password}"
         end
@@ -201,12 +205,12 @@ after_bundler do
       gsub_file "config/database.yml", /database: myapp_production/,  "database: #{app_name}_production"
     end
     if prefer :database, 'mysql'
-      mysql_username = ask_wizard("Username for MySQL? (leave blank to use the app name)")
+      mysql_username = prefs[:mysql_username] || ask_wizard("Username for MySQL? (leave blank to use the app name)")
       if mysql_username.blank?
         gsub_file "config/database.yml", /username: .*/, "username: #{app_name}"
       else
         gsub_file "config/database.yml", /username: .*/, "username: #{mysql_username}"
-        mysql_password = ask_wizard("Password for MySQL user #{mysql_username}?")
+        mysql_password = prefs[:mysql_password] || ask_wizard("Password for MySQL user #{mysql_username}?")
         gsub_file "config/database.yml", /password:/, "password: #{mysql_password}"
         say_wizard "set config/database.yml for username/password #{mysql_username}/#{mysql_password}"
       end

data/recipes/init.rb

@@ -115,8 +115,10 @@ FILE
     run 'bundle exec rake db:drop'
     run 'bundle exec rake db:mongoid:create_indexes'
   end
-  unless prefer :railsapps, 'rails-recurly-subscription-saas'
-    run 'bundle exec rake db:seed'
+  unless prefs[:skip_seeds]
+    unless prefer :railsapps, 'rails-recurly-subscription-saas'
+      run 'bundle exec rake db:seed'
+    end
   end
   ### GIT ###
   git :add => '-A' if prefer :git, true

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.4.8"
+  VERSION = "2.4.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.4.8
+  version: 2.4.9
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rails_apps_composer
-rubygems_version: 2.0.6
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: A version of the RailsWizard gem with custom recipes for Rails starter apps.