rails_app_generator 0.2.43 → 0.3.2

data/after_templates/application/klueless/app/avo/resources/rubocop_entry_resource.rb

@@ -0,0 +1,28 @@
+class RubocopEntryResource < Avo::BaseResource
+  filter RubocopEntryFilenameFilter
+  filter RubocopEntryMessageFilter
+  filter RubocopEntryStatusFilter
+  filter RubocopEntryCopFilter
+
+  self.title = :file_name
+  self.includes = []
+
+  self.search_query = ->(params:) do
+    scope.ransack(
+      cop_cont: params[:q],
+      file_name_cont: params[:q],
+      position_cont: params[:q],
+      status_cont: params[:q],
+      status_message_cont: params[:q],
+      m: "or"
+    ).result(distinct: false)
+  end
+
+  field :cop            , as: :text
+  field :file_name      , as: :text
+  # field :full_line      , as: :text
+  field :position       , as: :text
+  # field :status         , as: :text
+  field :status_message , as: :text
+  field :message        , as: :text
+end

data/after_templates/application/klueless/app/avo/resources/rubocop_resource.rb

@@ -9,4 +9,13 @@ class RubocopResource < Avo::BaseResource
   field :id, as: :id
   # field :data, as: :textarea, only_on: [:edit]
   # field :user_name, as: :text
+  tool RubocopInfo, show_on: :edit
+
+  # tabs do
+  #   tab "List of Cops" do
+  #     panel do
+  #       field :id, as: :id
+  #     end
+  #   end
+  # end
 end

data/after_templates/application/klueless/app/avo/resources/table_count_entry_resource.rb

@@ -0,0 +1,18 @@
+class TableCountEntryResource < Avo::BaseResource
+  filter TableCountEntryTablenameFilter
+
+  self.title = :table_count
+  self.includes = []
+
+  self.search_query = ->(params:) do
+    scope.ransack(
+      table_count_cont: params[:q],
+      m: "or"
+    ).result(distinct: false)
+  end
+
+  field :table_count, as: :text
+  field :au, as: :text
+  field :eu, as: :text
+  field :us, as: :text
+end

data/after_templates/application/klueless/app/controllers/home_controller.rb

@@ -7,6 +7,14 @@ class HomeController < ApplicationController
   end
 
   def reseed
-    SeedService.seed
+    SeedService.seed(variant: :refresh)
+
+    redirect_back_or_to root_path
+  end
+
+  def refresh_material_view
+    RubocopEntry.refresh
+
+    redirect_back_or_to root_path
   end
 end

data/after_templates/application/klueless/app/services/seed_service.rb

@@ -1,7 +1,53 @@
+# frozen_string_literal: true
+
 class SeedService
+  PRINTSPEAK_DATA_PATH = "/Users/davidcruwys/dev/printspeak/printspeak-generator/.builders/.data/"
+
   class << self
-    def seed
-      puts 'sssssssssssssssssssssss'
+    def seed(variant: :reset)
+      service = SeedService.new
+      service.call(variant: variant)
     end
   end
-end
+
+  def call(variant: :reset)
+    reset     if variant == :reset
+    refresh   if variant == :refresh
+    create
+  end
+
+  private
+
+  def get_data(filename)
+    json = File.read(File.join(PRINTSPEAK_DATA_PATH, filename))
+    JSON.parse(json)
+  end
+
+  def reset
+    User.delete_all
+    RailsApp.delete_all
+    Rubocop.delete_all
+    TableCount.delete_all
+  end
+
+  def refresh
+  end
+
+  def create
+    refresh_printspeak
+
+    RubocopEntry.refresh
+  end
+
+  def refresh_printspeak
+    david = User.create_with(name: 'david', password: 'password').find_or_create_by(email: 'david@site.com')
+
+    rails_app = RailsApp.create_with(user: david).find_or_create_by(name: 'Printspeak')
+
+    puts 'Create Rubocop Data'
+    Rubocop.create(rails_app: rails_app, data: get_data('rubocop.json'))
+
+    puts 'Create Table Count Data'
+    TableCount.create(rails_app: rails_app, data: get_data('sql_count.json'))
+  end
+end

