slining 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77cde7ad1c646626c7b5defa22f069d9ff799b14
-  data.tar.gz: ab5476cfcc6c3cb00e5a257246486e3a963c0dcf
+  metadata.gz: 5c7fc9e3a8bd48887f49e042743e9855c3cf27b1
+  data.tar.gz: 8b34aa89c782b89ae360fe4c6f2484d627e5706b
 SHA512:
-  metadata.gz: 967f856b529855353399864b5cc7226df2c0a48cfbed0b3ab53a3f95af4b41c0c2126cb7c18bc449ef6b2dd96c546dd5ec91e14870cc73d4f7c567f8792efa36
-  data.tar.gz: 0145b65bd84307661d0907cdb8e9196060bb9dacda52e71c7b82c968d8e2118ebc1e372e965ccb76e10286903e197a06361d17abd4bbc510820bfb3810d15561
+  metadata.gz: 59c4b2092db7d17ba70dc975fe6bfa9d9913d55b4a801709c40d8c9c7ea398e9f98883441fb6b2b342177ef7ddd4273d19250728ce23e5e8329a211b5691fc24
+  data.tar.gz: 13d5f17e0b107d4d02b8291730fcb1a335595621f1c23c0082361a9a57f5fc38530932c8a34da264cb32d87a5ab7a8e0fe3833302d6a23c4b1a4ec6bd3f43452

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.3.1

data/lib/slining/adapters/heroku.rb

@@ -46,7 +46,7 @@ module Slining
         end
       end
 
-      def provide_review_apps_setup_script
+      def create_review_apps_setup_script
         app_builder.template(
           "bin_setup_review_app.erb",
           "bin/setup_review_app",
@@ -55,14 +55,14 @@ module Slining
         app_builder.run "chmod a+x bin/setup_review_app"
       end
 
-      def create_heroku_pipelines_config_file
+      def create_heroku_application_manifest_file
         app_builder.template "app.json.erb", "app.json"
       end
 
       def create_heroku_pipeline
-        pipelines_plugin = `heroku plugins | grep pipelines`
+        pipelines_plugin = `heroku help | grep pipelines`
         if pipelines_plugin.empty?
-          puts "You need heroku pipelines plugin. Run: heroku plugins:install heroku-pipelines"
+          puts "You need heroku pipelines plugin. Run: brew upgrade heroku-toolbelt"
           exit 1
         end
 
@@ -80,15 +80,6 @@ module Slining
         )
       end
 
-      def set_heroku_serve_static_files
-        %w(staging production).each do |environment|
-          run_toolbelt_command(
-            "config:add RAILS_SERVE_STATIC_FILES=true",
-            environment,
-          )
-        end
-      end
-
       private
 
       attr_reader :app_builder

data/lib/slining/app_builder.rb

@@ -6,14 +6,13 @@ module Slining
     extend Forwardable
 
     def_delegators :heroku_adapter,
-                   :create_heroku_pipelines_config_file,
+                   :create_heroku_application_manifest_file,
                    :create_heroku_pipeline,
                    :create_production_heroku_app,
                    :create_staging_heroku_app,
-                   :provide_review_apps_setup_script,
+                   :create_review_apps_setup_script,
                    :set_heroku_rails_secrets,
                    :set_heroku_remotes,
-                   :set_heroku_serve_static_files,
                    :set_up_heroku_specific_gems
 
     def readme
@@ -83,7 +82,7 @@ module Slining
 
     def configure_quiet_assets
       config = <<-RUBY
-    config.quiet_assets = true
+    config.assets.quiet = true
       RUBY
 
       inject_into_class "config/application.rb", "Application", config
@@ -152,7 +151,7 @@ module Slining
       config = <<-RUBY
 
 if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
