k_manager 0.0.24 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 157a9a658d9851e2dc9aa452e5acfffbbd323d40a5bd3aedaefee2ee0c416566
-  data.tar.gz: c2e4e2c47536323c37764003f5ee3267871c0521707f60559a086a7bf7c269df
+  metadata.gz: 10d0353e9cdde7cbec88c6b6a7dd47135da7fa026bf90ec9b6e5017c75ac2a0b
+  data.tar.gz: a77c72d2aa9888f29f3b3b835919828cbf6480e349cecb723e6862d81478f540
 SHA512:
-  metadata.gz: 58f487cb037aec8befd840a16c984f570fff3e1e9e9e96f38c8982b387fc39d07942eb8ffe5ed0ae3b285c99ca199749b4e744083c0e2a9126232baec2bfb1ba
-  data.tar.gz: f21a0047dce6f822e9b2fbbfde1bc183850c8ab02712964d651f733f395d50d2dfd4439f155eef5ef421170e642117981209eeb57c6f4dd5523fe99837577f7b
+  metadata.gz: eda368dd81ee863ad42831c6527f27b56a60d78d2e2417d377d8425fc6bcf823efe3998a61c5c358ff0329ba2251530b16e94e51acf44c2d463e0dc24874d921
+  data.tar.gz: 6aa66dabe51fcecf3d76dd65f202e5b21b7023133ca1892d1d743ed7059f0b7d3e2a00a354ea3b6d780ec59a77131d50b784aaf786e0937f20a8f71a419d24ea

data/Gemfile

@@ -31,14 +31,18 @@ if ENV['KLUE_LOCAL_GEMS']&.to_s&.downcase == 'true'
     gem 'handlebars-helpers'      , path: '../handlebars-helpers'
     gem 'k_builder'               , path: '../k_builder'
     gem 'k_builder-dotnet'        , path: '../k_builder-dotnet'
-    gem 'k_builder-package_json'  , path: '../k_builder-package_json'
+    # gem 'k_builder-package_json'  , path: '../k_builder-package_json'
     gem 'k_builder-webpack5'      , path: '../k_builder-webpack5'
+    gem 'k_config'                , path: '../k_config'
     gem 'k_decor'                 , path: '../k_decor'
+    gem 'k_director'              , path: '../k_director'
     gem 'k_doc'                   , path: '../k_doc'
     gem 'k_domain'                , path: '../k_domain'
+    gem 'k_ext-github'            , path: '../k_ext-github'
     gem 'k_fileset'               , path: '../k_fileset'
     gem 'k_log'                   , path: '../k_log'
     gem 'k_type'                  , path: '../k_type'
     gem 'k_util'                  , path: '../k_util'
+    gem 'peeky'                   , path: '../peeky'
   end
 end

data/exe/k_manager

@@ -3,6 +3,7 @@
 # frozen_string_literal: true
 
 require 'pry'
+puts 'dddddddddddddddddddddd'
 
 lib_path = File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
 gem_path = File.expand_path(File.join(File.dirname(__FILE__), '../Gemfile'))

data/hooks/update-version

@@ -30,4 +30,4 @@ end
 output.push('')
 
 printf "%-25<label>s : %<version>s\n", label: 'GEM VERSION', version: version
-File.open('lib/k_manager/version.rb', 'w+') { |f| f.write(output.join("\n")) }
+File.write('lib/k_manager/version.rb', output.join("\n"))

data/k_manager.gemspec

@@ -41,7 +41,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dry-struct', '~> 1'
   spec.add_dependency 'filewatcher', '~> 2.0.0.beta5'
   spec.add_dependency 'k_builder', '~> 0.0.0'
+  spec.add_dependency 'k_director', '~> 0.1'
   spec.add_dependency 'k_doc', '~> 0.0.0'
+  spec.add_dependency 'k_domain', '~> 0.0.0'
   spec.add_dependency 'k_ext-github', '~> 0.0.0'
   spec.add_dependency 'k_fileset', '~> 0.0.0'
   spec.add_dependency 'k_log', '~> 0.0.0'

data/lib/k_manager/area.rb

@@ -18,7 +18,7 @@ module KManager
       raise 'Area name is required' unless @name
 
       @namespace  = opts[:namespace] || @name
-      @config     = KBuilder.configuration(@name)
+      @config     = KConfig.configuration(@name)
     end
 
     def resource_manager

data/lib/k_manager/cli/new.rb

@@ -14,46 +14,95 @@ module KManager
                   default: '.builders',
                   desc: 'The builder folder, defaults to (.builders)'
 
