rails_apps_composer 2.4.12 → 2.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 004fa66d78dd32e045ff2368ec6354b029787cb2
-  data.tar.gz: e78d06ee9655948a86376509a5b3291ca12a09b7
+  metadata.gz: 3184151973897b1c0e19e832f24a9728e968cf95
+  data.tar.gz: f12186da396c2f6b7cfbe4263a67ad7b1cc378ac
 SHA512:
-  metadata.gz: 7ff0f9b2b6c0d4d57e3956fd37887869868581a0495f63ac035548a2602800bce61479c5eb90501963a2804612ed89e0be6c1ac3bc9a1d7abb0fcac23d828a78
-  data.tar.gz: b39f0fb854fa1b64f00db509b05ff33d99666cd8e5fd195a64f42c39103988484dd8462090476b2254c832850f4467904a6f9d170f73ceb7bd4038e17cb3064a
+  metadata.gz: b05c9eaefa0ad3d39ac314e1be4efd1724a25e2c5c037ecbe4157cf5f53c50f88b95fbef217626a761f356225d1a8fb47ecc321493f24ef18df8d7ea71d7b5e0
+  data.tar.gz: 31b0a3b148e7d50d196381d8726a32f51f024c432581641905cfe877f75813ef4c2580add7e5ff8cc719c1b678fff50b1b2120151763d95ee64ac7a647f46081

data/lib/rails_wizard/command.rb

@@ -67,7 +67,7 @@ module RailsWizard
         # Load defaults from a file; if a file specifies recipes, they'll be run *before*
         # any on the command line (or prompted for)..
         return [[], {}] unless options[:defaults]
-        defaults = File.open(options[:defaults]) {|f| YAML.load(f) }
+        defaults = Kernel.open(options[:defaults]) {|f| YAML.load(f) }
         recipes = defaults.delete('recipes') { [] }
         [recipes, defaults]
       end

data/recipes/apps4.rb

@@ -61,7 +61,8 @@ if prefer :apps4, 'learn-rails'
     copy_from_repo 'app/views/user_mailer/contact_email.html.erb', :repo => repo
     copy_from_repo 'app/views/user_mailer/contact_email.text.erb', :repo => repo
     copy_from_repo 'app/views/visitors/new.html.erb', :repo => repo
-    copy_from_repo 'app/views/layouts/_navigation.html.erb', :repo => repo
+    # create navigation links using the rails_layout gem
+    generate 'navigation -f'
 
     # >-------------------------------[ Routes ]--------------------------------<
 
@@ -121,7 +122,8 @@ if prefer :apps4, 'rails-bootstrap'
 
     copy_from_repo 'app/views/pages/about.html.erb', :repo => repo
     copy_from_repo 'app/views/visitors/new.html.erb', :repo => repo
-    copy_from_repo 'app/views/layouts/_navigation.html.erb', :repo => repo
+    # create navigation links using the rails_layout gem
+    generate 'navigation -f'
 
     # >-------------------------------[ Routes ]--------------------------------<
 

data/recipes/frontend.rb

@@ -15,24 +15,29 @@ after_bundler do
       generate 'layout foundation4 -f'
   end
 
-  # specialized navigation partials
-  if prefer :authorization, 'cancan'
-    case prefs[:authentication]
-      when 'devise'
-        copy_from_repo 'app/views/layouts/_navigation-cancan.html.erb', :prefs => 'cancan'
-      when 'omniauth'
-        copy_from 'https://raw.github.com/RailsApps/rails-composer/master/files/app/views/layouts/_navigation-cancan-omniauth.html.erb', 'app/views/layouts/_navigation.html.erb'
+  ### GIT ###
+  git :add => '-A' if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: front-end framework"' if prefer :git, true
+end # after_bundler
+
+after_everything do
+  say_wizard "recipe running after everything"
+  # create navigation links using the rails_layout gem
+  generate 'navigation -f'
+  # replace with specialized navigation partials
+  if prefer :authentication, 'omniauth'
+    if prefer :authorization, 'cancan'
+      copy_from 'https://raw.github.com/RailsApps/rails-composer/master/files/app/views/layouts/_navigation-cancan-omniauth.html.erb', 'app/views/layouts/_navigation.html.erb'
+    else
+      copy_from_repo 'app/views/layouts/_navigation-omniauth.html.erb', :prefs => 'omniauth'
     end
-  else
-    copy_from_repo 'app/views/layouts/_navigation-devise.html.erb', :prefs => 'devise'
-    copy_from_repo 'app/views/layouts/_navigation-omniauth.html.erb', :prefs => 'omniauth'
   end
   copy_from_repo 'app/views/layouts/_navigation-subdomains_app.html.erb', :prefs => 'subdomains_app'
 
   ### GIT ###
   git :add => '-A' if prefer :git, true
-  git :commit => '-qm "rails_apps_composer: front-end framework"' if prefer :git, true
-end # after_bundler
+  git :commit => '-qm "rails_apps_composer: navigation links"' if prefer :git, true
+end # after_everything
 
 __END__
 

data/recipes/git.rb

@@ -9,6 +9,12 @@ if prefer :git, true
   git :init
   git :add => '-A'
   git :commit => '-qm "rails_apps_composer: initial commit"'
+else
+  after_everything do
+    say_wizard "removing .gitignore and .gitkeep files"
+    git_files = Dir[File.join('**','.gitkeep')] + Dir[File.join('**','.gitignore')]
+    File.unlink git_files
+  end
 end
 
 __END__

data/recipes/models.rb

@@ -12,7 +12,7 @@ after_bundler do
     generate 'devise user' # create the User model
     if prefer :orm, 'mongoid'
       ## DEVISE AND MONGOID
-      copy_from_repo 'app/models/user.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-devise/master/'
+      copy_from_repo 'app/models/user.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-devise/master/' unless rails_4?
       if (prefer :devise_modules, 'confirmable') || (prefer :devise_modules, 'invitable')
         gsub_file 'app/models/user.rb', /:registerable,/, ":registerable, :confirmable,"
         gsub_file 'app/models/user.rb', /# field :confirmation_token/, "field :confirmation_token"

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.4.12"
+  VERSION = "2.4.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.4.12
+  version: 2.4.13
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-11-14 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.7
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: A version of the RailsWizard gem with custom recipes for Rails starter apps.