rails_app_generator 0.2.12 → 0.2.15

data/lib/rails_app_generator/app_generator.rb

@@ -163,13 +163,15 @@ module RailsAppGenerator
     #   # add(:rspec) if options[:testing_framework] == 'rspec'
     # end
 
-    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def finish_template
       puts 'finish template'
 
+      add_if(:administrate) # tested
       add_if(:acts_as_list)
       add_if(:annotate)
       add_if(:browser)
+      add_if(:bcrypt) # tested
       add_if(:chartkick)
       add_if(:continuous_integration)
       add_if(:devise)
@@ -194,7 +196,7 @@ module RailsAppGenerator
       # invoke :rails_customization
       super
     end
-    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     def run_after_bundle_callbacks
       addon_instances.select { |addon| addon.respond_to?(:before_bundle) }.each(&:before_bundle)
@@ -247,6 +249,10 @@ module RailsAppGenerator
         run('rubocop -A --config .rubocop.yml')
       end
 
+      def rubocop_minimal
+        run('rubocop -A --format worst --config .rubocop.yml')
+      end
+
       def db_migrate
         rails_command('db:migrate')
       end
@@ -259,18 +265,27 @@ module RailsAppGenerator
         generate(:stimulus, name, *args)
       end
 
+      def prepare_environment
+        bundle_add('pry')
+        bundle_install
+      end
+
       def bundle_install
-        Bundler.with_unbundled_env do
+        Util.bundler_environment(environment_style: :unbundled_env) do
           run('bundle install')
         end
       end
 
       def bundle_add(name)
-        run("bundle add #{name}")
+        Util.bundler_environment(environment_style: :unbundled_env) do
+          run("bundle add #{name}")
+        end
       end
 
       def bundle_exec(name, *args)
-        run("bundle exec #{name} #{args.join(' ')}")
+        Util.bundler_environment(environment_style: :unbundled_env) do
+          run("bundle exec #{name} #{args.join(' ')}")
+        end
       end
 
       # If you need to manually install tailwind (instead of using the --template option)
@@ -289,10 +304,15 @@ module RailsAppGenerator
         pin(name, *args)
       end
 
-      def copy_file(source, destination, **args)
+      # copy_file in railties and copy_file in thor have different signatures
+      # I may want to remove this method because it just causes pain at the moment
+      def copy_file(source, destination, args = {})
+        # puts source
+        # puts destination
+        # puts args
         args = { force: true }.merge(args) if force_copy?
 
-        super(source, destination, **args)
+        super(source, destination, args)
       end
 
       def template(source, *args, &block)
@@ -421,6 +441,10 @@ module RailsAppGenerator
       def addon_gemfile_entries
         active_addon_classes.flat_map(&:gem_entries)
       end
+
+      def capture_console(&block)
+        Util.capture_console(&block)
+      end
     end
 
     protected

data/lib/rails_app_generator/cli/profile.rb

@@ -28,7 +28,7 @@ module RailsAppGenerator
 
         RailsAppGenerator::Util.write_last_run('rails_options_data.json', opts.to_h)
 
-        starter = RailsAppGenerator::Starter.new(args)
+        starter = RailsAppGenerator::Starter.new(**args)
 
         starter.delete_target_folder
         starter.start(opts)

data/lib/rails_app_generator/options/options_builder.rb

@@ -25,7 +25,7 @@ module RailsAppGenerator
       #
       # This is so options can be used interchangeably between OptionsBuilder and Thor.
       def class_option(name, **args)
-        option = BuildOption.new(name, args)
+        option = BuildOption.new(name, **args)
 
         add_class_option(option)
       end
@@ -48,7 +48,7 @@ module RailsAppGenerator
           default: thor_option.default,
           required: thor_option.required
         }
-        option = BuildOption.new(thor_option.name, args)
+        option = BuildOption.new(thor_option.name, **args)
 
         add_class_option(option)
       end

data/lib/rails_app_generator/rag_initializer.rb

@@ -109,7 +109,7 @@ KConfig.configure do |config|
   rag.add_option :add_acts_as_list            , type: :boolean, default: false
   rag.add_option :add_administrate            , type: :boolean, default: false
   rag.add_option :add_browser                 , type: :boolean, default: false
