k_builder-watch 0.0.9 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffba6b210249e0a99bb8095803c1df6e215e499f0f841525ab87be0bb7326cb2
-  data.tar.gz: f1ae33a4e14004351b27a09120a7baa58cb5b3277dbfa2f77ac39bd46b967b20
+  metadata.gz: a379652e102ecbfa747989d7c7e62a2d490c1d45f45c9c32974118e295432246
+  data.tar.gz: a1235bf9a4c8ed27bee303a5c4cdd08ac24f1a7fb6e54ebca8a5a73131b000d7
 SHA512:
-  metadata.gz: a82f58fedc9e4a1d30d11b9fe9cd5f8a6595d0c05cbdabf698da0bebea1ecf61d68b7b8126bbad47fed00b85df7db3750bad01df3ecf122880e00d339dca2376
-  data.tar.gz: d0a10ab980f218d39423140b16a0a8a2934ccf046bdc7378312c8d46756c5c593e4c8e1b78ccf08fadca244a10c951892d6612d09f211b2b1c67417cc5310112
+  metadata.gz: 6266476ab5cf6320a4e0390931f46882bd612adb80bf192c3696e19444845c6c60f232e1b6c34456a52b8e99932f354ca3ce4a1791d51e03485391905bb4ab02
+  data.tar.gz: 36ac20f9633c28f8e5f5e697a41c0ad958289e43ead3657e4bbf9657823049a09bd5d4b447eb15fb48d3618fbf83f9bff4b2807bdf16672e28ea2f45313957b7

data/.builders/_initialize.rb

@@ -0,0 +1,16 @@
+Handlebars::Helpers.configure do |config|
+  config_file = File.join(Gem.loaded_specs['handlebars-helpers'].full_gem_path, '.handlebars_helpers.json')
+  config.helper_config_file = config_file
+end
+
+KBuilder.reset
+templates_ruby  = '~/dev/kgems/k_dsl/_/.template/ruby-cmdlet'
+target_root     = '~/dev/kgems/k_builder-watch/'
+
+KBuilder.configure do |config|
+  config.target_folders.add(:app      , target_root)
+
+  config.template_folders.add(:global , File.join(templates_ruby , '.global_template'))
+  # config.template_folders.add(:app    , File.join(template_root , '.app_template'))
+end
+

data/.builders/basic.rb

@@ -0,0 +1,29 @@
+require '_initialize.rb'
+
+builder = KBuilder::BaseBuilder
+  .init
+#   .add_file('main.rb', template_file: 'class.rb', name: 'main')
+#   .add_file('person.rb',
+#     template_file: 'model.rb',
+#     name: 'person',
+#     fields: %i[first_name last_name])
+#   .add_file('address.rb',
+#     template_file: 'model.rb',
+#     name: 'address',
+#     fields: %i[street1 street2 post_code state])
+#   .add_file('css/index.css',
+#     template: '{{#each colors}} .{{.}} { color: {{.}} }  {{/each}}',
+#     colors: %w[red blue green],
+#     pretty: true)
+
+#     # /Users/davidcruwys/dev/xxx-watch
+#     # /Users/davidcruwys/dev/xxx-watch/basic.rb
+
+
+# file = builder.target_file('main.rb')
+# puts file
+# puts File.exist?(file)
+# system("code #{file}")
+# puts 'basic'
+
+puts 'DONE!'

data/.gitignore

@@ -23,6 +23,7 @@ k_builder_watch.yml
 /doc/
 /pkg/
 /spec/reports/
+/spec/samples-output/
 /tmp/
 !/tmp/.keep
 *.bundle

data/Gemfile

@@ -23,3 +23,16 @@ group :development, :test do
   gem 'rubocop-rake', require: false
   gem 'rubocop-rspec', require: false
 end
+
+# # If local dependency
+# if true
+#   group :development, :test do
+#     # /Users/davidcruwys/dev/kgems/k_builder/lib/k_builder
+#     gem 'k_builder', path: '../k_builder'
+#     gem 'k_builder-package_json', path: '../k_builder-package_json'
+#     gem 'k_builder-webpack5', path: '../k_builder-webpack5'
+#     gem 'k_doc', path: '../k_doc'
+#     gem 'k_log', path: '../k_log'
+#     gem 'k_util', path: '../k_util'
+#   end
+# end

data/bin/run

@@ -11,7 +11,5 @@ require 'k_builder/watch'
 cli = KBuilder::Watch::Cli.new
 cli.execute
 
-unless cli.debug
-  watcher = KBuilder::Watch::Watcher.new(cli.watch_path)
-  watcher.start
-end
+watcher = KBuilder::Watch::Watcher.new(cli.watch_path)
+watcher.start

data/exe/{kw → k_builder-watch}

@@ -11,7 +11,5 @@ require 'k_builder/watch'
 cli = KBuilder::Watch::Cli.new
 cli.execute
 
-unless cli.debug
-  watcher = KBuilder::Watch::Watcher.new(cli.watch_path)
-  watcher.start
-end
+watcher = KBuilder::Watch::Watcher.new(cli.watch_path)
+watcher.start

