rails_app_generator 0.2.43 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d9ac313ea8fc5383a7d3d37ed9495fff8509f9b7dd1ff373ed97c80ce69ae23
-  data.tar.gz: bb65bdcc19d95bfb69abf92458dbe0eec353a8b3085ba8e679d72955ab55f425
+  metadata.gz: 93b684c48a45efa3c3ed644b2908e1299bd0a26e58ae14e3483dd007c2128360
+  data.tar.gz: 7b263e75514434f35912bfb867674506839c0a4883bdb94d1427dbe899a7c396
 SHA512:
-  metadata.gz: 6f0ccd26ef5090325cbb6a76408fd201bbce81d8bbd739618e14393eebe0cc6814bb9e24eecdfec7dd7fd07664fe9e52ed1e47d92343461b45ab3378d37e22f7
-  data.tar.gz: 70dee6a466c8976ba4f385d532b34325d188a83599df9d4fcd4330b6805f9f0dcc580141fc4ad5e9d1b9a393c4b2084698f7a2771254b7839a18a4f98471765c
+  metadata.gz: 2cc5173515c7d24338097773dcfd3a632e09cd71b9cfbbf2b991cad560d631417f1dde2c1a9cb35dc6accf9c7d1fe5e779a76da5b1bb40cce9f208036b4f6353
+  data.tar.gz: 2eadb9067e14ab8812186a03b49b5a04287b69efd6ecedbc5859ad6c5458cbfe4373fa9e74e7445316a77009570a1e1b8bc73eddb1f272245228a8cdd9b08d6c

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.2.43](https://github.com/klueless-io/rails_app_generator/compare/v0.2.42...v0.2.43) (2022-08-31)
+
+
+### Bug Fixes
+
+* add scenic profile ([dc309e6](https://github.com/klueless-io/rails_app_generator/commit/dc309e6f399cec7085de3133aa32989bc7ff7ed4))
+* add scenic profile ([44614f7](https://github.com/klueless-io/rails_app_generator/commit/44614f70d73fe41cee5fd9cb9af5d20f0aa4f915))
+
 ## [0.2.42](https://github.com/klueless-io/rails_app_generator/compare/v0.2.41...v0.2.42) (2022-08-30)
 
 

data/after_templates/application/klueless/_.rb

@@ -44,6 +44,10 @@ def scaffolds
   # add_scaffold('db_schema_foreign_key', 'left', 'right', 'name', 'on_update', 'on_delete', 'column', 'db_schema_table:references')
   # add_scaffold('db_schema_index', 'name', 'fields', 'using', 'order:jsonb', 'where', 'unique', 'db_schema_table:references')
   # add_scaffold('db_schema_view', 'name', 'materialized:boolean', 'sql_definition', 'db_schema_table:references')
+
+  generate('scenic:model rubocop_log --materialized')
+
+  directory "db/views"
 end
 
 def setup_customizations
@@ -51,13 +55,14 @@ def setup_customizations
 
   force_copy
   
-  add_controller('home', 'index', 'quick_signin', 'reseed')
+  add_controller('home', 'index', 'quick_signin', 'reseed', 'refresh_material_view')
   
   directory "app/controllers"
   directory "app/models"
   directory "app/views"
   template  'app/views/layouts/application.html.erb', 'app/views/layouts/application.html.erb'
   directory "app/queries"
+  directory "app/services"
 end
 
 def setup_avo

data/after_templates/application/klueless/app/avo/cards/amount_raised.rb

@@ -0,0 +1,14 @@
+class AmountRaised < Avo::Dashboards::MetricCard
+  self.id = "amount_raised"
+  self.label = "Amount raised"
+  # self.description = "Some description"
+  # self.cols = 1
+  # self.initial_range = 30
+  # self.ranges = [7, 30, 60, 365, "TODAY", "MTD", "QTD", "YTD", "ALL"]
+  self.prefix = "$"
+  # self.suffix = ""
+
+  query do
+    result 9001
+  end
+end

data/after_templates/application/klueless/app/avo/cards/example_custom_partial.rb

@@ -0,0 +1,7 @@
+class ExampleCustomPartial < Avo::Dashboards::PartialCard
+  self.id = "users_custom_card"
+  self.cols = 3
+  self.rows = 4
+  self.partial = "avo/cards/custom_card"
+  self.description = "This card has been loaded from a custom partial."
+end

data/after_templates/application/klueless/app/avo/cards/example_metric.rb

@@ -0,0 +1,38 @@
+class ExampleMetric < Avo::Dashboards::MetricCard
+  self.id = "users_metric"
+  self.label = "Users count"
+  self.description = "Users description"
+  self.cols = 1
+  self.initial_range = 30
+  self.ranges = [7, 30, 60, 365, "TODAY", "MTD", "QTD", "YTD", "ALL"]
+  # self.prefix = "$"
+  # self.suffix = "%"
+  self.refresh_every = 10.minutes
+
+  # You have access to context, params, range, current dashboard, and current card
+  query do
+    from = Date.today.midnight - 1.week
+    to = DateTime.current
+
+    if range.present?
+      if range.to_s == range.to_i.to_s
+        from = DateTime.current - range.to_i.days
+      else
+        case range
+        when "TODAY"
+          from = DateTime.current.beginning_of_day
+        when "MTD"
+          from = DateTime.current.beginning_of_month
+        when "QTD"
+          from = DateTime.current.beginning_of_quarter
+        when "YTD"
+          from = DateTime.current.beginning_of_year
+        when "ALL"
+          from = Time.at(0)
+        end
+      end
+    end
+
+    result User.where(created_at: from..to).count
+  end
+end

data/after_templates/application/klueless/app/avo/cards/percent_done.rb

@@ -0,0 +1,10 @@
+class PercentDone < Avo::Dashboards::MetricCard
+  self.id = "percent_done"
+  self.label = "Percent done"
+  self.description = "This is the progress we made so far..."
+  self.suffix = "%"
+
+  query do
+    result 42
+  end
+end

data/after_templates/application/klueless/app/avo/cards/rubocop_card.rb

@@ -0,0 +1,10 @@
+class RubocopCard < Avo::Dashboards::PartialCard
+  self.id = "percent_done"
+  self.label = "Percent done"
+  self.description = "This is the progress we made so far..."
+
+  self.cols = 3
+  self.rows = 20
+  self.partial = "avo/cards/rubocop_card"
+
+end

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

@@ -9,4 +9,12 @@ class RubocopResource < Avo::BaseResource
   field :id, as: :id
   # field :data, as: :textarea, only_on: [:edit]
   # field :user_name, as: :text
+
+  tabs do
+    tab "List of Cops" do
+      panel do
+        field :id, as: :id
+      end
+    end
+  end
 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
+    RubocopLog.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
+
+    RubocopLog.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/layouts/_navbar.html.erb

@@ -1,4 +1,10 @@
-<%= 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 '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 />
+
+  <%= link_to 'Visits (View)', home_visitors_by_monument_path %>
+| <%= link_to 'Visits (Materialized)', home_individual_visitors_by_monument_path %>
 <hr />

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_logs_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 
+),
+rubocop_log 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 * from rubocop_log

data/docs/last_run/app_generator_data.json

@@ -4,7 +4,7 @@
     "skip_collision_check": false,
     "ruby": "/Users/davidcruwys/.asdf/installs/ruby/3.1.1/bin/ruby",
     "database": "postgresql",
-    "skip_git": true,
+    "skip_git": false,
     "skip_keeps": false,
     "skip_action_mailer": false,
     "skip_action_mailbox": false,
@@ -32,18 +32,18 @@
     "test": "rspec",
     "add_acts_as_list": false,
     "add_administrate": false,
-    "add_annotate": false,
-    "add_avo": false,
+    "add_annotate": true,
+    "add_avo": true,
     "add_bcrypt": false,
-    "add_brakeman": false,
+    "add_brakeman": true,
     "add_browser": false,
-    "add_bundler_audit": false,
+    "add_bundler_audit": true,
     "add_chartkick": false,
-    "add_devise": false,
+    "add_devise": true,
     "add_devise_masquerade": false,
-    "add_dotenv": false,
-    "add_factory_bot_rails": false,
-    "add_faker": false,
+    "add_dotenv": true,
+    "add_factory_bot_rails": true,
+    "add_faker": true,
     "add_friendly_id": false,
     "add_groupdate": false,
     "add_hexapdf": false,
@@ -52,7 +52,7 @@
     "add_image_processing": false,
     "add_kaminari": false,
     "add_lograge": false,
-    "add_minimal_css": true,
+    "add_minimal_css": false,
     "minimal_css_library": "water.css",
     "add_mini_magick": false,
     "add_motor_admin": false,
@@ -64,8 +64,9 @@
     "add_ransack": false,
     "add_redcarpet": false,
     "add_rolify": false,
-    "add_rubocop": false,
+    "add_rubocop": true,
     "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/application/klueless/_.rb",
+    "css": "tailwind"
   }
 }

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",
+    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/application/klueless/_.rb",
     "database": "postgresql",
-    "skip_git": true,
+    "skip_git": false,
     "skip_keeps": false,
     "skip_action_mailer": false,
     "skip_action_mailbox": false,
@@ -36,24 +36,24 @@
     "api": false,
     "minimal": false,
     "javascript": "importmap",
-    "css": "",
+    "css": "tailwind",
     "skip_bundle": false,
     "note": "",
     "test": "rspec",
     "add_acts_as_list": false,
     "add_administrate": false,
-    "add_annotate": false,
-    "add_avo": false,
+    "add_annotate": true,
+    "add_avo": true,
     "add_bcrypt": false,
-    "add_brakeman": false,
+    "add_brakeman": true,
     "add_browser": false,
-    "add_bundler_audit": false,
+    "add_bundler_audit": true,
     "add_chartkick": false,
-    "add_devise": false,
+    "add_devise": true,
     "add_devise_masquerade": false,
-    "add_dotenv": false,
-    "add_factory_bot_rails": false,
-    "add_faker": false,
+    "add_dotenv": true,
+    "add_factory_bot_rails": true,
+    "add_faker": true,
     "add_friendly_id": false,
     "add_groupdate": false,
     "add_hexapdf": false,
@@ -62,7 +62,7 @@
     "add_image_processing": false,
     "add_kaminari": false,
     "add_lograge": false,
-    "add_minimal_css": true,
+    "add_minimal_css": false,
     "minimal_css_library": "water.css",
     "add_mini_magick": false,
     "add_motor_admin": false,
@@ -74,7 +74,7 @@
     "add_ransack": false,
     "add_redcarpet": false,
     "add_rolify": false,
-    "add_rubocop": false,
+    "add_rubocop": true,
     "add_twilio_ruby": false
   }
 }

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_existence?
       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 :target_folder_exist_action # [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
