raykit 0.0.319 → 0.0.323

data/lib/raykit/project.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require 'rake/clean'
-require 'digest'
+require "rake/clean"
+require "digest"
 RAKE_DIRECTORY = Rake.application.original_dir
+
 module Raykit
   class Project
     attr_accessor :name, :timer, :verbose, :target
@@ -19,8 +20,8 @@ module Raykit
     def initialize
       @verbose = false
       @timer = Raykit::Timer.new
-      @remote = ''
-      @commit_message_filename = 'commit_message.tmp'
+      @remote = ""
+      @commit_message_filename = "commit_message.tmp"
       if Dir.exist?(RAKE_DIRECTORY)
         @directory = RAKE_DIRECTORY
         if Dir.exist?("#{RAKE_DIRECTORY}/.git") && Dir.exist?(@directory)
@@ -28,7 +29,7 @@ module Raykit
           @remote = @git_directory.remote
         end
       else
-        @directory = ''
+        @directory = ""
       end
 
       # @log=Log.new("#{RAKE_DIRECTORY}/tmp/raykit.log")
@@ -36,16 +37,16 @@ module Raykit
       if defined?(NAME)
         @name = NAME
       else
-        slns = Dir.glob('*.sln')
+        slns = Dir.glob("*.sln")
         if slns.length == 1
-          @name = slns[0].gsub('.sln', '')
+          @name = slns[0].gsub(".sln", "")
         else
-          gemspecs = Dir.glob('*.gemspec')
+          gemspecs = Dir.glob("*.gemspec")
           if gemspecs.length == 1
-            @name = gemspecs[0].gsub('.gemspec', '')
+            @name = gemspecs[0].gsub(".gemspec", "")
           else
-            remote_parts = @remote.split('/')
-            @name = remote_parts[-1].gsub('.git', '') if remote_parts.length.positive?
+            remote_parts = @remote.split("/")
+            @name = remote_parts[-1].gsub(".git", "") if remote_parts.length.positive?
           end
         end
       end
@@ -64,15 +65,17 @@ module Raykit
     def target_md5
       return Digest::MD5.file(target).to_s.strip if !target.nil? && File.exist?(target)
 
-      ''
+      ""
     end
 
     def branch
+      return "main" if @git_directory.nil?
       @git_directory.branch
     end
 
     # latest local commit
     def latest_commit
+      return "" if detached?
       Dir.chdir(@directory) do
         text = `git log -n 1`
         scan = text.scan(/commit (\w+)\s/)
@@ -82,7 +85,7 @@ module Raykit
 
     def outstanding_commit?
       Dir.chdir(@directory) do
-        return true unless `git status`.include?('nothing to commit')
+        return true unless `git status`.include?("nothing to commit")
       end
       false
     end
@@ -91,16 +94,14 @@ module Raykit
       # puts `git log -n 1`
       # !latest_tag_commit.eql?(latest_commit)
       # commit 2e4cb6d6c0721e16cd06afee85b7cdc27354921b (HEAD -> master, tag: 0.0.180, origin/master, origin/HEAD)
-      outstanding_commit? || !`git log -n 1`.include?('tag:')
+      outstanding_commit? || !`git log -n 1`.include?("tag:")
     end
 
     def detached?
-      return true if @git_directory.nil?  
+      return true if @git_directory.nil?
       @git_directory.detached?
     end
 
-  
-
     def has_diff?(filename)
       Dir.chdir(@directory) do
         text = `git diff #{filename}`.strip
@@ -139,12 +140,12 @@ module Raykit
       scan = text.scan(/md5=(\w{32})/)
       return scan[0][0].to_s.strip if scan.length.positive? && scan[0].length.positive?
 
-      ''
+      ""
     end
 
     def last_modified_filename
       Dir.chdir(@directory) do
-        Dir.glob('**/*.*').select { |f| File.file?(f) }.max_by { |f| File.mtime(f) }
+        Dir.glob("**/*.*").select { |f| File.file?(f) }.max_by { |f| File.mtime(f) }
       end
     end
 
