slining 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c8df117de827edd3c6bc4ab3dd8c3c6c5397010
-  data.tar.gz: daa8e46cd0c0567ddc3ef3b5d3305a714141612f
+  metadata.gz: 77cde7ad1c646626c7b5defa22f069d9ff799b14
+  data.tar.gz: ab5476cfcc6c3cb00e5a257246486e3a963c0dcf
 SHA512:
-  metadata.gz: 83dc0ede7093828872b27c103a8eba31e877b14175a4c6e6aa637d9fb03815113466e8d5d4a65e9478a3d6cdcf75f7240a410f795b385c386589b3fb12d78648
-  data.tar.gz: d33eccc0e3c047930402e4665a1bd223b0759046ae7d4e0c7ec0a25bbeb532e55a0ab7cbfa83ef7180c5cde08e5bfb1bcc66a6e87b062d9464800ed7c0ca6bf4
+  metadata.gz: 967f856b529855353399864b5cc7226df2c0a48cfbed0b3ab53a3f95af4b41c0c2126cb7c18bc449ef6b2dd96c546dd5ec91e14870cc73d4f7c567f8792efa36
+  data.tar.gz: 0145b65bd84307661d0907cdb8e9196060bb9dacda52e71c7b82c968d8e2118ebc1e372e965ccb76e10286903e197a06361d17abd4bbc510820bfb3810d15561

data/CONTRIBUTING.md

@@ -13,6 +13,9 @@ Set up your machine:
 
     ./bin/setup
 
