rails-new-app 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb1c777fb2609943a68f60119dfb6ce2f64023951c5610e8de0cd56f3b451241
-  data.tar.gz: ce22e54efe411c78d3e8f993213ba39fc00eceabfb0aa3519e05a4c8eccbaf2f
+  metadata.gz: 93081e6a5b8f36849c4d4a799966cefd00ca97133cfe35bef967c020fd7eff63
+  data.tar.gz: b629ee3815475d9917eeefedc90d8973a9d7162c5b27ab93c13625646c038df3
 SHA512:
-  metadata.gz: 20a5aa1c836fa51c1676dd48fce5a2abd736a782965ccee4d72444873d3336e90a758b06700569bf4ac28af5f9ae2828664a5a04d7f7dfa61a690b3fa2bd2711
-  data.tar.gz: bd31660941e502f74a8c164628aa71acfbcc6b4ab1a5fe72f58ab05e87d143e6bc8593538c6b117879e60b2ee7c0d98df04226ece36dbf407e44aee0d86a3eb3
+  metadata.gz: 5a2d9590d597b7ac2abe68b4d27ac09b274ee48fc52dc9bba40cfa28c3c41357bb5594e0be4fef2859df877936b20a98ecb5c1d4bb20366dc8c9d5cf69cd318f
+  data.tar.gz: 56bc800f44e839ae8ba63fb810890365d7963e8100c6e01fafa494a8846cc0d43039fc279bdb22820e2b6ab78e880a27f187882e14580650c4137018f8c026cf

data/README.md

@@ -1,5 +1,5 @@
 # rails-new-app
-Command-line tool to assist the creation of new Rails 5 and 6 apps
+Command-line tool to assist in the creation of new Rails 5 and 6 apps
 
 ## Installation:
 
@@ -16,12 +16,16 @@ If, for any reason, the menu navigation does not work, run `rails-new-app naviga
 ## Current configurations:
 - Rails version (validate and install)
 - Database: none / MySQL / PostgreSQL / SQLite
-- Tests: none / Minitest / RSpec
-- CodeCoverage: none / Simplecov
+- Tests:
+- - runner: none / Minitest / RSpec
+- - CodeCoverage: none / Simplecov
+- - Factories: none / FactoryBot
+- - Fake data: none / Faker
 - TemplateEngine: None (just ERB) / Slim / HAML
 - RubyLinter: None / RuboCop / StandardRB
 - FormBuilder: None / Simple Form / Formtastic
 - JS Framework: None / ReactJS / VueJS / Angular / Elm / Stimulus
+- Pagination: None / Pagy / Kaminari / WillPaginate
 
 ## TODOs and ideas:
 - improve GUI and UX
@@ -33,7 +37,6 @@ If, for any reason, the menu navigation does not work, run `rails-new-app naviga
 - support `rails new` flags configuration
 - research requirements
 - improve validations (check rails version, ruby version, if gems are compatible with rails, etc)
-- make sure the `rails-new-app` command is available globally
 - show the user the current Ruby version
 - support a `rails-new-app-defaults` file at the HOME dir to set default options if empty answers
 
@@ -42,8 +45,6 @@ If, for any reason, the menu navigation does not work, run `rails-new-app naviga
 - type of app: standard/minimal/api
 - CI config? github actions / travis / circleci / bitbucket / gitlab / others
 - js linter? None/ESlint/StandardJS
-- factory_bot?
-- faker?
 - devise?
 - carrierwave/paperclip/dragonfly?
 - exception_notification / airbreak / other reporting tools
@@ -54,8 +55,8 @@ If, for any reason, the menu navigation does not work, run `rails-new-app naviga
 - CSS framework? bootstrap/tailwind/material/spectre/bulma (this affects the form builders processor)
 - add basic docker config?
 - admin gems? ActiveAdmin/RailsAdmin/Trestle/others
-- pagination? pagy/kaminari/will_paginate
 - pre-commit hooks? overcommit
+- cancancan/pundit ?
 
 ## Adding more configurations and tools:
 
