pah 0.0.3 → 0.0.4

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.3@pah --create
+rvm use 2.0.0@pah --create

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 0.0.4 (July 19, 2013)
+
+### features
+
+### improvements
+
+- Use the new rspec expect syntax
+- Halt if Heroku app already exists.
+- Do not say "Pushing application to Heroku" if there is no deploy
+- Do not install Sendgrid unless user explicitely says so
+- Using user input for Heroku app name
+- Changed readme
+- Heroku tasks now run out of Bundler environment
+- Cleaning old stuffs
+- Show suggestion of heroku app
+- Export APP on .rvmrc
+- Updated to Rails 4.0 and Ruby 2.0 
+
+### bug fixes
+
 ## 0.0.3 (July 05, 2013)
 
 ### features

data/README.md

@@ -3,11 +3,11 @@
 [![Code Climate][code_climate_badge]][code_climate]
 [![Gemnasium][gemnasium_badge]][gemnasium]
 
-A rails application template which born from [Startup DEV][startupdev] and now is used to start most projects at [HE:labs][helabs].
+A rails application template which was born from [Startup DEV][startupdev] and now is used to start most projects at [HE:labs][helabs].
 
 ## Instalation
 
-Only install the Pah gem:
+Install Pah at the command prompt:
 
     gem install pah
 
@@ -17,7 +17,7 @@ Run:
 
     pah projectname
 
-This will create a Rails 3.2 app in `projectname` with ruby 1.9.3. This script creates a new git repository. It is not meant to be used against an existing repo.
+This will create a Rails 4.0 app in `projectname` with ruby 2.0.0. This script creates a new git repository. It is not meant to be used against an existing repo.
 
 Be sure to set your canonical domain on Heroku:
 ```shell
@@ -28,15 +28,11 @@ heroku config:add CANONICAL_HOST=yourdomain.com #or www.yourdomain.com
 
 ### heroku toolbelt
 
-So Install this from https://toolbelt.heroku.com/
+Install from: https://toolbelt.heroku.com/
 
 ### phantomjs
 
-On OSX install with:
-
-```shell
-brew install phantomjs
-```
+Install from: http://phantomjs.org/download.html
 
 ## Versioning
 

data/lib/pah/files/.rvmrc

@@ -46,3 +46,5 @@ fi
 # then
 #   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
 # fi
+
+export APP='PROJECT'

data/lib/pah/files/Gemfile

@@ -1,13 +1,18 @@
 source 'https://rubygems.org'
-ruby "1.9.3"
+ruby "2.0.0"
 
-gem 'rails',                '3.2.13'
+gem 'rails',                '4.0.0'
 gem 'unicorn',              '4.6.2'
 gem 'unicorn-worker-killer', '0.4.1'
 gem 'secure_headers',       '1.0.0'
-gem 'jquery-rails',         '3.0.1'
+gem 'jquery-rails',         '3.0.4'
+gem 'turbolinks'
+gem 'jbuilder',             '~> 1.2'
 gem 'haml-rails',           '0.4'
 gem 'pg',                   '0.15.1'
+gem 'sass-rails',         '~> 4.0.0'
+gem 'coffee-rails',       '~> 4.0.0'
+gem 'uglifier',           '>= 1.3.0'
 gem 'rack-canonical-host',  '0.0.8'
 gem 'bourbon',              '3.1.8'
 # gem 'paperclip',            '3.4.2'
@@ -18,14 +23,10 @@ gem 'bourbon',              '3.1.8'
 # gem 'kaminari',             '0.14.1'
 # gem 'acts_as_hashed',       '1.0.0'
 
-group :assets do
-  gem 'sass-rails',         '3.2.6'
-  gem 'coffee-rails',       '3.2.2'
-  gem 'uglifier',           '2.1.1'
-end
-
 group :development do
-  gem 'integration', git: 'git://github.com/mergulhao/integration.git'
+  gem "letter_opener",      '1.1.1'
+  gem 'foreman',            '0.63.0'
+  gem 'integration',        github: 'mergulhao/integration' 
   gem 'better_errors',      '0.9.0'
   gem 'binding_of_caller',  '0.7.2'
   gem "letter_opener",      '1.1.1'
@@ -34,7 +35,8 @@ group :development do
 end
 
 group :test do
-  gem 'shoulda-matchers',   '2.2.0'
+  # See https://github.com/thoughtbot/shoulda-matchers/issues/270
+  gem "shoulda-matchers",   github: "thoughtbot/shoulda-matchers" , branch: 'dp-rails-four'
   gem 'simplecov',          '0.7.1', require: false
   gem 'valid_attribute',    '1.3.1'
   gem 'email_spec',         '1.4.0'
@@ -51,3 +53,9 @@ group :development, :test do
   gem 'dotenv-rails',       '0.8.0'
   gem 'awesome_print',      '1.1.0'
 end
+
+group :doc do
+  # bundle exec rake doc:rails generates the API under doc/api.
+  gem 'sdoc', require: false
+end
+

data/lib/pah/files/lib/tasks/integration.rake

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 namespace :integration do
-  APP = 'PROJECT'
+  APP = ENV['APP']
 
   namespace :heroku do
     task :add_remote do
@@ -9,7 +9,7 @@ namespace :integration do
     end
 
     task :check do
-      var = `heroku config -s --app #{APP}|grep INTEGRATING_BY`
+      var = Bundler.with_clean_env { `heroku config -s --app #{APP}|grep INTEGRATING_BY` }
       integrating_by = var.split('=')[1] # Eu sei que é tosco, mas foda-se
       user = `whoami`
       if !integrating_by.blank? and integrating_by != user
