raykit 0.0.509 → 0.0.511

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7784b385cfc3ea2a2fc9a318a8867136f876b64d381499c7398f77c8974be3f
-  data.tar.gz: 84e101ecc1bbf418c9cc213b1fe0841a74d7babcee6941fdef76e9aaabb29b6c
+  metadata.gz: c1d1937bdf58abd18b03f0d8eefbc46046f9e12eb1b9123f7a27c869570f49be
+  data.tar.gz: 3c7e2be93bd42134a2ace37e3c8413b11218d9b9b729ff65e59d7df82248262a
 SHA512:
-  metadata.gz: 331687f9944a3b3128b77d3cfb3da8768f5a172454d88f449a10ba5a5b9e98449ad5a4d072ae1ea3f1cc83bdb3352803404e01f431d315fb81330e89949c5e2f
-  data.tar.gz: af55cd534d4747271790f9cdb73e6a95b4e10c640060ecbc98c43f736b6354cc36c86e1c78e737769864aa04898bdc7b8c0f4c13678977163fece7a1be6ecea3
+  metadata.gz: 9b961e91064b5b8d46e33bc4551cee0c2473948050959520acb1ddc56b0b4da28c5ac21732353b2e2318ea30895ba7ffb546ad917b26faac3ca2a9b344070bba
+  data.tar.gz: 6e9830b8c87a968b1641c8cb6c15b3105b7f8314d1413211e876e2f1ada4acf21421339c41173436fc9345e7d4a1290fe0420cf66ea08e62ef33846ba138da4d

data/lib/raykit/command.rb

@@ -208,7 +208,8 @@ module Raykit
       #error = "\u0058"
       #symbol = Rainbow(checkmark.encode("utf-8")).green
       #symbol = Rainbow(error.encode("utf-8")).red if @exitstatus != 0
-      symbol = Raykit::Symbols::checkmark if @exitstatus.zero?
+      symbol = Raykit::Symbols::warning
+      symbol = Raykit::Symbols::checkmark if !@exitstatus.nil? && @exitstatus.zero?
       symbol = Raykit::Symbols::error if @exitstatus != 0
       cmd = "#{Rainbow(SECRETS.hide(@command)).yellow}"
       if show_directory

data/lib/raykit/console.rb

@@ -24,17 +24,6 @@ module Raykit
       else
         @opts = opts
       end
-      #@opts = Slop.parse do |o|
-      #  o.string "-t", "--task", "rake task", default: "default"
-      #  o.bool "-v", "--verbose", "print detailed output", default: false
-      #  o.bool "-q", "--quiet", "minimal output", default: false
-      #  o.bool "-s", "--stop", "stop on error", default: true
-      #end
-
-      #if opts.verbose?
-      #  puts "options: #{Rainbow(@opts.to_hash).yellow.bright}"
-      #  puts "arguments:#{Rainbow(@opts.arguments).yellow.bright}"
-      #end
     end
 
     def run
@@ -148,7 +137,6 @@ module Raykit
       REPOSITORIES.matches(pattern).each do |url|
         repo = Raykit::Git::Repository.new(url)
         puts repo.to_s
-        #puts url
       end
     end
 
@@ -163,33 +151,17 @@ module Raykit
     def work
       pattern = ""
       pattern = @opts.arguments[1] if @opts.arguments.length > 1
-      #logger = Logger.new(STDOUT)
-
-      #logger.debug("work: pattern: #{pattern}")
-
       work_repositories = REPOSITORIES.matches(pattern)
       errors = []
-      #logger.info("work: found #{work_repositories.length} matching urls")
-      #puts "work: found #{work_repositories.length} matching urls"
+
       work_repositories.each do |url|
         default_command = "rake default"
-        #logger.info("work: #{url} #{default_command}")
-        #puts "work: #{url} #{default_command}"
         repo = Raykit::Git::Repository.new(url)
         cmd = repo.work default_command
-        #logger.info(cmd.to_s)
-        #puts cmd.to_s
-        #exitstatus = work_url(url)
-        #puts " " if @opts.verbose?
-        #return exitstatus if @opts[:stop] && exitstatus != 0
       end
       0
     end
 
-    #puts "\nwork \"rake default\""
-    #cmd = repo.work "rake default"
-    #puts cmd.to_s
-
     def work_url(url)
       return 0 if url == "https://gitlab.com/gems-rb/raykit.git"
 
@@ -270,19 +242,16 @@ module Raykit
       REPOSITORIES.matches(pattern).each do |url|
         repo = Raykit::Git::Repository.new(url)
         work = Raykit::Git::Directory.new(repo.get_dev_dir("work"))