@@ -75,4 +76,11 @@ If, for any reason, the menu navigation does not work, run `rails-new-app naviga
 This is a really early Alpha version as a proof of concept.
 
 ### 0.0.2
-Added navigation between menues.
+Added navigation between menus.
+
+### 0.0.3
+- Added `next_step` to configure related tools without going back to menu
+- Apply linter fixes after creation
+- Add a git initial commit
+- Added new tools: Faker, pagination gems
+- Bug fixing

data/lib/rails-new-app.rb

@@ -1,3 +1,4 @@
+require_relative "rails-new-app/string_underscore"
 require_relative "rails-new-app/version"
 require_relative "rails-new-app/runner"
 
@@ -13,7 +14,7 @@ module RailsNewApp
       end
     end
     ARGV.clear
-    
+
     Runner.new.run(navigation)
   end
 end

data/lib/rails-new-app/processors.rb

@@ -2,4 +2,4 @@
 path = File.expand_path("../processors", __FILE__)
 require "#{path}/processor"
 # require the rest
-Dir.glob("#{path}/*").each { |f| require f }
+Dir.glob("#{path}/*").sort.each { |f| require f }

data/lib/rails-new-app/processors/code_coverage_processor.rb

@@ -1,6 +1,6 @@
 module RailsNewApp
   class CodeCoverageProcessor < Processor
-    def udpate_gemfile(config)
+    def update_gemfile(config)
       return if config[:test_runner][:key] == ""
 
       case config[:code_coverage][:key]

data/lib/rails-new-app/processors/pagination_processor.rb

@@ -0,0 +1,18 @@
+module RailsNewApp
+  class PaginationProcessor < Processor
+    def update_gemfile(config)
+      case config[:pagination][:key]
+      when "pagy" then apply_template "pagy-gemfile"
+      when "kaminari" then apply_template "kaminari-gemfile"
+      when "will_paginate" then apply_template "will_paginate-gemfile"
+      end
+    end
+
+    def configure(config)
+      puts "Processing Pagination config"
+      case config[:pagination][:key]
+      when "pagy" then apply_template "pagy-config"
+      end
+    end
+  end
+end

data/lib/rails-new-app/processors/processor.rb

@@ -11,9 +11,11 @@ module RailsNewApp
     end
 
     def update_gemfile(config)
+      raise "Processor must redefine this method"
     end
 
     def configure(config)
+      raise "Processor must redefine this method"
     end
 
     def apply_template(template)

data/lib/rails-new-app/processors/ruby_linter_processor.rb

@@ -2,8 +2,12 @@ module RailsNewApp
   class RubyLinterProcessor < Processor
     def update_gemfile(config)
       case config[:ruby_linter][:key]
-      when "rubocop" then apply_template "rubocop-#{config[:test_runner][:key]}-gemfile"
-      when "standardrb" then apply_template "standardrb-#{config[:test_runner][:key]}-gemfile"
+      when "rubocop", "standardrb"
+        apply_template "#{config[:ruby_linter][:key]}-gemfile"
+        case config[:test_runner][:key]
+        when "minitest" then apply_template "rubocop-minitest-gemfile"
+        when "rspec" then apply_template "rubocop-rspec-gemfile"
+        end
       end
     end
 

data/lib/rails-new-app/processors/test_factory_processor.rb

@@ -0,0 +1,20 @@
+module RailsNewApp
+  class TestFactoryProcessor < Processor
+    def update_gemfile(config)
+      return if config[:test_runner][:key] == ""
+
+      case config[:test_factory][:key]
+      when "factory_bot" then apply_template "factory_bot-gemfile"
+      end
+    end
+
+    def configure(config)
+      return if config[:test_runner][:key] == ""
+
+      puts "Processing Test Factory config"
+      case config[:test_factory][:key]
+      when "factory_boy" then apply_template "factory_bot-#{config[:test_runner][:key]}-config"
+      end
+    end
+  end
+end

data/lib/rails-new-app/processors/test_fake_data_processor.rb

@@ -0,0 +1,11 @@
+module RailsNewApp
+  class TestFakeDataProcessor < Processor
+    def update_gemfile(config)
+      return if config[:test_runner][:key] == ""
+
+      case config[:test_fake_data][:key]
+      when "faker" then apply_template "faker-gemfile"
+      end
+    end
+  end
+end

data/lib/rails-new-app/runner.rb

@@ -4,36 +4,41 @@ require "readline"
 
 module RailsNewApp
   class Runner
-    SCREENS = {
-      "1" => [:app_name, AppNameStep],
-      "2" => [:rails_ver, RailsVersionStep],
-      "3" => [:database, DatabaseStep],
-      "4" => [:test_runner, TestRunnerStep],
-      "5" => [:code_coverage, CodeCoverageStep],
-      "6" => [:js_framework, JavaScriptFrameworkStep],
-      "7" => [:ruby_linter, RubyLinterStep],
-      "8" => [:template_engine, TemplateEngineStep],
-      "9" => [:form_builder, FormBuilderStep]
-    }.freeze
-
-    def config
-      @config
-    end
-  
+    # use option: nil to hide the screen from the main menu
+    SCREENS = [
+      {option: "1", class: AppNameStep},
+      {option: "2", class: RailsVersionStep},
+      {option: "3", class: DatabaseStep},
+      {option: "4", class: TestRunnerStep},
+      {option: "5", class: JavaScriptFrameworkStep},
+      {option: "6", class: RubyLinterStep},
+      {option: "7", class: TemplateEngineStep},
+      {option: "8", class: FormBuilderStep},
+      {option: "9", class: PaginationStep},
+      {option: nil, class: CodeCoverageStep},
+      {option: nil, class: TestFactoryStep},
+      {option: nil, class: TestFakeDataStep}
+    ].freeze
+
+    def get_screen(option)
+      case option.to_s
+      when /\A\d+\z/
+        SCREENS.find { |x| x[:option] == option.to_s }
+      else
+        SCREENS.find { |x| x[:class].key == option.to_sym }
+      end
+    end
+
+    attr_reader :config
+
     # entry point
     def run(navigation = true)
-      @config = {
-        navigation: navigation,
-        app_name: AppNameStep.default,
-        rails_ver: RailsVersionStep.default,
-        database: DatabaseStep.default,
-        test_runner: TestRunnerStep.default,
-        code_coverage: CodeCoverageStep.default,
-        js_framework: JavaScriptFrameworkStep.default,
-        ruby_linter: RubyLinterStep.default,
-        template_engine: TemplateEngineStep.default,
-        form_builder: FormBuilderStep.default
-      }
+      @config = {navigation: navigation}.tap do |h|
+        SCREENS.each do |s|
+          kls = s[:class]
+          h[kls.key] = kls.default
+        end
+      end
 
       intro
 
@@ -60,23 +65,24 @@ module RailsNewApp
     def clear
       system("clear")
     end
-  
+
     def intro
       clear
       puts "Let's create a new Rails app step by step"
     end
 
     def print_screens
-      SCREENS.each do |index, screen_meta|
-        screen = screen_meta[1].to_s.gsub("Step", "").gsub("RailsNewApp::", "")
-        puts "#{index} : #{screen}"
+      SCREENS.each do |s|
+        next if s[:option].nil?
+
+        screen_name = s[:class].clean_name
+        puts "#{s[:option]} : #{screen_name}"
       end
       puts "0 : Review and confirm"
       puts ""
       puts "Type the number of the menu and press enter:"
     end
 
-
     def show_menu
       print_screens
       loop do
@@ -89,134 +95,153 @@ module RailsNewApp
           clear
           print_screens
         else
-          screen_meta = SCREENS[option]
-          if screen_meta
-            key, screen = screen_meta
-            config[key] = screen.run(config)
-            clear
-            print_screens
-          else
-            puts "Invalid option, select a category:"
-          end
+          show_screen(option)
         end
       end
     end
-  
+
+    def show_screen(option)
+      if (s = get_screen(option))
+        screen_obj = s[:class].new
+        config[s[:class].key] = screen_obj.run(config)
+        clear
+        screen_obj.next_step ? show_screen(screen_obj.next_step) : print_screens
+      else
+        puts "Invalid option, select a category:"
+      end
+    end
+
     def steps
       config[:app_name] = AppNameStep.run(config)
-      config[:rails_ver] = RailsVersionStep.run(config)
+      config[:rails_version] = RailsVersionStep.run(config)
       config[:database] = DatabaseStep.run(config)
       config[:test_runner] = TestRunnerStep.run(config)
-  
-      # ignore test coverage if no tests
-      config[:code_coverage] =
-        if config[:test_runner][:key] == ""
-          puts "Skipping Simplecov config, no test runner"
-          {key: ""}
-        else
-          CodeCoverageStep.run(config)
-        end
-  
+
+      if config[:test_runner][:key] != ""
+        config[:code_coverage] = CodeCoverageStep.run(config)
+        config[:test_factory] = TestFactoryStep.run(config)
+        config[:test_fake_data] = TestFakeDataStep.run(config)
+      end
+
       config[:js_framework] = JavaScriptFrameworkStep.run(config)
       config[:ruby_linter] = RubyLinterStep.run(config)
       config[:template_engine] = TemplateEngineStep.run(config)
       config[:form_builder] = FormBuilderStep.run(config)
+      config[:pagination] = PaginationStep.run(config)
     end
-  
+
     def review_and_confirm
       clear
-      rails_ver = config[:rails_ver]
+      rails_ver = config[:rails_version]
       rails_ver = "Using latest installed Rails version" if rails_ver == ""
 
-      puts <<-REVIEW
-===== New Rails app config =====
-
-App name: #{config[:app_name]}
-Ruby version: #{RUBY_VERSION}
-Rails version: #{rails_ver}
-Database: #{config[:database]}
-Test runner: #{config[:test_runner]}
-Code coverage: #{config[:code_coverage]}
-JS framework: #{config[:js_framework]}
-Ruby Linter: #{config[:ruby_linter]}
-Template engine: #{config[:template_engine]}
-Form builder: #{config[:form_builder]}
-
-REVIEW
+      puts <<~REVIEW
+        ===== New Rails app config =====
+        
+        App name: #{config[:app_name]}
+        Ruby version: #{RUBY_VERSION}
+        Rails version: #{rails_ver}
+        Database: #{config[:database]}
+        Test runner: #{config[:test_runner]}
+        Code coverage: #{config[:code_coverage]}
+        Test factories: #{config[:test_factory]}
+        Test fake data: #{config[:test_fake_data]}
+        JS framework: #{config[:java_script_framework]}
+        Ruby Linter: #{config[:ruby_linter]}
+        Template engine: #{config[:template_engine]}
+        Form builder: #{config[:form_builder]}
+        Pagination: #{config[:pagination]}
+        
+      REVIEW
 
       message = "Type 'Y(es)' to confirm, 'B(ack) to go back, or 'N(o)' to abort"
       if config[:app_name] == ""
-        puts <<-WARNING
-=====================================
-         App name is required        
-=====================================
-
-WARNING
+        puts <<~WARNING
+          =====================================
+                   App name is required        
+          =====================================
+          
+        WARNING
         message.gsub!("Type 'Y(es)' to confirm, ", "Type ")
       end
 
       loop do
         puts message
         answer = gets.chomp.strip
-        return :yes if answer =~ /\A*Y(es)?\z/i
-        return :back if answer =~ /\A*B(ack)?\z/i
-        return :no if answer =~ /\A*N(o)?\z/i
+        return :yes if /\A*Y(es)?\z/i.match?(answer)
+        return :back if /\A*B(ack)?\z/i.match?(answer)
+        return :no if /\A*N(o)?\z/i.match?(answer)
 
         puts "Invalid option."
       end
     end
-  
+
     def install_rails
-      return if config[:rails_ver] == ""
+      return if config[:rails_version] == ""
       # install the require rails version if needed
       puts "Verifying and installing Rails #{config[:rails_ven]}"
-      `gem install rails -v#{config[:rails_ver]}`
+      `gem install rails -v#{config[:rails_version]}`
     end
