bnr_generator 0.4.3 → 0.5

data/README.md

@@ -36,6 +36,14 @@ sure QT is installed.
  bnr help
 ```
 
+## Notes
+
+If you are using heroku to host your app, be sure you have added your ssh key to heroku and have run `heroku auth:login`
+prior to running `bnr new`.
+
+If the database you choose relies on a server, make sure that the server is running prior to running `bnr new` so that
+the new database can be created.
+
 ## What's included?
 - [Rails](http://rubyonrails.org/) of course, currently the 3.2 branch
 - [Postgres](http://www.postgresql.org/) all your database needs

data/bnr-generator.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Bnr::Generator::VERSION
 
-  gem.add_dependency "rails", '>= 3.2.0'
+  gem.add_dependency "rails", '>=4.0.0'
   gem.add_dependency "thor"
   gem.add_dependency "heroku"
 end

data/lib/bnr-generator/version.rb

@@ -1,5 +1,5 @@
 module Bnr
   module Generator
-    VERSION = "0.4.3"
+    VERSION = "0.5"
   end
 end

data/lib/bnr_command.rb

@@ -13,15 +13,20 @@ class BnrCommand < Thor
   def new(name)
     @name = name
     run "rails new #{name} --skip-bundle -T -q -d #{options[:database]}"
+    if options[:ruby] == 'rvm'
+      copy_file 'templates/ruby-version', "#{name}/.ruby-version"
+    end
     inside name do
       run "git init -q"
       gsub_file "Gemfile", /^ *#.*$/, ''
-      gsub_file "Gemfile", /^ *$\n/, ''
+        gsub_file "Gemfile", /^ *$\n/, ''
       append_to_file "Gemfile" do
         <<-EOF
+ruby '2.0.0'
+
 gem 'bootstrap-sass', '~> 2.0.4.0'
 gem 'foreman'
-gem 'thin'
+gem 'unicorn'
 gem 'slim-rails'
 group :test, :development do
   gem 'rspec-rails'
@@ -39,16 +44,13 @@ group :test do
 end
         EOF
       end
-      if options[:ruby] == 'rvm'
-        run "rvm 1.9.3 do rvm --rvmrc --create 1.9.3@#{name}"
-      end
-      rvm_run "gem install bundler"
-      rvm_run "bundle install --quiet"
-      rvm_run "rails g rspec:install"
-      rvm_run "rails g forgery"
+      run "gem install bundler"
+      run "bundle install --quiet"
+      run "bundle exec rails g rspec:install"
+      run "bundle exec rails g forgery"
       insert_into_file 'spec/spec_helper.rb', "\nrequire 'capybara/rspec'", after: "require 'rspec/autorun'"
       gsub_file 'spec/spec_helper.rb', / *# Remove this[^\n]*\n *config\.fixture_path[^\n]*\n\n/m, ''
-      gsub_file 'spec/spec_helper.rb', /config.use_transactional_fixtures = true/, 'config.use_transactional_fixtures = false'
+        gsub_file 'spec/spec_helper.rb', /config.use_transactional_fixtures = true/, 'config.use_transactional_fixtures = false'
       insert_into_file 'spec/spec_helper.rb', after: "config.infer_base_class_for_anonymous_controllers = false\n" do
         <<-EOF
 
@@ -80,7 +82,7 @@ Zonebie.set_random_timezone
       remove_file 'README.rdoc'
       remove_file 'doc/README_FOR_APP'
       gsub_file 'config/database.yml', /username: .*$/, 'username:'
-      rvm_run 'rake db:create'
+      run 'bundle exec rake db:create'
 
     end
 
@@ -101,14 +103,15 @@ Zonebie.set_random_timezone
     template "templates/routes.rb.erb", "#{name}/config/routes.rb"
 
     template "templates/Procfile", "#{name}/Procfile"
+    template "templates/unicorn.rb", "#{name}/config/unicorn.rb"
 
     inside name do
-      rvm_run 'rake db:migrate'
-      rvm_run 'git add .'
-      rvm_run 'git commit -m "Initial Commit"'
+      run 'bundle exec rake db:migrate'
+      run 'git add .'
+      run 'git commit -m "Initial Commit"'
       if options[:host] == 'heroku'
-        rvm_run "heroku apps:create #{heroku_name(name)} -s cedar"
-        rvm_run 'git push heroku master'
+        run "heroku apps:create #{heroku_name(name)} -s cedar"
+        run 'git push heroku master'
       end
     end
   end
@@ -116,7 +119,7 @@ Zonebie.set_random_timezone
 
   desc "destroy NAME", "Destroys an app that was generated by the new action"
   def destroy(name)
-    rvm_run "heroku apps:destroy #{heroku_name(name)} --confirm #{heroku_name(name)}"
+    run "heroku apps:destroy #{heroku_name(name)} --confirm #{heroku_name(name)}"
     remove_dir name
   end
 
@@ -126,13 +129,6 @@ Zonebie.set_random_timezone
 
   private
 
-  def rvm_run(command, config = {})
-    if options[:ruby] == 'rvm'
-      command = "rvm 1.9.3@#{@name} do " + command
-    end
-    run command, config
-  end
-
   def heroku_name(name)
     name.gsub(/[^a-z0-9\-]/, '')
   end

data/lib/templates/Procfile

@@ -1 +1 @@
-web: bundle exec rails server thin -p $PORT
+web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb

data/lib/templates/README.md

@@ -6,9 +6,6 @@
 # Checkout the repo
 git clone git@github.com:highgroove/<project>.git
 
-# Install rvm and create a gemset
-rvm install 1.9.2 && rvm gemset create <project>
-
 # Install gem dependencies
 gem install bundler
 bundle install

data/lib/templates/ruby-version

@@ -0,0 +1 @@
+2.0.0

data/lib/templates/unicorn.rb

@@ -0,0 +1,25 @@
+worker_processes Integer(ENV['WEB_CONCURRENCY'] || 3)
+timeout 15
+preload_app true
+listen ENV['PORT'], backlog: Integer(ENV['UNICORN_BACKLOG'] || 200)
+
+before_fork do |server, worker|
+
+  Signal.trap 'TERM' do
+    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
+    Process.kill 'QUIT', Process.pid
+  end
+
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.connection.disconnect!
+end
+
+after_fork do |server, worker|
+
+  Signal.trap 'TERM' do
+    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT'
+  end
+
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.establish_connection
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bnr_generator
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70286032861800 !ruby/object:Gem::Requirement
+  requirement: &70305420659420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70286032861800
+  version_requirements: *70305420659420
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70286032895820 !ruby/object:Gem::Requirement
+  requirement: &70305420659000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70286032895820
+  version_requirements: *70305420659000
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &70286032893620 !ruby/object:Gem::Requirement
+  requirement: &70305420658540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,13 +43,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70286032893620
+  version_requirements: *70305420658540
 description: Tool to generate a rails project ready for development
 email:
 - aubrey@bignerdranch.com
 executables:
 - bnr
-- highgroove
 extensions: []
 extra_rdoc_files: []
 files:
@@ -59,7 +58,6 @@ files:
 - README.md
 - Rakefile
 - bin/bnr
-- bin/highgroove
 - bnr-generator.gemspec
 - lib/bnr-generator/version.rb
 - lib/bnr_command.rb
@@ -71,6 +69,8 @@ files:
 - lib/templates/index.slim
 - lib/templates/layout.html.slim
 - lib/templates/routes.rb.erb
+- lib/templates/ruby-version
+- lib/templates/unicorn.rb
 homepage: http://github.com/bignerdranch/bnr-generator
 licenses: []
 post_install_message: 
@@ -83,18 +83,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1897498371364409817
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1897498371364409817
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15

data/bin/highgroove

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require_relative '../lib/bnr_command'
-
-BnrCommand.start