-        option    :boot_file,
-                  default: 'boot.rb',
-                  aliases: ['-b'],
-                  desc: 'The name of the boot file to create'
-
         option    :force,
                   default: false,
                   aliases: ['-f'],
                   desc: 'Force even if guard fails'
 
+        option    :template,
+                  default: false,
+                  aliases: ['-t'],
+                  desc: 'Starter template'
+
+        option    :log_level,
+                  default: nil,
+                  desc: 'Log level, use debug for more info'
+
         example [
           '                           # Project in current directory - will create a .builders folder and boot file at ./builders/boot.rb',
           '-b ../config/boot.rb       # Project in current directory - will create a .builders folder and boot file at ./config/boot.rb',
+          '-t ruby_gem                # Use starter template `ruby_gem` to setup the files in .builders/*',
           'my_project                 # will watch .xmen folder'
         ]
 
         # rubocop:disable Metrics/ParameterLists
-        def call(project_folder:, builder_folder:, boot_file:, log_level:, force:, **)
-          project_folder  = absolute_path(project_folder, Dir.pwd)
-          name            = File.basename(project_folder)
-          builder_folder  = absolute_path(builder_folder, project_folder)
-          boot_file       = absolute_path(boot_file, builder_folder)
+        def call(project_folder:, builder_folder:, log_level:, force:, template:, **)
+          project_folder        = absolute_path(project_folder, Dir.pwd)
+          name                  = File.basename(project_folder)
+          builder_folder        = absolute_path(builder_folder, project_folder)
+          template_root_folder  = File.expand_path('~/dev/kgems/k_templates/definitions/starter')
 
-          log_params(name, project_folder, builder_folder, boot_file, force) if log_level == 'debug'
+          log_params(name, project_folder, builder_folder, force, log_level, template_root_folder, template) if log_level == 'debug'
 
-          create_project(project_folder, builder_folder, boot_file) if can_create?(force, builder_folder)
+          create_project(name, project_folder, builder_folder, template_root_folder, template) if can_create?(force, builder_folder)
         end
         # rubocop:enable Metrics/ParameterLists
 
         private
 
-        def create_project(project_folder, builder_folder, boot_file)
+        def create_project(name, project_folder, builder_folder, template_root_folder, template)
           FileUtils.mkdir_p(project_folder)
           FileUtils.mkdir_p(builder_folder)
-          File.write(boot_file, '# Boot Sequence')
-          # Use a boot_file_template if needed
+
+          # handle_main_start_command
+
+          setup_builder_from_template(name, builder_folder, template_root_folder, 'default') unless setup_builder_from_template(name, builder_folder, template_root_folder, template)
 
           log.info 'Project created'
         end
 
+        def setup_builder_from_template(name, builder_folder, template_root_folder, template = nil)
+          return false unless template
+
+          # /Users/davidcruwys/dev/kgems/k_templates/definitions/starter/ruby_gem/.starter.json
+          template_folder = File.join(template_root_folder, template)
+          starter_config = template_starter_config(template_folder)
+
+          return false unless starter_config
+
+          builder = get_builder(builder_folder, template_folder)
+
+          return false if starter_config['files'].nil? || starter_config['files'].empty?
+
+          starter_config['files']&.each do |relative_file|
+            builder.add_file(relative_file, template_file: relative_file, name: name)
+          end
+        end
+
+        def template_starter_config(template_folder)
+          starter_file = File.join(template_folder, '.starter.json')
+
+          return nil unless File.exist?(starter_file)
+
+          JSON.parse(File.read(starter_file))
+        end
+
+        # rubocop:disable Metrics/AbcSize
+        def get_builder(builder_folder, template_folder)
+          Handlebars::Helpers.configure do |config|
+            config.helper_config_file = File.join(Gem.loaded_specs['handlebars-helpers'].full_gem_path, '.handlebars_helpers.json')
+            config.string_formatter_config_file = File.join(Gem.loaded_specs['handlebars-helpers'].full_gem_path, '.handlebars_string_formatters.json')
+          end
+
+          KConfig.configure(:starter_template) do |config|
+            config.target_folders.add(:builder              , builder_folder)
+            config.template_folders.add(:template           , template_folder)
+          end
+
+          KBuilder::BaseBuilder.init(KConfig.configuration(:starter_template))
+        end
+        # rubocop:enable Metrics/AbcSize
+
         def can_create?(force, builder_folder)
           return true if force
           return true unless File.directory?(builder_folder)
@@ -63,14 +112,18 @@ module KManager
           false
         end
 
-        def log_params(name, project_folder, builder_folder, boot_file, force)
+        # rubocop:disable Metrics/ParameterLists
+        def log_params(name, project_folder, builder_folder, force, log_level, template_root_folder, template)
           log.section_heading('Create new project')
