k_builder 0.0.68 → 0.0.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bd3ddd77fda6cfa2a887a20fb924aa5a5181244a91d910540a32a7383074191
-  data.tar.gz: e942f11959736361d19c0b09f39a4ed6500b89373dcfa3e7e8763d79ff803559
+  metadata.gz: 71d70294c1dc49e1fc67dd77f71414019a3814f44057831273bc79d815146f05
+  data.tar.gz: 5d18531c4d7f4ddb2c1cafb8297bf7d2e0c3f708526464d2d700ea7750eb048f
 SHA512:
-  metadata.gz: 8ad7eec17221b5e64b59cea284bbfd7dc20af852c113462a90ae17637307f36945e4c7535c35d3a75a138a8fb662da86c8254dc2a244e2e5f3bc2c781ca2dff7
-  data.tar.gz: a8ca584e3c0ff1feae5d8cbf4b8c32fc0bea751cec6d23980092de814fea9f10c7f1dec936852a698edf6fdc70bfe913c26b86a6d5014f5a81ee0fe930c89a8f
+  metadata.gz: 7f5059460b2ab02d3708de1019a7ca2a9b4974c13e7f6da9b0c1d0aa720cdbdaabd29e3d9cb1451ce3b3db11211bd3fc9fd76edf4d284f12e48d0287ee328289
+  data.tar.gz: b02df37b1b11213b71e364d2c881de6df3e09ce355ada72807d30d6a37cca4a3fa263c8539e05cd582a64e3456c10b0ef74fed0a64de711c20bcf4c217fe546d

data/hooks/pre-commit

@@ -8,8 +8,8 @@ require 'English'
 
 exit 0 if ARGV.include?('--no-verify')
 
-warning_keywords = %w[console.log]
-keywords = %w[binding.pry console.dir byebug debugger]
+warning_keywords = %w[]
+keywords = %w[binding.pry console.dir byebug]
 files_changed = `git diff-index --name-only HEAD --`.split
 
 # puts '----------------------------------------------------------------------'

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_builder/version.rb', 'w+') { |f| f.write(output.join("\n")) }
+File.write('lib/k_builder/version.rb', output.join("\n"))

data/k_builder.gemspec

@@ -38,11 +38,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   # spec.extensions    = ['ext/k_builder/extconf.rb']
   spec.add_dependency 'handlebars-helpers', '~> 0'
+  spec.add_dependency 'k_config', '~> 0'
   spec.add_dependency 'k_log', '~> 0'
   spec.add_dependency 'k_type', '~> 0'
   spec.add_dependency 'k_util', '~> 0'
   spec.add_dependency 'rubocop', '~> 1.8'
 
-  # spec.add_dependency "anyway_config"     , ">= 2.0.0"
-  # spec.add_dependency "config"     , ">= 3.0.0"
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/k_builder/base_builder.rb

@@ -54,7 +54,7 @@ module KBuilder
 
     # assigns a builder hash and defines builder methods
     def initialize(configuration = nil)
-      configuration = KBuilder.configuration if configuration.nil?
+      configuration = KConfig.configuration if configuration.nil?
 
       @configuration = configuration
 
@@ -121,15 +121,16 @@ module KBuilder
     # Extra options will be used as data for templates, e.g
     # @option opts [String] :to Recipient email
     # @option opts [String] :body The email's body
-    def add_file_command(file, **opts)
+    def add_file_action(file, **opts)
       {
         action: :add_file,
+        played: false,
         file: file,
         opts: opts
       }
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def add_file(file, **opts)
       # move to command
       full_file = target_file(file, **opts) # opts.key?(:folder_key) || opts.key?(:folder) ? target_file(file, folder: opts[:folder], folder_key: opts[:folder_key]) : target_file(file)
@@ -145,6 +146,8 @@ module KBuilder
       run_prettier file                   if opts.key?(:pretty)
       # TODO: Add test
       run_cop(full_file, fix_safe: true)  if opts.key?(:cop) || opts.key?(:ruby_cop)
+      # TODO: Add test
+      run_command(file)                   if opts.key?(:run)
 
       # Need support for rubocop -a
       open_file(last_output_file)         if opts.key?(:open)