-  ENV["APPLICATION_HOST"] = ENV["HEROKU_APP_NAME"] ".herokuapp.com"
+  ENV["APPLICATION_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
 end
 
   # Ensure requests are only served from one, canonical host name
@@ -336,8 +335,8 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       generate 'rspec:install'
     end
 
-    def configure_puma
-      copy_file "puma.rb", "config/puma.rb"
+    def replace_default_puma_configuration
+      copy_file "puma.rb", "config/puma.rb", force: true
     end
 
     def set_up_forego
@@ -377,7 +376,7 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       create_production_heroku_app(flags)
     end
 
-    def provide_deploy_script
+    def create_deploy_script
       copy_file "bin_deploy", "bin/deploy"
 
       instructions = <<-MARKDOWN
@@ -472,10 +471,6 @@ you can deploy to staging and production with:
         "Rails.application.routes.draw do\nend"
     end
 
-    def disable_xml_params
-      copy_file 'disable_xml_params.rb', 'config/initializers/disable_xml_params.rb'
-    end
-
     def setup_default_rake_task
       append_file 'Rakefile' do
         <<-EOS

data/lib/slining/generators/app_generator.rb

@@ -12,18 +12,9 @@ module Slining
     class_option :heroku_flags, type: :string, default: "",
       desc: "Set extra Heroku flags"
 
-    class_option :github, type: :string, aliases: "-G", default: nil,
+    class_option :github, type: :string, default: nil,
       desc: "Create Github repository and add remote origin pointed to repo"
 
-    class_option :skip_test_unit, type: :boolean, aliases: "-T", default: true,
-      desc: "Skip Test::Unit files"
-
-    class_option :skip_turbolinks, type: :boolean, default: true,
-      desc: "Skip turbolinks gem"
-
-    class_option :skip_bundle, type: :boolean, aliases: "-B", default: true,
-      desc: "Don't run bundle install"
-
     def finish_template
       invoke :slining_customization
       super
@@ -45,6 +36,7 @@ module Slining
       invoke :remove_routes_comment_lines
       invoke :setup_git
       invoke :setup_database
+      invoke :create_local_heroku_setup
       invoke :setup_dotfiles
       invoke :create_heroku_apps
       invoke :create_github_repo
@@ -57,10 +49,6 @@ module Slining
     def customize_gemfile
       build :set_ruby_to_version_being_used
 
-      if options[:heroku]
-        build :set_up_heroku_specific_gems
-      end
-
       bundle_command 'install'
       build :configure_simple_form
     end
@@ -140,9 +128,8 @@ module Slining
       build :configure_action_mailer
       build :configure_active_job
       build :configure_time_formats
-      build :disable_xml_params
       build :setup_default_rake_task
-      build :configure_puma
+      build :replace_default_puma_configuration
       build :set_up_forego
       build :setup_rack_mini_profiler
     end
@@ -160,17 +147,20 @@ module Slining
       end
     end
 
+    def create_local_heroku_setup
+      say "Creating local Heroku setup"
+      build :create_review_apps_setup_script
+      build :create_deploy_script
+      build :create_heroku_application_manifest_file
+    end
+
     def create_heroku_apps
       if options[:heroku]
         say "Creating Heroku apps"
         build :create_heroku_apps, options[:heroku_flags]
-        build :provide_review_apps_setup_script
-        build :set_heroku_serve_static_files
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
-        build :create_heroku_pipelines_config_file
         build :create_heroku_pipeline
-        build :provide_deploy_script
         build :configure_automatic_deployment
       end
     end

data/lib/slining/version.rb

@@ -1,5 +1,5 @@
 module Slining
-  RAILS_VERSION = "~> 4.2.0"
+  RAILS_VERSION = "~> 5.0.0.1"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/slining.gemspec

@@ -31,9 +31,4 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.add_dependency 'rails', Slining::RAILS_VERSION
 
   s.add_development_dependency 'rspec', '~> 3.4'
-  s.add_development_dependency 'codeclimate-test-reporter'
-  s.add_development_dependency 'simple_form', '~> 3.2'
-  s.add_development_dependency 'title', '~> 0.0'
-  s.add_development_dependency 'quiet_assets', '~> 1.1'
-  s.add_development_dependency 'capybara-webkit', '~> 1.8'
 end

data/spec/features/github_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe "GitHub" do
   end
 
   it "slining a project with --github option" do
-    repo_name = 'test'
+    repo_name = "test"
     run_slining("--github=#{repo_name}")
 
     expect(FakeGithub).to have_created_repo(repo_name)

data/spec/features/heroku_spec.rb

@@ -10,9 +10,6 @@ RSpec.describe "Heroku" do
     it "slinings a project for Heroku" do
       app_name = SliningTestHelpers::APP_NAME.dasherize
 
-      expect(FakeHeroku).to(
-        have_gem_included(project_path, "rails_stdout_logging"),
-      )
       expect(FakeHeroku).to have_created_app_for("staging")
       expect(FakeHeroku).to have_created_app_for("production")
       expect(FakeHeroku).to have_configured_vars("staging", "SECRET_KEY_BASE")
@@ -29,19 +26,6 @@ RSpec.describe "Heroku" do
       expect(bin_setup).to include("heroku join --app #{app_name}-staging")
       expect(bin_setup).to include("git config heroku.remote staging")
       expect(File.stat(bin_setup_path)).to be_executable
-      bin_setup_path = "#{project_path}/bin/setup_review_app"
-      bin_setup = IO.read(bin_setup_path)
-
-      expect(bin_setup).to include("heroku run rake db:migrate --app #{app_name}-staging-pr-$1")
-      expect(bin_setup).to include("heroku ps:scale worker=1 --app #{app_name}-staging-pr-$1")
-      expect(bin_setup).to include("heroku restart --app #{app_name}-staging-pr-$1")
-      expect(File.stat(bin_setup_path)).to be_executable
-
-      bin_deploy_path = "#{project_path}/bin/deploy"
-      bin_deploy = IO.read(bin_deploy_path)
-
-      expect(bin_deploy).to include("heroku run rake db:migrate")
-      expect(File.stat(bin_deploy_path)).to be_executable
 
       readme = IO.read("#{project_path}/README.md")
 
@@ -60,16 +44,6 @@ RSpec.describe "Heroku" do
       YML
     end
 
-    it "adds app.json file" do
-      expect(File).to exist("#{project_path}/app.json")
-    end
-
-    it "includes application name in app.json file" do
-      app_json_file = IO.read("#{project_path}/app.json")
-      app_name = SliningTestHelpers::APP_NAME.dasherize
-
-      expect(app_json_file).to match(/"name":"#{app_name}"/)
-    end
   end
 
   context "--heroku with region flag" do

data/spec/features/new_project_spec.rb

@@ -5,6 +5,7 @@ RSpec.describe "Slining a new project with default configuration" do
     drop_dummy_database
     remove_project_directory
     run_slining
+    setup_app_dependencies
   end
 
   it "uses custom Gemfile" do
@@ -125,9 +126,7 @@ RSpec.describe "Slining a new project with default configuration" do
   it "adds explicit quiet_assets configuration" do
     result = IO.read("#{project_path}/config/application.rb")
 
-    expect(result).to match(
-      /^ +config.quiet_assets = true$/
-    )
+    expect(result).to match(/^ +config.assets.quiet = true$/)
   end
 
   it "raises on missing translations in development and test" do

data/spec/spec_helper.rb

@@ -1,8 +1,5 @@
 require 'bundler/setup'
 
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
-
 Bundler.require(:default, :test)
 
 require (Pathname.new(__FILE__).dirname + '../lib/slining').expand_path

data/spec/support/fake_heroku.rb

@@ -6,8 +6,8 @@ class FakeHeroku
   end
 
   def run!
-    if @args.first == "plugins"
-      puts "heroku-pipelines@0.29.0"
+    if @args.first == "help"
+      puts "pipelines   #  manage collections of apps in pipelines"
     end
     File.open(RECORDER, 'a') do |file|
       file.puts @args.join(' ')

data/spec/support/slining.rb

@@ -20,6 +20,27 @@ module SliningTestHelpers
     end
   end
 
+  def suspenders_help_command
+    Dir.chdir(tmp_path) do
+      Bundler.with_clean_env do
+        `
+          #{suspenders_bin} -h
+        `
+      end
+    end
+  end
+
+  def setup_app_dependencies
+    if File.exist?(project_path)
+      Dir.chdir(project_path) do
+        Bundler.with_clean_env do
+          `bundle check || bundle install`
+        end
+      end
+    end
+  end
+
+
   def drop_dummy_database
     if File.exist?(project_path)
       Dir.chdir(project_path) do

data/templates/Gemfile.erb

@@ -11,7 +11,6 @@ gem "haml-rails", "~> 0.9"
 gem "high_voltage"
 gem "honeybadger"
 gem "jquery-rails"
-gem "newrelic_rpm", ">= 3.9.8"
 gem "normalize-rails", "~> 3.0.0"
 gem "pg"
 gem "puma"
@@ -22,11 +21,12 @@ gem "sass-rails", "~> 5.0"
 gem "simple_form"
 gem "sprockets", ">= 3.0.0"
 gem "sprockets-es6"
+gem "skylight"
 gem "title"
 gem "uglifier"
 
 group :development do
-  gem "quiet_assets"
+  gem "listen"
   gem "spring"
   gem "spring-commands-rspec"
   gem "web-console"
@@ -40,7 +40,7 @@ group :development, :test do
   gem "factory_girl_rails"
   gem "pry-byebug"
   gem "pry-rails"
-  gem "rspec-rails", "~> 3.4.0"
+  gem "rspec-rails", "~> 3.5.0.beta4"
 end
 
 group :development, :staging do

data/templates/app.json.erb

@@ -31,9 +31,6 @@
     },
     "SMTP_USERNAME":{
       "required":true
-    },
-    "WEB_CONCURRENCY":{
-      "required":true
     }
   },
   "addons":[

data/templates/slining_layout.html.erb.erb

@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="ROBOTS" content="NOODP" />
-  <meta name="viewport" content="initial-scale=1" />
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
   <%%#
     Configure default and controller-, and view-specific titles in
     config/locales/en.yml. For more see:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slining
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - vaporware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,76 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simple_form
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: title
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-- !ruby/object:Gem::Dependency
-  name: quiet_assets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: capybara-webkit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 description: |
   Slining is a base Rails project that you can upgrade. It is used by
   vaporware to get a jump start on a working app. Use Slining if you're in a
@@ -185,7 +115,6 @@ files:
 - templates/config_locales_en.yml.erb
 - templates/database_cleaner_rspec.rb
 - templates/dev.rake
-- templates/disable_xml_params.rb
 - templates/dotfiles/.ctags
 - templates/dotfiles/.env
 - templates/errors.rb
@@ -220,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/templates/disable_xml_params.rb

@@ -1 +0,0 @@
-ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::XML)