-          log.kv 'name'           , name
-          log.kv 'project_folder' , project_folder
-          log.kv 'builder_folder' , builder_folder
-          log.kv 'boot_file'      , boot_file
-          log.kv 'force'          , force
+          log.kv 'name'                 , name
+          log.kv 'project_folder'       , project_folder
+          log.kv 'builder_folder'       , builder_folder
+          log.kv 'force'                , force
+          log.kv 'log_level'            , log_level
+          log.kv 'template_root_folder' , template_root_folder
+          log.kv 'template'             , template
         end
+        # rubocop:enable Metrics/ParameterLists
       end
     end
   end

data/lib/k_manager/cli/watch.rb

@@ -27,16 +27,32 @@ module KManager
 
           log_params(builder_folder, boot_file) if log_level == 'debug'
 
-          # puts builder_folder
-          # puts boot_file
+          # If you do a System Exit (control+c) you can go into a reboot sequence based on options
+          # if the option is not set then system will exit gracefully
+          while keep_watching(builder_folder, boot_file); end
+        end
+
+        private
 
+        # rubocop:disable Metrics/AbcSize
+        def keep_watching(builder_folder, boot_file)
           Dir.chdir(builder_folder) do
             watcher = KManager::Watcher.new(builder_folder, boot_file)
             watcher.start
           end
-        end
+          false
+        rescue Interrupt, SystemExit
+          if KManager.opts.reboot_on_kill == true || KManager.opts.reboot_on_kill == 1
+            puts "\nRebooting #{KManager.opts.app_name}..."
+            sleep KManager.opts.reboot_sleep unless KManager.opts.reboot_sleep.zero?
 
-        private
+            return true
+          end
+
+          puts "\nExiting..."
+          false
+        end
+        # rubocop:enable Metrics/AbcSize
 
         def log_params(builder_folder, boot_file)
           log.section_heading('Watch project')

data/lib/k_manager/manager.rb

@@ -28,7 +28,29 @@ module KManager
       yield(@current_resource)
     end
 
-    Options = Struct.new(:sleep, :exception_style)
+    # Usage
+    #
+    # KManager.opts.sleep                       = 10
+    # KManager.opts.reboot_on_kill              = 0
+    # KManager.opts.exception_style             = :short
+    # KManager.opts.show.time_taken             = true
+    # KManager.opts.show.finished               = true
+    # KManager.opts.show.finished_message       = 'FINISHED :)'
+
+    Options = Struct.new(
+      :app_name,
+      :exception_style,
+      :reboot_on_kill,
+      :reboot_sleep,
+      :sleep,
+      :show
+    )
+
+    Show = Struct.new(
+      :time_taken,
+      :finished,
+      :finished_message
+    )
 
     # @param [Integer] sleep Seconds to sleep after running, 0 = no sleep
     # @param [Symbol] exception_style Format for exception messages caught by watcher.
@@ -36,7 +58,7 @@ module KManager
     #   :short - message and short backtrace
     #   :long - message and long backtrace
     def opts
-      @opts ||= Options.new(0, :message)
+      @opts ||= Options.new('', :message, false, 1, 0, Show.new(true, true, 'FINISHED :)'))
     end
 
     def areas
@@ -104,7 +126,15 @@ module KManager
       @active_uri = nil
     end
 
+    def reboot
+      puts 'Fire reboot'
+      KManager.opts.reboot_on_kill = 1
+      raise SystemExit
+    end
+
     def debug(*sections)
+      log.structure(KUtil.data.to_hash(opts))
+
       areas.each do |area|
         area.debug(*sections)
       end

data/lib/k_manager/overview/dashboard.rb

@@ -45,7 +45,7 @@ module KManager
               { namespace:      { display_method: ->(row) { row.namespace } } },
               { status:         { display_method: ->(row) { row.status } } },
               { content_type:   { display_method: ->(row) { row.content_type } } },
-              { content:        { display_method: ->(row) { row.content } } },
+              { content:        { display_method: ->(row) { format_content(row.content, row.content_type) }, width: 50 } },
               { document_count: { display_method: ->(row) { blank_zero(row.document_count) } } },
               { valid:          { display_method: ->(row) { row.valid } } },
               { error_count:    { display_method: ->(row) { blank_zero(row.errors.length) } } },
@@ -119,6 +119,15 @@ module KManager
         log.structure(data, **opts)
       end
 