data/after_templates/application/klueless/app/views/home/index.html.erb

@@ -1,6 +1,6 @@
 <h1><%= I18n.t('application_name') %></h1>
 
-<p>The Klue is to do Less</p>
+<%# <p>The Klue is to do Less</p>
 
 <p>No Code as a Service - Rails Application Builder</p>
-
+ %>

data/after_templates/application/klueless/app/views/layouts/_navbar.html.erb

@@ -1,4 +1,7 @@
-<%= link_to 'Home', root_path %>
-<%= link_to 'Quick Sign In', home_quick_signin_path %> |
-<%= link_to 'Admin', avo_path %>
+  <%= link_to 'Home', root_path %>
+| <%= link_to 'Bookings', bookings_path %>
+| <%= link_to 'Re-Seed', home_reseed_path, style: 'color: blue; font-weight: 600;' %>
+| <%= link_to 'Refresh Material View', home_refresh_material_view_path, style: 'color: blue; font-weight: 600;' %>
+| <%= link_to 'Quick Sign In', home_quick_signin_path %>
+| <%= link_to 'Admin', avo_path %>
 <hr />

data/after_templates/application/klueless/config/initializers/avo.rb

@@ -78,8 +78,10 @@ Avo.configure do |config|
         resource :table_count, label: 'Table Count'
       end
 
-      # group "Xxx" do # , collapsable: true, collapsed: true
-      # end
+      group "Live Views", collapsable: true, collapsed: true do
+        resource :rubocop_entries, label: 'Rubo Cop'
+        resource :table_count_entries, label: 'Table Count'
+      end
 
       group "Admin" do
         resource :user

data/after_templates/application/klueless/db/seeds.rb

@@ -1,18 +1 @@
-@data_path = "/Users/davidcruwys/dev/printspeak/printspeak-generator/.builders/.data/"
-
-david = User.create_with(name: 'david', password: 'password').find_or_create_by(email: 'david@site.com')
-
-def get_data(filename)
-  json = File.read(File.join(@data_path, filename))
-  JSON.parse(json)
-end
-
-rails_app = RailsApp.create(name: 'Printspeak', user: david)
-
-puts 'Create Rubocop Data'
-Rubocop.create(rails_app: rails_app, data: get_data('rubocop.json'))
-
-puts 'Create Table Count Data'
-TableCount.create(rails_app: rails_app, data: get_data('sql_count.json'))
-
-
+SeedService.seed

data/after_templates/application/klueless/db/views/rubocop_entries_v01.sql

@@ -0,0 +1,23 @@
+WITH
+
+files AS (
+  SELECT jsonb_array_elements(data->'files') FROM rubocops
+),
+lines AS (
+  SELECT 
+    jsonb_array_elements(files)->>'file' as file,
+    jsonb_array_elements(files)->'lines' as lines
+  FROM files 
+),
+denormalized AS (
+  SELECT
+    jsonb_array_elements(lines)->>'position' as position,
+    jsonb_array_elements(lines)->>'status' as status,
+    jsonb_array_elements(lines)->>'status_message' as status_message,
+    jsonb_array_elements(lines)->>'cop' as cop,
+    jsonb_array_elements(lines)->>'message' as message,
+    jsonb_array_elements(lines)->>'full_line' as full_line,
+    jsonb_array_elements(lines)->>'file_name' as file_name
+  FROM lines
+)
+select row_number() OVER () AS id, * from denormalized

data/after_templates/application/klueless/db/views/table_count_entries_v01.sql

@@ -0,0 +1,11 @@
+WITH
+
+denormalized AS (
+  SELECT
+    jsonb_array_elements(data)->>'table_name' as table_name,
+    jsonb_array_elements(data)->>'au' as au,
+    jsonb_array_elements(data)->>'eu' as eu,
+    jsonb_array_elements(data)->>'us' as us
+  FROM table_counts
+)
+select * from denormalized order by table_name

data/docs/last_run/app_generator_data.json

@@ -3,8 +3,8 @@
     "skip_namespace": false,
     "skip_collision_check": false,
     "ruby": "/Users/davidcruwys/.asdf/installs/ruby/3.1.1/bin/ruby",
