RubyGems - k_builder - Versions diffs - 0.0.62 → 0.0.70 - Mend

k_builder 0.0.62 → 0.0.70

Files changed (19) hide show

checksums.yaml +4 -4
data/Sample-original.xml +103 -0
data/Sample.drawio +103 -0
data/Sample.xml +103 -0
data/assets/a.html +235 -0
data/assets/b.html +109 -0
data/assets/highlight.min.js +1120 -0
data/assets/highlight_css +1 -0
data/assets/ruby.min.js +7 -0
data/hooks/pre-commit +4 -2
data/k_builder.gemspec +0 -1
data/lib/k_builder/base_builder.rb +292 -22
data/lib/k_builder/commands/code_syntax_highlighter_command.rb +71 -0
data/lib/k_builder/commands/rubo_cop_command.rb +1 -1
data/lib/k_builder/configuration.rb +22 -12
data/lib/k_builder/version.rb +1 -1
data/lib/k_builder.rb +4 -0
metadata +12 -4
data/~/last_cop.txt +0 -19

data/assets/highlight_css ADDED Viewed

	@@ -0,0 +1 @@
1	+ /Users/davidcruwys/dev/slides-addons/highlight_css

data/assets/ruby.min.js ADDED Viewed

@@ -0,0 +1,7 @@
+<html>
+<head><title>404 Not Found</title></head>
+<body bgcolor="white">
+<center><h1>404 Not Found</h1></center>
+<hr><center>nginx</center>
+</body>
+</html>

data/hooks/pre-commit CHANGED Viewed

@@ -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 '----------------------------------------------------------------------'
@@ -23,6 +23,8 @@ files_changed -= ['Gemfile']
 files_changed -= ['Gemfile.lock']
 files_changed -= ['.gitignore']
 files_changed -= ['README.md']
+files_changed -= ['lib/k_builder/assets/highlight.min.js']
+files_changed -= ['spec/k_builder/base_builder_spec.rb']
 files_changed = files_changed.reject { |f| f.downcase.end_with?('.json') }
 files_changed = files_changed.reject { |f| f.downcase.end_with?('.yml') }

data/k_builder.gemspec CHANGED Viewed

@@ -37,7 +37,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
   # spec.extensions    = ['ext/k_builder/extconf.rb']
   spec.add_dependency 'handlebars-helpers', '~> 0'
   spec.add_dependency 'k_log', '~> 0'
   spec.add_dependency 'k_type', '~> 0'

data/lib/k_builder/base_builder.rb CHANGED Viewed

@@ -1,21 +1,38 @@
 # frozen_string_literal: true
 module KBuilder
+  # TODO: Why is this called BaseBuilder, why not just builder
+  # TODO: Is this really the builder pattern, it could be the class used by a director
+  #       but it is not really storing information for builder purposes.
+  #
   # Base builder defines builder methods, build method and configuration
   #
   # Convention: Setter methods (are Fluent) and use the prefix set_
   #             Getter methods (are NOT fluent) and return the stored value
   #             Setter methods (are NOT fluent) can be created as needed
   #             these methods would not be prefixed with the set_
+  # process_any_content(content: 'abc')
+  # process_any_content(content_file: 'abc.txt')
+  # process_any_content(template: 'abc {{name}}', name: 'sean')
+  # process_any_content(template_file: 'abc.txt', name: 'sean')
+  # process_any_content(content_gist:  'https://gist.github.com/klueless-io/8d4b6d199dbe4a5d40807a47fff8ed1c')
+  # process_any_content(template_gist: 'https://gist.github.com/klueless-io/8d4b6d199dbe4a5d40807a47fff8ed1c', name: 'sean')
   class BaseBuilder
     include KLog::Logging
     attr_reader :configuration
     attr_accessor :target_folders
     attr_accessor :template_folders
+    attr_accessor :last_output_file
+    attr_accessor :last_output_folder
+    # attr_accessor :last_template
+    attr_accessor :last_template_file
     # Factory method that provides a builder for a specified structure
     # runs through a configuration block and then builds the final structure
     #
@@ -59,6 +76,7 @@ module KBuilder
       }
     end
+    # rubocop:disable Metrics/AbcSize
     def debug
       log.subheading 'kbuilder'