-        next unless Dir.exist?(work.directory)
-
-        # TODO: run a git clean command in the directory
-        puts "cleaning #{work.directory}"
-        Dir.chdir(work.directory) do
-          cmd = Command.new("git clean -xdf")
-          cmd.summary if @opts.verbose?
-          if cmd.exitstatus != 0
-            cmd.details
-            abort Rainbow(cmd.summary).blue.bright if @opts.quit?
+        if Dir.exist?(work.directory)
+          puts "cleaning #{work.directory}"
+          Dir.chdir(work.directory) do
+            puts "git clean -xdf"
+            puts `git clean -xdf`
           end
+        else
+          puts "directory #{work.directory} does not exist"
         end
-      end
+      end # REPOSITORIES.matches(pattern).each do |url|
       Dir::remove_empty_directories(Raykit::Environment.get_dev_dir("work"))
     end
 

data/lib/raykit/git/repository.rb

@@ -69,7 +69,6 @@ module Raykit
       # The relative path is a valid local path name derived from the url
       def relative_path
         Repository::get_relative_path(@url)
-        #@url.gsub("https://", "").gsub(".git", "").gsub("http://", "")
       end
 
       def self.get_relative_path(url)
@@ -217,9 +216,6 @@ module Raykit
       end
 
       def pull
-        #repo = Raykit::Git::Repository.new(url)
-        #work_dir = repo.get_dev_dir("work")
-        #repo.clone(work_dir) if !Dir.exist?(work_dir)
         Raykit::Git::Repository::work_pull(url)
         update_local_clone_directory
       end
@@ -337,21 +333,11 @@ module Raykit
         symbol = Raykit::Symbols::warning
         symbol = Raykit::Symbols::success if (!latest_commit_exit_status.nil? && latest_commit_exit_status == 0)
         symbol = Raykit::Symbols::success if (!latest_commit_exit_status.nil? && latest_commit_exit_status != 0)
-        #latest_make_cmd = get_make_command(latest_commit_id, "rake default")
-        #commit = Rainbow(latest_commit(default_branch)[0..8]).cyan
-        #if (latest_make_cmd.nil?)
-        #  symbol = Raykit::Symbols::warning
-        #else
-        #  symbol = latest_make_cmd.exitstatus == 0 ? Raykit::Symbols::success : Raykit::Symbols::error
-        #end
         commit = latest_commit_id[0..8]
         "#{symbol} #{commit} #{short_name}"
       end # def to_s
 
       def to_table
-        #max_name_width = 10
-        #max_value_width = 10
-        #header = "  =".ljust(max_name_width + max_value_width + 5, "=")
         header = "==Repository=="
         table = header
         table += "\n" + to_table_row("Name", short_name)

data/lib/raykit/logevent.rb

@@ -17,33 +17,13 @@ module Raykit
     end
 
     def to_seq
-      # puts '---to_seq---'
-      # puts self['Message']
       unless ENV["SEQ_SERVER"].nil?
         cmd_str = "seqcli log -m \"#{self["Message"].gsub('"', "")}\" -l #{self["Level"]} -s #{ENV["SEQ_SERVER"]}"
         self["Properties"].each do |k, v|
           cmd_str += " -p \"#{k}=#{v}\""
         end
-        # puts '---executing---'
-        # puts cmd_str
         puts `#{cmd_str}`
       end
     end
   end
 end
-
-# {
-#	"Timestamp": "2021-10-06T06:09:25.5275817-06:00",
-#	"Level": "Information",
-#	"MessageTemplate": "MachineName     {machine}",
-#	"Properties": {
-#		"machine": "BLUEFIN",
-#		"SourceContext": "cslogging.Program",
-#		"ThreadId": 1,
-#		"ProcessId": 16764,
-#		"ProcessName": "cs-logging",
-#		"MachineName": "\"BLUEFIN\"",
-#		"UserName": "\"loupa\"",
-#		"OS": "Windows_NT"
-#	}
-# }

data/lib/raykit/logger.rb

@@ -49,7 +49,7 @@ module Raykit
     end
 
     def self.default
-      Raykit::Logger.new([Raykit::Logger::console_logger, Raykit::Logger::file_logger])
+      Raykit::Logger.new([Raykit::Logger::console_logger]) #, Raykit::Logger::file_logger])
     end
 
     def self.console_logger
@@ -61,7 +61,9 @@ module Raykit
     end
 
     def self.file_logger
-      FileUtils.mkdir("log") if (!Dir.exist?("log"))
+      log_dir = Environment::log_dir
+      FileUtils.mkdir_p(log_dir) if (!Dir.exist?(log_dir))
+      #FileUtils.mkdir("log") if (!Dir.exist?("log"))
       file_logger = ::Logger.new(File.new(LOG_FILENAME, "w"))
       file_logger.formatter = proc do |_severity, _datetime, _progname, msg|
         "#{strip_ansi_codes(msg)}\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.509
+  version: 0.0.511
 platform: ruby
 authors:
 - Lou Parslow
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: ruby gem to support rake ci/cd tasks