data/k_builder-watch.gemspec

@@ -38,8 +38,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   # spec.extensions    = ['ext/k_builder/watch/extconf.rb']
 
-  spec.add_dependency 'filewatcher', '~> 0.0'
+  spec.add_dependency 'filewatcher', '~> 2.0.0.beta3'
   spec.add_dependency 'k_builder', '~> 0.0'
   spec.add_dependency 'k_builder-package_json', '~> 0.0'
   spec.add_dependency 'k_builder-webpack5', '~> 0.0'
+  spec.add_dependency 'k_doc', '~> 0.0'
+  spec.add_dependency 'k_log', '~> 0.0'
+  spec.add_dependency 'k_util', '~> 0.0'
 end

data/lib/k_builder/watch.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'k_doc'
 require 'k_builder/watch/version'
 require 'k_builder/watch/cli'
 require 'k_builder/watch/watcher'
@@ -10,3 +11,5 @@ module KBuilder
     class Error < StandardError; end
   end
 end
+
+puts "KBuilder::Watch::Version: #{KBuilder::Watch::VERSION}" if ENV['KLUE_DEBUG']&.to_s&.downcase == 'true'

data/lib/k_builder/watch/cli.rb

@@ -14,16 +14,27 @@ module KBuilder
       attr_accessor :debug
       attr_accessor :base_path
       attr_accessor :path
+      attr_accessor :path_relative
+      attr_accessor :new_path
+      attr_accessor :new_path_relative
+      attr_accessor :new
+      attr_accessor :app_path
       attr_accessor :watch_path
       attr_accessor :help
 
       def initialize
+        # puts "Watch: #{KBuilder::Watch::VERSION}"
         # @repetitions = 1
         # @name = nil
         @debug = false
         @watch_path = nil
         @base_path = Dir.pwd
+        @path_relative = nil # '.'
         @path = nil
+        @app_path = nil
+        @new_path = nil
+        @new_path_relative = nil
+        @new = nil
 
         parse_arguments
         post_process_arguments
@@ -31,10 +42,10 @@ module KBuilder
 
       def options
         # ['--repeat'  , '-r', GetoptLong::REQUIRED_ARGUMENT],
-        # ['--name'    , '-n', GetoptLong::OPTIONAL_ARGUMENT]
         GetoptLong.new(
-          ['--help' , '-h', GetoptLong::NO_ARGUMENT],
-          ['--debug' , GetoptLong::NO_ARGUMENT]
+          ['--help'     , '-h', GetoptLong::NO_ARGUMENT],
+          ['--debug'    , GetoptLong::NO_ARGUMENT],
+          ['--new'      , '-n', GetoptLong::OPTIONAL_ARGUMENT]
         )
       end
 
@@ -52,15 +63,23 @@ module KBuilder
       end
 
       def parse_final_argument
-        if ARGV.length != 1
-          puts 'Missing dir argument (try --help)'
-          exit 0
-        end
+        # if ARGV.length != 1
+        #   puts 'Missing dir argument (try --help)'
+        #   exit 0
+        # end
+
+        @path_relative = if ARGV.length == 1
+                           ARGV.shift
+                         else
+                           '.'
+                         end
 
-        @path = ARGV.shift
+        return unless @path.nil?
+
+        @path = File.join(base_path, path_relative)
       end
 
-      def parse_option(opt, _arg)
+      def parse_option(opt, arg)
         case opt
         when '--help'
           @help = true
@@ -68,14 +87,20 @@ module KBuilder
           @debug = true
           # when '--repeat'
           #   @repetitions = arg.to_i
-          # when '--name' # sample
-          #   @name = (arg == '' ? 'John' : arg)
+        when '--new'
+          # Maybe better to call @new, @app_name
+          @new = arg
+          @app_path = File.join(base_path, arg)
+          @new_path_relative = arg == '' ? '.builders' : File.join(arg.to_s, '.builders')
+          @new_path = File.join(base_path, @new_path_relative)
+          @path = @new_path_relative
         end
       end
 
       def execute
         display_help      if help
         display_debug     if debug
+        new_builder       unless @new.nil?
 
         # Dir.chdir(dir)
         # for i in (1..repetitions)
@@ -87,29 +112,41 @@ module KBuilder
         # end
       end
 
-      def display_help
-        puts 'This is the help menu.'
-        puts '  -h This help file'
-        puts '  --debug debug options'
-
-        # hello [OPTION] ... DIR
-
-        # -h, --help:
-        #   show help
+      def new_builder
+        setup_file = File.join(new_path, 'setup.rb')
+        config_file = File.join(new_path, 'config', '_.rb')
 
-        # --repeat x, -n x:
-        #   repeat x times
+        FileUtils.mkdir_p(File.dirname(config_file))
+        File.write(setup_file, "require 'config/_'")                                unless File.exist?(setup_file)
+        File.write(config_file, "puts '_'\n\n#require 'config/_initialize'")        unless File.exist?(config_file)
 
