pah 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c4da3899fe6bca1c8bed8832756d255616aafff
-  data.tar.gz: 01a752f1bb9d27bd8d038e908a265792da52a1ed
+  metadata.gz: c6212ca852515a5d3a319e26a2679fbfabd8cedf
+  data.tar.gz: 926e305615e898e0c88197ae16acd5ee60d23c6f
 SHA512:
-  metadata.gz: c83aadb0ca4d59769263e8a7c169bbb1aa40db5b99f2c9061a1cc054ae7db3a82cc4997741d6a958a33c9c00d3d8c3841c5b9354fc0ecf9440938c284830779b
-  data.tar.gz: 9bf556fd7e1d6df48db25f13e8e7f768c9f15934affad914e3538dac8bee5ea797236a9ce4490eed8bd84009a45a76f288d534b4617cd36dcc19845955da2886
+  metadata.gz: 49d22795028acb466ca5995350d91ee7c141758ad7629c39968fa94e90136db571e4587fa3f48559fa3a456e08029b0f6c74057dbd21670d11c7ee2c30fe6377
+  data.tar.gz: cbff55dc3313b7d9f4079d6a883fb751a035afd90650a06af2b2514251a8e495bb9e56729a2fb78b7b9544a32214c48025743081709344d1af41365286545923

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.0.10 (November 5, 2013)
+
+### features
+
+### improvements
+
+- Remove rvm dependency
+- Remove staging app
+- Remove ominiauth integration
+- Refactoring bundle files 
+- Refactoring integration files
+- Remove password from db config
+
+### bug fixes
+
+- Integration now use app name hardcoded
+
 ## 0.0.9 (November 01, 2013)
 
 ### features

data/README.md

@@ -11,6 +11,8 @@ Install Pah at the command prompt:
 
     gem install pah
 