@@ -173,36 +174,33 @@ module Raykit
     def elapsed
       elapsed = @timer.elapsed
       if elapsed < 1.0
-        "#{format('%.1f', @timer.elapsed)}s"
+        "#{format("%.1f", @timer.elapsed)}s"
       else
-        "#{format('%.0f', @timer.elapsed)}s"
+        "#{format("%.0f", @timer.elapsed)}s"
       end
     end
 
     def info
       ljust = 35
-      puts ''
-      puts 'PROJECT.name'.ljust(ljust) + Rainbow(PROJECT.name).yellow.bright
-      puts 'PROJECT.version'.ljust(ljust) + Rainbow(PROJECT.version).yellow.bright
-      puts 'PROJECT.remote'.ljust(ljust) + Rainbow(PROJECT.remote).yellow.bright
-      puts 'PROJECT.detached?'.ljust(ljust) + Rainbow(PROJECT.detached?).yellow.bright
-      if !PROJECT.detached?
-        puts 'PROJECT.branch'.ljust(ljust) + Rainbow(PROJECT.branch).yellow.bright if !branch.nil?
-        
-        # puts "PROJECT.target".ljust(ljust) + Rainbow(PROJECT.target).yellow.bright
-        # puts "PROJECT.target_md5".ljust(ljust) + Rainbow(PROJECT.target_md5).yellow.bright
-        puts 'PROJECT.latest_tag'.ljust(ljust) + Rainbow(PROJECT.latest_tag).yellow.bright
-        puts 'PROJECT.latest_tag_commit'.ljust(ljust) + Rainbow(PROJECT.latest_tag_commit).yellow.bright
-        puts 'PROJECT.latest_tag_md5'.ljust(ljust) + Rainbow(PROJECT.latest_tag_md5).yellow.bright
-        puts 'PROJECT.latest_commit'.ljust(ljust) + Rainbow(PROJECT.latest_commit).yellow.bright
-        puts 'PROJECT.last_modified_filename'.ljust(ljust) + Rainbow(PROJECT.last_modified_filename).yellow.bright
-        # puts "PROJECT.elapsed".ljust(ljust) + Rainbow(PROJECT.elapsed).yellow.bright
-        puts 'PROJECT.size'.ljust(ljust) + Rainbow(PROJECT.size).yellow.bright
-        puts 'PROJECT.size_pack'.ljust(ljust) + Rainbow(PROJECT.size_pack).yellow.bright
-        puts 'PROJECT.outstanding_commit?'.ljust(ljust) + Rainbow(PROJECT.outstanding_commit?).yellow.bright
-        puts 'PROJECT.outstanding_tag?'.ljust(ljust) + Rainbow(PROJECT.outstanding_tag?).yellow.bright
-      end
-      puts ''
+      puts ""
+      puts "PROJECT.name".ljust(ljust) + Rainbow(PROJECT.name).yellow.bright
+      puts "PROJECT.version".ljust(ljust) + Rainbow(PROJECT.version).yellow.bright
+      puts "PROJECT.remote".ljust(ljust) + Rainbow(PROJECT.remote).yellow.bright
+      puts "PROJECT.branch".ljust(ljust) + Rainbow(PROJECT.branch).yellow.bright
+      puts "PROJECT.detached?".ljust(ljust) + Rainbow(PROJECT.detached?).yellow.bright
+      # puts "PROJECT.target".ljust(ljust) + Rainbow(PROJECT.target).yellow.bright
+      # puts "PROJECT.target_md5".ljust(ljust) + Rainbow(PROJECT.target_md5).yellow.bright
+      puts "PROJECT.latest_tag".ljust(ljust) + Rainbow(PROJECT.latest_tag).yellow.bright
+      puts "PROJECT.latest_tag_commit".ljust(ljust) + Rainbow(PROJECT.latest_tag_commit).yellow.bright
+      puts "PROJECT.latest_tag_md5".ljust(ljust) + Rainbow(PROJECT.latest_tag_md5).yellow.bright
+      puts "PROJECT.latest_commit".ljust(ljust) + Rainbow(PROJECT.latest_commit).yellow.bright
+      puts "PROJECT.last_modified_filename".ljust(ljust) + Rainbow(PROJECT.last_modified_filename).yellow.bright
+      # puts "PROJECT.elapsed".ljust(ljust) + Rainbow(PROJECT.elapsed).yellow.bright
+      puts "PROJECT.size".ljust(ljust) + Rainbow(PROJECT.size).yellow.bright
+      puts "PROJECT.size_pack".ljust(ljust) + Rainbow(PROJECT.size_pack).yellow.bright
+      puts "PROJECT.outstanding_commit?".ljust(ljust) + Rainbow(PROJECT.outstanding_commit?).yellow.bright
+      puts "PROJECT.outstanding_tag?".ljust(ljust) + Rainbow(PROJECT.outstanding_tag?).yellow.bright
+      puts ""
       self
     end
 
