k_manager 0.0.28 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10d0353e9cdde7cbec88c6b6a7dd47135da7fa026bf90ec9b6e5017c75ac2a0b
-  data.tar.gz: a77c72d2aa9888f29f3b3b835919828cbf6480e349cecb723e6862d81478f540
+  metadata.gz: e37f7eaec478502778d24559e32635bf448788a5f89598961b3b5dc1d2109168
+  data.tar.gz: f51fe8850fdab828076e197902b88037aa99527e8c9f5faab4ab11ff4eec7c33
 SHA512:
-  metadata.gz: eda368dd81ee863ad42831c6527f27b56a60d78d2e2417d377d8425fc6bcf823efe3998a61c5c358ff0329ba2251530b16e94e51acf44c2d463e0dc24874d921
-  data.tar.gz: 6aa66dabe51fcecf3d76dd65f202e5b21b7023133ca1892d1d743ed7059f0b7d3e2a00a354ea3b6d780ec59a77131d50b784aaf786e0937f20a8f71a419d24ea
+  metadata.gz: 64d7a94731b67333f2d271c6b0fe9b04841b3d0a4fdaa7fa014a04af5fd3bb38ff888ded7b96ea74bef3f8239f5759f4edc5ffa9c5e02ddfaca4dba197d88f63
+  data.tar.gz: a7ce44a02dde86c04c40481ac56dc73adf3340e538f183b51dbd61e02cb122674d3decd58451acffda39351ae9d3d657230a4489bf1fd6b67297ca6afb4a686b

data/exe/k_manager

@@ -3,7 +3,6 @@
 # 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/lib/k_manager/cli/new.rb

@@ -28,6 +28,19 @@ module KManager
                   default: nil,
                   desc: 'Log level, use debug for more info'
 
+        option    :description,
+                  default: nil,
+                  aliases: ['-d'],
+                  desc: 'Application description'
+
+        option    :user_story,
+                  default: nil,
+                  desc: 'Main user story'
+
+        option    :repo_organization,
+                  default: nil,
+                  desc: 'Repository organization'
+
         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',
@@ -36,32 +49,34 @@ module KManager
         ]
 
         # rubocop:disable Metrics/ParameterLists
-        def call(project_folder:, builder_folder:, log_level:, force:, template:, **)
+        def call(project_folder:, builder_folder:, log_level:, force:, template:, **opts)
           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, force, log_level, template_root_folder, template) if log_level == 'debug'
+          log_params(name, project_folder, builder_folder, force, log_level, template_root_folder, template, **opts) if log_level == 'debug'
 
-          create_project(name, project_folder, builder_folder, template_root_folder, template) if can_create?(force, builder_folder)
+          create_project(name, project_folder, builder_folder, template_root_folder, template, **opts) if can_create?(force, builder_folder)
         end
         # rubocop:enable Metrics/ParameterLists
 
         private
 
-        def create_project(name, project_folder, builder_folder, template_root_folder, template)
+        # rubocop:disable Metrics/ParameterLists
+        def create_project(name, project_folder, builder_folder, template_root_folder, template, **opts)
           FileUtils.mkdir_p(project_folder)
           FileUtils.mkdir_p(builder_folder)
 
           # 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)
+          setup_builder_from_template(name, builder_folder, template_root_folder, 'default', **opts) unless setup_builder_from_template(name, builder_folder, template_root_folder, template, **opts)
 
           log.info 'Project created'
         end
+        # rubocop:enable Metrics/ParameterLists
 
-        def setup_builder_from_template(name, builder_folder, template_root_folder, template = nil)
+        def setup_builder_from_template(name, builder_folder, template_root_folder, template, **opts)
           return false unless template
 
           # /Users/davidcruwys/dev/kgems/k_templates/definitions/starter/ruby_gem/.starter.json
@@ -75,7 +90,7 @@ module KManager
           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)
+            builder.add_file(relative_file, template_file: relative_file, **{ name: name }.merge(opts))
           end
         end
 
@@ -112,8 +127,8 @@ module KManager
           false
         end
 
-        # rubocop:disable Metrics/ParameterLists
-        def log_params(name, project_folder, builder_folder, force, log_level, template_root_folder, template)
+        # rubocop:disable Metrics/ParameterLists, Metrics/AbcSize
+        def log_params(name, project_folder, builder_folder, force, log_level, template_root_folder, template, **opts)
           log.section_heading('Create new project')
           log.kv 'name'                 , name
           log.kv 'project_folder'       , project_folder
@@ -122,8 +137,12 @@ module KManager
           log.kv 'log_level'            , log_level
           log.kv 'template_root_folder' , template_root_folder
           log.kv 'template'             , template
+
+          opts.each do |key, value|
+            log.kv key, value
+          end
         end
-        # rubocop:enable Metrics/ParameterLists
+        # rubocop:enable Metrics/ParameterLists, Metrics/AbcSize
       end
     end
   end

data/lib/k_manager/document_import/build_tag.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module KManager
+  # Allow existing documents from KDoc and other sources to be imported using the resource manager
+  module DocumentImport
+    class BuildTag
+      include KDoc::Taggable
+
+      def initialize(key:, type: :container, namespace: nil)
+        opts = {
+          key: key,
+          type: type,
+          namespace: namespace
+        }
+
+        initialize_tag(opts)
+      end
+    end
+  end
+end

