RubyGems - suspenders - Versions diffs - 1.30.0 → 1.31.0 - Mend

suspenders 1.30.0 → 1.31.0

Files changed (18) hide show

checksums.yaml +4 -4
data/.gitignore +1 -0
data/.ruby-version +1 -1
data/.travis.yml +1 -1
data/NEWS.md +9 -0
data/lib/suspenders/app_builder.rb +29 -3
data/lib/suspenders/generators/app_generator.rb +10 -0
data/lib/suspenders/version.rb +1 -1
data/spec/features/new_project_spec.rb +19 -0
data/suspenders.gemspec +1 -1
data/templates/Gemfile.erb +1 -1
data/templates/circle.yml.erb +6 -5
data/templates/disable_xml_params.rb +0 -2
data/templates/dotfiles/.ctags +2 -0
data/templates/rails_helper.rb +1 -0
data/templates/sample.env +1 -1
metadata +7 -8
data/Gemfile.lock +0 -132

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d05003d3e1588c15c4291ed296d2c9c936ccb959
-  data.tar.gz: 4f3a7b17134b11d774f02b827cceb9b07f214e07
+  metadata.gz: bc097cf89da27e8006356a8716c702f400b76631
+  data.tar.gz: 474d6fe3b9dd0b81dfa4be406e30fc7a2f38b991
 SHA512:
-  metadata.gz: 5743803276b70bf047a8481b5bbdc34bb1b1143e352624309ca941d1aded2f139a284990a4f517f50abc35408eb89b17d5b15f799e7327e7919b815829a09748
-  data.tar.gz: 9f5980411e60b3646b54d4424918df79592519beb010541f3878c9eb8d421f3c55e81c53a9cf0ffdd4cbb05c984b22c93b965bd1f22e9350e9420c2731ece04a
+  metadata.gz: 48f0762028d843e9a95d3e1c8c718ed557d0cf3cf38f8f54983f7e6b89c2799947007fa5a52840e6d975a52d1a405e333b4e827d597c235324305ea54dbf5a83
+  data.tar.gz: 9359e82fa9095de86f5c8940699f13cee98096d2c51bf80871c4609f0dd7223f8ac4e61ef35451df14e0780b98353f0efc3cab403e3d82697da098c6f5f1df0c

data/.gitignore CHANGED Viewed

@@ -1,4 +1,5 @@
 *.gem
 *.swp
+Gemfile.lock
 /.bundle
 /tmp

data/.ruby-version CHANGED Viewed

	@@ -1 +1 @@
1	- 2.2.2
1	+ 2.2.3

data/.travis.yml CHANGED Viewed

@@ -1,5 +1,5 @@
 language: ruby
-rvm: 2.2.2
+rvm: 2.2.3
 cache: bundler
 sudo: false
 before_install:

data/NEWS.md CHANGED Viewed

@@ -1,3 +1,12 @@
+1.31.0 (September 3, 2015)
+* Update to Ruby 2.2.3
+* Add ctags configuration dotfile
+* Rename `$HOST` to `$APPLICATION_HOST` for zsh compatibility
+* Update Bitters to 1.1
+* Remove comments and newlines in config files
+* Abort tests run if `DATABASE_URL` env variable is set
 1.30.0 (July 30, 2015)
 * Update to RSpec 3.3

data/lib/suspenders/app_builder.rb CHANGED Viewed

@@ -79,7 +79,7 @@ module Suspenders
       RUBY
       inject_into_file 'config/environments/production.rb', config,
-        :after => 'config.action_mailer.raise_delivery_errors = false'
+        after: "config.action_mailer.raise_delivery_errors = false"
     end
     def enable_rack_canonical_host
@@ -113,7 +113,7 @@ module Suspenders
     def setup_asset_host
       replace_in_file 'config/environments/production.rb',
         "# config.action_controller.asset_host = 'http://assets.example.com'",
