onotole 1.0.8 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddc9c847f5351269fde4990a5bed9e0ff6cd4623
-  data.tar.gz: dbf35516b4a9c84e8e6245a3b17f1acedc8c877b
+  metadata.gz: 7dc7303b50ac44931dbea07f86282518630ef33f
+  data.tar.gz: e5d5ee1620a68e5ae1eb71d01aa58274b61f5287
 SHA512:
-  metadata.gz: bc9b27921b0794e2b0eafc0d9cec8174d9e149a222bff409ee79206cc4b34a59f979994a9b89a454e6cb70fa1d7b5daeafb84bbaf35fcd159d7b7b7c4bbcd37e
-  data.tar.gz: 2c47b3194d7b4084cdcfadc0904ad7616812ea7eeb41398ab7dc0f648d278518b903faff31934d759719e8a89f53782ee749ed5e4e54581b08fadf586e3df38d
+  metadata.gz: 6b90e76edfd53882e6454ac49a0d47f3005ab2469bfb5b6ada03c1618eeb14b6d41ba5fade3e2344d86b14abfe3883403b0f9bafe073190049ce5eb960a5affa
+  data.tar.gz: 652bece2dadbc02b748bb8b9cddcae02e5cc053580f3c3c2178d1f9bc5300b7fc53370cbd0e41d9ad345d9b5413e1741ec43aabd6b0949529ee33ddc9fc00656

data/.rubocop.yml

@@ -40,8 +40,7 @@ AllCops:
   Exclude:
     - 'bin/**/*'
     - 'vendor/**/*'
-    - 'log/**/*'    
-    - 'tmp/**/*'    
+    - 'log/**/*'
   TargetRubyVersion: 2.3
 Metrics/AbcSize:
   Max: 30

data/README.md