@@ -69,8 +87,16 @@ module KBuilder
       log.info ''
       template_folders.debug(title: 'template folders (search order)')
+      log.info ''
+      log.kv 'last output file'     , last_output_file
+      log.kv 'last output folder'   , last_output_folder
+      # log.kv 'last template'        , last_template
+      log.kv 'last template file'   , last_template_file
       ''
     end
+    # rubocop:enable Metrics/AbcSize
     # ----------------------------------------------------------------------
     # Fluent interface
@@ -95,31 +121,116 @@ 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_action(file, **opts)
+      {
+        action: :add_file,
+        played: false,
+        file: file,
+        opts: opts
+      }
+    end
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
     def add_file(file, **opts)
       # move to command
-      full_file = opts.key?(:folder_key) ? target_file(file, folder: opts[:folder_key]) : target_file(file)
+      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)
       # Need logging options that can log these internal details
-      FileUtils.mkdir_p(File.dirname(full_file))
+      mkdir_p(File.dirname(full_file))
       content = process_any_content(**opts)
-      File.write(full_file, content)
+      file_write(full_file, content, on_exist: opts[:on_exist])
       # Prettier needs to work with the original file name
-      run_prettier file if opts.key?(:pretty)
+      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)
+      open_file(last_template_file)       if opts.key?(:open_template)
+      browse_file(last_output_file)       if opts.key?(:browse)
+      pause(opts[:pause])                 if opts[:pause]
       self
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    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
+    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
     alias touch add_file # it is expected that you would not supply any options, just a file name
+    def delete_file_action(file, **opts)
+      {
+        action: :delete_file,
+        played: false,
+        file: file,
+        opts: opts
+      }
+    end
+    def delete_file(file, **opts)
+      full_file = target_file(file, **opts) # = opts.key?(:folder_key) ? target_file(file, folder: opts[:folder_key]) : target_file(file)
+      File.delete(full_file) if File.exist?(full_file)
+      self
+    end
+    def file_exist?(file, **opts)
+      # full_file = opts.key?(:folder_key) ? target_file(file, folder_key: opts[:folder_key]) : target_file(file)
+      full_file = target_file(file, **opts)
+      File.exist?(full_file)
+    end
+    # ToDo
+    # def delete_folder(file)
+    #   FileUtils.remove_dir(path_to_directory) if File.directory?(path_to_directory)
+    #   self
+    # end
     def make_folder(folder_key = nil, sub_path: nil)
       folder_key  = current_folder_key if folder_key.nil?
       folder      = target_folder(folder_key)
       folder      = File.join(folder, sub_path) unless sub_path.nil?
-      FileUtils.mkdir_p(folder)
+      mkdir_p(folder)
       self
     end
@@ -140,6 +251,8 @@ module KBuilder
       begin
         IO.popen('pbcopy', 'w') { |f| f << content }
+        open_file(last_template_file) if opts.key?(:open_template)
       rescue Errno::ENOENT => e
         if e.message == 'No such file or directory - pbcopy'
           # May want to use this GEM in the future
@@ -152,15 +265,84 @@ module KBuilder
     end
     alias clipboard_copy add_clipboard
-    def vscode(*file_parts, folder: current_folder_key)
+    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 }
+      }
+    end
+    def vscode(*file_parts, folder_key: current_folder_key, file: nil)
       # move to command
-      file = target_file(*file_parts, folder: folder)
+      file = target_file(*file_parts, folder_key: folder_key) if file.nil?
       rc "code #{file}"
       self
     end
+    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 }
+      }
+    end
+    def browse(*file_parts, folder_key: current_folder_key, file: nil)
+      # move to command
+      file = target_file(*file_parts, folder_key: folder_key) if file.nil?
+      rc "open -a \"Google Chrome\" #{file}"
+      self
+    end
+    def open
+      open_file(last_output_file)
+      self
+    end
+    alias o open
+    def open_template
+      open_file(last_template_file)
+      self
+    end
+    alias ot open_template
+    def open_file(file)
+      if file.nil?
+        log.warn('open_file will not open when file is nil')
+        return self
+      end
+      vscode(file: file)
+      self
+    end
+    def browse_file(file)
+      if file.nil?
+        log.warn('browse_file will not browse when file is nil')
+        return self
+      end
+      browse(file: file)
+      self
+    end
+    def pause(seconds = 1)
+      sleep(seconds)
+      self
+    end
     # ----------------------------------------------------------------------
     # Attributes: Think getter/setter
     #