+      def format_content(content, type)
+        formatted = content
+        case type
+        when :ruby
+          formatted = formatted&.sub(/\A# frozen_string_literal: true/, '')&.strip
+        end
+        formatted
+      end
+
       def blank_zero(value)
         return nil if value.nil? || (value.is_a?(Integer) && value.zero?)
 

data/lib/k_manager/resources/base_resource.rb

@@ -175,7 +175,8 @@ module KManager
       rescue Exception => e
         guard(e.message)
         debug
-        log.exception(e, style: :short)
+        log.exception(e, style: KManager.opts.exception_style)
+        # log.exception(e, style: :short)
       end
       # rubocop:enable Lint/RescueException
 

data/lib/k_manager/resources/resource_document_factory.rb

@@ -89,6 +89,8 @@ module KManager
           # if documents.length > 0
           #   resource.resource_type = KDsl::Resources::Resource::TYPE_RUBY_DSL
           # end
+        rescue Interrupt, SystemExit
+          raise
         rescue Exception => e
           # Report the error but still add the document so that you can see
           # it in the ResourceDocument list, it will be marked as Error

data/lib/k_manager/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KManager
-  VERSION = '0.0.24'
+  VERSION = '0.0.28'
 end

data/lib/k_manager/watcher.rb

@@ -20,41 +20,65 @@ module KManager
     # process_updated_file(filename) if event == :updated # || event == :created
     # process_deleted_file(filename) if event == :deleted
 
-    # rubocop:disable Lint/RescueException, Metrics/AbcSize
+    # rubocop:disable Lint/RescueException, Metrics/AbcSize, Metrics/MethodLength
     def start
       boot_up
 
       update_dashboard
 
-      Filewatcher.new(watch_folder).watch do |changes|
-        changes.each do |filename, event|
-          clear_screen
+      watcher = Filewatcher.new(watch_folder)
 
-          puts "File #{event}: #{filename}"
+      watcher.watch do |changes|
+        watcher.pause
+        if changes.length > 1
+          log.kv 'HOW MANY CHANGES', changes.length
+          log.block changes
+        end
 
-          # NOTE: KManager will not support space in file name, but this will at least deal with file copy when " copy" is added to a file name
+        changes.each do |filename, event|
+          # NOTE: KManager will not support space in file name, but this will at least deal with file copies, where " copy" is added to a file name.
           filename = filename.gsub(' ', '%20')
 
-          puts "File #{event}: #{filename}"
+          log_file_event(event, filename)
 
           uri = URI::File.build(host: nil, path: filename)
+
+          start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
           KManager.resource_changed(uri, event)
+          finish_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          time_taken = finish_time - start_time
 
           sleep KManager.opts.sleep if KManager.opts.sleep.positive?
 
+          clear_screen
+
+          log_file_event(event, filename)
+          log.kv 'Time Taken', time_taken.to_d.round(3, :truncate).to_f if KManager.opts.show.time_taken
+
           update_dashboard
-          puts "File #{event}: #{filename}"
+
+          puts KManager.opts.show.finished_message if KManager.opts.show.finished
         end
+        watcher.resume
       end
+    rescue Interrupt, SystemExit
+      raise
     rescue Exception => e
-      # TODO: Make style a setting: :message, :short, (whatever the last one is)
-      log.exception(e, style: KManager.opts.exception_style)
       log.exception(e)
     end
-    # rubocop:enable Lint/RescueException, Metrics/AbcSize
+    # rubocop:enable Lint/RescueException, Metrics/AbcSize, Metrics/MethodLength
 
     private
 
+    def log_file_event(event, filename)
+      current = Time.now.strftime('%H:%M:%S')
+      output = "#{current} - #{event}: #{filename}"
+
+      log.warn(output)  if event == :updated
+      log.error(output) if event == :deleted
+      log.info(output)  if event == :created
+    end
+
     def boot_up
       clear_screen
 

data/lib/k_manager.rb

@@ -4,7 +4,10 @@ require 'csv'
 require 'dry-struct'
 require 'forwardable'
 require 'k_log'
+require 'k_config'
 require 'k_doc'
+require 'k_domain'
+require 'k_director'
 require 'k_fileset'
 require 'k_builder'
 require 'k_ext/github'
@@ -14,7 +17,6 @@ require 'handlebars/helpers/string_formatting/dasherize'
 require 'handlebars/helpers/string_formatting/snake'
 
 require 'k_manager/version'
-require 'k_manager/configuration/project_config'
 require 'k_manager/overview/models'
 require 'k_manager/overview/queries'
 require 'k_manager/overview/dump_json'
@@ -96,7 +98,15 @@ module KManager
       @manager = Manager.new
     end
 
-    def_delegators :manager, :opts, :areas, :add_area, :find_document, :fire_actions, :resource_changed
+    def_delegators  :manager,
+                    :opts,
+                    :areas,
+                    :add_area,
+                    :find_document,
+                    :fire_actions,
+                    :resource_changed,
+                    :reboot,
+                    :debug
 
     # ----------------------------------------------------------------------
     # Document factory facade methods
@@ -108,13 +118,6 @@ module KManager
 
     def_delegators :document_factory, :action, :model, :csv, :json, :yaml
 
-    # TODO: DEPRECATE or REFACTOR
-    def new_project_config(&block)
-      config = KManager::Configuration::ProjectConfig.new
-      block.call(config) if block_given?
-      config
-    end
-
     # ----------------------------------------------------------------------
     # Utilities
     # ----------------------------------------------------------------------

data/tasks/watch.rake

@@ -16,94 +16,3 @@ namespace :k_manager do
     watcher.start
   end
 end
-
-# require 'pry'
-# require 'k_manager'
-# require 'filewatcher'
-# require 'io/console'
-
-# class Watcher
-#   include KLog::Logging
-
-#   attr_reader :watch_folder
-#   attr_reader :boot_file
-
-#   def initialize(watch_folder, boot_file)
-#     @watch_folder = watch_folder
-#     @boot_file = boot_file
-#   end
-
-#
-#   def start
-#     boot(boot_file)
-#     update_dashboard
-
-#     Filewatcher.new(watch_folder).watch do |changes|
-#       changes.each do |filename, event|
-#         $stdout.clear_screen
-#         puts "File #{event}: #{filename}"
-
-#         uri = URI::File.build(host: nil, path: filename)
-#         KManager.resource_changed(uri, event)
-
-#         # process_created_file(filename) if event == :created
-#         # process_updated_file(filename) if event == :updated # || event == :created
-#         # process_deleted_file(filename) if event == :deleted
-#         update_dashboard
-#       end
-#     end
-#   rescue Exception => e
-#     # TODO: Make style a setting: :message, :short, (whatever the last one is)
-#     log.exception(e, style: :short)
-#   end
-#   #   private
-
-#   def boot(boot_file)
-#     clear_screen
-
-#     content = File.read(boot_file)
-#     Object.class_eval(content, boot_file)
-#   end
-
-#
-#   def process_updated_file(filename)
-#     clear_screen
-#     update_load_path(filename)
-
-#     puts "File updated: #{filename}"
-#   rescue Exception => e
-#     # TODO: Make style a setting: :message, :short, (whatever the last one is)
-#     log.exception(e, style: :short)
-#   end
-
-#   def process_updated_file_old(filename)
-#     clear_screen
-#     update_load_path(filename)
-
-#     puts "File updated: #{filename}"
-
-#     content = File.read(filename)
-#     Object.class_eval(content, filename)
-#   rescue Exception => e
-#     # TODO: Make style a setting: :message, :short, (whatever the last one is)
-#     log.exception(e, style: :short)
-#   end
-#   #   def update_dashboard
-#     dashboard = KManager::Overview::Dashboard.new(KManager.manager)
-#     dashboard.areas
-#     dashboard.resources
-#     dashboard.documents
-#   end
-
-#   def update_load_path(filename)
-#     dirname = File.dirname(filename)
-
-#     # This needs to be in detailed logging
-#     $LOAD_PATH.unshift(dirname) unless $LOAD_PATH.find { |path| path.start_with?(dirname) }
-#   end
-
-#   def clear_screen
-#     puts "\n" * 70
-#     $stdout.clear_screen
-#   end
-# end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k_manager
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.28
 platform: ruby
 authors:
 - David Cruwys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.0
+- !ruby/object:Gem::Dependency
+  name: k_director
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: k_doc
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.0
+- !ruby/object:Gem::Dependency
+  name: k_domain
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.0
 - !ruby/object:Gem::Dependency
   name: k_ext-github
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +190,6 @@ files:
 - lib/k_manager/cli/new.rb
 - lib/k_manager/cli/version.rb
 - lib/k_manager/cli/watch.rb
-- lib/k_manager/configuration/project_config.rb
 - lib/k_manager/document_factory.rb
 - lib/k_manager/manager.rb
 - lib/k_manager/overview/dashboard.rb

data/lib/k_manager/configuration/project_config.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module KManager
-  module Configuration
-    # Project configuration class for KManager
-    #
-    # This configuration contains template and target folders as used
-    # by all k_builders, it also has additional configuration that makes
-    # sense for a project, such as the GitHub repository configuration
-    class ProjectConfig < KBuilder::Configuration
-      attach_to(KExt::Github::Configuration, self, :github)
-    end
-  end
-end