voyage 1.0 → 1.44.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93b2d519b1167c66745f3cde36115fbe2d6b47b2
-  data.tar.gz: 85d75aaef00c54918529794748be6b3e7aa7e089
+  metadata.gz: ffbb065bd31fb43879ca2cf48aef345dcd64f5c6
+  data.tar.gz: 76125833cc10fc3a49f2272caf765c13edd60796
 SHA512:
-  metadata.gz: 871a09f641d0a7534be22c3c0f8fd408d49a8aa2946f668bd41a3bc58830dfca07a0faf3f2eca1fcc971d0499a2107549cdb6e4a08ae5f7e33b939cfd7b89128
-  data.tar.gz: db8014dbb5363b68e2ee50b77112828dd15dc0c77656625c2dab3d959231345fbbbfd5d53ff748e3230b69fc686a41131ac3c43abc57c4ca522113aa18b14914
+  metadata.gz: 2dc5b63b2a953254ce32367bd3c9bf45976f8ea9184fa43aeb8c72bc820a6b485f6d6102699dda7f44c374c9c223cbfc5a613397e50a3051662986b5afd829dc
+  data.tar.gz: ca0aa81041d38481db639bbea81c42484802019561dd953e2c3bb00867a052c944ec97f92b32700b066108d879328d5eae5ef4e8e93e189b113e025453087bfa

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.4.0

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-rvm: 2.3.1
+rvm: 2.4.0
 cache: bundler
 sudo: false
 before_install:

data/NEWS.md