@@ -154,26 +157,49 @@ module KBuilder
 
       self
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-    def replay_commands(commands)
-      commands.each do |command|
-        case command[:action]
-        when :add_file
-          add_file(command[:file], command[:opts])
-        when :delete_file
-          delete_file(command[:file], command[:opts])
-        else
-          log.error "Unknown command: #{command[:action]}"
-        end
+    def play_actions(actions)
+      actions.reject { |action| action[:played] }.each do |action|
+        play_action(action)
+      end
+    end
+
+    def play_action(action)
+      run_action(action)
+      action[:played] = true
+    end
+
+    # certain actions (e.g. set_current_folder) will run independently to play
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    def run_action(action)
+      case action[:action]
+      when :add_file
+        add_file(action[:file], action[:opts])
+      when :delete_file
+        delete_file(action[:file], action[:opts])
+      when :vscode
+        vscode(action[:file_parts], action[:opts])
+      when :browse
+        browse(action[:file_parts], action[:opts])
+      when :set_current_folder
+        set_current_folder(action[:folder_key])
+      when :run_command
+        run_command(action[:command])
+      when :run_script
+        run_script(action[:script])
+      else
+        log.error "Unknown action: #{action[:action]}"
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
     alias touch add_file # it is expected that you would not supply any options, just a file name
 
-    def delete_file_command(file, **opts)
+    def delete_file_action(file, **opts)
       {
         action: :delete_file,
+        played: false,
         file: file,
         opts: opts
       }
@@ -241,9 +267,10 @@ module KBuilder
     end
     alias clipboard_copy add_clipboard
 
-    def vscode_command(*file_parts, folder_key: current_folder_key, file: nil)
+    def vscode_action(*file_parts, folder_key: current_folder_key, file: nil)
       {
         action: :vscode,
+        played: false,
         file_parts: file_parts,
         opts: { folder_key: folder_key, file: file }
       }
@@ -258,9 +285,10 @@ module KBuilder
       self
     end
 
-    def browse_command(*file_parts, folder_key: current_folder_key, file: nil)
+    def browse_action(*file_parts, folder_key: current_folder_key, file: nil)
       {
         action: :browse,
+        played: false,
         file_parts: file_parts,
         opts: { folder_key: folder_key, file: file }
       }
@@ -330,6 +358,14 @@ module KBuilder
     # Target folders and files
     # ----------------------------------------------------------------------
 
+    def set_current_folder_action(folder_key)
+      {
+        action: :set_current_folder,
+        played: false,
+        folder_key: folder_key
+      }
+    end
+
     def set_current_folder(folder_key)
       target_folders.current = folder_key
 
@@ -503,9 +539,49 @@ module KBuilder
       # need to support the fork process options as I was not able to run
       # k_builder_watch -n because it hid all the following output
       system(build_command)
+
+      # FROM k_dsl
+      # system "/usr/local/bin/zsh #{output_file}" if execution_context == :system
+      # fork { exec("/usr/local/bin/zsh #{output_file}") } if execution_context == :fork
     end
     alias rc run_command
 
+    def run_command_action(command)
+      {
+        action: :run_command,
+        played: false,
+        command: command
+      }
+    end
+
+    # NOT TESTED, and not working with opts, this code needs rewrite
+    def run_script(script)
+      # Deep path create if needed
+      tf = target_folder
+
+      mkdir_p(tf)
+
+      Dir.chdir(tf) do
+        output, status = Open3.capture2(script) # , **opts)
+
+        unless status.success?
+          log.error('Script failed')
+          puts script
+          return nil
+        end
+
+        return output
+      end
+    end
+
+    def run_script_action(script)
+      {
+        action: :run_script,
+        played: false,
+        script: script
+      }
+    end
+
     def file_write(file, content, on_exist: :skip)
       self.last_output_file = file # if file not found, we still want to record this as the last_output_file
 

data/lib/k_builder/configuration_extension.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# Attach configuration to the KBuilder module
+module KBuilder
+  module ConfigurationExtension
+    # Target folders provide a set of named folders that can be written to
+    def target_folders=(value)
+      @target_folders = value
+    end
+
+    def target_folders
+      @target_folders ||= KType::NamedFolders.new
+    end
+
+    # Template folders provides layered folders that templates can exist within
+    def template_folders=(value)
+      @template_folders = value
+    end
+
+    def template_folders
+      @template_folders ||= KType::LayeredFolders.new
+    end
+
+    # Custom debug method for k_builder
+    #
+    # usage:
+    #   config.debug(:k_builder_debug)
+    def k_builder_debug
+      target_folders.debug(title: 'target_folders')
+
+      template_folders.debug(title: 'template folders (search order)')
+      ''
+    end
+
+    # Custom initialize_copy method for k_builder. This is called during clone
+    def k_builder_initialize_copy(orig)
+      @target_folders = orig.target_folders.clone
+      @template_folders = orig.template_folders.clone
+    end
+  end
+end
+
+puts 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+KConfig::Configuration.register(:k_builder, KBuilder::ConfigurationExtension)

data/lib/k_builder/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KBuilder
-  VERSION = '0.0.68'
+  VERSION = '0.0.73'
 end

data/lib/k_builder.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
 require 'rubocop'
+require 'open3'
 
+require 'k_config'
 require 'k_log'
 require 'k_util'
 require 'k_type'
 require 'k_builder/version'
 require 'k_builder/base_builder'
-require 'k_builder/base_configuration'
-require 'k_builder/configuration'
+require 'k_builder/configuration_extension'
 require 'k_builder/file_segments'
 
 # should commands be in their own gem?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.68
+  version: 0.0.73
 platform: ruby
 authors:
 - David Cruwys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: handlebars-helpers
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: k_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: k_log
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +117,7 @@ files:
 - Sample.drawio
 - Sample.xml
 - USAGE.md
+- a.txt
 - bin/console
 - bin/k
 - bin/kgitsync
@@ -112,17 +127,11 @@ files:
 - hooks/update-version
 - k_builder.gemspec
 - lib/k_builder.rb
-- lib/k_builder/assets/a.html
-- lib/k_builder/assets/b.html
-- lib/k_builder/assets/highlight.min.js
-- lib/k_builder/assets/highlight_css
-- lib/k_builder/assets/ruby.min.js
 - lib/k_builder/base_builder.rb
-- lib/k_builder/base_configuration.rb
 - lib/k_builder/commands/base_command.rb
 - lib/k_builder/commands/code_syntax_highlighter_command.rb
 - lib/k_builder/commands/rubo_cop_command.rb
-- lib/k_builder/configuration.rb
+- lib/k_builder/configuration_extension.rb
 - lib/k_builder/file_segments.rb
 - lib/k_builder/version.rb
 - usage/_out1.png
@@ -139,6 +148,7 @@ metadata:
   homepage_uri: http://appydave.com
   source_code_uri: https://github.com/klueless-io/k_builder
   changelog_uri: https://github.com/klueless-io/k_builder/commits/master
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/k_builder/assets/a.html