-        # --name [name]:
-        #   greet user by name, if name not supplied default is John
+        system("code #{File.join(app_path, '.')}")
+      end
 
-        # DIR: The directory in which to issue the greeting.
+      def display_help
+        puts 'HELP: k_watcher [OPTION] ... DIR'
+        puts ''
+        puts '  -h, --help:                                   - show help'
+        puts '  --debug                                       - display debug options'
+        puts '  -n, --new [folder_name]                       - create a new .builders folder with setup file, optionally create it under the [FolderName]'
+        puts ''
+        puts ' DIR:                                           - The directory to watch, will default to current directory "."'
+        puts ''
+        puts 'examples'
+        puts ''
+        puts 'Get Help                                        - k_watcher -h'
+        puts 'Debug                                           - k_watcher --debug'
+        puts 'New builder project   (./.builders)             - k_watcher -n'
+        puts 'New builder project   (./HelloWorld/.builders)  - k_watcher -n HelloWorld'
+        puts 'Watch current folder  (.)                       - k_watcher'
+        puts 'Watch the subfolder   (.builders)               - k_watcher .builders'
 
         exit
       end
 
       def display_debug
         puts JSON.pretty_generate(to_h)
+        exit
       end
 
       def to_h
@@ -117,14 +154,20 @@ module KBuilder
         # name: name,
         {
           debug: debug,
+          app_path: app_path,
           base_path: base_path,
+          path_relative: path_relative,
           watch_path: watch_path,
-          path: path
+          new_path: new_path,
+          new_path_relative: new_path_relative,
+          new: new
         }
       end
 
       private
 
+      # Refactor to use KUtil.file.expand_path(path, base_path)
+      # Need tests
       def set_watch_path
         @watch_path = if path.start_with?('~')
                         File.expand_path(path)

data/lib/k_builder/watch/version.rb

@@ -2,6 +2,6 @@
 
 module KBuilder
   module Watch
-    VERSION = '0.0.9'
+    VERSION = '0.0.15'
   end
 end

data/lib/k_builder/watch/watcher.rb

@@ -8,8 +8,9 @@ require 'io/console'
 # require 'handlebars/helpers/configuration'
 
 module KBuilder
+  # Watch supports any watch and execute processes for builders
   module Watch
-    # Watch fo
+    # Watcher does the actual file watching and run the processor
     class Watcher
       attr_accessor :directory
 
@@ -21,33 +22,52 @@ module KBuilder
       # watch_file = File.join(directory, 'DOMAIN_INSTRUCTIONS.MD')
 
       def start
-        puts 'Watching for file changes'
+        clear_screen
+        puts "KBuilder-Watch: v#{KBuilder::Watch::VERSION} is watching for file changes"
         puts "Directory: #{directory}"
         # puts "Watch File: #{watch_file}"
 
-        Filewatcher.new(directory).watch do |filename, event|
-          if (event == :updated) && filename # .casecmp(watch_file).zero?
-            # puts "\n" * 70
-            # $stdout.clear_screen
+        Filewatcher.new(directory).watch do |changes|
+          changes.each do |filename, event|
+            puts "File #{event}: #{filename}"
 
-            process_updated_file(filename)
+            process_updated_file(filename) if event == :updated
           end
-
-          puts "File deleted: #{filename}" if event == :delete
-          puts "Added file: #{filename}" if event == :new
         end
       end
 
+      # rubocop:disable Lint/RescueException
       def process_updated_file(filename)
-        puts "\n" * 70
-        $stdout.clear_screen
+        clear_screen
+        update_load_path(filename)
+
         puts "File updated: #{filename}"
 
         content = File.read(filename)
-        Object.class_eval content
-      rescue StandardError => e
+        Object.class_eval(content, filename)
+      rescue Exception => e
         puts e.message
-        puts e.backtrace.join("\n")
+        puts e.backtrace
+              .select { |ex| ex.start_with?(filename) }
+              .map { |m| m.delete_suffix(":in `process_updated_file'") }
+              .join("\n")
+        # puts '-' * 70
+        # puts e.backtrace.join("\n")
+      end
+      # rubocop:enable Lint/RescueException
+
+      private
+
+      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
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k_builder-watch
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.15
 platform: ruby
 authors:
 - David Cruwys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filewatcher
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 2.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 2.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: k_builder
   requirement: !ruby/object:Gem::Requirement
@@ -66,15 +66,59 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: k_doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: k_log
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: k_util
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 description: "    K-Builder-Watch will watch k_builder files and when they change,
   execute them\n"
 email:
 - david@ideasmen.com.au
 executables:
-- kw
+- k_builder-watch
 extensions: []
 extra_rdoc_files: []
 files:
+- ".builders/_initialize.rb"
+- ".builders/basic.rb"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
@@ -94,7 +138,7 @@ files:
 - bin/khotfix
 - bin/run
 - bin/setup
-- exe/kw
+- exe/k_builder-watch
 - hooks/pre-commit
 - hooks/update-version
 - k_builder-watch.gemspec