+If you're having trouble installing `capybara-webkit` check their [installation
+instructions](https://github.com/thoughtbot/capybara-webkit#qt-dependency-and-installation-issues).
+
 Make sure the tests pass:
 
     rake

data/{LICENSE → LICENSE.md}

@@ -1,7 +1,8 @@
 The MIT License
 
 Copyright (c) 2015-2016+ vaporware, inc.
-Copyright (c) 2008-2016 thoughtbot, inc.
+
+Copyright (c) 2008-2015 thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,3 +1,6 @@
+1.5.0 (March 5, 2016)
+* Pulled upstream updates
+
 1.4.0 (February 7, 2016)
 * Fixed error names
 * Enabled Heroku Pipeline Support [upstream-d53de08ef0b7588c5916585916b890e417741dd5]

data/README.md

@@ -126,8 +126,7 @@ This:
 
 * Creates a staging and production Heroku app
 * Sets them as `staging` and `production` Git remotes
-* Configures staging with `RACK_ENV` and `RAILS_ENV` environment variables set
-  to `staging`
+* 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.

data/circle.yml

@@ -0,0 +1,3 @@
+test:
+  override:
+    - bin/rake

data/lib/slining/adapters/heroku.rb

@@ -24,7 +24,7 @@ module Slining
       end
 
       def create_staging_heroku_app(flags)
-        rack_env = "RACK_ENV=staging RAILS_ENV=staging"
+        rack_env = "RACK_ENV=staging"
         app_name = heroku_app_name_for("staging")
 
         run_toolbelt_command "create #{app_name} #{flags}", "staging"

data/lib/slining/app_builder.rb

@@ -231,6 +231,13 @@ end
       copy_file '_javascript.html.erb', 'app/views/application/_javascript.html.erb'
     end
 
+    def create_shared_css_overrides
+      copy_file(
+        "_css_overrides.html.erb",
+        "app/views/application/_css_overrides.html.erb",
+      )
+    end
+
     def create_application_layout
       template 'slining_layout.html.erb.erb',
         'app/views/layouts/application.html.erb',

data/lib/slining/generators/app_generator.rb

@@ -131,6 +131,7 @@ module Slining
       build :create_partials_directory
       build :create_shared_flashes
       build :create_shared_javascripts
+      build :create_shared_css_overrides
       build :create_application_layout
     end
 

data/lib/slining/version.rb

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

data/slining.gemspec

@@ -16,7 +16,7 @@ rush to build something amazing; don't use it if you like missing deadlines.
 
   s.email = 'support@vaporwa.re'
   s.executables = ['slining']
-  s.extra_rdoc_files = %w[README.md LICENSE]
+  s.extra_rdoc_files = %w[README.md LICENSE.md]
   s.files = `git ls-files`.split("\n")
   s.homepage = 'http://github.com/vaporware/slining'
   s.license = 'MIT'
@@ -32,4 +32,8 @@ rush to build something amazing; don't use it if you like missing deadlines.
 
   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/templates/Gemfile.erb

@@ -4,7 +4,6 @@ ruby "<%= Slining::RUBY_VERSION %>"
 
 gem "autoprefixer-rails"
 gem "bootstrap-sass", "~> 3.3.5"
-gem "coffee-rails", "~> 4.1.0"
 gem "delayed_job_active_record"
 gem "email_validator"
 gem "flutie"
@@ -21,6 +20,8 @@ gem "rails", "<%= Slining::RAILS_VERSION %>"
 gem "recipient_interceptor"
 gem "sass-rails", "~> 5.0"
 gem "simple_form"
+gem "sprockets", ">= 3.0.0"
+gem "sprockets-es6"
 gem "title"
 gem "uglifier"
 
@@ -34,7 +35,7 @@ end
 group :development, :test do
   gem "awesome_print"
   gem "bullet"
-  gem "bundler-audit", require: false
+  gem "bundler-audit", ">= 0.5.0", require: false
   gem "dotenv-rails"
   gem "factory_girl_rails"
   gem "pry-byebug"

data/templates/_css_overrides.html.erb

@@ -0,0 +1,8 @@
+<% if Rails.env.test? %>
+  <style type="text/css">
+    * {
+      transition-property: none !important;
+      -webkit-transition-property: none !important;
+    }
+  </style>
+<% end %>

data/templates/app.json.erb

@@ -2,16 +2,19 @@
   "name":"<%= app_name.dasherize %>",
   "scripts":{},
   "env":{
-    "AIRBRAKE_API_KEY":{
+    "APPLICATION_HOST":{
       "required":true
     },
     "EMAIL_RECIPIENTS":{
       "required":true
     },
-    "RACK_ENV":{
+    "HEROKU_APP_NAME":{
+      "required":true
+    },
+    "HEROKU_PARENT_APP_NAME":{
       "required":true
     },
-    "RAILS_ENV":{
+    "RACK_ENV":{
       "required":true
     },
     "SECRET_KEY_BASE":{

data/templates/browserslist

@@ -1,4 +1,3 @@
 Last 2 versions
-Explorer >= 10
-iOS >= 7.1
+Explorer >= 11
 Android >= 4.4

data/templates/hound.yml

@@ -1,7 +1,4 @@
 # See https://houndci.com/configuration for help.
-coffeescript:
-  # config_file: .coffeescript-style.json
-  enabled: true
 haml:
   # config_file: .haml-style.yml
   enabled: true

data/templates/rails_helper.rb

@@ -1,4 +1,4 @@
-ENV["RAILS_ENV"] = "test"
+ENV["RACK_ENV"] = "test"
 
 require File.expand_path("../../config/environment", __FILE__)
 abort("DATABASE_URL environment variable is set") if ENV["DATABASE_URL"]

data/templates/slining_layout.html.erb.erb

@@ -17,5 +17,6 @@
   <%%= render "flashes" -%>
   <%%= yield %>
   <%%= render "javascript" %>
+  <%%= render "css_overrides" %>
 </body>
 </html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slining
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - vaporware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-07 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,62 @@ dependencies:
     - - ">="
       - !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
@@ -76,13 +132,13 @@ executables:
 extensions: []
 extra_rdoc_files:
 - README.md
-- LICENSE
+- LICENSE.md
 files:
 - ".gitignore"
 - ".ruby-version"
 - CONTRIBUTING.md
 - Gemfile
-- LICENSE
+- LICENSE.md
 - NEWS.md
 - README.md
 - RELEASING.md
@@ -91,6 +147,7 @@ files:
 - bin/rspec
 - bin/setup
 - bin/slining
+- circle.yml
 - lib/slining.rb
 - lib/slining/actions.rb
 - lib/slining/adapters/heroku.rb
@@ -112,6 +169,7 @@ files:
 - templates/Procfile
 - templates/README.md.erb
 - templates/_analytics.html.erb
+- templates/_css_overrides.html.erb
 - templates/_flashes.html.erb
 - templates/_javascript.html.erb
 - templates/action_mailer.rb