@@ -1,4 +1,43 @@
-master
+1.44.0 (January 25, 2017)
+
+* Improve readability of `bin/setup-review-app` (#819)
+* Update scripts to be `sh`-compatible (#820)
+* Remove `rails_stdout_logging` gem (#818)
+* Remove `12factor` gem (#817)
+* Update Ruby to 2.4.0 (#814)
+
+1.43.0 (November 8, 2016)
+
+* Update Bourbon to 5.0.0.beta.7
+* Update Neat to 2.0.0.beta.1
+* Update Bitters to 1.5.0
+* Drop sprockets-es6
+* Bugfix: doesn’t generate unused `test/` directory
+
+1.42.0 (July 23, 2016)
+
+* [#784] Require refills once
+* [#790] Ensure stylesheet_base generator runs with a clean bundle
+* [#791] Use Rails' 5 syntax for `public_file_server.headers`
+* [#792] Remove turbolinks from application.js file
+
+1.41.0 (July 1, 2016)
+
+* Update to Rails 5
+* Drop quiet_assets
+* Drop unneeded `suspenders` aliases: `--skip-test-unit`, `--skip-turbolinks`,
+  `--skip-bundle`. Drops `-G` that clashes with Rails’ `--skip-git` alias.
+
+1.40.0 (June 25, 2016)
+
+* Upgrade bourbon to 5.0.0.beta.6
+* Update Neat to 1.8.0
+* `APPLICATION_HOST` bug fix in production environment (was used before it was
+  defined)
+* Update comment around Pipelines: it is now a Heroku core plugin
+* Drop unneeded `WEB_CONCURRENCY` from `app.json` file
+* Introduce a `suspenders:stylesheet_base` generator. The `application.scss`
+  must list the imports in a specific order. This removes the `application.css`.
 
 1.39.0 (May 25, 2016)
 

data/README.md

@@ -74,13 +74,11 @@ And development gems like:
   pre-loading
 * [Web Console](https://github.com/rails/web-console) for better debugging via
   in-browser IRB consoles.
-* [Quiet Assets](https://github.com/evrone/quiet_assets) for muting assets
-  pipeline log messages
 
 And testing gems like:
 
 * [Capybara](https://github.com/jnicklas/capybara) and
-  [Capybara Webkit](https://github.com/thoughtbot/capybara-webkit) for
+  [Capybara WebKit](https://github.com/thoughtbot/capybara-webkit) for
   integration testing
 * [Factory Girl](https://github.com/thoughtbot/factory_girl) for test data
 * [Formulaic](https://github.com/thoughtbot/formulaic) for integration testing
@@ -131,13 +129,8 @@ This:
 * Sets them as `staging` and `production` Git remotes
 * Configures staging with `RACK_ENV` environment variable set
   to `staging`
-* Adds the [Rails Stdout Logging][logging-gem] gem
-  to configure the app to log to standard out,
-  which is how [Heroku's logging][heroku-logging] works.
 * Creates a [Heroku Pipeline] for review apps
 
-[logging-gem]: https://github.com/heroku/rails_stdout_logging
-[heroku-logging]: https://devcenter.heroku.com/articles/logging#writing-to-your-log
 [Heroku Pipeline]: https://devcenter.heroku.com/articles/pipelines
 
 You can optionally specify alternate Heroku flags:
@@ -187,10 +180,10 @@ installed on your machine before generating an app with Suspenders.
 Use [OS X GCC Installer](https://github.com/kennethreitz/osx-gcc-installer/) for
 Snow Leopard (OS X 10.6).
 
-Use [Command Line Tools for XCode](https://developer.apple.com/downloads/index.action)
+Use [Command Line Tools for Xcode](https://developer.apple.com/downloads/index.action)
 for Lion (OS X 10.7) or Mountain Lion (OS X 10.8).
 
-We use [Capybara Webkit](https://github.com/thoughtbot/capybara-webkit) for
+We use [Capybara WebKit](https://github.com/thoughtbot/capybara-webkit) for
 full-stack JavaScript integration testing. It requires QT. Instructions for
 installing QT are
 [here](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit).

data/RELEASING.md

@@ -4,7 +4,7 @@
 2. Update `NEWS.md` to reflect the changes since last release.
 3. Commit changes. There shouldn't be code changes, and thus CI doesn't need to
    run, you can then add `[ci skip]` to the commit message.
-4. Tag the release: `git tag vVERSION -a`. The tag message should contain the
+4. Tag the release: `git tag vVERSION -a -s`. The tag message should contain the
    appropriate `NEWS.md` subsection.
 5. Push changes: `git push --tags`
 6. Build and publish to rubygems:

data/bin/voyage

@@ -1,20 +1,31 @@
 #!/usr/bin/env ruby
-require 'pathname'
 
-source_path = (Pathname.new(__FILE__).dirname + '../lib').expand_path
-$LOAD_PATH << source_path
+rails_installed=`gem query --name-matches '^rails$' --installed`
 
-require 'suspenders'
-require 'voyage'
+if rails_installed.chomp == 'true'
+  require 'pathname'
 
-if ['-v', '--version'].include? ARGV[0]
-  puts Voyage::VERSION
-  exit 0
-end
+  source_path = (Pathname.new(__FILE__).dirname + '../lib').expand_path
+  $LOAD_PATH << source_path
+
+  require 'voyage'
 
-templates_root = File.expand_path(File.join("..", "templates"), File.dirname(__FILE__))
-template_additions = File.expand_path(File.join("..", "lib/voyage/templates"), File.dirname(__FILE__))
-Suspenders::AppGenerator.source_root templates_root
-Suspenders::AppGenerator.source_paths << Rails::Generators::AppGenerator.source_root << template_additions << templates_root
+  if ARGV.empty?
+    puts "Please provide a path for the new application"
+    puts
+    puts "See --help for more info"
+    exit 0
+  elsif ['-v', '--version'].include? ARGV[0]
+    puts Voyage::VERSION
+    exit 0
+  end
 
-Suspenders::AppGenerator.start
+  templates_root = File.expand_path(File.join("..", "templates"), File.dirname(__FILE__))
+  template_additions = File.expand_path(File.join("..", "lib/voyage/templates"), File.dirname(__FILE__))
+  Suspenders::AppGenerator.source_root templates_root
+  Suspenders::AppGenerator.source_paths << Rails::Generators::AppGenerator.source_root << template_additions << templates_root
+
+  Suspenders::AppGenerator.start
+else
+  puts "Please install Rails in the desired gemset before continuing..."
+end

data/lib/suspenders.rb

@@ -1,6 +1,7 @@
 require 'suspenders/version'
 require 'suspenders/generators/app_generator'
 require 'suspenders/generators/static_generator'
+require 'suspenders/generators/stylesheet_base_generator'
 require 'suspenders/actions'
 require "suspenders/adapters/heroku"
 require 'suspenders/app_builder'

data/lib/suspenders/adapters/heroku.rb

@@ -6,7 +6,7 @@ module Suspenders
       end
 
       def set_heroku_remotes
-        remotes = <<-SHELL.strip_heredoc
+        remotes = <<~SHELL
           #{command_to_join_heroku_app('staging')}
           #{command_to_join_heroku_app('production')}
 
@@ -51,9 +51,9 @@ module Suspenders
       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
 
@@ -70,15 +70,6 @@ module Suspenders
         )
       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
-
       def set_heroku_application_host
         %w(staging production).each do |environment|
           run_toolbelt_command(
@@ -94,14 +85,14 @@ module Suspenders
 
       def command_to_join_heroku_app(environment)
         heroku_app_name = heroku_app_name_for(environment)
-        <<-SHELL
-
-if heroku join --app #{heroku_app_name} &> /dev/null; then
-  git remote add #{environment} git@heroku.com:#{heroku_app_name}.git || true
-  printf 'You are a collaborator on the "#{heroku_app_name}" Heroku app\n'
-else
-  printf 'Ask for access to the "#{heroku_app_name}" Heroku app\n'
-fi
+        <<~SHELL
+
+          if heroku join --app #{heroku_app_name} > /dev/null 2>&1; then
+            git remote add #{environment} git@heroku.com:#{heroku_app_name}.git || true
+            printf 'You are a collaborator on the "#{heroku_app_name}" Heroku app\n'
+          else
+            printf 'Ask for access to the "#{heroku_app_name}" Heroku app\n'
+          fi
         SHELL
       end
 

data/lib/suspenders/app_builder.rb

@@ -13,8 +13,7 @@ module Suspenders
                    :create_review_apps_setup_script,
                    :set_heroku_rails_secrets,
                    :set_heroku_remotes,
-                   :set_heroku_application_host,
-                   :set_heroku_serve_static_files
+                   :set_heroku_application_host
 
     def readme
       template 'README.md.erb', 'README.md'
@@ -44,6 +43,14 @@ module Suspenders
         'raise_delivery_errors = false', 'raise_delivery_errors = true'
     end
 
+    def remove_turbolinks
+      replace_in_file(
+        "app/assets/javascripts/application.js",
+        "//= require turbolinks",
+        ""
+      )
+    end
+
     def set_test_delivery_method
       inject_into_file(
         "config/environments/development.rb",
@@ -79,7 +86,7 @@ module Suspenders
 
     def configure_quiet_assets
       config = <<-RUBY
-    config.quiet_assets = true
+    config.assets.quiet = true
       RUBY
 
       inject_into_class "config/application.rb", "Application", config
@@ -99,7 +106,7 @@ module Suspenders
 
     config.generators do |generate|
       generate.helper false
-      generate.javascript_engine false
+      generate.javascripts false
       generate.request_specs false
       generate.routing_specs false
       generate.stylesheets false
@@ -142,14 +149,19 @@ module Suspenders
 
     def enable_rack_canonical_host
       config = <<-RUBY
-if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
+
+  if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
     ENV["APPLICATION_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
   end
 
   config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")
       RUBY
 
-      configure_environment "production", config
+      inject_into_file(
+        "config/environments/production.rb",
+        config,
+        after: "Rails.application.configure do",
+      )
     end
 
     def enable_rack_deflater
@@ -165,10 +177,13 @@ if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
         "config.assets.version = '1.0'",
         'config.assets.version = (ENV["ASSETS_VERSION"] || "1.0")'
 
-      configure_environment(
-        "production",
-        'config.static_cache_control = "public, max-age=31557600"',
-      )
+      config = <<-EOD
+config.public_file_server.headers = {
+    "Cache-Control" => "public, max-age=31557600",
+  }
+      EOD
+
+      configure_environment("production", config)
     end
 
     def setup_secret_token
@@ -310,29 +325,14 @@ 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
       copy_file "Procfile", "Procfile"
     end
 
-    def setup_stylesheets
-      remove_file "app/assets/stylesheets/application.css"
-      copy_file "application.scss",
-                "app/assets/stylesheets/application.scss"
-    end
-
-    def install_refills
-      generate "refills:import", "flashes"
-      remove_dir "app/views/refills"
-    end
-
-    def install_bitters
-      run "bitters install --path app/assets/stylesheets"
-    end
-
     def setup_default_directories
       [
         'app/views/pages',

data/lib/suspenders/generators/app_generator.rb

@@ -14,18 +14,9 @@ module Suspenders
     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"
-
     class_option :version, type: :boolean, aliases: "-v", group: :suspenders,
       desc: "Show Suspenders version number and quit"
 
@@ -35,6 +26,9 @@ module Suspenders
     class_option :path, type: :string, default: nil,
       desc: "Path to the gem"
 
+    class_option :skip_test, type: :boolean, default: true,
+      desc: "Skip Test Unit"
+
     def finish_template
       invoke :suspenders_customization
       super
@@ -48,9 +42,6 @@ module Suspenders
       invoke :setup_secret_token
       invoke :create_suspenders_views
       invoke :configure_app
-      invoke :setup_stylesheets
-      invoke :install_bitters
-      invoke :install_refills
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :remove_config_comment_lines
@@ -89,6 +80,7 @@ module Suspenders
       say 'Setting up the development environment'
       build :raise_on_missing_assets_in_test
       build :raise_on_delivery_errors
+      build :remove_turbolinks
       build :set_test_delivery_method
       build :add_bullet_gem_configuration
       build :raise_on_unpermitted_parameters
@@ -145,26 +137,11 @@ module Suspenders
       build :configure_active_job
       build :configure_time_formats
       build :setup_default_rake_task
-      build :configure_puma
+      build :replace_default_puma_configuration
       build :set_up_forego
       build :setup_rack_mini_profiler
     end
 
-    def setup_stylesheets
-      say 'Set up stylesheets'
-      build :setup_stylesheets
-    end
-
-    def install_bitters
-      say 'Install Bitters'
-      build :install_bitters
-    end
-
-    def install_refills
-      say "Install Refills"
-      build :install_refills
-    end
-
     def setup_git
       if !options[:skip_git]
         say "Initializing git"
@@ -184,7 +161,6 @@ module Suspenders
       if options[:heroku]
         say "Creating Heroku apps"
         build :create_heroku_apps, options[:heroku_flags]
-        build :set_heroku_serve_static_files
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
         build :set_heroku_application_host
@@ -247,10 +223,8 @@ module Suspenders
 
     def generate_default
       run("spring stop")
-
       generate("suspenders:static")
-
-      bundle_command "install"
+      generate("suspenders:stylesheet_base")
     end
 
     def outro

data/lib/suspenders/generators/static_generator.rb

@@ -4,6 +4,7 @@ module Suspenders
   class StaticGenerator < Rails::Generators::Base
     def add_high_voltage
       gem "high_voltage"
+      Bundler.with_clean_env { run "bundle install" }
     end
   end
 end