-    "database": "postgresql",
-    "skip_git": true,
+    "database": "sqlite3",
+    "skip_git": false,
     "skip_keeps": false,
     "skip_action_mailer": false,
     "skip_action_mailbox": false,
@@ -32,7 +32,7 @@
     "test": "rspec",
     "add_acts_as_list": false,
     "add_administrate": false,
-    "add_annotate": false,
+    "add_annotate": true,
     "add_avo": false,
     "add_bcrypt": false,
     "add_brakeman": false,
@@ -42,8 +42,8 @@
     "add_devise": false,
     "add_devise_masquerade": false,
     "add_dotenv": false,
-    "add_factory_bot_rails": false,
-    "add_faker": false,
+    "add_factory_bot_rails": true,
+    "add_faker": true,
     "add_friendly_id": false,
     "add_groupdate": false,
     "add_hexapdf": false,
@@ -60,12 +60,12 @@
     "add_pretender": false,
     "add_public_suffix": false,
     "add_rails_html_sanitizer": false,
-    "add_scenic": true,
+    "add_scenic": false,
     "add_ransack": false,
     "add_redcarpet": false,
     "add_rolify": false,
     "add_rubocop": false,
     "add_twilio_ruby": false,
-    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/addons/scenic/_.rb"
+    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/addons/factory_bot/_.rb"
   }
 }

data/docs/last_run/rails_options_data.json

@@ -7,9 +7,9 @@
     "quiet": false,
     "skip": false,
     "ruby": "/Users/davidcruwys/.asdf/installs/ruby/3.1.1/bin/ruby",
-    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/addons/scenic/_.rb",
-    "database": "postgresql",
-    "skip_git": true,
+    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/addons/factory_bot/_.rb",
+    "database": "sqlite3",
+    "skip_git": false,
     "skip_keeps": false,
     "skip_action_mailer": false,
     "skip_action_mailbox": false,
@@ -42,7 +42,7 @@
     "test": "rspec",
     "add_acts_as_list": false,
     "add_administrate": false,
-    "add_annotate": false,
+    "add_annotate": true,
     "add_avo": false,
     "add_bcrypt": false,
     "add_brakeman": false,
@@ -52,8 +52,8 @@
     "add_devise": false,
     "add_devise_masquerade": false,
     "add_dotenv": false,
-    "add_factory_bot_rails": false,
-    "add_faker": false,
+    "add_factory_bot_rails": true,
+    "add_faker": true,
     "add_friendly_id": false,
     "add_groupdate": false,
     "add_hexapdf": false,
@@ -70,11 +70,13 @@
     "add_pretender": false,
     "add_public_suffix": false,
     "add_rails_html_sanitizer": false,
-    "add_scenic": true,
+    "add_scenic": false,
     "add_ransack": false,
     "add_redcarpet": false,
     "add_rolify": false,
     "add_rubocop": false,
-    "add_twilio_ruby": false
+    "add_twilio_ruby": false,
+    "add_factory_bot": true,
+    "add_rspec": true
   }
 }

data/lib/rails_app_generator/app_generator.rb

@@ -71,7 +71,7 @@ module RailsAppGenerator
         puts "gem not available for '#{gem_name}'"
 
         # THIS CODE DOES NOT REALLY WORK
-        return Dir.pwd if Dir.pwd.end_with?('dev/kgems/rails_app_generator') # code smell: this is for my local development environment
+        return Dir.pwd if Dir.pwd.end_with?('dev/kgems/rails_app_generator') # code smell: this is for my local test environment
 
         raise "'#{gem_name}' not available"
       end
@@ -103,7 +103,7 @@ module RailsAppGenerator
     # def rails_customization
     #   puts 'rails customizations'
     #   # invoke :customize_gemfile
-    #   # invoke :setup_development_environment
+    #   # invoke :setup_test_environment
     #   # invoke :setup_production_environment
     #   # invoke :setup_secret_token
     #   # invoke :configure_app
@@ -292,8 +292,17 @@ module RailsAppGenerator
         rails_command('db:migrate')
       end
 
