potassium 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e744bb4e04fa650c7190cfb645c050d0ff83691f
-  data.tar.gz: 588d03c4d1385f5d74387ab7720b32d45e3d2df3
+  metadata.gz: 61aa3d6c79b9fb3eabc4d1a6994ae6d48cdd858f
+  data.tar.gz: afc543181045764487eabbbbca082b4173e2ca11
 SHA512:
-  metadata.gz: 49627be487d9b2e423cc51cac06d135ca89b6c1e5e74d1facfd9a504d804ea4956fd6261fb91b1d2b27d9d03e428cadff4a8fc1fc2867d93411082ba730391b6
-  data.tar.gz: a723bb7e25ab5849b0b19cce675afd27a7083a1564937ed413189756166620dc77763c5cad3f1ea6827ae1065e19fc5ba04605f610797a3a8c7dfb6ae2e94cf0
+  metadata.gz: b9b969ee9403a6366abbf0ccd7fec9def9db563571d7d4682c484805efb332bc1f3930211f703ebc81548e7fbe2d498f6b488aa2fca47d2d9cd5e0cc80076036
+  data.tar.gz: 018bc293d98cfd61589f9e2bb321d4d567e8c01843a51ed6be2856af6e4a86c8556ffcb88878a7ca82ba33792a73ae20c6b6341a011f8585ffd648c57cb2a87d

data/.ruby-version

@@ -1 +1 @@
-2.2
+2.3

data/README.md

@@ -61,17 +61,12 @@ The following optional integrations are added too:
 A few more things are added to the project:
 
 - A [low database connection pool limit][pool]
-- Setup [Rubocop][rubocop] configuration with Platanus [style guides][rubocop-platanus]
-- Setup [Hound CI][platanus-hound] configuration, with Platanus flavour
 - Setup continuous integration in [CircleCI](circle-ci) to run tests.
 - Create the github repository for the project (it used `hub` under the hood)
 - A `bin/setup` script to setup things on a newly cloned project
 - A `bin/cibuild` script to run continuous integration build on CI
 
 [pool]: https://devcenter.heroku.com/articles/concurrency-and-database-connections
-[rubocop]: https://github.com/bbatsov/rubocop
-[rubocop-platanus]: https://raw.githubusercontent.com/platanus/hound/platanus/config/style_guides/platanus/ruby.yml
-[platanus-hound]: http://monkeyci.platan.us
 
 ### API support
 

data/lib/potassium/assets/config/database_mysql.yml.erb

@@ -21,5 +21,3 @@ production: &deploy
   pool: <%%= [Integer(ENV.fetch("MAX_THREADS", 5)), Integer(ENV.fetch("DB_POOL", 5))].max %>
   timeout: 5000
   url: <%%= ENV.fetch("DATABASE_URL", "") %>
-
-staging: *deploy

data/lib/potassium/assets/config/database_postgresql.yml.erb

@@ -15,11 +15,9 @@ test:
   database: <%= get(:underscorized_app_name) %>_test
 
 production: &deploy
-  adapter: mysql2
+  adapter: postgresql
   encoding: utf8
   min_messages: warning
   pool: <%%= [Integer(ENV.fetch("MAX_THREADS", 5)), Integer(ENV.fetch("DB_POOL", 5))].max %>
   timeout: 5000
   url: <%%= ENV.fetch("DATABASE_URL", "") %>
-
-staging: *deploy

data/lib/potassium/assets/config/puma.rb

@@ -20,7 +20,7 @@ preload_app!
 
 rackup DefaultRackup
 port ENV.fetch('PORT', 3000)
-environment ENV.fetch("RAILS_ENV", "development")
+environment ENV.fetch("RACK_ENV", "development")
 
 on_worker_boot do
   # Worker specific setup for Rails 4.1+

data/lib/potassium/assets/config/secrets.yml.erb

@@ -7,8 +7,5 @@ development:
 test:
   <<: *default
 
-staging:
-  <<: *default
-
 production:
   <<: *default

data/lib/potassium/assets/docker-compose.ci.yml

