voyage 1.0 → 1.44.0.1

data/spec/features/github_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe "GitHub" do
   end
 
   it "suspends a project with --github option" do
-    repo_name = 'test'
+    repo_name = "test"
     run_suspenders("--github=#{repo_name}")
     setup_app_dependencies
 

data/spec/features/heroku_spec.rb

@@ -31,9 +31,9 @@ RSpec.describe "Heroku" do
       bin_setup_path = "#{project_path}/bin/setup"
       bin_setup = IO.read(bin_setup_path)
 
-      expect(bin_setup).to include("heroku join --app #{app_name}-production")
-      expect(bin_setup).to include("heroku join --app #{app_name}-staging")
-      expect(bin_setup).to include("git config heroku.remote staging")
+      expect(bin_setup).to match(/^if heroku join --app #{app_name}-production/)
+      expect(bin_setup).to match(/^if heroku join --app #{app_name}-staging/)
+      expect(bin_setup).to match(/^git config heroku.remote staging/)
       expect(File.stat(bin_setup_path)).to be_executable
 
       readme = IO.read("#{project_path}/README.md")

data/spec/features/new_project_spec.rb

@@ -41,10 +41,15 @@ RSpec.describe "Suspend a new project with default configuration" do
     end
   end
 
+  it "doesn't generate test directory" do
+    expect(File).not_to exist("#{project_path}/test")
+  end
+
   it "loads secret_key_base from env" do
     secrets_file = IO.read("#{project_path}/config/secrets.yml")
 
-    expect(secrets_file).to match(/secret_key_base: <%= ENV\["SECRET_KEY_BASE"\] %>/)
+    expect(secrets_file).
+      to match(/secret_key_base: <%= ENV\["SECRET_KEY_BASE"\] %>/)
   end
 
   it "adds bin/setup file" do
@@ -110,22 +115,17 @@ RSpec.describe "Suspend 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 "configures static_cache_control in production" do
-    prod_env_file = IO.read("#{project_path}/config/environments/production.rb")
-    expect(prod_env_file).to match(
-      /config.static_cache_control = "public, max-age=.+"/,
+  it "configures public_file_server.headers in production" do
+    expect(production_config).to match(
+      /^ +config.public_file_server.headers = {\n +"Cache-Control" => "public,/,
     )
   end
 
   it "raises on missing translations in development and test" do
-    %w[development test].each do |environment|
-      environment_file =
-        IO.read("#{project_path}/config/environments/#{environment}.rb")
+    [development_config, test_config].each do |environment_file|
       expect(environment_file).to match(
         /^ +config.action_view.raise_on_missing_translations = true$/
       )
@@ -143,15 +143,13 @@ RSpec.describe "Suspend a new project with default configuration" do
   end
 
   it "configs :test email delivery method for development" do
-    dev_env_file = IO.read("#{project_path}/config/environments/development.rb")
-    expect(dev_env_file).
+    expect(development_config).
       to match(/^ +config.action_mailer.delivery_method = :file$/)
   end
 
   it "uses APPLICATION_HOST, not HOST in the production config" do
-    prod_env_file = IO.read("#{project_path}/config/environments/production.rb")
-    expect(prod_env_file).to match(/"APPLICATION_HOST"/)
-    expect(prod_env_file).not_to match(/"HOST"/)
+    expect(production_config).to match(/"APPLICATION_HOST"/)
+    expect(production_config).not_to match(/"HOST"/)
   end
 
   it "configures email interceptor in smtp config" do
@@ -168,7 +166,6 @@ RSpec.describe "Suspend a new project with default configuration" do
 
   it "configs active job queue adapter" do
     application_config = IO.read("#{project_path}/config/application.rb")
-    test_config = IO.read("#{project_path}/config/environments/test.rb")
 
     expect(application_config).to match(
       /^ +config.active_job.queue_adapter = :delayed_job$/
@@ -179,16 +176,12 @@ RSpec.describe "Suspend a new project with default configuration" do
   end
 
   it "configs bullet gem in development" do
-    test_config = IO.read("#{project_path}/config/environments/development.rb")
-
-    expect(test_config).to match /^ +Bullet.enable = true$/
-    expect(test_config).to match /^ +Bullet.bullet_logger = true$/
-    expect(test_config).to match /^ +Bullet.rails_logger = true$/
+    expect(development_config).to match /^ +Bullet.enable = true$/
+    expect(development_config).to match /^ +Bullet.bullet_logger = true$/
+    expect(development_config).to match /^ +Bullet.rails_logger = true$/
   end
 
   it "configs missing assets to raise in test" do
-    test_config = IO.read("#{project_path}/config/environments/test.rb")
-
     expect(test_config).to match(
       /^ +config.assets.raise_runtime_errors = true$/,
     )
@@ -207,9 +200,9 @@ RSpec.describe "Suspend a new project with default configuration" do
     config_files = [
       IO.read("#{project_path}/config/application.rb"),
       IO.read("#{project_path}/config/environment.rb"),
-      IO.read("#{project_path}/config/environments/development.rb"),
-      IO.read("#{project_path}/config/environments/production.rb"),
-      IO.read("#{project_path}/config/environments/test.rb"),
+      development_config,
+      test_config,
+      production_config,
     ]
 
     config_files.each do |file|
@@ -226,12 +219,12 @@ RSpec.describe "Suspend a new project with default configuration" do
     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 --exit-code "\
-                                 "--app #{app_name.dasherize}-staging-pr-$1")
-    expect(bin_setup).to include("heroku ps:scale worker=1 "\
-                                 "--app #{app_name.dasherize}-staging-pr-$1")
-    expect(bin_setup).to include("heroku restart "\
-                                 "--app #{app_name.dasherize}-staging-pr-$1")
+    expect(bin_setup).to include("PARENT_APP_NAME=#{app_name.dasherize}-staging")
+    expect(bin_setup).to include("APP_NAME=#{app_name.dasherize}-staging-pr-$1")
+    expect(bin_setup).to include("heroku run rake db:migrate --exit-code --app $APP_NAME")
+    expect(bin_setup).to include("heroku ps:scale worker=1 --app $APP_NAME")
+    expect(bin_setup).to include("heroku restart --app $APP_NAME")
+
     expect(File.stat(bin_setup_path)).to be_executable
   end
 
@@ -249,12 +242,6 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(app_json_file).to match(/"name":"#{app_name.dasherize}"/)
   end
 
-  it "sets up heroku specific gems" do
-    gemfile_file = IO.read("#{project_path}/Gemfile")
-
-    expect(gemfile_file).to include %{gem "rails_stdout_logging"}
-  end
-
   def app_name
     SuspendersTestHelpers::APP_NAME
   end
@@ -264,7 +251,46 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(gemfile).to match(/high_voltage/)
   end
 
+  it "adds and configures bourbon, neat, and refills" do
+    gemfile = read_project_file("Gemfile")
+
+    expect(gemfile).to match(/bourbon/)
+    expect(gemfile).to match(/neat/)
+    expect(gemfile).to match(/refills/)
+  end
+
+  it "configures bourbon, neat, and refills" do
+    flashes_path = %w(app assets stylesheets refills _flashes.scss)
+    expect(read_project_file(flashes_path)).to match(/\$flashes/m)
+
+    app_css = read_project_file(%w(app assets stylesheets application.scss))
+    expect(app_css).to match(/normalize-rails.*bourbon.*neat.*base.*refills/m)
+  end
+
+  it "doesn't use turbolinks" do
+    app_js = read_project_file(%w(app assets javascripts application.js))
+    expect(app_js).not_to match(/turbolinks/)
+  end
+
+  def development_config
+    @_development_config ||=
+      read_project_file %w(config environments development.rb)
+  end
+
+  def test_config
+    @_test_config ||= read_project_file %w(config environments test.rb)
+  end
+
+  def production_config
+    @_production_config ||=
+      read_project_file %w(config environments production.rb)
+  end
+
   def analytics_partial
     IO.read("#{project_path}/app/views/application/_analytics.html.erb")
   end
+
+  def read_project_file(path)
+    IO.read(File.join(project_path, *path))
+  end
 end

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/suspenders.gemspec

@@ -26,7 +26,7 @@ is used by headway to get a jump start on a working app.
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Voyage::VERSION
 
-  s.add_dependency 'bitters', '~> 1.3'
+  s.add_dependency 'bitters', '~> 1.5'
   s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'rails', Voyage::RAILS_VERSION
 

data/templates/Gemfile.erb

@@ -3,12 +3,10 @@ source "https://rubygems.org"
 ruby "<%= Suspenders::RUBY_VERSION %>"
 
 gem "autoprefixer-rails"
-gem "bourbon", "5.0.0.beta.5"
 gem "delayed_job_active_record"
 gem "flutie"
 gem "honeybadger"
 gem "jquery-rails"
-gem "neat", "~> 1.7.0"
 gem "normalize-rails", "~> 3.0.0"
 gem "pg"
 gem "puma"
@@ -19,13 +17,12 @@ gem "sass-rails", "~> 5.0"
 gem "simple_form"
 gem "skylight"
 gem "sprockets", ">= 3.0.0"
-gem "sprockets-es6"
 gem "suspenders"
 gem "title"
 gem "uglifier"
 
 group :development do
-  gem "quiet_assets"
+  gem "listen"
   gem "spring"
   gem "spring-commands-rspec"
   gem "web-console"
@@ -39,8 +36,7 @@ group :development, :test do
   gem "factory_girl_rails"
   gem "pry-byebug"
   gem "pry-rails"
-  gem "refills"
-  gem "rspec-rails", "~> 3.4.0"
+  gem "rspec-rails", "~> 3.5"
 end
 
 group :development, :staging do
@@ -60,5 +56,4 @@ end
 
 group :staging, :production do
   gem "rack-timeout"
-  gem "rails_stdout_logging"
 end

data/templates/app.json.erb

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

data/templates/bin_setup_review_app.erb

@@ -9,11 +9,11 @@ if [ -z "$1" ]; then
   exit 64
 fi
 
-heroku pg:backups restore \
-  `heroku pg:backups public-url -a <%= app_name.dasherize %>-staging` \
-  DATABASE_URL \
-  --confirm <%= app_name.dasherize %>-staging-pr-$1 \
-  --app <%= app_name.dasherize %>-staging-pr-$1
-heroku run rake db:migrate --exit-code --app <%= app_name.dasherize %>-staging-pr-$1
-heroku ps:scale worker=1 --app <%= app_name.dasherize %>-staging-pr-$1
-heroku restart --app <%= app_name.dasherize %>-staging-pr-$1
+PARENT_APP_NAME=<%= app_name.dasherize %>-staging
+APP_NAME=<%= app_name.dasherize %>-staging-pr-$1
+URL=`heroku pg:backups public-url -a $PARENT_APP_NAME`
+
+heroku pg:backups restore $URL DATABASE_URL --confirm $APP_NAME --app $APP_NAME
+heroku run rake db:migrate --exit-code --app $APP_NAME
+heroku ps:scale worker=1 --app $APP_NAME
+heroku restart --app $APP_NAME

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voyage
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.44.0.1
 platform: ruby
 authors:
 - thoughtbot, headway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -99,8 +99,10 @@ files:
 - lib/suspenders/app_builder.rb
 - lib/suspenders/generators/app_generator.rb
 - lib/suspenders/generators/static_generator.rb
+- lib/suspenders/generators/stylesheet_base_generator.rb
 - lib/suspenders/version.rb
 - lib/voyage.rb
+- lib/voyage/README.md
 - lib/voyage/app_builder.rb
 - lib/voyage/generators/app_generator.rb
 - lib/voyage/templates/Gemfile.erb
@@ -181,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.1
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -189,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using headway's best practices.