pah 0.0.14 → 0.0.15

data/features/secure_headers.feature

@@ -1,6 +1,7 @@
+@no-clobber
 Feature: Secure Headers
   Background:
-    Given I have created a app with pah
+    Given I have created the app "myapp" with pah
 
   Scenario: Have correct files
     Then I have the file app/controllers/application_controller.rb and contents of this file should include:

data/features/sendgrid.feature

@@ -1,6 +1,7 @@
+@no-clobber
 Feature: SendGrid
   Background:
-    Given I have created a app with pah
+    Given I have created the app "myapp" with pah
 
   Scenario: Have correct files
     Then I have the file config/environments/production.rb and contents of this file should include:

data/features/simple_form.feature

@@ -1,6 +1,7 @@
+@no-clobber
 Feature: Simple Form
   Background:
-    Given I have created a app with pah
+    Given I have created the app "myapp" with pah
 
   Scenario: Have correct files
     Then I have a config/locales/simple_form.pt-BR.yml

data/features/step_definitions/create_simple_app.rb

@@ -1,10 +1,20 @@
-Given(/^I have created a app with pah$/) do
-  steps %Q{
-    When I run `pah myapp` interactively
-    And I type "n"
-    Then the output should contain:
-      """
-      CONGRATS! INSTALLATION COMPLETE!
-      """
-  }
+Given(/^I have created the app "(.*?)" with pah$/) do |app_name|
+  app_exists = File.directory?("tmp/aruba/#{app_name}")
+
+  if app_exists
+    steps %Q{
+      Then a directory named "#{app_name}" should exist
+    }
+  else
+    steps %Q{
+      When I run `rm -rf #{app_name}`
+      Then I run `pah #{app_name}` interactively
+      And I type "n"
+      Then the output should contain:
+        """
+        CONGRATS! INSTALLATION COMPLETE!
+        """
+      Then a directory named "#{app_name}" should exist
+    }
+  end
 end

data/features/step_definitions/file_content.rb

@@ -8,6 +8,11 @@ Then(/^I have the file(.* )and contents of this file should include:$/) do |file
   expect(file_content).to include(content)
 end
 