@@ -220,10 +218,10 @@ module Raykit
     def commit(commit_message)
       warn "[DEPRECATION] 'commit_message_filename' is deprectated. Use a run command for better transparency."
       Dir.chdir(@directory) do
-        if File.exist?('.gitignore')
+        if File.exist?(".gitignore")
           status = `git status`
-          if status.include?('Changes not staged for commit:')
-            run('git add --all')
+          if status.include?("Changes not staged for commit:")
+            run("git add --all")
             if GIT_DIRECTORY.outstanding_commit?
               if File.exist?(@commit_message_filename)
                 run("git commit --file #{@commit_message_filename}")
@@ -234,7 +232,7 @@ module Raykit
             end
           end
         else
-          puts 'warning: .gitignore not found.'
+          puts "warning: .gitignore not found."
         end
       end
       self
@@ -244,9 +242,7 @@ module Raykit
       Dir.chdir(@directory) do
         status = `git status`
         if status.include?('use "git push"')
-          run('git push')
-
-          # run('git push --tags')
+          run("git push")
         end
       end
       self
@@ -254,7 +250,7 @@ module Raykit
 
     def pull
       Dir.chdir(@directory) do
-        run('git pull')
+        run("git pull")
       end
       self
     end
@@ -281,17 +277,15 @@ module Raykit
       self
     end
 
-    def run(command, quit_on_failure = true, success_log_level = Logger::DEBUG)
+    def run(command, quit_on_failure = true)
       if command.is_a?(Array)
         command.each { |subcommand| run(subcommand, quit_on_failure, success_log_level) }
       else
-        cmd = Command.new(command, 0, success_log_level)
+        cmd = Command.new(command).set_timeout(0).run
         cmd.summary
         cmd.save
         elapsed_str = Timer.get_elapsed_str(cmd.elapsed, 0)
-        if cmd.exitstatus.zero?
-        # puts elapsed_str + " " +  Rainbow(cmd.command).yellow.bright
-        # return elapsed_str + " " + cmd.command
+        if !cmd.exitstatus.nil? && cmd.exitstatus.zero?
         else
           # display error details
           puts cmd.output

data/lib/raykit/rake.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require 'time'
+require "time"
 
 module Raykit
   class Rake
-    def self.run(remote, branch, task = 'default')
+    def self.run(remote, branch, task = "default")
       repo = Raykit::Git::Repository.new(remote)
       rel_dir = repo.relative_path
       commit = repo.latest_commit(branch)
-      log_filename = "#{Environment.get_dev_dir('log')}/RayKit.Runner/#{rel_dir}/#{branch}/#{commit}.json"
+      log_filename = "#{Environment.get_dev_dir("log")}/RayKit.Runner/#{rel_dir}/#{branch}/#{commit}.json"
       if File.exist?(log_filename)
         Command.parse(File.read(log_filename))
       else
-        run_dir = "#{Environment.get_dev_dir('tmp')}/#{rel_dir}.#{branch}.#{commit}"
+        run_dir = "#{Environment.get_dev_dir("tmp")}/#{rel_dir}.#{branch}.#{commit}"
         unless Dir.exist?(run_dir)