-  
+
     def rails_new
       puts "Running Rails new"
       command = build_rails_new_command
-      # puts command
+      puts command
       system(command)
     end
-  
+
     def process_config
       # cd into rails app
       Dir.chdir(config[:app_name]) do
         # add different gems
-        TestRunnerProcessor.update_gemfile(config)
-        CodeCoverageProcessor.update_gemfile(config)
-        TemplateEngineProcessor.update_gemfile(config)
-        FormBuilderProcessor.update_gemfile(config)
-        RubyLinterProcessor.update_gemfile(config)
+        [
+          TestRunnerProcessor,
+          CodeCoverageProcessor,
+          TestFactoryProcessor,
+          TestFakeDataProcessor,
+          TemplateEngineProcessor,
+          FormBuilderProcessor,
+          RubyLinterProcessor,
+          PaginationProcessor
+        ].each { |p| p.update_gemfile(config) }
 
         # install gems
         system("bundle install")
 
-        #configure each gem
-        TestRunnerProcessor.configure(config)
-        CodeCoverageProcessor.configure(config)
-        TemplateEngineProcessor.configure(config)
-        FormBuilderProcessor.configure(config)
-        RubyLinterProcessor.configure(config)
+        # configure each gem
+        [
+          TestRunnerProcessor,
+          CodeCoverageProcessor,
+          TestFactoryProcessor,
+          FormBuilderProcessor,
+          RubyLinterProcessor,
+          PaginationProcessor
+        ].each { |p| p.configure(config) }
+
+        after_create
       end
     end