@@ -6,4 +6,4 @@ test:
     - ./vendor/bundle:/usr/local/bundle
     - $CIRCLE_TEST_REPORTS/rspec:$HOME/.rspec_reports
   environment:
-    RAILS_ENV: test
+    RACK_ENV: test

data/lib/potassium/assets/lib/tasks/auto_annotate_models.rake

@@ -0,0 +1,44 @@
+if Rails.env.development?
+  task :set_annotation_options do
+    # You can override any of these by setting an environment variable of the
+    # same name.
+    Annotate.set_defaults(
+      'routes'                  => 'false',
+      'position_in_routes'      => 'after',
+      'position_in_class'       => 'after',
+      'position_in_test'        => 'after',
+      'position_in_fixture'     => 'after',
+      'position_in_factory'     => 'after',
+      'position_in_serializer'  => 'after',
+      'show_foreign_keys'       => 'true',
+      'show_indexes'            => 'true',
+      'simple_indexes'          => 'false',
+      'model_dir'               => 'app/models',
+      'root_dir'                => '',
+      'include_version'         => 'false',
+      'require'                 => '',
+      'exclude_tests'           => 'true',
+      'exclude_fixtures'        => 'true',
+      'exclude_factories'       => 'true',
+      'exclude_serializers'     => 'true',
+      'exclude_scaffolds'       => 'true',
+      'exclude_controllers'     => 'true',
+      'exclude_helpers'         => 'false',
+      'ignore_model_sub_dir'    => 'false',
+      'ignore_columns'          => nil,
+      'ignore_unknown_models'   => 'false',
+      'hide_limit_column_types' => 'integer,boolean',
+      'skip_on_db_migrate'      => 'false',
+      'format_bare'             => 'true',
+      'format_rdoc'             => 'false',
+      'format_markdown'         => 'false',
+      'sort'                    => 'false',
+      'force'                   => 'false',
+      'trace'                   => 'false',
+      'wrapper_open'            => nil,
+      'wrapper_close'           => nil
+    )
+  end
+
+  Annotate.load_tasks
+end

data/lib/potassium/assets/testing/rails_helper.rb

@@ -1,5 +1,5 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV['RAILS_ENV'] ||= 'test'
+ENV['RACK_ENV'] ||= 'test'
 require File.expand_path('../../config/environment', __FILE__)
 require 'rspec/rails'
 require 'spec_helper'
@@ -51,3 +51,10 @@ RSpec.configure do |config|
 
   config.include FactoryGirl::Syntax::Methods
 end
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    with.library :rails
+  end
+end

data/lib/potassium/recipes/annotate.rb

@@ -0,0 +1,10 @@
+class Recipes::Annotate < Rails::AppBuilder
+  def create
+    gather_gems(:development) do
+      gather_gem('annotate')
+    end
+
+    template '../assets/lib/tasks/auto_annotate_models.rake',
+      'lib/tasks/auto_annotate_models.rake'
+  end
+end

data/lib/potassium/recipes/cleanup.rb

@@ -2,7 +2,6 @@ class Recipes::Cleanup < Rails::AppBuilder
   def create
     erase_comments "config/application.rb"
     erase_comments "config/environments/production.rb"
-    erase_comments "config/environments/staging.rb"
     erase_comments "config/environments/test.rb"
     erase_comments "config/environments/development.rb"
     cut_comments "config/initializers/backtrace_silencers.rb", limit: 100

data/lib/potassium/recipes/heroku.rb

@@ -34,7 +34,7 @@ class Recipes::Heroku < Rails::AppBuilder
   private
 
   def add_heroku
-    gather_gems(:production, :staging) do
+    gather_gems(:production) do
       gather_gem('rails_stdout_logging')
     end
 
@@ -80,7 +80,7 @@ class Recipes::Heroku < Rails::AppBuilder
   end
 
   def create_app_on_heroku(environment)