-          parent_dir = File.expand_path('..', run_dir)
+          parent_dir = File.expand_path("..", run_dir)
           FileUtils.mkdir_p(parent_dir) unless Dir.exist?(parent_dir)
           cmd = Command.new("git clone #{remote} #{run_dir}")
         end
@@ -22,7 +22,7 @@ module Raykit
           cmd = Command.new("rake #{task}")
           parent_dir = File.dirname(log_filename)
           FileUtils.mkdir_p(parent_dir) unless Dir.exist?(parent_dir)
-          File.open(log_filename, 'w') do |f|
+          File.open(log_filename, "w") do |f|
             f.write(JSON.generate(cmd.to_hash))
           end
           return cmd

data/lib/raykit/runner.rb

@@ -1,25 +1,25 @@
 # frozen_string_literal: true
 
-require 'yaml'
+require "yaml"
 
 module Raykit
   class Runner
     def self.run(git_url)
       commands = []
-      local_dir = Dir.mktmpdir('runner')
+      local_dir = Dir.mktmpdir("runner")
       puts "local_dir : #{local_dir}"
       commands << Raykit::Command.new("git clone #{git_url} #{local_dir}")
       Dir.chdir(local_dir) do
-        commands << Raykit::Command.new('git log -n 1')
+        commands << Raykit::Command.new("git log -n 1")
         yaml = get_build_yaml(local_dir)
         build_hash = YAML.safe_load(yaml)
         build_commands = Raykit::Command.parse_yaml_commands(yaml)
-        if build_hash.key?('image')
-          image = build_hash['image']
-          build_commands.insert(0, 'cd home')
+        if build_hash.key?("image")
+          image = build_hash["image"]
+          build_commands.insert(0, "cd home")
           build_commands.insert(1, "git clone #{git_url} build")
-          build_commands.insert(2, 'cd build')
-          build_commands_string = build_commands.join(';')
+          build_commands.insert(2, "cd build")
+          build_commands_string = build_commands.join(";")
           commands << Raykit::Command.new("docker run #{image} sh -c \"#{build_commands_string}\"")
         else
           build_commands.each do |cmd_string|
@@ -32,9 +32,9 @@ module Raykit
     end
 
     def self.get_build_yaml(directory)
-      yaml = ''
+      yaml = ""
       Dir.chdir(directory) do
-        yaml = File.open('.gitlab-ci.yml').read if File.exist?('.gitlab-ci.yml')
+        yaml = File.open(".gitlab-ci.yml").read if File.exist?(".gitlab-ci.yml")
       end
       yaml
     end

data/lib/raykit/secrets.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'time'
+require "time"
 
 module Raykit
   # Provides functionality to record the time execution times
   class Secrets < Hash
     def initialize
-      if ENV.key?('RAYKIT_SECRETS_PATH')
-        secrets_file = ENV['RAYKIT_SECRETS_PATH']
+      if ENV.key?("RAYKIT_SECRETS_PATH")
+        secrets_file = ENV["RAYKIT_SECRETS_PATH"]
         if File.exist?(secrets_file)
           text = IO.read(secrets_file)
           if text.length > 7
@@ -23,15 +23,15 @@ module Raykit
     def hide(text)
       hidden = text
       each do |_k, v|
-        hidden = hidden.gsub(v, '****') if !v.nil? && v.length.positive?
+        hidden = hidden.gsub(v, "****") if !v.nil? && v.length.positive?
       end
       hidden
     end
 
     def save
-      if ENV.key?('RAYKIT_SECRETS_PATH')
-        secrets_file = ENV['RAYKIT_SECRETS_PATH']
-        File.open(secrets_file, 'w') { |f| f.puts to_json }
+      if ENV.key?("RAYKIT_SECRETS_PATH")
+        secrets_file = ENV["RAYKIT_SECRETS_PATH"]
+        File.open(secrets_file, "w") { |f| f.puts to_json }
       end
     end
   end

data/lib/raykit/sourceImport.rb