-  
+
+    def after_create
+      fix_code_style
+      initial_commit
+    end
+
     def end_message
       puts "Your new Rails app is ready!"
     end
-  
+
     def aborted_message
       puts "Aborted"
     end
-  
+
     private
-  
+
     # final step and creation
     def build_rails_new_command
       ["rails"].tap do |ar|
         # use specific Rails version
-        ar << "_#{config[:rails_ver]}_" if config[:rails_ver] != ""
+        ar << "_#{config[:rails_version]}_" if config[:rails_version] != ""
         # new command
         ar << "new"
         # use desired database
@@ -224,11 +249,23 @@ WARNING
         # ignore test if not minitest
         ar << "--skip_test" if config[:test_runner][:key] != "minitest"
         # use desired js framework
-        ar << "--webpack=#{config[:js_framework][:key]}" if config[:js_framework][:in_rails_new]
+        ar << "--webpack=#{config[:java_script_framework][:key]}" if config[:java_script_framework][:in_rails_new]
         # ar << "--skip-javascript"
         # add app name
         ar << config[:app_name]
       end.join(" ")
     end
+
+    def fix_code_style
+      case config[:ruby_linter][:key]
+      when "rubocop" then system("rubocop -A")
+      when "standardrb" then system("standardrb --fix")
+      end
+    end
+
+    def initial_commit
+      system("git add .")
+      system("git commit -a -m 'Initial commit'")
+    end
   end
 end

data/lib/rails-new-app/steps.rb