@@ -174,6 +356,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
@@ -216,12 +406,18 @@ module KBuilder
     #   target_file('/abc.txt')
     #   target_file('/xyz/abc.txt')
     #   target_file('/xyz', 'abc.txt')
-    def target_file(*file_parts, folder: current_folder_key)
+    def target_file(*file_parts, folder_key: current_folder_key, folder: nil, **)
+      # TODO: Mismatch (sometimes called folder, sometimes called folder_key:)
+      if folder
+        log.error("Change folder: to folder_key: for #{folder} - #{file_parts}")
+        return
+      end
       # Absolute path
       return File.join(*file_parts) if Pathname.new(file_parts.first).absolute?
-      # Relative to :folder
-      File.join(target_folder(folder), *file_parts)
+      # Relative to :folder_key
+      File.join(target_folder(folder_key), *file_parts)
     end
     # Template folder & Files
@@ -242,7 +438,8 @@ module KBuilder
     # Gets a template_file relative to the template folder, looks first in
     # local template folder and if not found, looks in global template folder
     def find_template_file(file_parts)
-      template_folders.find_file(file_parts)
+      self.last_template_file = template_folders.find_file(file_parts)
+      last_template_file
     end
     # Building content from templates
@@ -268,15 +465,6 @@ module KBuilder
       return "content not found: #{opts[:content_file]}" if cf.nil?
-      # cf = opts[:content_file]
-      # unless File.exist?(cf)
-      #   cf_from_template_folders = find_template_file(cf)
-      #   return "Content not found: #{File.expand_path(cf)}" unless File.exist?(cf_from_template_folders)
-      #   cf = cf_from_template_folders
-      # end
       File.read(cf)
     end
@@ -340,7 +528,7 @@ module KBuilder
       # Deep path create if needed
       tf = target_folder
-      FileUtils.mkdir_p(tf)
+      mkdir_p(tf)
       build_command = "cd #{tf} && #{command}"
@@ -349,7 +537,89 @@ 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
+      not_found = !File.exist?(file)
+      if not_found
+        File.write(file, content)
+        return
+      end
+      return if %i[skip ignore].include?(on_exist)
+      if %i[overwrite write].include?(on_exist)
+        File.write(file, content)
+        return
+      end
+      return unless on_exist == :compare
+      vscompare(file, content)
+    end
+    def vscompare(file, content)
+      # need to use some sort of caching folder for this
+      ext = File.extname(file)
+      fn  = File.basename(file, ext)
+      temp_file = Tempfile.new([fn, ext])
+      temp_file.write(content)
+      temp_file.close
+      return if File.read(file) == content
+      system("code -d #{file} #{temp_file.path}")
+      sleep 2
+    end
+    def mkdir_p(folder)
+      @last_output_folder = FileUtils.mkdir_p(folder).first
+    end
   end
 end

data/lib/k_builder/commands/code_syntax_highlighter_command.rb ADDED Viewed

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+module KBuilder
+  module Commands
+    # Run CodeSyntaxHighlighter against source code and produce a styled HTML representation
+    #
+    # Alternatives to Highlighter-js could be carbon-now and ray.so
+    class CodeSyntaxHighlighterCommand < BaseCommand
+      attr_reader :source_code
+      attr_reader :formatted_code
+      def initialize(source_code, **opts)
+        super(**opts)
+        self.source_code = source_code
+      end
+      def execute
+        return unless valid?
+        run
+      end
+      private
+      def source_code=(value)
+        @source_code = value
+        guard('Source code is required for formatting') if value.nil? || value.empty?
+      end
+      def run
+        # @formatted_code = ExecJS.eval("'red yellow blue'.split(' ')")
+        # # highlight_source = 'lib/k_builder/assets/a.js'
+        # highlight_source = 'lib/k_builder/assets/highlight.min.js'
+        # log.error ExecJS.runtime.name
+        # a = File.read(highlight_source)
+        # # context = ExecJS.compile(a)
+        # context = ExecJS.compile(highlight_source)
+        # context.call("html = hljs.highlightAuto('<h1>Hello World!</h1>').value")
+        # get_js_asset('highlight')
+        # get_js_asset('ruby')
+      end
+      # https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.0.1/highlight.min.js
+      # https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.0.1/languages/ruby.min.js
+      def get_js_asset(name)
+        url = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.0.1/#{name}.min.js"
+        target_folder = 'lib/k_builder/assets'
+        file = "#{name}.min.js"
+        get_asset(url, target_folder, file)
+      end
+      def get_asset(url, target_folder, file)
+        local_asset_file = File.join(target_folder, file)
+        return if File.exist?(local_asset_file)
+        content = Net::HTTP.get(URI.parse(url))
+        File.write(local_asset_file, content)
+      end
+    end
+  end
+end

