nubis_rails_boilerplate 0.0.5 → 0.0.6

data/lib/capistrano_recipes/templates/mysql.yml.erb

@@ -1,8 +1,8 @@
 production:
   adapter: mysql2
   encoding: utf8
-  database: <%= mysql_database %>
+  database: <%= configs['mysql']['database'] %>
   pool: 5
-  username: <%= mysql_username %>
-  password: <%= mysql_password %>
-  host: <%= mysql_host %>
+  username: <%= configs['mysql']['username'] %>
+  password: <%= configs['mysql']['password'] %>
+  host: <%= configs['mysql']['host'] %>

data/lib/extra_capistrano.rb

@@ -8,10 +8,10 @@ module NubisRailsBoilerplate
 
       cap.set :host_app_path, cap_path
       cap.set :repository, "git@github.com:nubis/#{app_name}.git"
+      load_configs
       check_git_repo
       load_modules
       load_permission
-      load_configs
 
       cap.set :user, "ubuntu"
       cap.set :application, app_name
@@ -70,11 +70,12 @@ module NubisRailsBoilerplate
       unless configs.values.all?
         puts "You need to provide your configuration options before you can push."
         puts "Setup your server and database and input your data in: #{configs_path}"
+        exit 1
       end
       configs.each do |key, value|
-        cap.set key, value
+        cap.set :configs, configs
       end
-      cap.server configs['server_url'], :web, :app, :db, primary: true
+      cap.server configs['site_url'], :web, :app, :db, primary: true
     end
   end
 end

data/lib/rails_app_templates/spree.rb

@@ -76,8 +76,8 @@ if Rails.env.production?
     definition[:storage] = 's3'
     definition[:bucket] = Settings.s3_bucket_name
     definition[:s3_credentials] = {
-      access_key_id: Settings.aws_access_key_id,
-      secret_access_key: Settings.aws_secret_access_key
+      access_key_id: Settings.s3.aws_access_key_id,
+      secret_access_key: Settings.s3.aws_secret_access_key
     }
   end
 end

data/lib/templates.rb

@@ -13,7 +13,7 @@ module NubisRailsBoilerplate
       puts "Patching #{skeleton} files for #{app_name}"
       %w(Rakefile config/application.rb config/environment.rb config/environments/development.rb
       config/environments/test.rb config/environments/production.rb config/initializers/secret_token.rb
-      config/database.yml config/initializers/session_store.rb config/routes.rb config.ru).each do |filename|
+      config/deploy.rb config/database.yml config/initializers/session_store.rb config/routes.rb config.ru).each do |filename|
         full_path = File.expand_path(filename, app_name)
         new_contents = File.read(full_path)
           .gsub(skeleton.camelize, app_name.camelize)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nubis_rails_boilerplate
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-17 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70133092875420 !ruby/object:Gem::Requirement
+  requirement: &70278036112220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133092875420
+  version_requirements: *70278036112220
 - !ruby/object:Gem::Dependency
   name: activeadmin
-  requirement: &70133092887800 !ruby/object:Gem::Requirement
+  requirement: &70278036111300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70133092887800
+  version_requirements: *70278036111300
 - !ruby/object:Gem::Dependency
   name: settingslogic
-  requirement: &70133092885820 !ruby/object:Gem::Requirement
+  requirement: &70278036110040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133092885820
+  version_requirements: *70278036110040
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70133092884080 !ruby/object:Gem::Requirement
+  requirement: &70278036124060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,15 +54,13 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70133092884080
+  version_requirements: *70278036124060
 description: I usually start the same rails apps, running on the same infrastructure,
   so this collection of recipes and application templates let me focus on what I care
   about the most.
 email: yo@nubis.im
 executables:
 - new_real_estate_app
-- new_site_with_admin
-- new_spree_app
 extensions: []
 extra_rdoc_files: []
 files:
@@ -89,8 +87,6 @@ files:
 - Readme.md
 - MIT-LICENSE
 - bin/new_real_estate_app
-- bin/new_site_with_admin
-- bin/new_spree_app
 homepage: https://github.com/nubis/nubis_rails_boilerplate
 licenses: []
 post_install_message: 

data/bin/new_site_with_admin

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-if ARGV.size != 1
-  puts "Call like #{$0} appname"
-  exit 1
-end
-
-template = File.expand_path('../../lib/rails_app_templates/site_with_admin.rb', __FILE__)
-exec("rails new #{ARGV.first} -d mysql -m #{template}")

data/bin/new_spree_app

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-if ARGV.size != 1
-  puts "Call like #{$0} appname"
-  exit 1
-end
-
-template = File.expand_path('../../lib/rails_app_templates/spree.rb', __FILE__)
-exec("rails new #{ARGV.first} -d mysql -m #{template}")