@@ -4,4 +4,4 @@ require "#{path}/step"
 require "#{path}/choice_step"
 require "#{path}/yes_no_choice_step"
 # require the rest
-Dir.glob("#{path}/*").each { |f| require f }
+Dir.glob("#{path}/*").sort.each { |f| require f }

data/lib/rails-new-app/steps/app_name_step.rb

@@ -9,7 +9,7 @@ module RailsNewApp
     end
 
     def valid?(input)
-      if input.strip =~ /\A[a-z_]+\z/i
+      if /\A[a-z_]+\z/i.match?(input.strip)
         true
       else
         puts "Invalid app name"

data/lib/rails-new-app/steps/choice_step.rb

@@ -12,15 +12,17 @@ module RailsNewApp
       puts step_question
       puts ""
 
+      current = config[self.class.key][:option_number]
       options.each_with_index do |op, idx|
-        puts "#{idx} ) #{op}"
+        is_current = idx == current ? " (current)" : ""
+        puts "#{idx} ) #{op}#{is_current}"
       end
     end
-    
+
     def clean_input(input)
       input.to_i
     end
-    
+
     def valid?(input)
       if options[input]
         true

data/lib/rails-new-app/steps/code_coverage_step.rb

@@ -11,7 +11,7 @@ module RailsNewApp
     end
 
     def options
-      ["None (Default)", "SimpleCov"]
+      ["None", "SimpleCov"]
     end
 
     def lowercase_keys
@@ -26,8 +26,12 @@ module RailsNewApp
       {
         option_number: 0,
         name: "None (Default)",
-        key: "",
+        key: ""
       }
     end
+
+    def next_step
+      :test_factory
+    end
   end
 end

data/lib/rails-new-app/steps/database_step.rb

@@ -5,7 +5,7 @@ module RailsNewApp
     end
 
     def options
-      ["None", "SQLite (Default)", "MySQL / MariaDB", "PostgreSQL"]
+      ["None", "SQLite", "MySQL / MariaDB", "PostgreSQL"]
     end
 
     def lowercase_keys
@@ -29,7 +29,7 @@ module RailsNewApp
     def self.default
       {
         option_number: "1",
-        name: "SQLite (Default)",
+        name: "SQLite",
         key: "sqlite3",
         in_rails_new: true
       }

data/lib/rails-new-app/steps/form_builder_step.rb

@@ -5,7 +5,7 @@ module RailsNewApp
     end
 
     def options
-      ["None (Default)", "Simple Form", "Formtastic"]
+      ["None", "Simple Form", "Formtastic"]
     end
 
     def lowercase_keys
@@ -19,8 +19,8 @@ module RailsNewApp
     def self.default
       {
         option_number: 0,
-        name: "None (Default)",
-        key: "",
+        name: "None",
+        key: ""
       }
     end
   end

data/lib/rails-new-app/steps/java_script_framework_step.rb

@@ -3,23 +3,23 @@ module RailsNewApp
     def rails_new_options
       %W[react vue angular elm stimulus]
     end
-  
+
     def options
-      ["None (Default)", "ReactJS", "VueJS", "Angular", "Elm", "Stimulus"]
+      ["None", "ReactJS", "VueJS", "Angular", "Elm", "Stimulus"]
     end
-  
+
     def lowercase_keys
       ["", "react", "vue", "angular", "elm", "stimulus"]
     end
-  
+
     def step_question
       "Type the option number of the JavaScript framework to use:"
     end
-  
+
     def after_valid
       puts "Selected framework is: #{option}\n"
     end
-  
+
     def return_value
       super.tap do |h|
         h[:in_rails_new] = rails_new_options.include?(h[:key])
@@ -29,7 +29,7 @@ module RailsNewApp
     def self.default
       {
         option_number: 0,
-        name: "None (Default)",
+        name: "None",
         key: "",
         in_rails_new: false
       }

data/lib/rails-new-app/steps/pagination_step.rb

@@ -0,0 +1,27 @@
+module RailsNewApp
+  class PaginationStep < ChoiceStep
+    def step_question
+      "Type the option number of the Pagination gem to use:"
+    end
+
+    def options
+      ["None", "Pagy", "Kaminari", "WillPaginate"]
+    end
+
+    def lowercase_keys
+      ["", "pagy", "kaminari", "will_paginate"]
+    end
+
+    def after_valid
+      puts "Selected pagination gem is: #{option}\n"
+    end
+
+    def self.default
+      {
+        option_number: 0,
+        name: "None",
+        key: ""
+      }
+    end
+  end
+end

data/lib/rails-new-app/steps/rails_version_step.rb

@@ -1,27 +1,34 @@
 module RailsNewApp
   class RailsVersionStep < Step
     def valid?(ver)
-      if ver =~ /\A[56].\d.\d\z/
-        # puts "Validating against Rubygems..."
+      if /\A[56].\d\z/.match?(ver)
         # uncomment this to validate the input against RubyGems