@@ -19,10 +19,10 @@ namespace :integration do
     end
     task :lock do
       user = `whoami`
-      sh "heroku config:add INTEGRATING_BY=#{user}"
+      Bundler.with_clean_env { sh "heroku config:add INTEGRATING_BY=#{user}" }
     end
     task :unlock do
-      `heroku config:remove INTEGRATING_BY`
+      Bundler.with_clean_env { sh "heroku config:remove INTEGRATING_BY" }
     end
   end
 end

data/lib/pah/files/lib/tasks/tasks.rake

@@ -1,5 +1,5 @@
 namespace :heroku do
-  APP = 'PROJECT'
+  APP = ENV['APP']
 
   def run(*cmd)
     system(*cmd)
@@ -17,12 +17,12 @@ namespace :heroku do
     run "git push git@heroku.com:#{APP}.git HEAD:master -f"
 
     puts "-----> Migrating..."
-    run "heroku run rake db:migrate --app #{APP}"
+    Bundler.with_clean_env { run "heroku run rake db:migrate --app #{APP}" }
 
     puts "-----> Seeding..."
-    run "heroku run rake db:seed --app #{APP}"
+    Bundler.with_clean_env { run "heroku run rake db:seed --app #{APP}" }
 
     puts "-----> Restarting..."
-    run "heroku restart --app #{APP}"
+    Bundler.with_clean_env { run "heroku restart --app #{APP}" }
   end
 end

data/lib/pah/files/spec/spec_helper.rb

@@ -33,6 +33,11 @@ RSpec.configure do |config|
   # instead of true.
   config.use_transactional_fixtures = true
 
+  # Use the new rspec expect syntax
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
   config.order = "random"
   config.render_views
   config.treat_symbols_as_metadata_keys_with_true_values = true

data/lib/pah/files/spec/support/deferred_garbage_collection.rb

@@ -4,7 +4,6 @@
 # https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection
 
 class DeferredGarbageCollection
-  RESERVED_IVARS = %w(@loaded_fixtures)
   DEFERRED_GC_THRESHOLD = (ENV['DEFER_GC'] || 10.0).to_f
   @@last_gc_run = Time.now
   def self.start
@@ -24,11 +23,7 @@ RSpec.configure do |config|
   config.before(:all) do
     DeferredGarbageCollection.start
   end
-  config.after(:each) do
-   (instance_variables - DeferredGarbageCollection::RESERVED_IVARS).each do |ivar|
-     instance_variable_set(ivar, nil)
-   end
-  end
+
   config.after(:all) do
     DeferredGarbageCollection.reconsider
   end

data/lib/pah/partials/_cleanup.rb

@@ -5,16 +5,14 @@ git :commit => "-aqm 'Commit new rails app.'"
 
 puts "Removing unnecessary files ... ".magenta
 
-remove_file "README"
+remove_file "README.rdoc"
 remove_file "app/views/layouts/application.html.erb"
-remove_file "app/assets/images/rails.png"
 
 inside "public" do
-	remove_file "index.html"
 	remove_file "favicon.ico"
 	remove_file "robots.txt"
 end
 
 git :add => '.'
 git :commit => "-aqm 'Removed unnecessary files left over from initial app generation.'"
-puts "\n"
+puts "\n"

data/lib/pah/partials/_default.rb

@@ -7,7 +7,6 @@ copy_static_file 'Procfile'
 copy_static_file "lib/tasks/integration.rake"
 
 copy_static_file 'config/locales/pt-BR.yml'
-copy_static_file 'public/index.html' if ENV['RAILS_TEMPLATE_TEST'] == 'true'
 
 gsub_file 'lib/tasks/integration.rake', /PROJECT/, @app_name
 