-    rack_env = "RACK_ENV=#{environment} RAILS_ENV=#{environment}"
+    rack_env = "RACK_ENV=production"
     staged_app_name = app_name_for(environment)
 
     run_toolbelt_command "create #{staged_app_name} --remote #{environment}"

data/lib/potassium/recipes/puma.rb

@@ -2,7 +2,7 @@ class Recipes::Puma < Rails::AppBuilder
   def create
     gather_gem 'puma'
 
-    gather_gems(:production, :staging) do
+    gather_gems(:production) do
       gather_gem 'rack-timeout'
     end
 

data/lib/potassium/recipes/style.rb

@@ -1,9 +1,8 @@
 class Recipes::Style < Rails::AppBuilder
   def create
-    copy_file '../assets/.rubocop.yml', '.rubocop.yml'
-    copy_file '../assets/.ruby_style.yml', '.ruby_style.yml'
-    copy_file '../assets/.hound.yml', '.hound.yml'
-    append_to_file '.gitignore', ".rubocop-http*\n"
+    append_to_file ".gitignore", ".rubocop.yml\n"
+    append_to_file ".gitignore", ".eslintrc.json\n"
+    append_to_file ".gitignore", ".sscs-lint.yml\n"
     add_readme_header :style_guide
   end
 

data/lib/potassium/templates/application.rb

@@ -29,6 +29,7 @@ run_action(:recipe_loading) do
   create :style
   create :puma
   create :database
+  create :annotate
   create :ruby
   create :env
   create :bower
@@ -43,7 +44,6 @@ run_action(:recipe_loading) do
   create :pundit
   create :testing
   create :production
-  create :staging
   create :secrets
   create :git
   create :api
@@ -63,5 +63,5 @@ end
 
 run_action(:database_creation) do
   run "rake db:create db:migrate"
-  run "RAILS_ENV=test rake db:create db:migrate"
+  run "RACK_ENV=test rake db:create db:migrate"
 end

data/lib/potassium/version.rb

@@ -1,6 +1,6 @@
 module Potassium
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
   RUBY_VERSION = "2.3.1"
   RAILS_VERSION = "~> 4.2.0"
-  RUBOCOP_VERSION = "~> 0.38.0"
+  RUBOCOP_VERSION = "~> 0.42.0"
 end

data/spec/features/heroku_spec.rb

@@ -34,12 +34,10 @@ RSpec.describe "Heroku" do
 
     expect(FakeHeroku).to have_configured_vars("staging", "SECRET_KEY_BASE")
     expect(FakeHeroku).to have_configured_vars("staging", "RACK_ENV")
-    expect(FakeHeroku).to have_configured_vars("staging", "RAILS_ENV")
     expect(FakeHeroku).to have_configured_vars("staging", "DEPLOY_TASKS")
 
     expect(FakeHeroku).to have_configured_vars("production", "SECRET_KEY_BASE")
     expect(FakeHeroku).to have_configured_vars("production", "RACK_ENV")
-    expect(FakeHeroku).to have_configured_vars("production", "RAILS_ENV")
     expect(FakeHeroku).to have_configured_vars("production", "DEPLOY_TASKS")
 
     expect(FakeHeroku).to have_created_pipeline_for("staging")

data/spec/features/new_project_spec.rb

@@ -18,24 +18,6 @@ RSpec.describe "A new project" do
     end
   end
 
-  it "configures rubocop" do
-    rubocop_config_file = IO.read("#{project_path}/.rubocop.yml")
-
-    expect(rubocop_config_file).to include("inherit_from")
-    expect(rubocop_config_file).to include("style_guides/platanus/ruby.yml")
-    expect(rubocop_config_file).to include(".ruby_style.yml")
-  end
-
-  it "set custom ruby style file placeholder" do
-    expect(File).to exist("#{project_path}/.ruby_style.yml")
-  end
-
-  it "configures hound" do
-    hound_config_file = IO.read("#{project_path}/.hound.yml")
-
-    expect(hound_config_file).to include("config_file: .ruby_style.yml")
-  end
-
   it "configures postgresql" do
     database_config_file = IO.read("#{project_path}/config/database.yml")
     gemfile = IO.read("#{project_path}/Gemfile")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: potassium
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - juliogarciag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.42.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.42.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -174,11 +174,8 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".gitignore"
-- ".hound.yml"
 - ".rspec"