+      @target_folder_exist_action = args[:target_folder_exist_action]   || '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,45 @@ module RailsAppGenerator
       end
     end
 
-    def delete_target_folder
-      FileUtils.rm_rf(target_path)
+    def handle_target_folder_found?
+      return true unless File.directory?(target_path)
+
+      case target_folder_exist_action
+      when 'abort'
+        puts "Target folder [#{target_path}] already exists. Aborting"
+        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 target_folder_exist_action: #{target_folder_exist_action}"
+      end
     end
 
     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.0'
 end

data/package-lock.json

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

data/package.json

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

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",
+    "target_folder_exists": "keep_git"
   },
   "opts": {
     "skip_test": true,
@@ -18,6 +19,7 @@
     "add_factory_bot_rails": true,
     "add_faker": true,
     "add_ransack": false,
-    "add_rubocop": true
+    "add_rubocop": true,
+    "add_scenic": true
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_app_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.43
+  version: 0.3.0
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootsnap
@@ -458,6 +458,11 @@ files:
 - after_templates/addons/twilio_ruby/app/views/home/index.html.erb
 - after_templates/addons/twilio_ruby/config/initializers/twilio.rb
 - after_templates/application/klueless/_.rb
+- after_templates/application/klueless/app/avo/cards/amount_raised.rb
+- after_templates/application/klueless/app/avo/cards/example_custom_partial.rb
+- after_templates/application/klueless/app/avo/cards/example_metric.rb
+- after_templates/application/klueless/app/avo/cards/percent_done.rb
+- after_templates/application/klueless/app/avo/cards/rubocop_card.rb
 - after_templates/application/klueless/app/avo/dashboards/dashboard.rb
 - after_templates/application/klueless/app/avo/resources/db_schema_resource.rb
 - after_templates/application/klueless/app/avo/resources/rails_app_resource.rb
@@ -481,6 +486,7 @@ files:
 - after_templates/application/klueless/config/initializers/avo.rb
 - after_templates/application/klueless/config/locales/en.yml
 - after_templates/application/klueless/db/seeds.rb
+- after_templates/application/klueless/db/views/rubocop_logs_v01.sql
 - after_templates/application/printspeak/_.rb
 - after_templates/application/printspeak/app/assets/images/.keep
 - after_templates/application/printspeak/app/assets/images/about/1.jpg