-        # `gem list -r -e -a rails | grep '#{ver}'` != false
-        true
+        puts "Validating against Rubygems..."
+        if `gem list -r -e -a rails | grep '[\( ]#{ver}\.'` != ""
+          true
+        else
+          puts "Invalid Rails version, type the version you want to use:"
+        end
       else
         puts "Invalid Rails version, type the version you want to use:"
         false
       end
     end
-    
-    def step_question
-      <<-QUESTION
-Type the version of Rails you want to use:
-! Notice that Rails will use the latest patch version for a given version !
 
-QUESTION
+    def step_question
+      <<~QUESTION
+        Type the version of Rails you want to use (MAJOR.MINOR):
+        ! Notice that Rails will use the latest patch version for a given version !
+        
+      QUESTION
     end
 
     def after_valid
       puts "Selected version is: #{@selection}\n"
     end
+
+    def self.default
+      ""
+    end
   end
 end

data/lib/rails-new-app/steps/ruby_linter_step.rb

@@ -5,7 +5,7 @@ module RailsNewApp
     end
 
     def options
-      ["None (Default)", "RuboCop", "StandardRB"]
+      ["None", "RuboCop", "StandardRB"]
     end
 
     def lowercase_keys
@@ -19,8 +19,8 @@ module RailsNewApp
     def self.default
       {
         option_number: 0,
-        name: "None (Default)",
-        key: "",
+        name: "None",
+        key: ""
       }
     end
   end

data/lib/rails-new-app/steps/step.rb

@@ -1,18 +1,24 @@
 module RailsNewApp
   class Step
+    def self.clean_name
+      to_s.gsub("Step", "").gsub("RailsNewApp::", "")
+    end
+
+    def self.key
+      clean_name.underscore.to_sym
+    end
+
     def self.run(config)
       new.run(config)
     end
 
-    def config
-      @config
-    end
+    attr_reader :config
 
     def run(current_config)
       @config = current_config
- 
+
       system("clear") if config[:navigation]
- 
+
       ask
       read_and_validate
       after_valid
@@ -61,5 +67,9 @@ module RailsNewApp
     def self.default
       ""
     end
+
+    def next_step
+      nil
+    end
   end
-end
+end

data/lib/rails-new-app/steps/template_engine_step.rb

@@ -5,7 +5,7 @@ module RailsNewApp
     end
 
     def options
-      ["None (Default)", "Slim", "HAML"]
+      ["None", "Slim", "HAML"]
     end
 
     def lowercase_keys
@@ -19,8 +19,8 @@ module RailsNewApp
     def self.default
       {
         option_number: 0,
-        name: "None (Default)",
-        key: "",
+        name: "None",
+        key: ""
       }
     end
   end

data/lib/rails-new-app/steps/test_factory_step.rb

@@ -0,0 +1,38 @@
+module RailsNewApp
+  class TestFactoryStep < ChoiceStep
+    def step_question
+      warning =
+        if config[:test_runner][:key] == ""
+          "This configuration will be ignored because you selected no test runner\n"
+        else
+          ""
+        end
+      "#{warning}Type the option number of the test factories tool to use:"
+    end
+
+    def options
+      # TODO: add Forgery and Fabrication?
+      ["None", "FactoryBot"]
+    end
+
+    def lowercase_keys
+      ["", "factory_bot"]
+    end
+
+    def after_valid
+      puts "Selected test factories tool is: #{option}\n"
+    end
+
+    def self.default
+      {
+        option_number: 0,
+        name: "None (Default)",
+        key: ""
+      }
+    end
+
+    def next_step
+      :test_fake_data
+    end
+  end
+end

data/lib/rails-new-app/steps/test_fake_data.rb

@@ -0,0 +1,34 @@
+module RailsNewApp
+  class TestFakeDataStep < ChoiceStep
+    def step_question
+      warning =
+        if config[:test_runner][:key] == ""
+          "This configuration will be ignored because you selected no test runner\n"
+        else
+          ""
+        end
+      "#{warning}Type the option number of the test fake data tool to use:"
+    end
+
+    def options
+      # TODO: add ffaker and Fake Person?
+      ["None", "Faker"]
+    end
+
+    def lowercase_keys
+      ["", "faker"]
+    end
+
+    def after_valid
+      puts "Selected test fake data tool is: #{option}\n"
+    end
+
+    def self.default
+      {
+        option_number: 0,
+        name: "None (Default)",
+        key: ""
+      }
+    end
+  end
+end

data/lib/rails-new-app/steps/test_runner_step.rb

@@ -1,7 +1,7 @@
 module RailsNewApp
   class TestRunnerStep < ChoiceStep
     def options
-      ["None", "Minitest (Default)", "RSpec"]
+      ["None", "Minitest", "RSpec"]
     end
 
     def lowercase_keys