-- ".rubocop.yml"
 - ".ruby-version"
-- ".ruby_style.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -194,10 +191,7 @@ files:
 - lib/potassium/assets/.dockerignore
 - lib/potassium/assets/.editorconfig
 - lib/potassium/assets/.env.development.erb
-- lib/potassium/assets/.hound.yml
 - lib/potassium/assets/.pryrc
-- lib/potassium/assets/.rubocop.yml
-- lib/potassium/assets/.ruby_style.yml
 - lib/potassium/assets/Dockerfile.ci
 - lib/potassium/assets/Procfile
 - lib/potassium/assets/README.md.erb
@@ -217,11 +211,11 @@ files:
 - lib/potassium/assets/circle.yml
 - lib/potassium/assets/config/database_mysql.yml.erb
 - lib/potassium/assets/config/database_postgresql.yml.erb
-- lib/potassium/assets/config/environments/staging.rb
 - lib/potassium/assets/config/puma.rb
 - lib/potassium/assets/config/secrets.yml.erb
 - lib/potassium/assets/docker-compose.ci.yml
 - lib/potassium/assets/es.yml
+- lib/potassium/assets/lib/tasks/auto_annotate_models.rake
 - lib/potassium/assets/testing/.rspec
 - lib/potassium/assets/testing/rails_helper.rb
 - lib/potassium/cli.rb
@@ -243,6 +237,7 @@ files:
 - lib/potassium/recipe.rb
 - lib/potassium/recipes/admin.rb
 - lib/potassium/recipes/angular_admin.rb
+- lib/potassium/recipes/annotate.rb
 - lib/potassium/recipes/api.rb
 - lib/potassium/recipes/aws_sdk.rb
 - lib/potassium/recipes/bower.rb
@@ -267,7 +262,6 @@ files:
 - lib/potassium/recipes/ruby.rb
 - lib/potassium/recipes/script.rb
 - lib/potassium/recipes/secrets.rb
-- lib/potassium/recipes/staging.rb
 - lib/potassium/recipes/style.rb
 - lib/potassium/recipes/testing.rb
 - lib/potassium/template_finder.rb
@@ -306,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An application generator from Platanus
@@ -321,4 +315,3 @@ test_files:
 - spec/support/fake_github.rb
 - spec/support/fake_heroku.rb
 - spec/support/potassium_test_helpers.rb
-has_rdoc: 

data/.hound.yml

@@ -1,2 +0,0 @@
-ruby:
-  config_file: .ruby_style.yml

data/.rubocop.yml

@@ -1,3 +0,0 @@
-inherit_from:
-  - https://raw.githubusercontent.com/platanus/hound/platanus/config/style_guides/platanus/ruby.yml
-  - .ruby_style.yml

data/.ruby_style.yml

@@ -1,6 +0,0 @@
-Rails:
-  Enabled: false
-Metrics/MethodLength:
-  Enabled: false
-Metrics/AbcSize:
-  Enabled: false

data/lib/potassium/assets/.hound.yml

@@ -1,2 +0,0 @@
-ruby:
-  config_file: .ruby_style.yml

data/lib/potassium/assets/.rubocop.yml

@@ -1,3 +0,0 @@
-inherit_from:
-  - https://raw.githubusercontent.com/platanus/hound/platanus/config/style_guides/platanus/ruby.yml
-  - .ruby_style.yml

data/lib/potassium/assets/config/environments/staging.rb

@@ -1,5 +0,0 @@
-require_relative "production"
-
-Rails.application.configure do
-  # ...
-end

data/lib/potassium/recipes/staging.rb

@@ -1,5 +0,0 @@
-class Recipes::Staging < Rails::AppBuilder
-  def create
-    copy_file '../assets/config/environments/staging.rb', "config/environments/staging.rb"
-  end
-end