-        'config.action_controller.asset_host = ENV.fetch("ASSET_HOST", ENV.fetch("HOST"))'
+        'config.action_controller.asset_host = ENV.fetch("ASSET_HOST", ENV.fetch("APPLICATION_HOST"))'
       replace_in_file 'config/initializers/assets.rb',
         "config.assets.version = '1.0'",
@@ -320,6 +320,10 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       end
     end
+    def copy_dotfiles
+      directory("dotfiles", ".")
+    end
     def init_git
       run 'git init'
     end
@@ -429,11 +433,33 @@ you can deploy to staging and production with:
       EOS
       %w(500 404 422).each do |page|
-        inject_into_file "public/#{page}.html", meta_tags, :after => "<head>\n"
+        inject_into_file "public/#{page}.html", meta_tags, after: "<head>\n"
         replace_in_file "public/#{page}.html", /<!--.+-->\n/, ''
       end
     end
+    def remove_config_comment_lines
+      config_files = [
+        "application.rb",
+        "environment.rb",
+        "environments/development.rb",
+        "environments/production.rb",
+        "environments/test.rb",
+      ]
+      config_files.each do |config_file|
+        path = File.join(destination_root, "config/#{config_file}")
+        accepted_content = File.readlines(path).reject do |line|
+          line =~ /^.*#.*$/ || line =~ /^$\n/
+        end
+        File.open(path, "w") do |file|
+          accepted_content.each { |line| file.puts line }
+        end
+      end
+    end
     def remove_routes_comment_lines
       replace_in_file 'config/routes.rb',
         /Rails\.application\.routes\.draw do.*end/m,

data/lib/suspenders/generators/app_generator.rb CHANGED Viewed

@@ -43,7 +43,9 @@ module Suspenders
       invoke :install_refills
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
+      invoke :remove_config_comment_lines
       invoke :remove_routes_comment_lines
+      invoke :setup_dotfiles
       invoke :setup_git
       invoke :setup_database
       invoke :create_heroku_apps
@@ -188,6 +190,10 @@ module Suspenders
       build :setup_segment
     end
+    def setup_dotfiles
+      build :copy_dotfiles
+    end
     def setup_gitignore
       build :gitignore_files
     end
@@ -216,6 +222,10 @@ module Suspenders
       build :customize_error_pages
     end
+    def remove_config_comment_lines
+      build :remove_config_comment_lines
+    end
     def remove_routes_comment_lines
       build :remove_routes_comment_lines
     end

data/lib/suspenders/version.rb CHANGED Viewed

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

data/spec/features/new_project_spec.rb CHANGED Viewed

@@ -29,6 +29,10 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(ruby_version_file).to eq "#{RUBY_VERSION}\n"
   end
+  it "copies dotfiles" do
+    expect(File).to exist("#{project_path}/.ctags")
+  end
   it "loads secret_key_base from env" do
     secrets_file = IO.read("#{project_path}/config/secrets.yml")
@@ -129,6 +133,21 @@ RSpec.describe "Suspend a new project with default configuration" do
     end
   end
+  it "removes comments and extra newlines from config files" 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"),
+    ]
+    config_files.each do |file|
+      expect(file).not_to match(/.*#.*/)
+      expect(file).not_to match(/^$\n/)
+    end
+  end
   def analytics_partial
     IO.read("#{project_path}/app/views/application/_analytics.html.erb")
   end

data/suspenders.gemspec CHANGED Viewed

@@ -27,7 +27,7 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Suspenders::VERSION
-  s.add_dependency 'bitters', '~> 1.0.0'
+  s.add_dependency 'bitters', '~> 1.1.0'
   s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'rails', Suspenders::RAILS_VERSION

data/templates/Gemfile.erb CHANGED Viewed

@@ -16,8 +16,8 @@ gem "neat", "~> 1.7.0"
 gem "newrelic_rpm", ">= 3.9.8"
 gem "normalize-rails", "~> 3.0.0"
 gem "pg"
-gem "rack-canonical-host"
 gem "puma"
+gem "rack-canonical-host"
 gem "rails", "<%= Suspenders::RAILS_VERSION %>"
 gem "recipient_interceptor"
 gem "refills"

data/templates/circle.yml.erb CHANGED Viewed

@@ -1,8 +1,9 @@
+checkout:
+  post:
+    - cp .sample.env .env
+database:
+  override:
+    - bin/setup
 test:
   override:
     - bundle exec rake
-deployment:
-  staging:
-    branch: master
-    commands:
-      - bin/deploy staging

data/templates/disable_xml_params.rb CHANGED Viewed

@@ -1,3 +1 @@
-# Protect against injection attacks
-# http://www.kb.cert.org/vuls/id/380039
 ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::XML)

data/templates/dotfiles/.ctags ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ --recurse=yes
2	+ --exclude=vendor

data/templates/rails_helper.rb CHANGED Viewed

@@ -1,6 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path("../../config/environment", __FILE__)
+abort("DATABASE_URL environment variable is set") if ENV["DATABASE_URL"]
 require "rspec/rails"
 require "shoulda/matchers"

data/templates/sample.env CHANGED Viewed

@@ -1,6 +1,6 @@
 # http://ddollar.github.com/foreman/
 ASSET_HOST=localhost:3000
-HOST=localhost:3000
+APPLICATION_HOST=localhost:3000
 RACK_ENV=development
 SECRET_KEY_BASE=development_secret
 EXECJS_RUNTIME=Node

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.30.0
+  version: 1.31.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,6 @@ files:
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - NEWS.md
 - README.md
@@ -125,6 +124,7 @@ files:
 - templates/database_cleaner_rspec.rb
 - templates/dev.rake
 - templates/disable_xml_params.rb
+- templates/dotfiles/.ctags
 - templates/errors.rb
 - templates/factory_girl_rspec.rb
 - templates/flashes_helper.rb
@@ -155,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.2.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key:
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.
@@ -177,4 +177,3 @@ test_files:
 - spec/support/fake_github.rb
 - spec/support/fake_heroku.rb
 - spec/support/suspenders.rb
-has_rdoc:

data/Gemfile.lock DELETED Viewed

@@ -1,132 +0,0 @@
-PATH
-  remote: .
-  specs:
-    suspenders (1.29.0)
-      bitters (~> 1.0.0)
-      bundler (~> 1.3)
-      rails (~> 4.2.0)
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.2)
-      actionpack (= 4.2.2)
-      actionview (= 4.2.2)
-      activejob (= 4.2.2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.2)
-      actionview (= 4.2.2)
-      activesupport (= 4.2.2)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.2)
-      activesupport (= 4.2.2)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.2)
-      activesupport (= 4.2.2)
-      globalid (>= 0.3.0)
-    activemodel (4.2.2)
-      activesupport (= 4.2.2)
-      builder (~> 3.1)
-    activerecord (4.2.2)
-      activemodel (= 4.2.2)
-      activesupport (= 4.2.2)
-      arel (~> 6.0)
-    activesupport (4.2.2)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arel (6.0.0)
-    bitters (1.0.0)
-      bourbon (>= 3.2)
-      sass (>= 3.2)
-      thor
-    bourbon (4.2.3)
-      sass (~> 3.4)
-      thor
-    builder (3.2.2)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    globalid (0.3.5)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    loofah (2.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.7.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    rack (1.6.2)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.2)
-      actionmailer (= 4.2.2)
-      actionpack (= 4.2.2)
-      actionview (= 4.2.2)
-      activejob (= 4.2.2)
-      activemodel (= 4.2.2)
-      activerecord (= 4.2.2)
-      activesupport (= 4.2.2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.2)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
-      loofah (~> 2.0)
-    railties (4.2.2)
-      actionpack (= 4.2.2)
-      activesupport (= 4.2.2)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    sass (3.4.14)
-    sprockets (3.2.0)
-      rack (~> 1.0)
-    sprockets-rails (2.3.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-PLATFORMS
-  ruby
-DEPENDENCIES
-  rspec (~> 3.2)
-  suspenders!
-BUNDLED WITH
-   1.10.4