@@ -3,36 +3,36 @@
 module Raykit
   class SourceImport < Hash
     def initialize(url, source, glob, target, commit)
-      self['remote'] = url
-      self['source'] = source
-      self['glob'] = glob
-      self['target'] = target
-      self['commit'] = commit
+      self["remote"] = url
+      self["source"] = source
+      self["glob"] = glob
+      self["target"] = target
+      self["commit"] = commit
     end
 
     def remote
-      self['remote']
+      self["remote"]
     end
 
     def source
-      self['source']
+      self["source"]
     end
 
     def target
-      self['target']
+      self["target"]
     end
 
     def glob
-      self['glob']
+      self["glob"]
     end
 
     def update
-      work = self['remote'].work_dir
+      work = self["remote"].work_dir
       work_parent = File.dirname(work)
       FileUtils.mkdir_p(work_parent) unless Dir.exist?(work_parent)
       if Dir.exist?(work)
         Dir.chdir(work) do
-          cmd = Command.new('git pull')
+          cmd = Command.new("git pull")
         end
       else
         PROJECT.run("git clone #{remote} #{work}")
@@ -41,22 +41,22 @@ module Raykit
       Dir.chdir(work) do
         text = `git log -n 1`
         scan = text.scan(/commit (\w+)\s/)
-        self['commit'] = scan[0][0].to_s
+        self["commit"] = scan[0][0].to_s
       end
     end
 
     def copy
       if target.length.zero?
-        puts 'target has not been specified'
+        puts "target has not been specified"
       else
         FileUtils.remove_dir(target) if Dir.exist?(target)
         count = 0
         source_names = []
-        work = self['remote'].work_dir
+        work = self["remote"].work_dir
         Dir.chdir(work) do
-          cmd = Command.new('rake clean') if File.exist?('rakefile.rb')
+          cmd = Command.new("rake clean") if File.exist?("rakefile.rb")
           Dir.chdir(source) do
-            source_names = Dir.glob(self['glob'])
+            source_names = Dir.glob(self["glob"])
           end
         end
         source_names.each do |source_name|

data/lib/raykit/sourceImports.rb

@@ -4,7 +4,7 @@ module Raykit
   class SourceImports < Array
     def initialize(urls)
       urls.each do |url|
-        self << SourceImport.new(url, 'src', '**/*.cs', 'dep', '')
+        self << SourceImport.new(url, "src", "**/*.cs", "dep", "")
       end
     end
 
@@ -24,7 +24,7 @@ module Raykit
     end
 
     def save(filename)
-      File.open(filename, 'w') do |f|
+      File.open(filename, "w") do |f|
         f.write(JSON.pretty_generate(self))
       end
     end
@@ -33,8 +33,8 @@ module Raykit
       sourceImports = SourceImports.new([])
       array = JSON.parse(IO.read(filename))
       array.each do |hash|
-        sourceImport = SourceImport.new(hash['remote'], hash['source'], hash['glob'], hash['target'],
-                                        hash['commit'])
+        sourceImport = SourceImport.new(hash["remote"], hash["source"], hash["glob"], hash["target"],
+                                        hash["commit"])
         sourceImports << sourceImport
       end
       sourceImports

data/lib/raykit/string.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative('./environment')
+require_relative("./environment")
 
 class String
   def work_dir
-    rel_name = sub('https://', '').gsub('http://', '').gsub('.git', '')
-    "#{Raykit::Environment.get_dev_dir('work')}/#{rel_name}"
+    rel_name = sub("https://", "").gsub("http://", "").gsub(".git", "")
+    "#{Raykit::Environment.get_dev_dir("work")}/#{rel_name}"
   end
 
   def latest_commit

data/lib/raykit/tasks.rb

@@ -1,33 +1,33 @@
 # frozen_string_literal: true
 
-desc 'Display project information'
+desc "Display project information"
 task :info do
   PROJECT.info
 end
 
-desc 'integrate changes into the git repository'
+desc "integrate changes into the git repository"
 task :integrate do