data/lib/pah/partials/_heroku.rb

@@ -2,14 +2,19 @@ say "Configuring Heroku application...".magenta
 
 if would_you_like? "Create Heroku apps?".red
   config = {}
-  heroku_name = ask_unless_test "What do you want to call your app? (#{heroku_name})".red
   heroku_name = @app_name.gsub('_','')
+  new_heroku_name = ask "What do you want to call your app? (#{heroku_name})", :red
+  heroku_name = new_heroku_name.present? ? new_heroku_name : heroku_name
   config['staging'] = would_you_like? "Create staging app? (#{heroku_name}-staging.heroku.com) [y,n]".red
   config['deploy']  = would_you_like? "Deploy immediately?".red
   config['domain']  = ask_unless_test "Add custom domain(customdomain.com) or leave blank".red
 
   say "Creating Heroku app '#{heroku_name}.herokuapp.com'".magenta
-  system("heroku create #{heroku_name}")
+  created = system("heroku create #{heroku_name}")
+  unless created
+    puts "Heroku app already exists, halting"
+    exit
+  end
 
   if config['staging']
     staging_name = ask_unless_test "What do you want to call your staging app?".red
@@ -38,14 +43,16 @@ if would_you_like? "Create Heroku apps?".red
   say "Adding heroku addon [Loggly]...".magenta
   run "heroku addons:add loggly:mole"
 
-  sendgrid = ask_unless_test "Add sendgrid:starter addon?".red
+  sendgrid = yes? "Add sendgrid:starter addon? [yN]".red
 
   if sendgrid
     say "Adding heroku addon [Sendgrid]...".magenta
     run "heroku addons:add sendgrid:starter"
   end
 
-  say "Pushing application to heroku...".magenta
-  git :push => "heroku master" if config['deploy']
+  if config['deploy']
+    say "Pushing application to heroku...".magenta
+    git :push => "heroku master" if config['deploy']
+  end
   run "heroku open" if config['deploy']
-end
+end

data/lib/pah/partials/_integration.rb

@@ -1,8 +1,6 @@
 puts "Setting up Integration... ".magenta
 copy_static_file 'lib/tasks/integration.rake'
 copy_static_file 'lib/tasks/tasks.rake'
-gsub_file 'lib/tasks/integration.rake', /PROJECT/, @app_name
-gsub_file 'lib/tasks/tasks.rake', /PROJECT/, @app_name
 git :add => 'lib/tasks/integration.rake lib/tasks/tasks.rake'
 git :commit => "-qm 'Adding integration'"
 

data/lib/pah/partials/_secure_headers.rb

@@ -4,9 +4,9 @@ content = <<EOF
   ensure_security_headers # See more: https://github.com/twitter/secureheaders
 EOF
 in_root do
-  inject_into_file 'app/controllers/application_controller.rb', content, {after: "protect_from_forgery", verbose: false}
+  inject_into_file 'app/controllers/application_controller.rb', content, {after: "with: :exception", verbose: false}
 end
 git :add => 'app/controllers/application_controller.rb'
 git :commit => "-qm 'Adding secure headers.'"
 
-puts "\n"
+puts "\n"

data/lib/pah/template.rb

@@ -28,7 +28,6 @@ def apply_n(partial)
 end
 
 def would_you_like?(question)
-  return true if ENV['RAILS_TEMPLATE_TEST'] == 'true'
   answer = ask("#{question} [y,n]".red)
   case answer.downcase
     when "yes", "y"
@@ -41,7 +40,7 @@ def would_you_like?(question)
 end
 
 def ask_unless_test(*params)
-  ask(*params) unless ENV['RAILS_TEMPLATE_TEST'] == 'true'
+  ask(*params)
 end
 
 puts "\n========================================================="
@@ -67,18 +66,10 @@ apply_n :rvm
 apply_n :unicorn
 apply_n :integration
 apply_n :finish
-
-if ENV['RAILS_TEMPLATE_TEST'] == 'true'
-  in_root do
-    run "rake"
-  end
-end
-
 apply_n :heroku
 
 # apply_n :omniauth # TODO: add spec support files
                     # TODO: take care of facebook when user is not logged in on facebook (when app)
-# TODO: extrair phone validator to gem
 
 puts "\n========================================================="
 puts " CONGRATS! INSTALLATION COMPLETE!".yellow.bold

data/lib/pah/version.rb

@@ -1,3 +1,3 @@
 module Pah
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/pah.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rails', '3.2.13'
+  spec.add_dependency 'rails', '4.0.0'
   spec.add_dependency 'colored', '1.2'
   spec.add_dependency 'rvm', '1.11.3.8'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pah
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement