welaika-suspenders 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ecf4d405edda55de70fd1f180c267d59dfa9006
-  data.tar.gz: 645f248b78993bd9edaf7a0727769b8ad3377994
+  metadata.gz: 2ba7c8b0136a167dcc9ae6ce048ef674a079a52d
+  data.tar.gz: 13597374a2fdab6082ac299ec8b7a4b608e02423
 SHA512:
-  metadata.gz: 2a78896ad5dbcdb5dd16cf2ecf75dbf5e7aa9a0cb398c434fc4cca68fdf2f434cf71c74713666bf9100b98bc62eb71a90627835b973da0962646f4d7b737342b
-  data.tar.gz: 29f40fa844f103f2c0a2c0d49826049a23f5a405f0310df35656c26a3da7c1d9f160ed39ee8a6e3b6f7144c245df1bd99e2780f6c19d29724b2ac1537364fa76
+  metadata.gz: aa56cc61ca09d0f4eda510c4a31173ec1567f78fac9c8f07c44c024e7f7ab966a9ba13e181ff23cd463435d2dad0dadd50b4e72453be640bca1e2852a4a31641
+  data.tar.gz: b784d2453f86f09038e6eaec9ab675dc7251a0b9353e96db02a62cd93242648b52d119b1d0d24a40b78fdbf576583de4c48d9af74861ed10604b45a4d7f7372c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    welaika-suspenders (2.7.0)
+    welaika-suspenders (2.7.1)
       bitters (~> 0.10.0)
       bundler (~> 1.3)
       rails (= 4.2.0)
@@ -45,10 +45,6 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.0)
-    aruba (0.5.4)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
     bitters (0.10.1)
       bourbon (>= 3.2)
       sass (>= 3.2)
@@ -63,20 +59,9 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.3)
-      ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.15)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    ffi (1.9.3)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    globalid (0.3.0)
+    globalid (0.3.3)
       activesupport (>= 4.1.0)
     hike (1.2.3)
     i18n (0.7.0)
@@ -89,7 +74,6 @@ GEM
     mini_portile (0.6.0)
     minitest (5.5.1)
     multi_json (1.10.1)
-    multi_test (0.1.1)
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
     rack (1.6.0)
@@ -128,7 +112,7 @@ GEM
     rspec-expectations (2.99.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.0)
-    sass (3.4.11)
+    sass (3.4.13)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -150,8 +134,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 0.5)
   capybara (~> 2.2, >= 2.2.0)
-  cucumber (~> 1.2)
   rspec (~> 2.0)
   welaika-suspenders!

data/README.md

@@ -65,3 +65,5 @@ List of changes we made since [this is commit](https://github.com/thoughtbot/sus
 - use `application.css.sass` instead of `application.css.scss`
 - do not import refills/flashes
 - add `quiet_assets` gem
+- add `brakeman` gem
+- change `i18n_tasks` configuration: set `it` as base locale

data/lib/suspenders/app_builder.rb

@@ -12,15 +12,11 @@ module Suspenders
     end
 
     def configure_letter_opener
-      config = <<-RUBY
-
-  config.action_mailer.delivery_method = :letter_opener
-      RUBY
-
-      # this method must be called after `raise_on_delivery_errors`
-      # because the `after` clause search for `raise_delivery_errors = true`
-      inject_into_file 'config/environments/development.rb', config,
-        :after => 'config.action_mailer.raise_delivery_errors = true'
+      inject_into_file(
+        "config/environments/development.rb",
+        "\n  config.action_mailer.delivery_method = :letter_opener",
+        after: "config.action_mailer.raise_delivery_errors = true",
+      )
     end
 
     def raise_on_unpermitted_parameters
@@ -99,7 +95,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")'
+        'config.action_controller.asset_host = ENV.fetch("ASSET_HOST", ENV.fetch("HOST"))'
 
       replace_in_file 'config/initializers/assets.rb',
         "config.assets.version = '1.0'",
@@ -226,6 +222,11 @@ end
       copy_file 'action_mailer.rb', 'spec/support/action_mailer.rb'
     end
 
+    def configure_locales
+      remove_file "config/locales/en.yml"
+      template "config_locales_it.yml.erb", "config/locales/it.yml"
+    end
+
     def configure_rack_timeout
       copy_file 'rack_timeout.rb', 'config/initializers/rack_timeout.rb'
     end
@@ -373,6 +374,7 @@ you can deploy to staging and production with:
       MARKDOWN
 
       append_file "README.md", instructions
+      run "chmod a+x bin/deploy"
     end
 
     def create_github_repo(repo_name)

data/lib/suspenders/generators/app_generator.rb

@@ -21,6 +21,9 @@ module Suspenders
     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 :suspenders_customization
       super
@@ -124,6 +127,7 @@ module Suspenders
     def configure_app
       say 'Configuring app'
       build :configure_action_mailer
+      build :configure_locales
       build :configure_rack_timeout
       build :configure_simple_form
       build :configure_slim
@@ -203,10 +207,6 @@ module Suspenders
       say "Remember to run 'bin/setup' and configure errbit"
     end
 
-    def run_bundle
-      # Let's not: We'll bundle manually at the right spot
-    end
-
     protected
 
     def get_builder_class

data/lib/suspenders/version.rb

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

data/spec/features/heroku_spec.rb

@@ -11,15 +11,19 @@ feature "Heroku" do
     expect(FakeHeroku).to have_configured_vars("staging", "SECRET_KEY_BASE")
     expect(FakeHeroku).to have_configured_vars("production", "SECRET_KEY_BASE")
 
-    bin_setup = IO.read("#{project_path}/bin/setup")
+    bin_setup_path = "#{project_path}/bin/setup"
+    bin_setup = IO.read(bin_setup_path)
     app_name = SuspendersTestHelpers::APP_NAME
 
     expect(bin_setup).to include("heroku join --app #{app_name}-staging")
     expect(bin_setup).to include("heroku join --app #{app_name}-production")
+    expect(File.stat(bin_setup_path)).to be_executable
 
-    bin_deploy = IO.read("#{project_path}/bin/deploy")
+    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")
 

data/spec/features/new_project_spec.rb

@@ -114,10 +114,12 @@ feature 'Suspend a new project with default configuration' do
   scenario "generated en.yml is evaluated" do
     run_suspenders
 
-    locales_en_file = IO.read("#{project_path}/config/locales/en.yml")
+    locales_en_file = "#{project_path}/config/locales/en.yml"
+    locales_it_file = "#{project_path}/config/locales/it.yml"
     app_name = SuspendersTestHelpers::APP_NAME
 
-    expect(locales_en_file).to match(/application: #{app_name.humanize}/)
+    expect(File.exist?(locales_en_file)).to eq(false)
+    expect(IO.read(locales_it_file)).to match(/application: #{app_name.humanize}/)
   end
 
   scenario "config simple_form" do
@@ -126,4 +128,15 @@ feature 'Suspend a new project with default configuration' do
     expect(File).to exist("#{project_path}/config/initializers/simple_form.rb")
   end
 
+  scenario "config :letter_opener as email delivery method for development" do
+    run_suspenders
+
+    dev_env_file = IO.read("#{project_path}/config/environments/development.rb")
+    expect(dev_env_file).
+      to match(/^ +config.action_mailer.delivery_method = :letter_opener$/)
+  end
+
+  def analytics_partial
+    IO.read("#{project_path}/app/views/application/_analytics.html.erb")
+  end
 end

data/suspenders.gemspec

@@ -29,8 +29,6 @@ weLaika's fork of the famous thoughbot suspenders gem.
   s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 
-  s.add_development_dependency 'aruba', '~> 0.5'
-  s.add_development_dependency 'cucumber', '~> 1.2'
   s.add_development_dependency 'rspec', '~> 2.0'
   s.add_development_dependency 'capybara', '~> 2.2', '>= 2.2.0'
 end

data/templates/Gemfile.erb

@@ -36,6 +36,7 @@ end
 
 group :development, :test do
   gem "awesome_print"
+  gem "brakeman", require:false
   gem "bundler-audit", require: false
   gem "dotenv-rails"
   gem "faker"
@@ -44,7 +45,7 @@ group :development, :test do
   gem "pry-bloodline"
   gem "pry-byebug"
   gem "pry-rails"
-  gem "rspec-rails", "~> 3.1.0"
+  gem "rspec-rails", "~> 3.2.1"
 end
 
 group :test do

data/templates/config_i18n_tasks.yml

@@ -1,13 +1,79 @@
+base_locale: it
+locales: [it]
+
+# Read and write locale data
+data:
+  # Locale files to read from
+  read:
+    - config/locales/%{locale}.yml
+    - config/locales/*.%{locale}.yml
+    - config/locales/**/*.%{locale}.yml
+
+  # key => file routes, matched top to bottom
+  write:
+    ## E.g., write devise and simple form keys to their respective files
+    - ['{devise, simple_form}.*', 'config/locales/\1.%{locale}.yml']
+    # Catch-all
+    - config/locales/%{locale}.yml
+    # `i18n-tasks normalize -p` will force move the keys according to these rules
+
+  # YAML / JSON serializer options, passed to load / dump / parse / serialize
+  yaml:
+    write:
+      # do not wrap lines at 80 characters
+      line_width: -1
+  json:
+    write:
+      # pretty print JSON
+      indent: '  '
+      space: ' '
+      object_nl: "\n"
+      array_nl: "\n"
+
+# Find translate calls
 search:
+  ## Default scanner finds t() and I18n.t() calls
+  # scanner: I18n::Tasks::Scanners::PatternWithScopeScanner
+
+  ## Paths to search in, passed to File.find
   paths:
-    - "app/controllers"
-    - "app/helpers"
-    - "app/presenters"
-    - "app/views"
+    - app/
+
+  ## Root for resolving relative keys (default)
+  # relative_roots:
+  #   - app/views
 
+  ## File.fnmatch patterns to exclude from search (default)
+  # exclude: ["*.jpg", "*.png", "*.gif", "*.svg", "*.ico", "*.eot", "*.ttf", "*.woff", "*.pdf"]
+
+  ## Or, File.fnmatch patterns to include
+  # include: ["*.rb", "*.html.slim"]
+
+## Google Translate
+# translation:
+#   # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate
+#   api_key: "AbC-dEf5"
+
+## Consider these keys not missing
+# ignore_missing:
+# - 'errors.messages.{accepted,blank,invalid,too_short,too_long}'
+# - '{devise,simple_form}.*'
+
+## Consider these keys used
 ignore_unused:
-  - activerecord.*
-  - date.*
-  - simple_form.*
-  - time.*
-  - titles.*
+  - 'activerecord.*'
+  - '{devise,kaminari,will_paginate,simple_form}.*'
+  - 'date.*'
+  - 'time.*'
+  - 'titles.*'
+
+## Exclude these keys from `i18n-tasks eq-base' report
+# ignore_eq_base:
+#   all:
+#     - common.ok
+#   fr,es:
+#     - common.brand
+
+## Exclude these keys from all of the reports
+# ignore:
+#  - kaminari.*

data/templates/config_locales_it.yml.erb

@@ -0,0 +1,3 @@
+it:
+  titles:
+    application: <%= app_name.humanize %>

data/templates/sample.env

@@ -1,3 +1,5 @@
 # http://ddollar.github.com/foreman/
+ASSET_HOST=localhost:3000
+HOST=localhost:3000
 RACK_ENV=development
 SECRET_KEY_BASE=development_secret

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -53,34 +53,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +138,7 @@ files:
 - templates/bin_setup.erb
 - templates/bundler_audit.rake
 - templates/config_i18n_tasks.yml
+- templates/config_locales_it.yml.erb
 - templates/database_cleaner_rspec.rb
 - templates/development_seeds.rb
 - templates/disable_xml_params.rb