-  rag.add_option :add_bcrypt_ruby             , type: :boolean, default: false
+  rag.add_option :add_bcrypt                  , type: :boolean, default: false
   rag.add_option :add_chartkick               , type: :boolean, default: false
   rag.add_option :add_faker                   , type: :boolean, default: false
   rag.add_option :add_groupdate               , type: :boolean, default: false
@@ -117,6 +117,7 @@ KConfig.configure do |config|
   rag.add_option :add_httparty                , type: :boolean, default: false
   rag.add_option :add_honeybadger             , type: :boolean, default: false
   rag.add_option :add_mini_magick             , type: :boolean, default: false
+  rag.add_option :add_motor_admin             , type: :boolean, default: false
   rag.add_option :add_phony_rails             , type: :boolean, default: false
   rag.add_option :add_public_suffix           , type: :boolean, default: false
   rag.add_option :add_rails_html_sanitizer    , type: :boolean, default: false

data/lib/rails_app_generator/starter.rb

@@ -50,7 +50,7 @@ module RailsAppGenerator
       opts = extract_rails_options(app_path, options)
 
       if capture_output
-        @console_output = capture_console do
+        @console_output = Util.capture_console do
           RailsAppGenerator::AppGenerator.start(opts, destination_root: destination_root)
         end
       else
@@ -64,17 +64,6 @@ module RailsAppGenerator
 
     private
 
-    def capture_console
-      $stdout = StringIO.new
-      yield
-      output = $stdout.string
-      $stdout.close
-      output
-    ensure
-      $stdout = STDOUT
-      $stdout.puts output
-    end
-
     # Rails options returns a flat array of options
     #
     # It can work accept a flat array of options or a

data/lib/rails_app_generator/util.rb

@@ -47,6 +47,17 @@ module RailsAppGenerator
           end
         end
       end
+
+      def bundler_environment(environment_style: :unbundled_env, &block)
+        case environment_style
+        when :unbundled_env
+          Bundler.with_unbundled_env(&block)
+        when :original_env
+          Bundler.with_original_env(&block)
+        else
+          block.call
+        end
+      end
     end
   end
 end