@@ -73,6 +73,10 @@ pack will not be installed with any gem option.
  provides an easy-to-use interface for managing your data
  * [activeadmin](https://github.com/activeadmin/activeadmin) Rails framework for 
 creating elegant backends for website administration. 
+ * [ActiveAdminImport](https://github.com/activeadmin-plugins/active_admin_import) 
+ Based on ActiveRecord-import gem - the most efficient way to import for ActiveAdmin
+ * [ActiveAdminTheme](https://github.com/activeadmin-plugins/active_admin_theme) 
+ Flat skin for ActiveAdmin
  * `*`[rubycritic](https://github.com/whitesmith/rubycritic) A Ruby code quality 
  reporter
  * [railroady](https://github.com/preston/railroady) Model and controller UML 

data/bin/install

@@ -1,2 +1,5 @@
 #!/bin/sh
-rm onotole-*.gem && gem build onotole.gemspec && gem install onotole
+rm onotole-*.gem 
+rm -fr tmp/
+git add .
+gem build onotole.gemspec && gem install onotole

data/lib/onotole/add_user_gems/after_install_patch.rb

@@ -13,6 +13,7 @@ module Onotole
                        :guard_rubocop,
                        :bootstrap3_sass,
                        :bootstrap3,
+                       :active_admin_theme,
                        :normalize,
                        :tinymce,
                        :rubocop,
@@ -135,9 +136,14 @@ end
     end
 
     def after_install_typus
-rails_generator 'typus'
-rails_generator 'typus:migration'
-rails_generator 'typus:views'
+      rails_generator 'typus'
+      rails_generator 'typus:migration'
+      rails_generator 'typus:views'
+    end
+
+    def after_install_active_admin_theme
+      append_file('app/assets/stylesheets/active_admin.scss',
+                  "\n@import 'wigu/active_admin_theme';")    
     end
   end
 end

data/lib/onotole/add_user_gems/before_bundle_patch.rb

@@ -5,13 +5,6 @@ module Onotole
       add_to_user_choise(:normalize)
     end
 
-    def add_user_gems
-      GEMPROCLIST.each do |g|
-        send "add_#{g}_gem" if user_choose? g.to_sym
-      end
-      # add_foo_bar_gem if user_choose?(:foo) && user_choose?(:bar)
-    end
-
     def add_haml_gem
       inject_into_file('Gemfile', "\ngem 'haml-rails'", after: '# user_choice')
     end
@@ -119,14 +112,6 @@ module Onotole
       copy_file 'devise_rspec.rb', 'spec/support/devise.rb'
     end
 
-    def add_will_paginate_gem
-      inject_into_file('Gemfile', "\ngem 'will_paginate', '~> 3.0.6'",
-                       after: '# user_choice')
-      inject_into_file('Gemfile', "\ngem 'will_paginate-bootstrap'",
-                       after: '# user_choice') if user_choose?(:bootstrap3) ||
-                                                  user_choose?(:bootstrap3_sass)
-    end
-
     def add_responders_gem
       inject_into_file('Gemfile', "\ngem 'responders'", after: '# user_choice')
     end
@@ -180,7 +165,6 @@ module Onotole
 
     def add_rails_admin_gem
       inject_into_file('Gemfile', "\ngem 'rails_admin'", after: '# user_choice')
-      puts
     end
 
     def add_rubycritic_gem
@@ -189,12 +173,35 @@ module Onotole
     end
 
     def add_railroady_gem
-      inject_into_file('Gemfile', "\n  gem 'railroady', :require => false",
-                       after: 'group :development do')
+      inject_into_file('Gemfile', "\n  gem 'railroady'", after: 'group :development do')
     end
 
     def add_typus_gem
       inject_into_file('Gemfile', "\n  gem 'typus', github: 'typus/typus'", after: '# user_choice')
     end
+
+    def add_will_paginate_gem
+      inject_into_file('Gemfile', "\ngem 'will_paginate', '~> 3.0.6'",
+                       after: '# user_choice')
+      inject_into_file('Gemfile', "\ngem 'will_paginate-bootstrap'",
+                       after: '# user_choice') if user_choose?(:bootstrap3) ||
+                                                  user_choose?(:bootstrap3_sass)
+    end
+
+    def add_kaminari_gem
+      inject_into_file('Gemfile', "\ngem 'kaminari'", after: '# user_choice')
+      copy_file 'kaminari.rb', 'config/initializers/kaminari.rb'
+      inject_into_file('Gemfile', "\ngem 'bootstrap-kaminari-views'",
+                       after: '# user_choice') if user_choose?(:bootstrap3) ||
+                                                  user_choose?(:bootstrap3_sass)
+    end
+
+    def add_active_admin_import_gem
+      inject_into_file('Gemfile', "\ngem 'active_admin_import'", after: '# user_choice')
+    end
+
+    def add_active_admin_theme_gem
+      inject_into_file('Gemfile', "\ngem 'active_admin_theme'", after: '# user_choice')
+    end
   end
 end

data/lib/onotole/add_user_gems/edit_menu_questions.rb

@@ -29,18 +29,39 @@ module Onotole
 
     def choose_cms_engine
       variants = { none:        'None',
-                   activeadmin: 'Activeadmin CMS',
+                   activeadmin: 'Activeadmin CMS (if devise selected Admin model will create automatic)',
                    rails_admin: 'Rails admin CMS',
                    rails_db:    'Rails DB. Simple pretty view in browser & xls export for models',
                    typus:       'Typus control panel to allow trusted users edit structured content.' }
       gem = choice 'Select control panel or CMS: ', variants
       add_to_user_choise(gem) if gem
-      puts gem
+      show_active_admin_plugins_submenu
+    end
+
+    def show_active_admin_plugins_submenu
+      return unless user_choose? :activeadmin
+      variants = {            none: 'None', 
+                              active_admin_import: 'Active_admin_import - the most efficient way to import for ActiveAdmin',
+                              active_admin_theme:  'Active_admin_theme - flat skin for activeadmin' }
+      multiple_choice('Select activeadmin plug-ins.', variants).each do |gem|
+        add_to_user_choise gem
+      end
+    end
+
+    def choose_pagimation
+      if user_choose? :activeadmin
+        add_to_user_choise(:kaminari)
+        return
+      end
+      variants = { none:          'None',
+                   will_paginate: 'Will paginate',
+                   kaminari:      'Kaminari' }
+      gem = choice 'Select paginator: ', variants
+      add_to_user_choise(gem) if gem
     end
 
     def choose_undroup_gems
       variants = { none:                'None',
-                   will_paginate:       'Easy pagination implement',
                    faker:               'Gem for generate fake data in testing',
                    rubocop:             'Code inspector and code formatting tool',
                    rubycritic:          'A Ruby code quality reporter',
@@ -81,12 +102,11 @@ module Onotole
     end
 
     def ask_cleanup_commens
-      unless options[:clean_comments]
+      return if options[:clean_comments]
         variants = { none: 'No', clean_comments: 'Yes' }
         sel = choice 'Delete comments in Gemfile, routes.rb & config files? ',
                      variants
         add_to_user_choise(sel) unless sel == :none
-      end
     end
 
     def add_github_repo_creation_choice

data/lib/onotole/add_user_gems/user_gems_menu_questions.rb

@@ -2,10 +2,11 @@
 module Onotole
   module UserGemsMenu
     def users_gems
-      choose_authenticate_engine
+      choose_cms_engine
       choose_template_engine
       choose_frontend
-      choose_cms_engine
+      choose_authenticate_engine
+      choose_pagimation
       # Placeholder for other gem additions
       # menu description in add_gems_in_menu.rb
 

data/lib/onotole/app_builder.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 require 'forwardable'
 # require 'pry'
-Dir['lib/onotole/**/*.rb'].each { |file| require file.slice(4..-4) }
+Dir[File.expand_path(File.join(File.dirname(File.absolute_path(__FILE__)), '../')) + '/**/*.rb'].each do |file|
+  require file
+end
 
 module Onotole
   class AppBuilder < Rails::AppBuilder
@@ -15,7 +17,9 @@ module Onotole
     include Onotole::Tests
     include Onotole::Mail
     include Onotole::Goodbye
-    include Onotole::FrontendDefault
+    include Onotole::DefaultFrontend
+    include Onotole::DefalutScripts
+    include Onotole::Deploy
     extend Forwardable
 
     @use_asset_pipelline = true
@@ -23,11 +27,13 @@ module Onotole
     @app_file_scss = 'app/assets/stylesheets/application.scss'
     @app_file_css = 'app/assets/stylesheets/application.css'
     @js_file = 'app/assets/javascripts/application.js'
+    @quiet = true
 
     class << self
        attr_accessor :use_asset_pipelline,
                      :devise_model,
-                     :user_choice, :app_file_scss, :app_file_css, :js_file
+                     :user_choice, :app_file_scss,
+                     :app_file_css, :js_file, :quiet
     end
 
     def_delegators :heroku_adapter,
@@ -41,10 +47,6 @@ module Onotole
                    :set_heroku_serve_static_files,
                    :set_up_heroku_specific_gems
 
-    def readme
-      template 'README.md.erb', 'README.md'
-    end
-
     def add_bullet_gem_configuration
       config = <<-RUBY
   config.after_initialize do
@@ -62,20 +64,6 @@ module Onotole
       )
     end
 
-    def raise_on_unpermitted_parameters
-      config = "\n    config.action_controller.action_on_unpermitted_parameters = :raise\n"
-      inject_into_class 'config/application.rb', 'Application', config
-    end
-
-    def provide_setup_script
-      template 'bin_setup', 'bin/setup', force: true
-      run 'chmod a+x bin/setup'
-    end
-
-    def provide_dev_prime_task
-      copy_file 'dev.rake', 'lib/tasks/dev.rake'
-    end
-
     def set_up_hound
       copy_file 'hound.yml', '.hound.yml'
     end
@@ -84,112 +72,15 @@ module Onotole
       template 'newrelic.yml.erb', 'config/newrelic.yml'
     end
 
-    def enable_rack_canonical_host
-      config = <<-RUBY
-
-  if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
-    ENV["APPLICATION_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
-  end
-
-  # Ensure requests are only served from one, canonical host name
-  config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")
-      RUBY
-
-      inject_into_file(
-        'config/environments/production.rb',
-        config,
-        after: 'Rails.application.configure do'
-      )
-    end
-
-    def enable_rack_deflater
-      config = <<-RUBY
-
-  # Enable deflate / gzip compression of controller-generated responses
-  config.middleware.use Rack::Deflater
-      RUBY
-
-      inject_into_file(
-        'config/environments/production.rb',
-        config,
-        after: serve_static_files_line
-      )
-    end
-
-    def setup_staging_environment
-      staging_file = 'config/environments/staging.rb'
-      copy_file 'staging.rb', staging_file
-
-      config = <<-RUBY
-
-Rails.application.configure do
-  # ...
-end
-      RUBY
-
-      append_file staging_file, config
-    end
-
-    def setup_secret_token
-      template 'secrets.yml', 'config/secrets.yml', force: true
-    end
-
-    def disallow_wrapping_parameters
-      remove_file 'config/initializers/wrap_parameters.rb'
-    end
-
-    def create_shared_javascripts
-      copy_file '_javascript.html.erb', 'app/views/application/_javascript.html.erb'
-    end
-
-    def use_postgres_config_template
-      template 'postgresql_database.yml.erb', 'config/database.yml',
-               force: true
-      template 'postgresql_database.yml.erb', 'config/database.yml.sample',
-               force: true
-    end
-
-    def create_database
-      bundle_command 'exec rake db:drop db:create db:migrate db:seed'
-    end
-
-    def replace_gemfile
-      remove_file 'Gemfile'
-      template 'Gemfile.erb', 'Gemfile'
-    end
-
-    def set_ruby_to_version_being_used
-      create_file '.ruby-version', "#{Onotole::RUBY_VERSION}\n"
-    end
-
     def configure_ci
       template 'circle.yml.erb', 'circle.yml'
     end
 
-    def configure_i18n_for_missing_translations
-      raise_on_missing_translations_in('development')
-      raise_on_missing_translations_in('test')
-    end
-
-    def configure_background_jobs_for_rspec
-      rails_generator 'delayed_job:active_record'
-    end
-
-    def configure_time_formats
-      remove_file 'config/locales/en.yml'
-      template 'config_locales_en.yml.erb', 'config/locales/en.yml'
-    end
-
-    def configure_rack_timeout
-      rack_timeout_config = 'Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i'
-      append_file 'config/environments/production.rb', rack_timeout_config
-    end
-
     def configure_simple_form
       if user_choose?(:bootstrap3_sass) || user_choose?(:bootstrap3)
-        rails_generator 'simple_form:install --bootstrap'
+        rails_generator "simple_form:install --bootstrap"
       else
-        rails_generator 'simple_form:install'
+        rails_generator "simple_form:install"
       end
     end
 
@@ -200,116 +91,10 @@ end
       configure_environment 'test', 'config.active_job.queue_adapter = :inline'
     end
 
-    def fix_i18n_deprecation_warning
-      config = '    config.i18n.enforce_available_locales = true'
-      inject_into_class 'config/application.rb', 'Application', config
-    end
-
     def configure_puma
       copy_file 'puma.rb', 'config/puma.rb'
     end
 
-    def set_up_forego
-      copy_file 'Procfile', 'Procfile'
-    end
-
-    def install_refills
-      rails_generator 'refills:import flashes'
-      run 'rm app/views/refills/_flashes.html.erb'
-      run 'rmdir app/views/refills'
-    end
-
-    def copy_dotfiles
-      directory 'dotfiles', '.', force: true
-    end
-
-    def create_heroku_apps(flags)
-      create_staging_heroku_app(flags)
-      create_production_heroku_app(flags)
-    end
-
-    def provide_deploy_script
-      copy_file 'bin_deploy', 'bin/deploy'
-
-      instructions = <<-MARKDOWN
-
-## Deploying
-
-If you have previously run the `./bin/setup` script,
-you can deploy to staging and production with:
-
-    $ ./bin/deploy staging
-    $ ./bin/deploy production
-      MARKDOWN
-
-      append_file 'README.md', instructions
-      run 'chmod a+x bin/deploy'
-    end
-
-    def configure_automatic_deployment
-      deploy_command = <<-YML.strip_heredoc
-      deployment:
-        staging:
-          branch: master
-          commands:
-            - bin/deploy staging
-      YML
-
-      append_file 'circle.yml', deploy_command
-    end
-
-    def setup_spring
-      bundle_command 'exec spring binstub --all'
-      bundle_command 'exec spring stop'
-    end
-
-    def copy_miscellaneous_files
-      copy_file 'browserslist', 'browserslist'
-      copy_file 'errors.rb', 'config/initializers/errors.rb'
-      copy_file 'json_encoding.rb', 'config/initializers/json_encoding.rb'
-    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|
-        cleanup_comments File.join(destination_root, "config/#{config_file}")
-      end
-    end
-
-    def remove_routes_comment_lines
-      replace_in_file 'config/routes.rb',
-                      /Rails\.application\.routes\.draw do.*end/m,
-                      "Rails.application.routes.draw do\nend"
-    end
-
-    def disable_xml_params
-      copy_file 'disable_xml_params.rb',
-                'config/initializers/disable_xml_params.rb'
-    end
-
-    def setup_default_rake_task
-      append_file 'Rakefile' do
-        <<-EOS
-task(:default).clear
-task default: [:spec]
-
-if defined? RSpec
-  task(:spec).clear
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.verbose = false
-  end
-end
-        EOS
-      end
-    end
-
     # def rvm_bundler_stubs_install
     #   if system "rvm -v | grep 'rvm.io'"
     #     run 'chmod +x $rvm_path/hooks/after_cd_bundler'
@@ -317,18 +102,6 @@ end
     #   end
     # end
 
-    def user_gems_from_args_or_default_set
-      gems_flags = []
-      options.each { |gem, usage| gems_flags.push(gem.to_sym) if usage }
-      gems = GEMPROCLIST & gems_flags
-      if gems.empty?
-        AppBuilder.user_choice = DEFAULT_GEMSET
-      else
-        gems.each { |gem| AppBuilder.user_choice << gem }
-      end
-      add_user_gems
-    end
-
     def delete_comments
       return unless options[:clean_comments] || user_choose?(:clean_comments)
       cleanup_comments 'Gemfile'

data/lib/onotole/{frontend_default.rb → default_frontend.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Onotole
-  module FrontendDefault
+  module DefaultFrontend
     def configure_quiet_assets
       config = "\n    config.quiet_assets = true\n"
       inject_into_class 'config/application.rb', 'Application', config
@@ -64,5 +64,15 @@ module Onotole
     def create_partials_directory
       empty_directory 'app/views/application'
     end
+
+    def install_refills
+      rails_generator 'refills:import flashes'
+      run 'rm app/views/refills/_flashes.html.erb'
+      run 'rmdir app/views/refills'
+    end
+
+    def create_shared_javascripts
+      copy_file '_javascript.html.erb', 'app/views/application/_javascript.html.erb'
+    end
   end
 end

data/lib/onotole/default_scripts.rb

@@ -0,0 +1,180 @@
+# frozen_string_literal: true
+module Onotole
+  module DefalutScripts
+    def raise_on_unpermitted_parameters
+      config = "\n    config.action_controller.action_on_unpermitted_parameters = :raise\n"
+      inject_into_class 'config/application.rb', 'Application', config
+    end
+
+    def provide_setup_script
+      template 'bin_setup', 'bin/setup', force: true
+      run 'chmod a+x bin/setup'
+    end
+
+    def provide_dev_prime_task
+      copy_file 'dev.rake', 'lib/tasks/dev.rake'
+    end
+
+    def enable_rack_deflater
+      config = <<-RUBY
+
+  # Enable deflate / gzip compression of controller-generated responses
+  config.middleware.use Rack::Deflater
+      RUBY
+
+      inject_into_file(
+        'config/environments/production.rb',
+        config,
+        after: serve_static_files_line
+      )
+    end
+
+    def set_up_forego
+      copy_file 'Procfile', 'Procfile'
+    end
+
+    def setup_staging_environment
+      staging_file = 'config/environments/staging.rb'
+      copy_file 'staging.rb', staging_file
+
+      config = <<-RUBY
+
+Rails.application.configure do
+  # ...
+end
+      RUBY
+
+      append_file staging_file, config
+    end
+
+    def setup_secret_token
+      template 'secrets.yml', 'config/secrets.yml', force: true
+    end
+
+    def disallow_wrapping_parameters
+      remove_file 'config/initializers/wrap_parameters.rb'
+    end
+
+    def use_postgres_config_template
+      template 'postgresql_database.yml.erb', 'config/database.yml',
+               force: true
+      template 'postgresql_database.yml.erb', 'config/database.yml.sample',
+               force: true
+    end
+
+    def create_database
+      bundle_command 'exec rake db:drop db:create db:migrate db:seed'
+    end
+
+    def replace_gemfile
+      remove_file 'Gemfile'
+      template 'Gemfile.erb', 'Gemfile'
+    end
+
+    def set_ruby_to_version_being_used
+      create_file '.ruby-version', "#{Onotole::RUBY_VERSION}\n"
+    end
+
+    def configure_background_jobs_for_rspec
+      rails_generator 'delayed_job:active_record'
+    end
+
+    def configure_time_formats
+      remove_file 'config/locales/en.yml'
+      template 'config_locales_en.yml.erb', 'config/locales/en.yml'
+    end
+
+    def configure_i18n_for_missing_translations
+      raise_on_missing_translations_in('development')
+      raise_on_missing_translations_in('test')
+    end
+
+    def configure_rack_timeout
+      rack_timeout_config = 'Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i'
+      append_file 'config/environments/production.rb', rack_timeout_config
+    end
+
+    def fix_i18n_deprecation_warning
+      config = '    config.i18n.enforce_available_locales = true'
+      inject_into_class 'config/application.rb', 'Application', config
+    end
+
+    def copy_dotfiles
+      directory 'dotfiles', '.', force: true
+    end
+
+    def setup_spring
+      bundle_command 'exec spring binstub --all'
+      bundle_command 'exec spring stop'
+    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|
+        cleanup_comments File.join(destination_root, "config/#{config_file}")
+      end
+    end
+
+    def remove_routes_comment_lines
+      replace_in_file 'config/routes.rb',
+                      /Rails\.application\.routes\.draw do.*end/m,
+                      "Rails.application.routes.draw do\nend"
+    end
+
+    def disable_xml_params
+      copy_file 'disable_xml_params.rb',
+                'config/initializers/disable_xml_params.rb'
+    end
+
+    def setup_default_rake_task
+      append_file 'Rakefile' do
+        <<-EOS
+task(:default).clear
+task default: [:spec]
+
+if defined? RSpec
+  task(:spec).clear
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.verbose = false
+  end
+end
+        EOS
+      end
+    end
+
+    def copy_miscellaneous_files
+      copy_file 'browserslist', 'browserslist'
+      copy_file 'errors.rb', 'config/initializers/errors.rb'
+      copy_file 'json_encoding.rb', 'config/initializers/json_encoding.rb'
+    end
+
+    def enable_rack_canonical_host
+      config = <<-RUBY
+
+  if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
+    ENV["APPLICATION_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
+  end
+
+  # Ensure requests are only served from one, canonical host name
+  config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")
+      RUBY
+
+      inject_into_file(
+        'config/environments/production.rb',
+        config,
+        after: 'Rails.application.configure do'
+      )
+    end
+
+    def readme
+      template 'README.md.erb', 'README.md'
+    end
+  end
+end

data/lib/onotole/deploy.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+module Onotole
+  module Deploy
+    def provide_deploy_script
+      copy_file 'bin_deploy', 'bin/deploy'
+
+      instructions = <<-MARKDOWN
+
+## Deploying
+
+If you have previously run the `./bin/setup` script,
+you can deploy to staging and production with:
+
+    $ ./bin/deploy staging
+    $ ./bin/deploy production
+      MARKDOWN
+
+      append_file 'README.md', instructions
+      run 'chmod a+x bin/deploy'
+    end
+
+    def configure_automatic_deployment
+      deploy_command = <<-YML.strip_heredoc
+      deployment:
+        staging:
+          branch: master
+          commands:
+            - bin/deploy staging
+      YML
+
+      append_file 'circle.yml', deploy_command
+    end
+
+    def create_heroku_apps(flags)
+      create_staging_heroku_app(flags)
+      create_production_heroku_app(flags)
+    end
+  end
+end

data/lib/onotole/helpers.rb

@@ -8,18 +8,20 @@ module Onotole
     end
 
     def choice(selector, variants)
-      unless variants.keys[1..-1].map { |a| options[a] }.include? true
-        values = []
-        say "\n  #{BOLDGREEN}#{selector}#{COLOR_OFF}"
-        variants.each_with_index do |variant, i|
-          values.push variant[0]
-          say "#{i.to_s.rjust(5)}. #{BOLDBLUE}#{variant[1]}#{COLOR_OFF}"
-        end
-        answer = ask_stylish('Enter choice:') until (0...variants.length)
-                                                    .map(&:to_s).include? answer
-        numeric_answer = answer.to_i
-        numeric_answer == :none ? nil : numeric_answer
+      return if variant_in_options? variants
+      values = variants.keys
+      say "\n  #{BOLDGREEN}#{selector}#{COLOR_OFF}"
+      variants.each_with_index do |variant, i|
+        say "#{i.to_s.rjust(5)}. #{BOLDBLUE}#{variant[1]}#{COLOR_OFF}"
       end
+      numeric_answers = (0...variants.length).map(&:to_s)
+      answer = ask_stylish('Enter choice:') until numeric_answers.include? answer
+      symbol_answer = values[answer.to_i]
+      symbol_answer == :none ? nil : symbol_answer
+    end
+
+    def variant_in_options?(variants)
+      variants.keys[1..-1].map { |a| options[a] }.include? true
     end
 
     def multiple_choice(selector, variants)
@@ -113,7 +115,7 @@ module Onotole
     end
 
     def rails_generator(command)
-      bundle_command "exec rails generate #{command} -f"
+      bundle_command "exec rails generate #{command} -f #{quiet_suffix}"
     end
 
     def pgsql_db_exist?(db_name)
@@ -122,7 +124,30 @@ module Onotole
 
     def clean_by_rubocop
       return unless user_choose?(:rubocop)
-      bundle_command 'exec rubocop --auto-correct'
+      bundle_command "exec rubocop --auto-correct #{quiet_suffix}"
+    end
+
+    def quiet_suffix
+      AppBuilder.quiet ? ' > /dev/null' : ''
+    end
+
+    def user_gems_from_args_or_default_set
+      gems_flags = []
+      options.each { |gem, usage| gems_flags.push(gem.to_sym) if usage }
+      gems = GEMPROCLIST & gems_flags
+      if gems.empty?
+        AppBuilder.user_choice = DEFAULT_GEMSET
+      else
+        gems.each { |gem| AppBuilder.user_choice << gem }
+      end
+      add_user_gems
+    end
+
+    def add_user_gems
+      GEMPROCLIST.each do |g|
+        send "add_#{g}_gem" if user_choose? g.to_sym
+      end
+      # add_foo_bar_gem if user_choose?(:foo) && user_choose?(:bar)
     end
   end
 end

data/lib/onotole/version.rb

@@ -2,5 +2,5 @@
 module Onotole
   RAILS_VERSION = '~> 4.2.0'
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = '1.0.8'
+  VERSION = '1.0.10'
 end

data/spec/features/heroku_spec.rb

@@ -9,6 +9,7 @@ RSpec.describe 'Heroku' do
     end
 
     it 'suspends a project for Heroku' do
+      allow(Onotole::AppBuilder).to receive(:prevent_double_usage)
       app_name = OnotoleTestHelpers::APP_NAME.dasherize
 
       expect(FakeHeroku).to(
@@ -81,6 +82,7 @@ RSpec.describe 'Heroku' do
     end
 
     it 'suspends a project with extra Heroku flags' do
+      allow(Onotole::AppBuilder).to receive(:prevent_double_usage)
       expect(FakeHeroku).to have_created_app_for('staging', '--region eu')
       expect(FakeHeroku).to have_created_app_for('production', '--region eu')
     end

data/spec/features/new_project_spec.rb

@@ -8,7 +8,20 @@ RSpec.describe 'Suspend a new project with default configuration' do
     run_onotole
   end
 
+  let(:secrets_file) { IO.read("#{project_path}/config/secrets.yml") }
+  let(:staging_file) { IO.read("#{project_path}/config/environments/staging.rb") }
+  let(:ruby_version_file) { IO.read("#{project_path}/.ruby-version") }
+  let(:secrets_file) { IO.read("#{project_path}/config/secrets.yml") }
+  let(:bin_setup_path) { "#{project_path}/bin/setup" }
+  let(:newrelic_file) { IO.read("#{project_path}/config/newrelic.yml") }
+  let(:application_rb) { IO.read("#{project_path}/config/application.rb") }
+  let(:locales_en_file) { IO.read("#{project_path}/config/locales/en.yml") }
+  let(:test_rb) { IO.read("#{project_path}/config/environments/test.rb") }
+  let(:development_rb) { IO.read("#{project_path}/config/environments/development.rb") }
+  let(:dev_env_file) { IO.read("#{project_path}/config/environments/development.rb") }
+
   it 'ensures project specs pass' do
+    allow(Onotole::AppBuilder).to receive(:prevent_double_usage)
     Dir.chdir(project_path) do
       Bundler.with_clean_env do
         expect(`rake`).to include('0 failures')
@@ -17,16 +30,12 @@ RSpec.describe 'Suspend a new project with default configuration' do
   end
 
   it 'inherits staging config from production' do
-    staging_file = IO.read("#{project_path}/config/environments/staging.rb")
     config_stub = 'Rails.application.configure do'
-
     expect(staging_file).to match(/^require_relative ("|')production("|')/)
     expect(staging_file).to match(/#{config_stub}/), staging_file
   end
 
   it 'creates .ruby-version from Onotole .ruby-version' do
-    ruby_version_file = IO.read("#{project_path}/.ruby-version")
-
     expect(ruby_version_file).to eq "#{RUBY_VERSION}\n"
   end
 
@@ -37,8 +46,6 @@ RSpec.describe 'Suspend a new project with default configuration' do
   end
 
   it 'loads secret_key_base from env' do
-    secrets_file = IO.read("#{project_path}/config/secrets.yml")
-
     expect(secrets_file).to match(/secret_key_base: <%= ENV\["SECRET_KEY_BASE"\] %>/)
   end
 
@@ -47,8 +54,6 @@ RSpec.describe 'Suspend a new project with default configuration' do
   end
 
   it 'makes bin/setup executable' do
-    bin_setup_path = "#{project_path}/bin/setup"
-
     expect(File.stat(bin_setup_path)).to be_executable
   end
 
@@ -71,11 +76,8 @@ RSpec.describe 'Suspend a new project with default configuration' do
   # end
 
   it 'ensures newrelic.yml reads NewRelic license from env' do
-    newrelic_file = IO.read("#{project_path}/config/newrelic.yml")
-
     expect(newrelic_file).to match(
-      /license_key: "<%= ENV\["NEW_RELIC_LICENSE_KEY"\] %>"/
-    )
+      /license_key: "<%= ENV\["NEW_RELIC_LICENSE_KEY"\] %>"/)
   end
 
   it 'records pageviews through Segment if ENV variable set' do
@@ -86,34 +88,23 @@ RSpec.describe 'Suspend a new project with default configuration' do
   end
 
   it 'raises on unpermitted parameters in all environments' do
-    result = IO.read("#{project_path}/config/application.rb")
-
-    expect(result).to match(
-      /^\s+config.action_controller.action_on_unpermitted_parameters = :raise/
-    )
+    expect(application_rb).to match(
+      /^\s+config.action_controller.action_on_unpermitted_parameters = :raise/)
   end
 
   it 'adds explicit quiet_assets configuration' do
-    result = IO.read("#{project_path}/config/application.rb")
-
-    expect(result).to match(
-      /^ +config.quiet_assets = true$/
-    )
+    expect(application_rb).to match(/^ +config.quiet_assets = true$/)
   end
 
   it 'raises on missing translations in development and test' do
     %w(development test).each do |environment|
-      environment_file =
-        IO.read("#{project_path}/config/environments/#{environment}.rb")
+      environment_file = IO.read("#{project_path}/config/environments/#{environment}.rb")
       expect(environment_file).to match(
-        /^ +config.action_view.raise_on_missing_translations = true$/
-      )
+        /^ +config.action_view.raise_on_missing_translations = true$/)
     end
   end
 
   it 'evaluates en.yml.erb' do
-    locales_en_file = IO.read("#{project_path}/config/locales/en.yml")
-
     expect(locales_en_file).to match(/application: #{app_name.humanize}/)
   end
 
@@ -122,7 +113,6 @@ RSpec.describe 'Suspend a new project with default configuration' do
   end
 
   it 'configs :test email delivery method for development' do
-    dev_env_file = IO.read("#{project_path}/config/environments/development.rb")
     expect(dev_env_file)
       .to match(/^ +config.action_mailer.delivery_method = :test$/)
   end
@@ -140,36 +130,24 @@ RSpec.describe 'Suspend a new project with default configuration' do
   # end
 
   it 'configs active job queue adapter' do
-    application_config = IO.read("#{project_path}/config/application.rb")
-    test_config = IO.read("#{project_path}/config/environments/test.rb")
-
-    expect(application_config).to match(
-      /^ +config.active_job.queue_adapter = :delayed_job$/
-    )
-    expect(test_config).to match(
-      /^ +config.active_job.queue_adapter = :inline$/
-    )
+    expect(application_rb).to match(
+      /^ +config.active_job.queue_adapter = :delayed_job$/)
+    expect(test_rb).to match(
+      /^ +config.active_job.queue_adapter = :inline$/)
   end
 
   it 'configs bullet gem in development' do
-    test_config = IO.read("#{project_path}/config/environments/development.rb")
-
-    expect(test_config).to match /^ +Bullet.enable = true$/
-    expect(test_config).to match /^ +Bullet.bullet_logger = true$/
-    expect(test_config).to match /^ +Bullet.rails_logger = true$/
+    expect(development_rb).to match /^ +Bullet.enable = true$/
+    expect(development_rb).to match /^ +Bullet.bullet_logger = true$/
+    expect(development_rb).to match /^ +Bullet.rails_logger = true$/
   end
 
   it 'configs missing assets to raise in test' do
-    test_config = IO.read("#{project_path}/config/environments/test.rb")
-
-    expect(test_config).to match(
-      /^ +config.assets.raise_runtime_errors = true$/
-    )
+    expect(test_rb).to match(/^ +config.assets.raise_runtime_errors = true$/)
   end
 
   it 'adds spring to binstubs' do
     expect(File).to exist("#{project_path}/bin/spring")
-
     bin_stubs = %w(rake rails rspec)
     bin_stubs.each do |bin_stub|
       expect(IO.read("#{project_path}/bin/#{bin_stub}")).to match(/spring/)

data/templates/kaminari.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+Kaminari.configure do |config|
+  config.page_method_name = :per_page_kaminari
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onotole
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
 platform: ruby
 authors:
 - kvokka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,9 @@ files:
 - lib/onotole/add_user_gems/user_gems_menu_questions.rb
 - lib/onotole/app_builder.rb
 - lib/onotole/colors.rb
-- lib/onotole/frontend_default.rb
+- lib/onotole/default_frontend.rb
+- lib/onotole/default_scripts.rb
+- lib/onotole/deploy.rb
 - lib/onotole/generators/app_generator.rb
 - lib/onotole/git.rb
 - lib/onotole/helpers.rb
@@ -140,6 +142,7 @@ files:
 - templates/hound.yml
 - templates/i18n.rb
 - templates/json_encoding.rb
+- templates/kaminari.rb
 - templates/newrelic.yml.erb
 - templates/onotole_layout.html.erb.erb
 - templates/onotole_overcommit.yml