data/lib/k_manager/document_import/extension.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module KManager
+  # Alow existing documents from KDoc and other sources to be imported using the resource manager
+  module DocumentImport
+    module Extension
+      include KLog::Logging
+
+      def import(tag)
+        # KManager.find_document(tag)
+      end
+    end
+  end
+end
+
+KDoc::Action.include(KManager::DocumentImport::Extension)
+KDoc::Model.include(KManager::DocumentImport::Extension)
+KDoc::CsvDoc.include(KManager::DocumentImport::Extension)
+KDoc::JsonDoc.include(KManager::DocumentImport::Extension)
+KDoc::YamlDoc.include(KManager::DocumentImport::Extension)

data/lib/k_manager/document_import/importer.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module KManager
+  # Allow existing documents from KDoc and other sources to be imported using the resource manager
+  module DocumentImport
+    # Find a document by tag for importing
+    class Importer
+      def import(tag, area: nil)
+        KManager.find_document(tag, area: area)
+      end
+    end
+  end
+end

data/lib/k_manager/manager.rb

@@ -5,6 +5,8 @@ module KManager
   #
   # TODO: Write Tests
   class Manager
+    include KLog::Logging
+
     attr_accessor :active_uri
 
     # NOTE: rename current_resource to active_resource, focused_resource?
@@ -65,6 +67,24 @@ module KManager
       @areas ||= []
     end
 
+    # List of resources for an area.
+    #
+    # if area is nil, then return resources for the area matching the current_resource
+    def area_resources(area: nil)
+      area = resolve_area(area)
+
+      log.error 'Could not resolve area' if area.nil?
+
+      area&.resources
+    end
+
+    # List of documents for an area.
+    #
+    # if area is nil, for the area matching the current_resource
+    def area_documents(area: nil)
+      area_resources(area: area)&.flat_map(&:documents)
+    end
+
     def add_area(name, namespace: nil)
       area = find_area(name)
 
@@ -76,16 +96,7 @@ module KManager
     end
 
     def find_document(tag, area: nil)
-      area = resolve_area(area)
-
-      log.error 'Could not resolve area' if area.nil?
-
-      log.line
-      log.error(tag)
-      log.line
-
-      documents = area.resources.flat_map(&:documents)
-      documents.find { |d| d.tag == tag }
+      area_documents(area: area)&.find { |d| d.tag == tag }
     end
 
     def fire_actions(*actions)
@@ -101,14 +112,14 @@ module KManager
 
     def resolve_area(area)
       if area.nil?
-        return KManager.current_resource.area if KManager.current_resource
+        return current_resource.area if current_resource
 
-        return KManager.areas.first
+        return areas.first
       end
 
       return area if area.is_a?(Area)
 
-      find_area(name)
+      find_area(area)
     end
 
     # Return a list of resources for a URI.

data/lib/k_manager/overview/models.rb

@@ -64,7 +64,9 @@ module KManager
       attribute :document_id              , Types::Strict::Integer
       attribute :document_data            , Types::Strict::Any.optional.default # Hash.optional.default(nil) | Types::Strict::Array.of(Types::Strict::Hash).optional.default(nil)
       attribute :document_key             , Types::Strict::String | Types::Strict::Symbol
-      attribute :document_namespace       , Types::Strict::String | Types::Strict::Array.of(Types::Strict::String).optional.default(nil)
+      attribute :document_namespace       , Types::Strict::String | Types::Strict::Symbol |
+                                            Types::Strict::Array.of(Types::Strict::String).optional.default(nil) |
+                                            Types::Strict::Array.of(Types::Strict::Symbol).optional.default(nil)
       attribute :document_tag             , Types::Strict::String | Types::Strict::Symbol
       attribute :document_type            , Types::Strict::String | Types::Strict::Symbol
       # TODO: Write code to populate this with the resource line number

data/lib/k_manager/version.rb

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

data/lib/k_manager.rb

@@ -29,6 +29,9 @@ require 'k_manager/resources/mem_resource'
 require 'k_manager/resources/resource_document_factory'
 require 'k_manager/resources/resource_factory'
 require 'k_manager/resources/resource_manager'
+require 'k_manager/document_import/build_tag'
+require 'k_manager/document_import/importer'
+require 'k_manager/document_import/extension'
 require 'k_manager/document_factory'
 require 'k_manager/manager'
 require 'k_manager/area'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k_manager
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.30
 platform: ruby
 authors:
 - David Cruwys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -191,6 +191,9 @@ files:
 - lib/k_manager/cli/version.rb
 - lib/k_manager/cli/watch.rb
 - lib/k_manager/document_factory.rb
+- lib/k_manager/document_import/build_tag.rb
+- lib/k_manager/document_import/extension.rb
+- lib/k_manager/document_import/importer.rb
 - lib/k_manager/manager.rb
 - lib/k_manager/overview/dashboard.rb
 - lib/k_manager/overview/dump_json.rb