data/lib/rails_app_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsAppGenerator
-  VERSION = '0.2.12'
+  VERSION = '0.2.15'
 end

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "rails_app_generator",
-  "version": "0.2.12",
+  "version": "0.2.15",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "rails_app_generator",
-      "version": "0.2.12",
+      "version": "0.2.15",
       "dependencies": {
         "daisyui": "^2.20.0"
       },

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rails_app_generator",
-  "version": "0.2.12",
+  "version": "0.2.15",
   "description": "Create new Rails Application with custom opinions",
   "scripts": {
     "release": "semantic-release"

data/profiles/addons/{bcrypt_ruby.json → bcrypt.json}

@@ -1,12 +1,12 @@
 {
   "args": {
-    "app_path": "bcrypt_ruby",
+    "app_path": "bcrypt",
     "destination_root": "/Users/davidcruwys/dev/kgems/rails_app_generator/a/addons"
   },
   "opts": {
     "skip_git": true,
     "skip_test": true,
-    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/addons/bcrypt_ruby/_.rb",
-    "add_bcrypt_ruby": true
+    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/addons/bcrypt/_.rb",
+    "add_bcrypt": true
   }
 }

data/profiles/addons/motor_admin.json

@@ -0,0 +1,15 @@
+{
+  "args": {
+    "app_path": "motor_admin",
+    "destination_root": "/Users/davidcruwys/dev/kgems/rails_app_generator/a/addons"
+  },
+  "opts": {
+    "skip_git": true,
+    "skip_test": true,
+    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/addons/motor_admin/_.rb",
+    "add_annotate": true,
+    "add_faker": true,
+    "add_motor_admin": true,
+    "add_rubocop": true
+  }
+}

data/tasks/profile.thor

@@ -2,7 +2,6 @@
 
 # https://codecrate.com/2014/01/replace-rake-with-thor.html
 
-require 'pry'
 require_relative 'gem_info'
 require 'cmdlet'
 

data/templates/thor_task/addon/addon.tt

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 # lib/rails_app_generator/rag_initializer.rb
+# add_if(:<%= data.name_snake %>)
 # rag.add_option :add_<%= data.name_snake %>            , type: :boolean, default: false
 
 module RailsAppGenerator

data/templates/thor_task/profile/app/views/home/index.html.erb.tt

@@ -1,3 +1,3 @@
 <h1><%= data.name_human %></h1>
 
-<h2><%= data.description %></h2>
+<p><%= data.description %></p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_app_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.15
 platform: ruby
 authors:
 - David Cruwys
@@ -201,16 +201,16 @@ files:
 - after_templates/addons/administrate/app/views/layouts/_navbar.html.erb
 - after_templates/addons/administrate/app/views/layouts/application.html.erb
 - after_templates/addons/administrate/db/seeds.rb
-- after_templates/addons/bcrypt_ruby/_.rb
-- after_templates/addons/bcrypt_ruby/app/controllers/home_controller.rb
-- after_templates/addons/bcrypt_ruby/app/models/user.rb
-- after_templates/addons/bcrypt_ruby/app/views/home/index.html.erb
-- after_templates/addons/bcrypt_ruby/app/views/layouts/_footer.html.erb
-- after_templates/addons/bcrypt_ruby/app/views/layouts/_navbar.html.erb
-- after_templates/addons/bcrypt_ruby/app/views/layouts/application.html.erb
-- after_templates/addons/bcrypt_ruby/app/views/users/_form.html.erb
-- after_templates/addons/bcrypt_ruby/app/views/users/_user.html.erb
-- after_templates/addons/bcrypt_ruby/db/seeds.rb
+- after_templates/addons/bcrypt/_.rb
+- after_templates/addons/bcrypt/app/controllers/home_controller.rb
+- after_templates/addons/bcrypt/app/models/user.rb
+- after_templates/addons/bcrypt/app/views/home/index.html.erb
+- after_templates/addons/bcrypt/app/views/layouts/_footer.html.erb
+- after_templates/addons/bcrypt/app/views/layouts/_navbar.html.erb
+- after_templates/addons/bcrypt/app/views/layouts/application.html.erb
+- after_templates/addons/bcrypt/app/views/users/_form.html.erb
+- after_templates/addons/bcrypt/app/views/users/_user.html.erb
+- after_templates/addons/bcrypt/db/seeds.rb
 - after_templates/addons/browser/_.rb
 - after_templates/addons/browser/app/controllers/home_controller.rb
 - after_templates/addons/browser/app/views/home/index.html.erb
@@ -272,6 +272,13 @@ files:
 - after_templates/addons/mini_magick/app/views/layouts/_footer.html.erb
 - after_templates/addons/mini_magick/app/views/layouts/_navbar.html.erb
 - after_templates/addons/mini_magick/app/views/layouts/application.html.erb
+- after_templates/addons/motor_admin/_.rb
+- after_templates/addons/motor_admin/app/controllers/home_controller.rb
+- after_templates/addons/motor_admin/app/views/home/index.html.erb
+- after_templates/addons/motor_admin/app/views/layouts/_footer.html.erb
+- after_templates/addons/motor_admin/app/views/layouts/_navbar.html.erb
+- after_templates/addons/motor_admin/app/views/layouts/application.html.erb
+- after_templates/addons/motor_admin/db/seeds.rb
 - after_templates/addons/phony_rails/_.rb
 - after_templates/addons/phony_rails/app/controllers/home_controller.rb
 - after_templates/addons/phony_rails/app/views/home/index.html.erb
@@ -500,7 +507,7 @@ files:
 - lib/rails_app_generator/addons/acts_as_list.rb
 - lib/rails_app_generator/addons/administrate.rb
 - lib/rails_app_generator/addons/annotate.rb
-- lib/rails_app_generator/addons/bcrypt_ruby.rb
+- lib/rails_app_generator/addons/bcrypt.rb
 - lib/rails_app_generator/addons/browser.rb
 - lib/rails_app_generator/addons/chartkick.rb
 - lib/rails_app_generator/addons/continuous_integration.rb
@@ -573,7 +580,7 @@ files:
 - package.json
 - profiles/addons/acts_as_list.json
 - profiles/addons/administrate.json
-- profiles/addons/bcrypt_ruby.json
+- profiles/addons/bcrypt.json
 - profiles/addons/browser.json
 - profiles/addons/chartkick.json
 - profiles/addons/dotenv.json
@@ -583,6 +590,7 @@ files:
 - profiles/addons/httparty.json
 - profiles/addons/lograge.json
 - profiles/addons/mini_magick.json
+- profiles/addons/motor_admin.json
 - profiles/addons/phony_rails.json
 - profiles/addons/public_suffix.json
 - profiles/addons/rails-html-sanitizer.json