-      def db(drop: false, create: false, migrate: false, seed: false)
+      def db_recreate(environment: nil)
+        db_environment(environment) if environment
+        # when a DB does not exist, the drop will fail, but we still need to run create separately
+        db(drop: true)
+        db(create: true)
+      end
+
+      def db(environment: nil, drop: false, create: false, migrate: false, seed: false)
         commands = []
+
+        commands << "db:environment:set RAILS_ENV=#{environment}" if environment
         commands << 'db:drop' if drop
         commands << 'db:create' if create
         commands << 'db:migrate' if migrate
@@ -301,6 +310,10 @@ module RailsAppGenerator
         rails_command(commands.join(' '))
       end
 
+      def db_environment(environment)
+        rails_command("db:environment:set RAILS_ENV=#{environment}")
+      end
+
       def db_seed
         rails_command('db:seed')
       end
@@ -350,11 +363,12 @@ module RailsAppGenerator
 
       # 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 = {})
+      def copy_file(source, destination = nil, args = {})
         # puts source
         # puts destination
         # puts args
         args = { force: true }.merge(args) if force_copy?
+        destination ||= source
 
         super(source, destination, args)
       end

data/lib/rails_app_generator/cli/profile.rb

@@ -29,9 +29,7 @@ module RailsAppGenerator
         RailsAppGenerator::Util.write_last_run('rails_options_data.json', opts.to_h)
 
         starter = RailsAppGenerator::Starter.new(**args)
-
-        starter.delete_target_folder
-        starter.start(opts)
+        starter.start(opts) if starter.handle_target_folder_found?
       end
       # rubocop:enable Metrics/AbcSize
     end

data/lib/rails_app_generator/starter.rb

@@ -28,17 +28,22 @@ module RailsAppGenerator
     # points to templates related to rails addons
     attr_reader :addon_template_path
 
+    attr_reader :when_folder_exist # [abort destroy keep_git overwrite]
+
     attr_reader :capture_output
     attr_reader :console_output
 
+    # rubocop:disable Metrics/CyclomaticComplexity
     def initialize(**args)
-      @app_path               = args[:app_path]                     || '.'
-      @destination_root       = args[:destination_root]             || Dir.pwd
-      @rails_template_path    = args[:rails_template_path]          || AppGenerator.rails_template_path
-      @override_template_path = args[:override_template_path]       || AppGenerator.override_template_path
-      @addon_template_path    = args[:addon_template_path]          || AppGenerator.addon_template_path
-      @capture_output         = args[:capture_output].nil? ? false : args[:capture_output]
+      @app_path                   = args[:app_path]                     || '.'
+      @destination_root           = args[:destination_root]             || Dir.pwd
+      @rails_template_path        = args[:rails_template_path]          || AppGenerator.rails_template_path
+      @override_template_path     = args[:override_template_path]       || AppGenerator.override_template_path
+      @addon_template_path        = args[:addon_template_path]          || AppGenerator.addon_template_path
+      @when_folder_exist          = args[:when_folder_exist] || 'abort'
+      @capture_output             = args[:capture_output].nil? ? false : args[:capture_output]
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     def target_path
       File.expand_path(File.join(destination_root, app_path))
@@ -58,12 +63,48 @@ module RailsAppGenerator
       end
     end
 
-    def delete_target_folder
-      FileUtils.rm_rf(target_path)
+    # rubocop:disable Metrics/AbcSize
+    def handle_target_folder_found?
+      return true unless File.directory?(target_path)
+
+      case when_folder_exist
+      when 'abort'
+        puts "Target folder [#{target_path}] already exists. Aborting"
+        puts 'Maybe you want to use when_folder_exist option with one of these values [destroy overwrite keep_git]'
+        false
+      when 'destroy'
+        puts "Target folder [#{target_path}] already exists. Destroying it"
+        FileUtils.rm_rf(target_path)
+        true
+      when 'keep_git'
+        puts "Target folder [#{target_path}] already exists. Wiping it but keeping git history"
+        clean_target_folder
+        true
+      when 'overwrite'
+        puts "Target folder [#{target_path}] already exists. Overwriting it"
+        true
+      else
+        raise "Invalid when_folder_exist: #{when_folder_exist}"
+      end
     end
