potassium 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bc7c7e4daf4fbcae5761bb994cfabc9db7d8d64
-  data.tar.gz: 919510d523b761b9c74a6d1bbdb23be36fd563e3
+  metadata.gz: 0bc9e2e96b1fa0d0f800bc2bf23617765c9c5b68
+  data.tar.gz: a844e31692d312c32791da3c08d1e95fb5ea661b
 SHA512:
-  metadata.gz: 6ef25b0c7d589ee4afd3819beb04ecbf043c0cdb99d1dfe37fc728e3739eb3f37deae49a8e87b4207cdc28e2be24699062dc9171a3f3d3b086944f4eaa44605b
-  data.tar.gz: 8a69de0aee82d9192eb69e18529c97256672ee873bb8708f486d784da47a81315754ea2323c4a7fad653aff696928d974409c106dbf9824e66f06445c6ab113d
+  metadata.gz: 6f67bdf66ad59d474cd4d9d29e38ccfc9780a5a56087baaf8b9c80c3121c49e391daf5830775a2e698e13ab238e75a7bcdc5a9d4750e979b1989c8ba5aef265a
+  data.tar.gz: 66a2c03ebbca40f554992b4a7cb596da2e8b876242164dfdd58b360caaa468b7376a0e679a2a6e87c61362d5302db72b23e28abedbe1ff7e71169e277d6fa18f

data/CHANGELOG.md

@@ -68,8 +68,3 @@ Features:
 
 Bugfixes:
   - Removed `default_command` call to fix --version usage.
-
-## 1.3.4
-
-Bugfixes:
-  - Removed `rails` from the runtime dependencies due to terrible performance.

data/README.md