@@ -19,10 +19,14 @@ module RailsNewApp
     def self.default
       {
         option_number: 1,
-        name: "Minitest (Default)",
+        name: "Minitest",
         key: "minitest",
         in_rails_new: true
       }
     end
+
+    def next_step
+      option == "None" ? nil : :code_coverage
+    end
   end
 end

data/lib/rails-new-app/steps/yes_no_choice_step.rb

@@ -4,4 +4,4 @@ module RailsNewApp
       ["Yes", "No"]
     end
   end
-end
+end

data/lib/rails-new-app/string_underscore.rb

@@ -0,0 +1,9 @@
+class String
+  def underscore
+    gsub(/::/, "/")
+      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+      .tr("-", "_")
+      .downcase
+  end
+end

data/lib/rails-new-app/templates/factory_bot-gemfile.rb

@@ -0,0 +1,3 @@
+gem_group :development, :test do
+  gem "factory_bot_rails"
+end

data/lib/rails-new-app/templates/factory_bot-minitest-config.rb

@@ -0,0 +1 @@
+run "mkdir test/support/factories"

data/lib/rails-new-app/templates/factory_bot-rspec-config.rb

@@ -0,0 +1 @@
+run "mkdir spec/support/factories"

data/lib/rails-new-app/templates/faker-gemfile.rb

@@ -0,0 +1,3 @@
+gem_group :development, :test do
+  gem "faker"
+end

data/lib/rails-new-app/templates/kaminari-gemfile.rb

@@ -0,0 +1 @@
+gem "kaminari"

data/lib/rails-new-app/templates/pagy-config.rb

@@ -0,0 +1,13 @@
+initializer "pagy.rb", "Check initializer options at: https://github.com/ddnexus/pagy/blob/master/lib/config/pagy.rb"
+
+inject_into_file "app/helpers/application_helper.rb", after: "module ApplicationHelper\n" do
+  <<~'RUBY'
+    include Pagy::Frontend
+  RUBY
+end
+
+inject_into_file "app/controllers/application_controller.rb", after: "class ApplicationController < ActionController::Base\n" do
+  <<~'RUBY'
+    include Pagy::Backend
+  RUBY
+end

data/lib/rails-new-app/templates/pagy-gemfile.rb

@@ -0,0 +1 @@
+gem "pagy"

data/lib/rails-new-app/templates/rspec-rails-config.rb

@@ -1,7 +1,6 @@
 generate "rspec:install"
 
 # Create the spec folders for RSpec
-run "mkdir spec"
 run "mkdir spec/models"
 run "mkdir spec/controllers"
 run "mkdir spec/system"
@@ -13,11 +12,12 @@ run "mkdir spec/mailers"
 run "mkdir spec/factories"
 
 # Add `rails spec` task to run tests
-inject_into_file "Rakefile", before: "Rails.application.load_tasks\n" do <<-'RUBY'
-begin
-  require "rspec/core/rake_task"
-  RSpec::Core::RakeTask.new(:spec)
-rescue LoadError
+inject_into_file "Rakefile", before: "Rails.application.load_tasks\n" do
+  <<~'RUBY'
+    begin
+      require "rspec/core/rake_task"
+      RSpec::Core::RakeTask.new(:spec)
+    rescue LoadError
+    end
+  RUBY
 end
-RUBY
-end

data/lib/rails-new-app/templates/{standardrb-minitest-gemfile.rb → rubocop-gemfile.rb}

@@ -1,5 +1,4 @@
 gem_group :development, :test do
-  gem "standard"
+  gem "rubocop"
   gem "rubocop-rails"
-  gem "rubocop-minitest"
 end

data/lib/rails-new-app/templates/rubocop-minitest-gemfile.rb

@@ -1,5 +1,3 @@
 gem_group :development, :test do
-  gem "rubocop"
-  gem "rubocop-rails"
   gem "rubocop-minitest"
 end

data/lib/rails-new-app/templates/rubocop-rspec-gemfile.rb

@@ -1,5 +1,3 @@
 gem_group :development, :test do
-  gem "rubocop"
-  gem "rubocop-rails"
   gem "rubocop-rspec"
 end

data/lib/rails-new-app/templates/simplecov-minitest-config.rb

@@ -1,5 +1,6 @@
-prepend_file "test/test_helper.rb" do <<-'RUBY'
-require "simplecov"
-SimpleCov.start
-RUBY
+prepend_file "test/test_helper.rb" do
+  <<~'RUBY'
+    require "simplecov"
+    SimpleCov.start
+  RUBY
 end

data/lib/rails-new-app/templates/simplecov-rspec-config.rb