+    # rubocop:enable Metrics/AbcSize
 
     private
 
+    def clean_target_folder
+      Dir.entries(target_path).each do |entry|
+        entry_path = File.join(target_path, entry)
+
+        next if ['.', '..', '.git'].include?(entry)
+
+        if File.file?(entry_path)
+          File.delete(entry_path)
+        elsif File.directory?(entry_path)
+          FileUtils.rm_rf(entry_path)
+        end
+      end
+    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/version.rb

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

data/package-lock.json

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

data/package.json

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

data/profiles/addons/factory_bot.json

@@ -0,0 +1,18 @@
+{
+  "args": {
+    "app_path": "r7_factory_bot",
+    "destination_root": "/Users/davidcruwys/dev/kgems/rails_app_generator/a/addons",
+    "when_folder_exist": "keep_git"
+  },
+  "opts": {
+    "skip_git": false,
+    "skip_test": true,
+    "add_minimal_css": true,
+    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/addons/factory_bot/_.rb",
+    "add_annotate": true,
+    "add_factory_bot": true,
+    "add_factory_bot_rails": true,
+    "add_faker": true,
+    "add_rspec": true
+  }
+}

data/profiles/addons/faker.json

@@ -1,6 +1,6 @@
 {
   "args": {
-    "app_path": "faker",
+    "app_path": "r7_faker",
     "destination_root": "/Users/davidcruwys/dev/kgems/rails_app_generator/a/addons"
   },
   "opts": {

data/profiles/application/klueless.json

@@ -2,7 +2,8 @@
   "args": {
     "app_path": "klueless",
     "destination_root": "/Users/davidcruwys/dev/kweb",
-    "note": "add sidekiq to handle the data import tasks, add impersonate"
+    "note": "add sidekiq to handle the data import tasks, add impersonate",
+    "when_folder_exist": "keep_git"
   },
   "opts": {
     "skip_test": true,
@@ -17,7 +18,10 @@
     "add_dotenv": true,
     "add_factory_bot_rails": true,
     "add_faker": true,
-    "add_ransack": false,
-    "add_rubocop": true
+    "add_kaminari": true,
+    "add_lograge": true,
+    "add_ransack": true,
+    "add_rubocop": true,
+    "add_scenic": true
   }
 }

data/templates/README.md.erb

@@ -18,9 +18,9 @@ Open your browser on [localhost:3000](http://localhost:3000).
 
 ## Development
 
-This app was generated using [Schienenzeppelin](https://github.com/hschne/schienenzeppelin) - there are tons of little tweaks to simplify your development workflow.
+This app was generated using [Klueless - RailsAppGenerator](https://github.com/klueless-io/rails_app_generator) - there are tons of little tweaks to simplify your development workflow.
 
-For more details refer to the [Documentation](https://github.com/hschne/schienenzeppelin)
+For more details refer to the [Documentation](https://github.com/klueless-io/rails_app_generator)
 
 ## Deployment
 

data/templates/thor_task/profile/app/services/seed_service.rb

@@ -1,13 +1,14 @@
 class SeedService
   class << self
-    def seed
+    def seed(variant: :reset)
       service = SeedService.new
-      service.call
+      service.call(variant: variant)
     end
   end
 
-  def call
-    reset
+  def call(variant: :reset)
+    reset     if variant == :reset
+    refresh   if variant == :refresh
     create
   end
 
@@ -19,6 +20,9 @@ class SeedService
     # Project.delete_all
   end
 
+  def refresh
+  end
+
   def create
     # FactoryBot.create_list(:post, rand(10..20))
     # FactoryBot.create_list(:person, rand(10..20))

data/templates/thor_task/profile/profile.json.tt

@@ -1,7 +1,8 @@
 {
   "args": {
     "app_path": "r7_<%= data.name_snake %>",
-    "destination_root": "<%= data.destination_root %>"
+    "destination_root": "<%= data.destination_root %>",
+    "when_folder_exist": "destroy"
   },
   "opts": {
     "skip_git": true,