@@ -4,9 +4,7 @@ A Rails application generator from [Platanus](https://github.com/platanus), insp
 
 ## Installation
 
-First, be sure to have Rails 4.2+ installed on your system.
-
-Then, install Potassium globally:
+You have to install Potassium globally:
 
     $ gem install potassium
 
@@ -18,7 +16,7 @@ Use the `potassium create` command to create a new project:
 
     $ potassium create project-name
 
-It's important to note that it will perform a version check before running to ensure that you're using the latest potassium.
+It's important to note that it will perform a version check before running to ensure that you're using the latest potassium. Also, if you feel that it's too slow, you may need to update rubygems: `gem update --system`.
 
 ### Adding recipes to an existing project
 

data/Rakefile

@@ -1,2 +1 @@
 require "bundler/gem_tasks"
-

data/lib/potassium/cli/commands/create.rb

@@ -7,7 +7,7 @@ module Potassium::CLI
                               desc: "Performs a version check before running.",
                               negatable: true
 
-    c.action do |global_options, options, args|
+    c.action do |_global_options, options, _args|
       require "potassium/newest_version_ensurer"
 
       begin_creation = -> do

data/lib/potassium/cli/commands/install.rb

@@ -5,7 +5,7 @@ require "potassium/templates/application/recipe_generator"
 module Potassium::CLI
   desc "Installs a new feature or library"
   command :install do |c|
-    c.action do |global_options, options, args|
+    c.action do |_global_options, _options, args|
       if args.first.nil?
         index = Ask.list('Select a recipe to install', recipe_name_list)
         ARGV << recipe_name_list[index]
@@ -14,7 +14,8 @@ module Potassium::CLI
         if recipe_exists?(args)
           Potassium::RecipeGenerator.start
         else
-          puts "Oops! Sorry, that recipe doesn't exist. Were you looking for this?: #{guess_recipe_name(args)}"
+          guess = guess_recipe_name(args)
+          puts "Oops! Sorry, that recipe doesn't exist. Were you looking for this?: #{guess}"
         end
       end
     end

data/lib/potassium/templates/application/assets/api/api_error_concern.rb

@@ -5,32 +5,24 @@ module ApiErrorConcern
     rescue_from "Exception" do |exception|
       logger.error exception.message
       logger.error exception.backtrace.join("\n")
-      respond_api_error(:internal_server_error, {
-        message: "server_error",
-        type: exception.class.to_s,
-        detail: exception.message
-      })
+      respond_api_error(:internal_server_error, message: "server_error",
+                                                type: exception.class.to_s,
+                                                detail: exception.message)
     end
 
     rescue_from "ActiveRecord::RecordNotFound" do |exception|
-      respond_api_error(:not_found, {
-        message: "record_not_found",
-        detail: exception.message
-      })
+      respond_api_error(:not_found, message: "record_not_found",
+                                    detail: exception.message)
     end
 
     rescue_from "ActiveModel::ForbiddenAttributesError" do |exception|
-      respond_api_error(:bad_request, {
-        message: "protected_attributes",
-        detail: exception.message
-      })
+      respond_api_error(:bad_request, message: "protected_attributes",
+                                      detail: exception.message)
     end
 
     rescue_from "ActiveRecord::RecordInvalid" do |exception|
-      respond_api_error(:bad_request, {
-        message: "invalid_attributes",
-        errors: exception.record.errors
-      })
+      respond_api_error(:bad_request, message: "invalid_attributes",
+                                      errors: exception.record.errors)
     end
   end
 

data/lib/potassium/templates/application/assets/api/responder.rb

@@ -3,15 +3,15 @@ class ApiResponder < ActionController::Responder
     return display_errors if has_errors?
     return head :no_content if delete?
 
-    display resource, :status_code => status_code
+    display resource, status_code: status_code
   end
 
   private
 
-  def display(resource, given_options = {})
-    controller.render options.merge(given_options).merge({
-      :json => serializer.as_json
-    })
+  def display(_resource, given_options = {})
+    controller.render options.merge(given_options).merge(
+      json: serializer.as_json
+    )
   end
 
   def serializer
@@ -25,14 +25,14 @@ class ApiResponder < ActionController::Responder
 
   def status_code
     return :created if post?
-    return :ok
+    :ok
   end
 
   def display_errors
-    controller.render({
-      :status => :unprocessable_entity,
-      :json => { msg: "invalid_attributes", errors: format_errors }
-    })
+    controller.render(
+      status: :unprocessable_entity,
+      json: { msg: "invalid_attributes", errors: format_errors }
+    )
   end
 
   def format_errors

data/lib/potassium/templates/application/helpers/callback-helpers.rb

@@ -11,7 +11,7 @@ module CallbackHelpers
 
   def before(action_name, wrap_in_action: false, &action)
     ensure_callbacks_variables_for_action(action_name)
-    add_callback(action_name, :before, action)
+    add_callback(action_name, :before, wrap_action(action, wrap_in_action))
   end
 
   def run_action(action_name, &action)
@@ -32,7 +32,7 @@ module CallbackHelpers
 
   def wrap_action(action, wrap_in_action)
     return action unless wrap_in_action
-    ->{ run_action(wrap_in_action, &action) }
+    -> { run_action(wrap_in_action, &action) }
   end
 
   def ensure_callbacks_variables_for_action(action_name)

data/lib/potassium/templates/application/helpers/gem-helpers.rb

@@ -1,14 +1,6 @@
 module GemHelpers
-
-  def gem_exists?(regex)
-    exists = false
-    File.open("Gemfile").each_line do |line|
-      if line =~ regex
-        exists = true
-        return
-      end
-    end
-    exists
+  def gem_exists?(regexp)
+    File.open("Gemfile").each_line.any? { |line| line =~ regexp }
   end
 
   def gather_gem(name, *attributes)
@@ -20,7 +12,7 @@ module GemHelpers
   end
 
   def discard_gem(name)
-    get(:gems).each do |environments, gems|
+    get(:gems).each do |_environments, gems|
       gems.delete_if do |gem_entry|
         gem_entry[:name] == name
       end

data/lib/potassium/templates/application/helpers/template-helpers.rb

@@ -1,12 +1,17 @@
 module TemplateHelpers
   def load_recipe(recipe)
     return if exists?(recipe)
-    eval_file "recipes/checks/#{recipe}.rb" rescue Exception
-    eval_file "recipes/dependencies/#{recipe}.rb" rescue Exception
-    eval_file "recipes/asks/#{recipe}.rb" rescue Exception
+    eval_file_with_rescue "recipes/checks/#{recipe}.rb"
+    eval_file_with_rescue "recipes/dependencies/#{recipe}.rb"
+    eval_file_with_rescue "recipes/asks/#{recipe}.rb"
     eval_file "recipes/#{recipe}.rb"
   end
 
+  def eval_file_with_rescue(source)
+    eval_file(source)
+  rescue StandardError
+  end
+
   def eval_file(source)
     location = File.expand_path(find_in_source_paths(source))
     unique_name = SecureRandom.hex

data/lib/potassium/templates/application/recipe_template.rb

@@ -1,7 +1,9 @@
 recipe = ARGV.first
 
 # Consider all the recipe's questions as true
-def selected?(key, val = nil); true; end
+def selected?(_key, _val = nil)
+  true
+end
 
 run_action(:recipe_loading) do
   load_recipe(recipe)
@@ -13,11 +15,9 @@ run_action(:gem_install) do
 end
 
 # Ensure all the recipe's callbacks are executed
-get(:callbacks).each do |name, cbs|
-
+get(:callbacks).each do |_name, callbacks|
   puts "Processing #{name} callbacks"
-  cbs.each do |event, cb|
-    cb.each {|callback| instance_exec(&callback) }
+  callbacks.each do |_event, event_callbacks|
+    event_callbacks.each { |callback| instance_exec(&callback) }
   end
-
 end

data/lib/potassium/templates/application/recipes/admin.rb

@@ -4,12 +4,12 @@ if selected?(:admin_mode)
     gather_gem 'activeadmin_addons'
     gather_gem 'active_skin'
 
-    after(:gem_install, :wrap_in_action => :admin_install) do
+    after(:gem_install, wrap_in_action: :admin_install) do
       generate "active_admin:install"
 
       line = "ActiveAdmin.setup do |config|"
       initializer = "config/initializers/active_admin.rb"
-      gsub_file initializer, /(#{Regexp.escape(line)})/mi do |match|
+      gsub_file initializer, /(#{Regexp.escape(line)})/mi do |_match|
         <<-HERE.gsub(/^ {11}/, '')
            class CustomFooter < ActiveAdmin::Component
              def build
@@ -25,13 +25,9 @@ if selected?(:admin_mode)
       line = "@import \"active_admin/base\";"
       style = "app/assets/stylesheets/active_admin.css.scss"
 
-      style = if File.exist?(style)
-        style
-      else
-        "app/assets/stylesheets/active_admin.scss"
-      end
+      style = File.exist?(style) ? style : "app/assets/stylesheets/active_admin.scss"
 
-      gsub_file style, /(#{Regexp.escape(line)})/mi do |match|
+      gsub_file style, /(#{Regexp.escape(line)})/mi do |_match|
         <<-HERE.gsub(/^ {11}/, '')
            #{line}
            $skinActiveColor: #001CEE;

data/lib/potassium/templates/application/recipes/angular_admin.rb

@@ -1,11 +1,14 @@
 if selected?(:angular_admin)
 
   after(:admin_install) do
-    copy_file 'assets/active_admin/init_activeadmin_angular.rb', 'config/initializers/init_activeadmin_angular.rb'
+    copy_file 'assets/active_admin/init_activeadmin_angular.rb',
+      'config/initializers/init_activeadmin_angular.rb'
 
     create_file 'app/assets/javascripts/admin_app.js', "angular.module('ActiveAdmin', []);"
 
-    copy_file 'assets/active_admin/active_admin.js.coffee', 'app/assets/javascripts/active_admin.js.coffee', force: true
+    copy_file 'assets/active_admin/active_admin.js.coffee',
+      'app/assets/javascripts/active_admin.js.coffee',
+      force: true
 
     empty_directory 'app/assets/javascripts/admin'
     empty_directory 'app/assets/javascripts/admin/controllers'

data/lib/potassium/templates/application/recipes/devise.rb

@@ -1,5 +1,5 @@
 authentication_framework = {
-  devise: ->{
+  devise: -> do
     gather_gem 'devise'
     gather_gem 'devise-i18n'
 
@@ -7,22 +7,22 @@ authentication_framework = {
       generate "devise:install"
 
       if auth_model = get(:authentication_model)
-        generate "devise #{auth_model.to_s}"
+        generate "devise #{auth_model}"
       end
 
-      gsub_file "config/initializers/devise.rb", /(\# config.secret_key.+)/i do |match|
-        match = "config.secret_key = ENV['DEVISE_SECRET_KEY']"
+      gsub_file "config/initializers/devise.rb", /(\# config.secret_key.+)/i do |_match|
+        "config.secret_key = ENV['DEVISE_SECRET_KEY']"
       end
 
-      gsub_file "config/initializers/devise.rb", /(config.mailer_sender.+)/i do |match|
-        match = "config.mailer_sender = ENV['DEFAULT_EMAIL_ADDRESS']"
+      gsub_file "config/initializers/devise.rb", /(config.mailer_sender.+)/i do |_match|
+        "config.mailer_sender = ENV['DEFAULT_EMAIL_ADDRESS']"
       end
 
       append_to_file '.rbenv-vars.example', 'DEVISE_SECRET_KEY='
     end
-  }
+  end
 }
 
 if get(:authentication)
-  instance_exec(&(authentication_framework[get(:authentication)] || ->{ }))
+  instance_exec(&(authentication_framework[get(:authentication)] || -> {}))
 end

data/lib/potassium/templates/application/recipes/git.rb

@@ -5,5 +5,5 @@ after(:database_creation) do
 
   git :init
   git add: "."
-  git commit: %Q{ -m 'Initial commit' }
+  git commit: %{ -m 'Initial commit' }
 end

data/lib/potassium/templates/application/recipes/paperclip.rb

@@ -1,8 +1,8 @@
 if selected?(:paperclip)
   gather_gem('paperclip', '~> 4.3')
 
-  gsub_file "config/environments/production.rb", /^end$/o do |match|
-    match = %q{
+  gsub_file "config/environments/production.rb", /^end$/o do |_match|
+    %{
 
   # Paperclip support for S3
   config.paperclip_defaults = {

data/lib/potassium/templates/application/recipes/production.rb

@@ -1,3 +1,3 @@
 gsub_file "config/environments/production.rb", /(\# config.action_mailer.+)/i do |match|
-  match = "#{match}\n  config.action_mailer.default_options = {from: ENV['DEFAULT_EMAIL_ADDRESS']}\n"
+  "#{match}\n  config.action_mailer.default_options = {from: ENV['DEFAULT_EMAIL_ADDRESS']}\n"
 end

data/lib/potassium/templates/application/recipes/pundit.rb

@@ -1,5 +1,5 @@
 authorization_framework = {
-  pundit: ->{
+  pundit: -> do
     gather_gem 'pundit'
 
     after(:gem_install) do
@@ -17,14 +17,17 @@ authorization_framework = {
           "config.authorization_adapter = ActiveAdmin::PunditAdapter\n"
         end
 
-        template "assets/active_admin/pundit_page_policy.rb", "app/policies/active_admin/page_policy.rb"
-        template "assets/active_admin/comment_policy.rb", "app/policies/active_admin/comment_policy.rb"
-        template "assets/active_admin/admin_user_policy.rb", "app/policies/admin_user_policy.rb"
+        template "assets/active_admin/pundit_page_policy.rb",
+          "app/policies/active_admin/page_policy.rb"
+        template "assets/active_admin/comment_policy.rb",
+          "app/policies/active_admin/comment_policy.rb"
+        template "assets/active_admin/admin_user_policy.rb",
+          "app/policies/admin_user_policy.rb"
       end
     end
-  }
+  end
 }
 
 if get(:authorization)
-  instance_exec(&(authorization_framework[get(:authorization)] || ->{ }))
+  instance_exec(&(authorization_framework[get(:authorization)] || -> {}))
 end

data/lib/potassium/templates/application/recipes/testing.rb

@@ -26,6 +26,7 @@ after(:gem_install) do
   run "guard init"
 end
 
-gsub_file 'config/environments/development.rb', /config.action_mailer.raise_delivery_errors = false\n/ do
+raise_delivery_errors_regexp = /config.action_mailer.raise_delivery_errors = false\n/
+gsub_file 'config/environments/development.rb', raise_delivery_errors_regexp do
   "config.action_mailer.raise_delivery_errors = true"
 end

data/lib/potassium/templates/application/template.rb

@@ -2,11 +2,11 @@ set :app_name, @app_name
 set :titleized_app_name, get(:app_name).titleize
 set :underscorized_app_name, get(:app_name).underscore
 
-default_env({
-  'DB_NAME' => "#{get(:underscorized_app_name)}",
+default_env(
+  'DB_NAME' => get(:underscorized_app_name).to_s,
   'DB_USER' => "root",
   'DB_PASSWORD' => ''
-})
+)
 
 run_action(:cleaning) do
   clean_gemfile

data/lib/potassium/text_spinner.rb

@@ -5,7 +5,7 @@ module Potassium
       :counter, :started
 
     DEFAULT_ATTRIBUTES = {
-      wait_condition: -> { },
+      wait_condition: -> {},
       base_message: "",
       interval: 0.4,
       message_continuations: ["", ".", "..", "..."]
@@ -13,7 +13,7 @@ module Potassium
 
     def initialize(attributes = {})
       DEFAULT_ATTRIBUTES.merge(attributes).each do |key, value|
-        self.public_send("#{key}=", value)
+        public_send("#{key}=", value)
       end
       self.started = false
       self.counter = 0
@@ -45,7 +45,7 @@ module Potassium
     end
 
     def clear_message
-      print "\r#{" " * (base_message.size * 2)}\r"
+      print "\r#{' ' * (base_message.size * 2)}\r"
     end
 
     def already_started_message

data/lib/potassium/version.rb

@@ -1,3 +1,4 @@
 module Potassium
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
+  RAILS_VERSION = "~> 4.2.0"
 end

data/potassium.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Potassium::VERSION
   spec.authors       = ["juliogarciag"]
   spec.email         = ["julioggonz@gmail.com"]
-  spec.summary       = %q{An application generator from Platanus}
-  spec.description   = %q{An application generator from Platanus}
+  spec.summary       = "An application generator from Platanus"
+  spec.description   = "An application generator from Platanus"
   spec.homepage      = "https://github.com/platanus/potassium"
   spec.license       = "MIT"
 
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_runtime_dependency "rails", Potassium::RAILS_VERSION
   spec.add_runtime_dependency "gli", "~> 2.12.2"
   spec.add_runtime_dependency "inquirer", "~> 0.2"
   spec.add_runtime_dependency "gems", "~> 0.8"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: potassium
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - juliogarciag
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An application generator from Platanus