+If using [RVM see this tips](https://github.com/Helabs/pah/wiki/Using-Pah-with-RVM).
+
 ## Usage
 
 Run:
@@ -19,6 +21,18 @@ Run:
 
 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.
 
+### RVM
+
+If using the rvm is recomended before using pah, create and use a gemset, with the project name.
+
+```bash
+$ rvm use 2.0.0@projectname --create
+```
+
+Pah automatically create the .ruby-version and .ruby-gemset files.
+
+### Canonical host
+
 Be sure to set your canonical domain on Heroku:
 ```shell
 heroku config:add CANONICAL_HOST=yourdomain.com #or www.yourdomain.com

data/lib/pah/files/config/database.yml

@@ -1,22 +1,18 @@
 development:
   adapter: postgresql
-  encoding: unicode
+  encoding: utf8
   database: PROJECT_development
   pool: 5
   username: postgres
-  password:
   host: localhost
-  encoding: utf8
   template: template0
 
 test:
   adapter: postgresql
-  encoding: unicode
+  encoding: utf8
   database: PROJECT_test
   pool: 5
   username: postgres
-  password:
   min_messages: WARNING
   host: localhost
-  encoding: utf8
-  template: template0
+  template: template0

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

@@ -4,8 +4,46 @@ def run_with_clean_env(command, capture_output=false)
   Bundler.with_clean_env { capture_output ? `#{command}` : sh(command) }
 end
 
+def confirm(message)
+  print "\n#{message}\nAre you sure? [yN] "
+  raise 'Ok. Bye...' unless STDIN.gets.chomp.downcase == 'y'
+end
+
+def has_database?(app)
+  database_url = run_with_clean_env("heroku config -s --app #{app} | grep DATABASE_URL", true).strip
+  not database_url.blank?
+end
+
+def backup(app)
+  return unless has_database?(app)
+  puts "--> Backing up database via Heroku".magenta
+  run_with_clean_env("heroku pgbackups:capture --expire --app #{app}")
+end
+
+def migrate(app)
+  return unless has_database?(app)
+  puts "--> Migrating".magenta
+  run_with_clean_env("heroku run rake db:migrate --app #{app}")
+end
+
+def seed(app)
+  return unless has_database?(app)
+  puts "--> Seeding".magenta
+  run_with_clean_env("heroku run rake db:seed --app #{app}")
+end
+
+def restart(app)
+  puts "--> Restarting".magenta
+  run_with_clean_env("heroku restart --app #{app}")
+end
+
+def deploy(app) 
+  puts "--> Pushing".magenta
+  run_with_clean_env("git push git@heroku.com:#{APP}.git HEAD:master")
+end
+
 namespace :integration do
-  APP = ENV['STAGING_APP'] || ENV['APP']
+  APP = 'PROJECT'
   USER = run_with_clean_env("git config --get user.name", true).strip
 
   namespace :heroku do
@@ -44,6 +82,15 @@ namespace :integration do
       puts "--> Unlocking Heroku integration".magenta
       run_with_clean_env("heroku config:unset INTEGRATING_BY --app #{APP}")
     end
+
+    desc "Deploy to heroku"
+    task :deploy do
+      backup(APP)
+      deploy(APP)      
+      migrate(APP)
+      seed(APP)
+      restart(APP)
+    end
   end
 end
 
@@ -57,6 +104,6 @@ INTEGRATION_TASKS = %w(
   spec
   integration:coverage_verify
   integration:finish
-  heroku:deploy:staging
+  integration:heroku:deploy
   integration:heroku:unlock
 )

data/lib/pah/partials/_cleanup.rb

@@ -1,8 +1,3 @@
-puts "Commiting new rails app ... ".magenta
-
-git :add => '.'
-git :commit => "-aqm 'Commit new rails app.'"
-
 puts "Removing unnecessary files ... ".magenta
 
 remove_file "README.rdoc"

data/lib/pah/partials/_database.rb

@@ -3,4 +3,11 @@ gsub_file 'config/database.yml', /PROJECT/, @app_name
 git :add => 'config/database.yml'
 git :commit => "-qm 'Adding config/database.yml.'"
 
-puts "\n"
+in_root do
+  run "rake db:create db:migrate db:test:clone"
+end
+
+git :add => 'db/schema.rb'
+git :commit => "-qm 'Create database, adding db/schema.rb.'"
+
+puts "\n"

data/lib/pah/partials/_default.rb

@@ -8,9 +8,7 @@ copy_static_file 'config/unicorn.rb'
 copy_static_file 'Procfile'
 copy_static_file 'config/locales/pt-BR.yml'
 copy_static_file '.gitignore'
-
-create_file ".env"
-append_to_file '.env', "APP: #{@app_name}\n"
+copy_static_file '.env'
 
 git :add => '.'
 git :commit => "-aqm 'Add default stuff.'"

data/lib/pah/partials/_gems.rb

@@ -1,7 +1,16 @@
-puts "Adding Gemfile... ".magenta
+puts "Setting up bundler and installing bundled gems (may take a while) ... ".magenta
 
 copy_static_file 'Gemfile'
 
+in_root do
+  # Since the gemset is likely empty, manually install bundler so it can install the rest
+  run "gem install bundler --no-ri --no-rdoc"
+
+  # Install all other gems needed from Gemfile
+  run "bundle install"
+end
+
 git :add => 'Gemfile'
-git :commit => "-qm 'Adding Gemfile.'"
-puts "\n"
+git :add => 'Gemfile.lock'
+git :commit => "-qm 'Add Gemfile and Gemfile.lock.'"
+puts "\n"

data/lib/pah/partials/_heroku.rb

@@ -3,7 +3,7 @@ class HerokuApp < Rails::Generators::AppGenerator
 
   attr_reader :name, :description
 
-  def initialize(name, description, staging=false)
+  def initialize(name, description)
     @name = name
     @description = description
 
@@ -11,12 +11,9 @@ class HerokuApp < Rails::Generators::AppGenerator
     add_secret_token
     add_timezone_config
     add_addons
-
-    unless staging
-      add_heroku_git_remote
-      check_canonical_domain
-      check_collaborators
-    end
+    add_heroku_git_remote
+    check_canonical_domain
+    check_collaborators
   end
 
   def create
@@ -102,25 +99,9 @@ if would_you_like? "Create Heroku apps?".red
   end
 
   config = {}
-  config['staging'] = would_you_like? "Create staging app?".red
   config['deploy']  = would_you_like? "Deploy immediately?".red
 
   production_app = HerokuApp.new(@app_name.gsub('_',''), "app")
-  staging_app = HerokuApp.new("#{production_app.name}-staging", "staging app", true) if config['staging']
-
-  if config['staging'] && staging_app.name.present?
-    append_to_file '.env', "STAGING_APP: #{staging_app.name}\n"
-    append_to_file '.env', "PRODUCTION_APP: #{production_app.name}\n"
-
-    git add: '.env'
-    git commit: "-qm 'Adding STAGING_APP and PRODUCTION_APP configs.'"
-  else
-    # The STAGING_APP is the default integration destination
-    append_to_file '.env', "STAGING_APP: #{production_app.name}\n"
-
-    git add: '.env'
-    git commit: "-qm 'Adding STAGING_APP config.'"
-  end
 
   production_app.open if config['deploy']
 end

data/lib/pah/partials/_integration.rb

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

data/lib/pah/partials/_ruby_env.rb

@@ -0,0 +1,16 @@
+puts "Setting up ruby env ... ".magenta
+
+current_ruby = 'ruby-2.0.0'
+current_gemset = @app_name
+
+copy_static_file '.ruby-version'
+gsub_file '.ruby-version', /RUBY_VERSION/, current_ruby
+
+copy_static_file '.ruby-gemset'
+gsub_file '.ruby-gemset', /GEMSET/, current_gemset
+
+git :add => '.ruby-version'
+git :add => '.ruby-gemset'
+git :commit => "-qm 'Add .ruby-version and .ruby-gemset'"
+
+puts "\n"

data/lib/pah/template.rb

@@ -50,6 +50,7 @@ puts "=========================================================\n"
 # TODO: timezone, Add rspec extensions
 
 apply_n :git
+apply_n :ruby_env
 apply_n :cleanup
 apply_n :gems
 apply_n :database
@@ -58,16 +59,13 @@ apply_n :default
 apply_n :stylesheets
 apply_n :secure_headers
 apply_n :secret_token
-apply_n :omniauth
 apply_n :capybara
 apply_n :generators
 apply_n :letter_opener
 apply_n :locale
 apply_n :canonical_host
-apply_n :rvm
 apply_n :unicorn
 apply_n :integration
-apply_n :finish
 apply_n :heroku
 
 # apply_n :omniauth # TODO: add spec support files

data/lib/pah/version.rb

@@ -1,3 +1,3 @@
 module Pah
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/pah.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rails', '4.0.0'
   spec.add_dependency 'colored', '1.2'
-  spec.add_dependency 'rvm', '1.11.3.8'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pah
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - HE:labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,20 +38,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: rvm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.11.3.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.11.3.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +85,7 @@ files:
 - README.md
 - Rakefile
 - bin/pah
+- lib/pah/files/.env
 - lib/pah/files/.gitignore
 - lib/pah/files/.ruby-gemset
 - lib/pah/files/.ruby-version
@@ -110,10 +97,8 @@ files:
 - lib/pah/files/app/views/application/_flash_messages.html.haml
 - lib/pah/files/app/views/layouts/application.html.haml
 - lib/pah/files/config/database.yml
-- lib/pah/files/config/initializers/omniauth.rb
 - lib/pah/files/config/locales/pt-BR.yml
 - lib/pah/files/config/unicorn.rb
-- lib/pah/files/lib/tasks/deploy.rake
 - lib/pah/files/lib/tasks/integration.rake
 - lib/pah/files/spec/acceptance/dummy_spec.rb
 - lib/pah/files/spec/spec_helper.rb
@@ -135,7 +120,6 @@ files:
 - lib/pah/partials/_cleanup.rb
 - lib/pah/partials/_database.rb
 - lib/pah/partials/_default.rb
-- lib/pah/partials/_finish.rb
 - lib/pah/partials/_gems.rb
 - lib/pah/partials/_generators.rb
 - lib/pah/partials/_git.rb
@@ -143,9 +127,8 @@ files:
 - lib/pah/partials/_integration.rb
 - lib/pah/partials/_letter_opener.rb
 - lib/pah/partials/_locale.rb
-- lib/pah/partials/_omniauth.rb
 - lib/pah/partials/_rspec.rb
-- lib/pah/partials/_rvm.rb
+- lib/pah/partials/_ruby_env.rb
 - lib/pah/partials/_secret_token.rb
 - lib/pah/partials/_secure_headers.rb
 - lib/pah/partials/_stylesheets.rb

data/lib/pah/files/config/initializers/omniauth.rb

@@ -1,4 +0,0 @@
-# -*- encoding : utf-8 -*-
-Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :facebook, ENV['FACEBOOK_APP_KEY'], ENV['FACEBOOK_APP_SECRET'], :scope => "email"
-end

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

@@ -1,109 +0,0 @@
-require 'colored' if Rails.env.development?
-
-def run_with_clean_env(command, capture_output=false)
-  Bundler.with_clean_env { capture_output ? `#{command}` : sh(command) }
-end
-
-def confirm(message)
-  print "\n#{message}\nAre you sure? [yN] "
-  raise 'Ok. Bye...' unless STDIN.gets.chomp.downcase == 'y'
-end
-
-namespace :heroku do
-  PRODUCTION_APP = ENV['PRODUCTION_APP'] || ENV['APP']
-  STAGING_APP = ENV['STAGING_APP'] || ENV['APP']
-
-  def has_database?(app)
-    database_url = run_with_clean_env("heroku config -s --app #{app} | grep DATABASE_URL", true).strip
-    not database_url.blank?
-  end
-
-  def backup(app)
-    return unless has_database?(app)
-    puts "--> Backing up database via Heroku".magenta
-    run_with_clean_env("heroku pgbackups:capture --expire --app #{app}")
-  end
-
-  def migrate(app)
-    return unless has_database?(app)
-    puts "--> Migrating".magenta
-    run_with_clean_env("heroku run rake db:migrate --app #{app}")
-  end
-
-  def seed(app)
-    return unless has_database?(app)
-    puts "--> Seeding".magenta
-    run_with_clean_env("heroku run rake db:seed --app #{app}")
-  end
-
-  def restart(app)
-    puts "--> Restarting".magenta
-    run_with_clean_env("heroku restart --app #{app}")
-  end
-
-  namespace :deploy do
-
-    desc "Deploy to staging"
-    task :staging do
-      APP = STAGING_APP
-
-      backup(APP) if ENV['SKIP_BACKUP'] != "true"
-
-      puts "--> Pushing".magenta
-      run_with_clean_env("git push git@heroku.com:#{APP}.git HEAD:master")
-
-      migrate(APP)
-      seed(APP)
-      restart(APP)
-    end
-
-    desc "Deploy to production"
-    task :production do
-      # This constant is defined to avoid problemd of copying and pasting from one environment to another
-      APP = PRODUCTION_APP
-
-      confirm("Going deploy to production [#{APP}]...".red)
-
-      if ENV['SKIP_TESTS'] != "true"
-        puts "--> Running all specs".magenta
-        Rake::Task['spec'].invoke
-      end
-
-      print "\nPut #{APP} in maintenance mode? [Yn] ".red
-      maintenance = (ENV['MAINTENANCE'] == "true" or (STDIN.gets.chomp.downcase == 'y'))
-
-      if maintenance
-        puts "--> Setting Maintenance on".magenta
-        run_with_clean_env("heroku maintenance:on --app #{APP}")
-
-        puts "--> Restarting".magenta
-        run_with_clean_env("heroku restart --app #{APP}")
-
-        puts "--> Waiting 20 seconds to app come back (in maintenance mode)".magenta
-        sleep(20)
-      end
-
-      backup(APP) if ENV['SKIP_BACKUP'] != "true"
-
-      iso_date = Time.now.strftime('%Y-%m-%dT%H%M%S')
-      tag_name = "production-#{iso_date}"
-
-      puts "--> Tagging as #{tag_name}".magenta
-      run_with_clean_env("git tag #{tag_name} master")
-
-      puts "--> Pushing".magenta
-      run_with_clean_env("git push origin #{tag_name}")
-      run_with_clean_env("git push git@heroku.com:#{APP}.git HEAD:master")
-
-      migrate(APP)
-      seed(APP)
-
-      if maintenance
-        puts "Setting Maintenance off".magenta
-        run_with_clean_env("heroku maintenance:off --app #{APP}")
-      end
-
-      restart(APP)
-    end
-  end
-end

data/lib/pah/partials/_finish.rb

@@ -1,8 +0,0 @@
-in_root do
-  run "rake db:create db:migrate db:test:clone"
-end
-
-git :add => 'db/schema.rb'
-git :commit => "-qm 'Create database, adding db/schema.rb.'"
-
-puts "\n"

data/lib/pah/partials/_omniauth.rb

@@ -1,13 +0,0 @@
-puts "Add omniauth support ...".magenta
-
-if would_you_like? "Add omniauth support?".red
-  %w{omniauth.rb}.each do |component|
-    copy_static_file "config/initializers/#{component}"
-  end
-
-  gsub_file 'Gemfile', /# gem 'omniauth/, "gem 'omniauth"
-  
-  git :add => '.'
-  git :commit => "-aqm 'Add omniauth support.'"
-  puts "\n"
-end

data/lib/pah/partials/_rvm.rb

@@ -1,47 +0,0 @@
-# Set up rvm private gemset
-require 'rvm'
-puts "Setting up RVM gemset and installing bundled gems (may take a while) ... ".magenta
-
-# Need to strip colors in case rvm_pretty_print_flag is enabled in user's .rvmrc
-rvm_list = `rvm list`.gsub(Regexp.new("\e\\[.?.?.?m"), '')
-
-current_ruby = rvm_list.match(/=.? ([^ ]+)/)[1]
-desired_ruby = current_ruby.gsub(/\-p\d+/, "")
-
-@env = RVM::Environment.new(desired_ruby)
-
-gemset_name = @app_name
-
-puts "Creating gemset #{gemset_name} in #{desired_ruby}"
-@env.gemset_create(gemset_name)
-puts "Now using gemset #{gemset_name}"
-@env.gemset_use!(gemset_name)
-
-rvm_current = `rvm current`.match(/[\w\d.-]+@[\w\d\.-]+/)[0].strip.split('@').last
-
-if rvm_current != gemset_name
-  puts "Error using gemset #{gemset_name}:".red
-  puts "#{rvm_current} does not match the gemset #{gemset_name}".yellow
-  exit
-end
-
-# Since the gemset is likely empty, manually install bundler so it can install the rest
-run "gem install bundler --no-ri --no-rdoc"
-
-# Install all other gems needed from Gemfile
-run "bundle install"
-
-copy_static_file '.ruby-version'
-gsub_file '.ruby-version', /RUBY_VERSION/, desired_ruby
-
-copy_static_file '.ruby-gemset'
-gsub_file '.ruby-gemset', /GEMSET/, gemset_name
-
-git :add => '.ruby-version'
-git :add => '.ruby-gemset'
-git :commit => "-qm 'Adding RVM config files.'"
-
-git :add => 'Gemfile.lock'
-git :commit => "-qm 'Adding Gemfile.lock.'"
-
-puts "\n"