@@ -1,5 +1,6 @@
-inject_into_file "spec/spec_helper.rb", before: "RSpec.configure do |config|\n" do <<-'RUBY'
-require "simplecov"
-SimpleCov.start
-RUBY
+inject_into_file "spec/spec_helper.rb", before: "RSpec.configure do |config|\n" do
+  <<~'RUBY'
+    require "simplecov"
+    SimpleCov.start
+  RUBY
 end

data/lib/rails-new-app/templates/{standardrb-rspec-gemfile.rb → standardrb-gemfile.rb}

@@ -1,5 +1,4 @@
 gem_group :development, :test do
   gem "standard"
   gem "rubocop-rails"
-  gem "rubocop-rspec"
 end

data/lib/rails-new-app/templates/will_paginate-gemfile.rb

@@ -0,0 +1 @@
+gem "will_paginate", "~> 3.1.0"

data/lib/rails-new-app/version.rb

@@ -1,3 +1,3 @@
 module RailsNewApp
-  VERSION = Gem::Version.new("0.0.2")
-end
+  VERSION = Gem::Version.new("0.0.3")
+end

data/rails-new-app.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version = RailsNewApp::VERSION
   s.authors = ["Ariel Juodziukynas"]
   s.email = ["arieljuod@gmail.com"]
-  s.license = 'MIT'
+  s.license = "MIT"
 
   s.summary = "Command-line tool to assist the creation of new Rails apps"
   s.homepage = "https://github.com/arielj/rails-new-app"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-new-app
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ariel Juodziukynas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-05-23 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -26,9 +26,12 @@ files:
 - lib/rails-new-app/processors.rb
 - lib/rails-new-app/processors/code_coverage_processor.rb
 - lib/rails-new-app/processors/form_builder_processor.rb
+- lib/rails-new-app/processors/pagination_processor.rb
 - lib/rails-new-app/processors/processor.rb
 - lib/rails-new-app/processors/ruby_linter_processor.rb
 - lib/rails-new-app/processors/template_engine_processor.rb
+- lib/rails-new-app/processors/test_factory_processor.rb
+- lib/rails-new-app/processors/test_fake_data_processor.rb
 - lib/rails-new-app/processors/test_runner_processor.rb
 - lib/rails-new-app/runner.rb
 - lib/rails-new-app/steps.rb
@@ -38,18 +41,30 @@ files:
 - lib/rails-new-app/steps/database_step.rb
 - lib/rails-new-app/steps/form_builder_step.rb
 - lib/rails-new-app/steps/java_script_framework_step.rb
+- lib/rails-new-app/steps/pagination_step.rb
 - lib/rails-new-app/steps/rails_version_step.rb
 - lib/rails-new-app/steps/ruby_linter_step.rb
 - lib/rails-new-app/steps/step.rb
 - lib/rails-new-app/steps/template_engine_step.rb
+- lib/rails-new-app/steps/test_factory_step.rb
+- lib/rails-new-app/steps/test_fake_data.rb
 - lib/rails-new-app/steps/test_runner_step.rb
 - lib/rails-new-app/steps/yes_no_choice_step.rb
+- lib/rails-new-app/string_underscore.rb
+- lib/rails-new-app/templates/factory_bot-gemfile.rb
+- lib/rails-new-app/templates/factory_bot-minitest-config.rb
+- lib/rails-new-app/templates/factory_bot-rspec-config.rb
+- lib/rails-new-app/templates/faker-gemfile.rb
 - lib/rails-new-app/templates/formtastic-config.rb
 - lib/rails-new-app/templates/formtastic-gemfile.rb
 - lib/rails-new-app/templates/haml-gemfile.rb
+- lib/rails-new-app/templates/kaminari-gemfile.rb
+- lib/rails-new-app/templates/pagy-config.rb
+- lib/rails-new-app/templates/pagy-gemfile.rb
 - lib/rails-new-app/templates/rspec-rails-config.rb
 - lib/rails-new-app/templates/rspec-rails-gemfile.rb
 - lib/rails-new-app/templates/rubocop-config.rb
+- lib/rails-new-app/templates/rubocop-gemfile.rb
 - lib/rails-new-app/templates/rubocop-minitest-gemfile.rb
 - lib/rails-new-app/templates/rubocop-rspec-gemfile.rb
 - lib/rails-new-app/templates/simple_form-config.rb
@@ -59,8 +74,8 @@ files:
 - lib/rails-new-app/templates/simplecov-rspec-config.rb
 - lib/rails-new-app/templates/slim-gemfile.rb
 - lib/rails-new-app/templates/standardrb-config.rb
-- lib/rails-new-app/templates/standardrb-minitest-gemfile.rb
-- lib/rails-new-app/templates/standardrb-rspec-gemfile.rb
+- lib/rails-new-app/templates/standardrb-gemfile.rb
+- lib/rails-new-app/templates/will_paginate-gemfile.rb
 - lib/rails-new-app/version.rb
 - rails-new-app.gemspec
 homepage: https://github.com/arielj/rails-new-app