-  puts Rainbow(':integrate').blue.bright
+  puts Rainbow(": integrate").blue.bright
 
   git_dir = Raykit::Git::Directory.new(Rake.application.original_dir)
   if git_dir.detached?
-    puts 'detached head state, skipping integrate operations'
+    puts "detached head state, skipping integrate operations"
   else
     if PROJECT.outstanding_commit?
-      Rake::Task['test'].invoke if Rake::Task.task_defined?('test')
+      Rake::Task["test"].invoke if Rake::Task.task_defined?("test")
     else
-      puts 'no outstanding commits detected'
+      puts "  no outstanding commits detected"
     end
 
-    if !File.exist?('.gitignore')
-      puts 'warning: .gitignore does not exist.'
+    if !File.exist?(".gitignore")
+      puts "warning: .gitignore does not exist."
     else
-      PROJECT.run('git add --all')
-      unless `git status`.include?('nothing to commit')
+      PROJECT.run("git add --all")
+      unless `git status`.include?("nothing to commit")
         # if(PROJECT.outstanding_commit?)
-        commit_message = 'integrate'
+        commit_message = "integrate"
         PROJECT.run("git commit -m\"#{commit_message}\"") if PROJECT.outstanding_commit?
-        PROJECT.run('git pull')
+        PROJECT.run("git pull")
         # PROJECT.run("git push")
         # PROJECT.run("git push --tags")
       end
@@ -35,40 +35,40 @@ task :integrate do
   end
 end
 
-desc 'push changes including tags'
+desc "push changes including tags"
 task :push do
   git_dir = Raykit::Git::Directory.new(Rake.application.original_dir)
   if git_dir.detached?
-    puts 'detached head state, skipping push operations'
+    puts "detached head state, skipping push operations"
   else
-    PROJECT.run('git push')
-    PROJECT.run('git push --tags')
+    PROJECT.run("git push")
+    PROJECT.run("git push --tags")
   end
 end
 
-desc 'clean files not tracked by git'
+desc "clean files not tracked by git"
 task :clean do
-  puts Rainbow(':clean').blue.bright
-  PROJECT.run('git clean -dXf')
+  puts Rainbow(": clean").blue.bright
+  PROJECT.run("git clean -dXf")
 end
 
-desc 'update_source from sourceImports.json'
+desc "update_source from sourceImports.json"
 task :update_source do
-  if File.exist?('sourceImports.json')
-    puts Rainbow(':update_source').blue.bright
-    sourceImports = Raykit::SourceImports.load('sourceImports.json')
+  if File.exist?("sourceImports.json")
+    puts Rainbow(":update_source").blue.bright
+    sourceImports = Raykit::SourceImports.load("sourceImports.json")
     json = sourceImports.to_json
     sourceImports.update
 
     json2 = sourceImports.to_json
     if json2 != json || !sourceImports.targets_exist?
-      sourceImports.save('sourceImports.json')
+      sourceImports.save("sourceImports.json")
       sourceImports.copy
     else
-      puts '        no update required.'
+      puts "        no update required."
     end
   end
 end
 
-desc 'update source files'
+desc "update source files"
 task update: [:update_source]

data/lib/raykit/text.rb

@@ -10,10 +10,8 @@ module Raykit
       text1 = IO.read(filename)
       text2 = text1.gsub(search) { |_str| str = replace }
       unless text1 == text2
-        if File.writable?(filename)
-          File.open(filename, 'w') { |f| f.puts text2 }
-          return true
-        end
+        File.open(filename, "w") { |f| f.puts text2 }
+        return true
       end
       false
     end

data/lib/raykit/timer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'time'
+require "time"
 
 module Raykit
   # Provides functionality to record the time execution times
@@ -25,7 +25,7 @@ module Raykit
     # Converts a time span in seconds to a formatted string
     def self.get_elapsed_str(elapsed, pad = 0)
       # "[" + "%.0f" % (elapsed) + "s]".ljust(pad)
-      format('%.0f', elapsed) + 's'.ljust(pad)
+      format("%.0f", elapsed) + "s".ljust(pad)
     end
   end
 end