k_manager 0.0.24 → 0.0.32

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,17 +4,20 @@ 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'
+require 'drawio_dsl'
 
 # IS THIS NEEDED? this was used for infer_key
 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 +99,18 @@ module KManager
       @manager = Manager.new
     end
 
-    def_delegators :manager, :opts, :areas, :add_area, :find_document, :fire_actions, :resource_changed
+    def_delegators  :manager,
+                    :opts,
+                    :areas,
+                    :area_resources,
+                    :area_documents,
+                    :add_area,
+                    :find_document,
+                    :fire_actions,
+                    :resource_changed,
+                    :boot,
+                    :reboot,
+                    :debug
 
     # ----------------------------------------------------------------------
     # Document factory facade methods
@@ -108,13 +122,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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: k_manager
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.32
 platform: ruby
 authors:
 - David Cruwys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: drawio_dsl
+  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: dry-struct
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,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 +94,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
@@ -131,6 +173,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".builders/_.rb"
+- ".builders/boot.rb"
+- ".builders/generators/01-bootstrap.rb"
+- ".builders/generators/02-draw-chart.rb"
+- ".builders/graph/test.drawio"
+- ".builders/graph/xmen.drawio"
+- ".builders/graph/xmen.txt"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
@@ -150,6 +199,7 @@ files:
 - bin/khotfix
 - bin/setup
 - docs/flow.drawio
+- docs/shapes
 - exe/k_manager
 - hooks/pre-commit
 - hooks/update-version
@@ -162,7 +212,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