+Then(/^I have the file(.* )and contents of this file should not include:$/) do |file, content|
+  file_content = read_from_app(file.strip)
+  expect(file_content).to_not include(content)
+end
+
 Then(/^I have the file(.* )and contents of this file should match:$/) do |file, content|
   file_content = read_from_app(file.strip)
   expect(file_content).to match(%r{#{content}})

data/features/support/env.rb

@@ -7,3 +7,6 @@ ENV['PATH'] = "#{root}/features/support/bin#{File::PATH_SEPARATOR}#{ENV['PATH']}
 Before do
   @aruba_timeout_seconds = 60 * 5
 end
+
+# Remove old generated projects
+system "rm -rf tmp/aruba"

data/lib/pah/files/Gemfile

@@ -1,58 +1,57 @@
 source 'https://rubygems.org'
 ruby '2.1.2'
 
-# See: https://github.com/rails/rails/issues/13164
-gem 'i18n',                   github: 'svenfuchs/i18n',
-                              ref: '8fc94e7e9ec20396e974b0549cf499662238bf56'
-
 gem 'rails',                  'RAILS_VERSION'
 gem 'puma',                   '2.8.2'
-gem 'secure_headers',         '1.1.1'
-gem 'jquery-rails',           '3.1.0'
+gem 'secure_headers',         '1.2.0'
+gem 'jquery-rails',           '3.1.1'
 gem 'turbolinks',             '2.2.2'
-gem 'jbuilder',               '2.0.4'
-gem 'slim-rails',             '2.1.4'
+gem 'jbuilder',               '2.1.1'
+gem 'slim-rails',             '2.1.5'
 gem 'pg',                     '0.17.1'
 gem 'sass-rails',             '4.0.3'
 gem 'coffee-rails',           '4.0.1'
-gem 'uglifier',               '2.5.0'
-gem 'rack-canonical-host',    '0.1.0'
-gem 'rack-timeout',           github: 'kch/rack-timeout', ref: '83ca9f5141c1fdcb626820b1601c406e3a3a560a'
-gem 'bourbon',                '3.1.8'
+gem 'uglifier',               '2.5.1'
 gem 'simple_form',            '3.1.0.rc1'
 gem 'flutie',                 '2.0.0'
-gem 'newrelic_rpm',           '3.8.0.218'
+gem 'bourbon',                '3.2.3'
+gem 'neat',                   '1.5.1'
+gem 'bitters',                '0.10.0'
+gem 'refills',                '0.0.2'
 
-group :production do
+group :production, :staging do
   gem 'rails_12factor',       '0.0.2'
-  gem 'rollbar',              '0.12.17'
+  gem 'rack-canonical-host',  '0.1.0'
+  gem 'rack-timeout',         github: 'kch/rack-timeout', ref: '83ca9f5141c1fdcb626820b1601c406e3a3a560a'
+  gem 'newrelic_rpm',         '3.9.0.229'
+  gem 'rollbar',              '0.13.1'
 end
 
 group :development do
   gem 'spring',               '1.1.3'
-  gem 'foreman',              '0.63.0'
+  gem 'foreman',              '0.74.0'
   gem 'jumpup',               '0.0.5'
   gem 'jumpup-heroku',        '0.0.5'
   gem 'better_errors',        '1.1.0'
   gem 'binding_of_caller',    '0.7.2'
   gem 'letter_opener',        '1.2.0'
-  gem 'bullet',               '4.8.0'
-  gem 'quiet_assets',         '1.0.2'
+  gem 'bullet',               '4.11.3'
+  gem 'quiet_assets',         '1.0.3'
 end
 
 group :test do
   gem 'shoulda-matchers',     '2.6.1', require: false
   gem 'simplecov',            '0.8.2', require: false
-  gem 'email_spec',           github: 'bmabey/email-spec', ref: '8f862c22413fe4cb220a8dac6b9206b8b46d1148'
-  gem 'capybara',             '2.2.1'
-  gem 'poltergeist',          '1.5.0'
-  gem 'vcr',                  '2.9.0'
-  gem 'webmock',              '< 1.16' # VCR 2.8.0 requires Webmock >= 1.8.0, < 1.16
-  gem 'database_cleaner',     '1.2.0'
+  gem 'email_spec',           '1.6.0'
+  gem 'capybara',             '2.4.1'
+  gem 'poltergeist',          '1.5.1'
+  gem 'vcr',                  '2.9.2'
+  gem 'webmock',              '1.18.0'
+  gem 'database_cleaner',     '1.3.0'
 end
 
 group :development, :test do
-  gem 'rspec-rails',          '3.0.0.rc1'
+  gem 'rspec-rails',          '3.0.1'
   gem 'factory_girl_rails',   '4.4.1'
   gem 'pry-rails',            '0.3.2'
   gem 'dotenv-rails',         '0.11.1'

data/lib/pah/files/app/views/application/_flash_messages.html.slim

@@ -1,4 +1,3 @@
-#flash-messages
-  - flash.each do |key, value|
-    div id="flash_#{key}"
-      = value
+- flash.each do |key, value|
+  div id="flash_#{key}"
+    = value

data/lib/pah/files/app/views/layouts/application.html.slim

@@ -9,43 +9,14 @@ html lang="pt"
       = page_title(app_name: 'example')
 
     link href="/favicon.ico" rel=("shortcut icon")
-    = yield(:header_tags)
 
-    = stylesheet_link_tag "application", :type => nil, :media => "all"
-    = javascript_include_tag "application", :type => nil, "data-turbolinks-track" => true
+    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
+    = javascript_include_tag 'application', 'data-turbolinks-track' => true
     = csrf_meta_tags
 
     /![if lt IE 9]
       script src="http://html5shim.googlecode.com/svn/trunk/html5.js"
 
-    javascript:
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'XXXXX-XXXX']);
-      _gaq.push(['_trackPageview']);
-
-      (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
-
   body class=body_class
-    #wrapper
-      header
-        .holder
-          #logo
-            = link_to "Logo", "/"
-          = render 'flash_messages'
-
-      #main-content
-        .holder
-          section role="main"
-            = yield
-
-          - if content_for?(:sidebar)
-            aside
-              = yield(:sidebar)
-
-      footer
-        .holder
-          = "Copyright © #{Time.zone.now.year} App".html_safe
+    = render 'flash_messages'
+    = yield

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

@@ -1 +1,3 @@
-Rack::Timeout.timeout = Integer(ENV['RACK_TIMEOUT'] || 10) # seconds
+if defined? Rack::Timeout
+  Rack::Timeout.timeout = Integer(ENV['RACK_TIMEOUT'] || 10) # seconds
+end

data/lib/pah/files/spec/acceptance/dummy_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
-describe "Homepage", type: :request do
+RSpec.describe "Homepage", type: :request do
   xit {
     visit root_path
     page.should have_content('Copyright © 2012 App')

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

@@ -0,0 +1,19 @@
+ENV["RAILS_ENV"] ||= 'test'
+require 'spec_helper'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+require 'shoulda/matchers'
+require "email_spec"
+
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+
+ActiveRecord::Migration.maintain_test_schema!
+
+RSpec.configure do |config|
+  config.use_transactional_fixtures = true
+  config.infer_spec_type_from_file_location!
+  config.render_views
+  config.include FactoryGirl::Syntax::Methods
+  config.include EmailSpec::Helpers
+  config.include EmailSpec::Matchers
+end

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

@@ -1,5 +1,3 @@
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-
 if ENV['coverage'] == 'on'
   require 'simplecov'
   SimpleCov.start 'rails' do
@@ -7,51 +5,20 @@ if ENV['coverage'] == 'on'
   end
 end
 
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
-require 'shoulda/matchers'
-require "email_spec"
-
-# Checks for pending migrations before tests are run.
-# If you are not using ActiveRecord, you can remove this line.
-ActiveRecord::Migration.maintain_test_schema!
-
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
-
 RSpec.configure do |config|
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = true
-
-  # Use the new rspec expect syntax
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
+  config.disable_monkey_patching!
+  config.order = :random
+  Kernel.srand config.seed
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = :expect
   end
-
   config.mock_with :rspec do |mocks|
     mocks.syntax = :expect
     mocks.verify_partial_doubles = true
   end
-
-  config.infer_spec_type_from_file_location!
-  config.order = "random"
-  config.render_views
-  config.include FactoryGirl::Syntax::Methods
-  config.include EmailSpec::Helpers
-  config.include EmailSpec::Matchers
-
-  config.filter_run focus: true
-  config.run_all_when_everything_filtered = true
-
-  # If true, the base class of anonymous controllers will be inferred
-  # automatically. This will be the default behavior in future versions of
-  # rspec-rails.
-  config.infer_base_class_for_anonymous_controllers = false
+  if config.files_to_run.one?
+    config.default_formatter = 'doc'
+  end
 end

data/lib/pah/pah.rb

@@ -0,0 +1,64 @@
+require File.expand_path(File.join('..', 'pah', 'version.rb'), File.dirname(__FILE__))
+
+%w{colored}.each do |component|
+  if Gem::Specification.find_all_by_name(component).empty?
+    run "gem install #{component}"
+    Gem.refresh
+    Gem::Specification.find_by_name(component).activate
+  end
+end
+
+require "rails"
+require "colored"
+require "bundler"
+
+def template_root
+  File.expand_path(File.join('..', 'pah'), File.dirname(__FILE__))
+end
+
+def partials
+  File.join(template_root, 'partials')
+end
+
+def static_files
+  File.join(template_root, 'files')
+end
+
+# Copy a static file from the template into the new application
+def copy_static_file(path)
+  remove_file path
+  file path, File.read(File.join(static_files, path))
+end
+
+def apply_n(partial_name, message='')
+  puts message.magenta
+
+  in_root do
+    Bundler.with_clean_env do
+      apply "#{partials}/_#{partial_name}.rb"
+    end
+  end
+
+  puts "\n"
+end
+
+def will_you_like_to?(question)
+  answer = ask("Will you like to #{question} [y,n]".red)
+  case answer.downcase
+    when "yes", "y"
+      true
+    when "no", "n"
+      false
+    else
+      will_you_like_to?(question)
+  end
+end
+
+def ask_unless_test(*params)
+  ask(*params)
+end
+
+def git_commit(message)
+  message = "#{message}\n\nGenerated by pah version #{Pah::VERSION}"
+  git commit: "-qm '#{message}'"
+end

data/lib/pah/partials/_bourbon.rb

@@ -0,0 +1,25 @@
+css_path = 'app/assets/stylesheets/'
+application_css_path = "#{css_path}application.css"
+
+prepend_to_file application_css_path do
+<<IMPORTS
+@import 'bourbon';
+@import 'base/base';
+@import 'neat';
+IMPORTS
+end
+
+gsub_file application_css_path, /\*= require_tree \./, '*'
+
+inside(css_path) do
+  system 'bundle exec bitters install'
+end
+
+gsub_file "#{css_path}base/_base.scss", %r{// @import 'grid-settings';}, "@import 'grid-settings';"
+
+system "mv #{application_css_path} #{css_path}application.css.scss"
+
+git rm: application_css_path
+git add: css_path
+git_commit 'Install bourbon.'
+

data/lib/pah/partials/_heroku.rb

@@ -1,5 +1,6 @@
 class HerokuApp < Rails::Generators::AppGenerator
-  DEFAULT_ADDONS = %w(heroku-postgresql:dev pgbackups:auto-month loggly:mole sendgrid:starter rollbar newrelic:stark)
+  DEFAULT_ADDONS = %w(heroku-postgresql:dev pgbackups:auto-month loggly:mole
+                      sendgrid:starter rollbar newrelic:stark)
 
   attr_reader :name, :description, :config
 
@@ -22,41 +23,47 @@ class HerokuApp < Rails::Generators::AppGenerator
 
   def add_secret_token
     say "Creating SECRET_KEY_BASE for Heroku '#{name}.herokuapp.com'".magenta
-    system "heroku config:set SECRET_KEY_BASE=#{SecureRandom::hex(60)} --app #{name}"
+    run "heroku config:set SECRET_KEY_BASE=#{SecureRandom::hex(60)} --app #{name}"
   end
 
   def add_heroku_git_remote
     say "Adding Heroku git remote for deploy to '#{name}'.".magenta
-    system "git remote add heroku git@heroku.com:#{name}.git"
+    run "git remote add heroku git@heroku.com:#{name}.git"
   end
 
   def add_heroku_addon(addon)
     say "Adding heroku addon [#{addon}] to '#{name}'.".magenta
-    system "heroku addons:add #{addon} --app #{name}"
+    run "heroku addons:add #{addon} --app #{name}"
   end
 
   def add_canonical_domain(domain)
-    system "heroku domains:add #{domain} --app #{name}"
+    run "heroku domains:add #{domain} --app #{name}"
   end
 
   def add_collaborator(email)
-    system "heroku sharing:add #{email} --app #{name}"
+    run "heroku sharing:add #{email} --app #{name}"
   end
 
   def add_timezone_config
     say "Adding timezone config on Heroku".magenta
-    system "heroku config:set TZ=America/Sao_Paulo --app #{name}"
+    run "heroku config:set TZ=America/Sao_Paulo --app #{name}"
   end
 
   def open
     say "Pushing application to heroku...".magenta
 
-    system "git push heroku master"
+    run "git push heroku master"
 
-    system "heroku open --app #{name}"
+    run "heroku open --app #{name}"
   end
 
   private
+    def run(command)
+      unless system(command)
+        raise "Error while running #{command}"
+      end
+    end
+
     def check_canonical_domain
       domain = @config[:heroku][:domain]
       add_canonical_domain(domain) unless domain.blank?