@@ -1,235 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>David</title>
-  <script src="highlight.min.js"></script>
-  <!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.0.1/styles/default.min.css"> -->
-  <script src="https://cdn.jsdelivr.net/npm/html2canvas@1.0.0-rc.5/dist/html2canvas.min.js"></script>
-  <script src="//cdn.jsdelivr.net/gh/TRSasasusu/highlightjs-highlight-lines.js@1.1.6/highlightjs-highlight-lines.min.js"></script>
-  <script src="//cdn.jsdelivr.net/npm/highlightjs-line-numbers.js@2.8.0/dist/highlightjs-line-numbers.min.js"></script>
-
-  <link rel="stylesheet" href="highlight_css/a11y-light.css">
-
-  <style>
-  pre > code {
-      font-family: "Sans Mono", "Consolas", "Courier", monospace;
-  }
-
-
-  /* 
-    color: white; */
-
-  .animated-box {
-    font-family: 'Lato';
-    color: #ffffff;
-    padding: 30px;
-    text-align: center;
-    border-radius: 4px;
-  }
-
-  .animated-box {
-    position: relative;
-  }
-
-  .animated-box:after {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    border-radius: 4px;
-    background: linear-gradient(120deg, #00F260, #0575E6, #00F260); 
-    background-size: 300% 300%;
-    clip-path: polygon(0% 100%, 3px 100%, 3px 3px, calc(100% - 3px) 3px, calc(100% - 3px) calc(100% - 3px), 3px calc(100% - 3px), 3px 100%, 100% 100%, 100% 0%, 0% 0%);
-  }
-
-  .animated-box.in:after {
-    animation: frame-enter 1s forwards ease-in-out reverse, gradient-animation 4s ease-in-out infinite;
-  }
-
-  #box {
-    position: absolute;
-    top: 170px;
-    left: 70px;
-    width: 600px;
-    height: 465px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: white;
-    font-family: 'Raleway';
-    font-size: 2.5rem;
-    /* background-color: rgba(255,255,225,0); */
-  }
-
-  .with-linear-gradient {
-    --borderWidth: 13px;
-    background: transparent;
-    position: relative;
-    border-radius: var(--borderWidth);
-  }
-  .with-linear-gradient:after {
-    content: '';
-    position: absolute;
-    top: calc(-1 * var(--borderWidth));
-    left: calc(-1 * var(--borderWidth));
-    height: calc(100% + var(--borderWidth) * 2);
-    width: calc(100% + var(--borderWidth) * 2);
-    border-radius: calc(2 * var(--borderWidth));
-    background: linear-gradient(60deg, #f79533, #f37055, #ef4e7b, #a166ab, #5073b8);
-    z-index: -1;
-    animation: animatedgradient 3s ease alternate infinite;
-    background-size: 300% 300%;
-  }
-  .animated-box {
-    position: relative;
-  }
-
-  .animated-box:after {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    border-radius: 4px;
-    background: linear-gradient(120deg, #00F260, #0575E6, #00F260); 
-    background-size: 300% 300%;
-    clip-path: polygon(0% 100%, 3px 100%, 3px 3px, calc(100% - 3px) 3px, calc(100% - 3px) calc(100% - 3px), 3px calc(100% - 3px), 3px 100%, 100% 100%, 100% 0%, 0% 0%);
-  }
-
-  .animated-box.in:after {
-    animation: frame-enter 1s forwards ease-in-out reverse, gradient-animation 4s ease-in-out infinite;
-  }
-
-
-  @keyframes animatedgradient {
-    0% {
-      background-position: 0% 50%;
-    }
-    50% {
-      background-position: 100% 50%;
-    }
-    100% {
-      background-position: 0% 50%;
-    }
-  }
-
- */
-  /* for block of numbers */
-  .hljs-ln-numbers {
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-
-    text-align: center;
-    color: #ccc;
-    border-right: 1px solid #CCC;
-    vertical-align: top;
-    padding-right: 5px;
-
-    /* your custom style here */
-  }
-
-  /* for block of code */
-  .hljs-ln-code {
-      padding-left: 100px;
-  }
-
-  .borderexample {
-    border-style:solid;
-    border-color:#287EC7;
-  }
-</style>
-</head>
-<body>
-
-  
-
-  <div id="myBlock">
-    <pre><code class="ruby">
-# frozen_string_literal: true
-
-module KBuilder
-  module Commands
-    # Base command for single responsibility actions that can be fired
-    # from methods in the builder.
-    #
-    # Uses the command pattern
-    class BaseCommand
-      include KLog::Logging
-
-      attr_accessor :builder
-      attr_accessor :valid
-
-      def initialize(**opts)
-        @builder = opts[:builder]
-        @valid = true
-      end
-
-      def guard(message)
-        # THIS SHOULD ONLY LOG IF DEBUGGING IS TURNED ON
-        log.error(message)
-        @valid = false
-      end
-
-      def valid?
-        @valid
-      end
-
-      def debug(title: nil)
-        log.section_heading(title) if title
-        debug_values if respond_to?(:debug_values)
-      end
-    end
-  end
-end
-</code></pre>
-are go
-<a id='x' href="" download="name.jpg"></a>
-
-<div id='box' class='animated-box in' xclass="with-linear-gradient">
-  
-</div>
-</body>
-<script>hljs.highlightAll();</script>
-
-<button onclick="takeshot()">
-  Take Screenshot
-</button>
-
-<div id="output"></div>
-
-<script>
-
-const screenshotTarget = document.getElementById('myBlock');
-
-let div = document.getElementById('myBlock');
-
-setTimeout(function(){ 
-
-  html2canvas(div).then(
-  function (canvas) {
-    document
-    .getElementById('output')
-    .appendChild(canvas);
-  });
-
-}, 1000);
-
-hljs.initHighlightingOnLoad();
-hljs.initLineNumbersOnLoad();
-hljs.initHighlightLinesOnLoad([
-    [{start: 1, end: 3, color: '#555'}, {start: 6, end: 6, color: 'yellow'},], // Highlight some lines in the first code block.
-    [{start: 2, end: 3, color: 'rgba(255, 255, 255, 0.2)'},], // Highlight some lines in the second code block.
-]);
-
-</script>
-</html>