data/lib/k_builder/commands/rubo_cop_command.rb CHANGED Viewed

@@ -55,7 +55,7 @@ module KBuilder
         cli_options << '-a' if fix_safe
         cli_options << '-A' if fix_unsafe
         cli_options << '--config' << rubo_config_file if rubo_config_file
-        cli_options << '--out' << '~/last_cop.txt' unless show_console
+        cli_options << '--out' << File.expand_path('~/last_cop.txt') unless show_console
         cli_options << file_pattern
         cli_options
       end

data/lib/k_builder/configuration.rb CHANGED Viewed

@@ -5,18 +5,24 @@ module KBuilder
   # Configuration for webpack5/builder
   class << self
     attr_writer :configuration
-  end
-  def self.configuration
-    @configuration ||= Configuration.new
-  end
+    def configuration(name = :default)
+      @configuration ||= Hash.new do |h, key|
+        h[key] = KBuilder::Configuration.new
+      end
+      @configuration[name]
+    end
-  def self.reset
-    @configuration = Configuration.new
-  end
+    def reset(name = :default)
+      @configuration ||= Hash.new do |h, key|
+        h[key] = KBuilder::Configuration.new
+      end
+      @configuration[name] = KBuilder::Configuration.new
+    end
-  def self.configure
-    yield(configuration)
+    def configure(name = :default)
+      yield(configuration(name))
+    end
   end
   # Does this class need to move out into k_types?
@@ -48,12 +54,16 @@ module KBuilder
       @template_folders = orig.template_folders.clone
     end
-    def debug
-      log.subheading 'kbuilder base configuration'
+    def debug(heading: 'kbuilder base configuration')
+      log.section_heading 'kbuilder base configuration' if heading
+      # TODO: Add name to configuration object
+      # Don't have support for name on the configuration object yet
+      # log.kv 'config name', name
       target_folders.debug(title: 'target_folders')
-      log.info ''
+      # log.info ''
       template_folders.debug(title: 'template folders (search order)')
       ''

data/lib/k_builder/version.rb CHANGED Viewed

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

data/lib/k_builder.rb CHANGED Viewed

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require 'rubocop'
+require "open3"
 require 'k_log'
 require 'k_util'
@@ -10,8 +11,11 @@ require 'k_builder/base_builder'
 require 'k_builder/base_configuration'
 require 'k_builder/configuration'
 require 'k_builder/file_segments'
+# should commands be in their own gem?
 require 'k_builder/commands/base_command'
 require 'k_builder/commands/rubo_cop_command'
+require 'k_builder/commands/code_syntax_highlighter_command'
 require 'handlebars/helpers/template'

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.62
+  version: 0.0.70
 platform: ruby
 authors:
 - David Cruwys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: handlebars-helpers
@@ -99,7 +99,15 @@ files:
 - README.md
 - Rakefile
 - STORIES.md
+- Sample-original.xml
+- Sample.drawio
+- Sample.xml
 - USAGE.md
+- assets/a.html
+- assets/b.html
+- assets/highlight.min.js
+- assets/highlight_css
+- assets/ruby.min.js
 - bin/console
 - bin/k
 - bin/kgitsync
@@ -112,6 +120,7 @@ files:
 - 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/file_segments.rb
@@ -123,7 +132,6 @@ files:
 - usage/_out5.png
 - usage/_usage_folder_after.png
 - usage/_usage_folder_before.png
-- "~/last_cop.txt"
 homepage: http://appydave.com
 licenses:
 - MIT
@@ -146,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: K Builder provides various fluent builders for initializing applications