raykit 0.0.322 → 0.0.323

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b6a6dfaef888511950ae3963bd45ba6fa75136319984315e875f8e4cf79172f
-  data.tar.gz: b28f6c77327b17b2f61f889fb4148e03063d3b9b201559a4f8396e98068713cb
+  metadata.gz: efd74944a1f30ac6317bef794cc964e37e484cef50814f0702b61b7b17c1d4d2
+  data.tar.gz: 5eb12a1cafeb1dd6812d5747ea90046face2dfefffdc4c6008ec7d4593d26a4a
 SHA512:
-  metadata.gz: f9cac9bbfe5f7f118b7fde0133e0d3c4a458a25a87dbb235c53c2201675221c45f71c8ea108d281ece5b59242ea632f5faebdf1f4bc34f184dfd5dc80723458e
-  data.tar.gz: 4d4a92abc1d5dca663b2368d33034ac12030a4024887b89c5015243f10cdfb0cc8a2f64d6537236114f2bb7f1da74591478d744bb9202c368b80526f99d3f3ef
+  metadata.gz: 4848c9952dcc2853067c1e7ef54b275f1c08c4dd18dac99c5e692750bc2ce28d526bd7e74da7910e27577ae1251f2ba20fe0f6510c51a7ab5ea140a58722a8b0
+  data.tar.gz: 8390ef4a06b1c5c48217dda4e729647750757e03c15e3a0a4ebc5c90c9dfae214f9422aedc329f5346b39903ad27986dec94f6c0311877b7645f0d0ddc52fffa

data/lib/raykit/command.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "open3"
 require "timeout"
 require "json"
@@ -26,39 +24,51 @@ module Raykit
     def init_defaults
       @timeout = 0
       @directory = Dir.pwd
-      @output = ""
-      @error = ""
+      @output = +""
+      @error = +""
       @exitstatus = 0
       @user = Environment.user
       @machine = Environment.machine
       @logging_enabled = true
     end
 
-    def initialize(command, timeout = 0, success_log_level = Logger::DEBUG, logging_enabled = true)
+    def initialize(command)
+    #def initialize(command, timeout = 0, success_log_level = Logger::DEBUG, logging_enabled = true)
+      timeout = 0
+      success_log_level = nil
+      logging_enabled = false
       @@commands = []
       init_defaults
       @success_log_level = success_log_level
       @logging_enabled = logging_enabled
       @command = command
       @timeout = timeout
-      run if @command.length.positive?
+      #t = Time.now
+      @elapsed = 0
+      #run if @command.length.positive?
+      self
+    end
+
+    def set_timeout(timeout)
+      @timeout = timeout
       self
     end
 
     def run
       # puts '---running---'
       @start_time = Time.now
+      @elapsed = 0
       timer = Timer.new
       if @timeout.zero?
         @output, @error, process_status = Open3.capture3(@command)
         @exitstatus = process_status.exitstatus
       else
+        puts "@timeout is #{@timeout}"
         Open3.popen3(@command, chdir: @directory) do |_stdin, stdout, stderr, thread|
-          tick = 2
+          tick = 1
           pid = thread.pid
           start = Time.now
-          elapsed = Time.now - start
-          while ((elapsed) < @timeout) && thread.alive?
+          while ((Time.now - start) < @timeout) && thread.alive?
             Kernel.select([stdout, stderr], nil, nil, tick)
             begin
               @output << stdout.read_nonblock(BUFFER_SIZE)
@@ -68,8 +78,8 @@ module Raykit
               @exitstatus = thread.value.exitstatus
               break
             end
-            elapsed = Time.now - start
           end
+          sleep 1
           if thread.alive?
             if Gem.win_platform?
               `taskkill /f /pid #{pid}`
@@ -77,7 +87,7 @@ module Raykit
               Process.kill("TERM", pid)
             end
             @exitstatus = 5
-            @error = "timed out"
+            @error = +"timed out"
           else
             @exitstatus = thread.value.exitstatus
           end
@@ -100,8 +110,10 @@ module Raykit
           end
         end
       end
+      self
     end
 
+    
     def to_log_event
       secrets = Secrets.new
       msg = secrets.hide(@command)
@@ -168,25 +180,35 @@ module Raykit
       "#{format("%.0f", elapsed)}s"
     end
 
-    def summary(show_directory = false)
+    def summary(show_directory = true)
       checkmark = "\u2713"
       # warning="\u26A0"
       error = "\u0058"
       symbol = Rainbow(checkmark.encode("utf-8")).green
       symbol = Rainbow(error.encode("utf-8")).red if @exitstatus != 0
       if show_directory
-        puts "#{symbol}  #{elapsed_str.rjust(4)} #{Rainbow(SECRETS.hide(@command)).yellow} (#{@directory})"
+        puts "#{symbol} #{Rainbow(SECRETS.hide(@command)).yellow} (#{@directory},#{elapsed_str})"
       else
-        puts "#{symbol}  #{elapsed_str.rjust(4)} #{Rainbow(SECRETS.hide(@command)).yellow}" # + " (#{@directory})"
+        puts "#{symbol} #{Rainbow(SECRETS.hide(@command)).yellow} (#{elapsed_str})"
       end
-      # puts symbol + "  " + elapsed_str.rjust(4) + " " + Rainbow(SECRETS.hide(@command)).yellow# + " (#{@directory})"
+      self
     end
 
     def details
+      if @output.length > 0
+        @output.lines.each do |line|
+          puts '  ' + line
+        end
+      end
+      if @error.length > 0
+        @error.lines.each do |line|
+          puts '  ' + line
+        end
+      end
       # summary
-      puts @output
-      puts @error
-      puts
+      #puts @output
+      #puts @error
+      #puts
     end
 
     def save

data/lib/raykit/git/directory.rb

@@ -87,7 +87,7 @@ module Raykit
       end
 
       def get_tag_commit_id(name)
-        cmd = Raykit::Command.new("git rev-parse \"#{name}\"", 0, nil, false)
+        cmd = Raykit::Command.new("git rev-parse \"#{name}\"").run#, 0, nil, false)
         if !cmd.output.include?("fatal") && !cmd.error.include?("fatal")
           cmd.output.strip
         else
@@ -97,7 +97,7 @@ module Raykit
 
       def has_tag(name)
         cmd = Raykit::Command.new("git rev-parse \"#{name}\"", 0, nil, false)
-        if !cmd.output.include?('fatal') && !cmd.error.include?('fatal')
+        if !cmd.output.include?("fatal") && !cmd.error.include?("fatal")
           true
         else
           false
@@ -144,7 +144,7 @@ module Raykit
       def remote
         if Dir.exist?(directory)
           Dir.chdir(directory) do
-            return Command.new("git config --get remote.origin.url").output.strip if Dir.exist?(".git")
+            return Command.new("git config --get remote.origin.url").run.output.strip if Dir.exist?(".git")
           end
         end
         ""

data/lib/raykit/log.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "json"
 
 module Raykit

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,7 +65,7 @@ module Raykit
     def target_md5
       return Digest::MD5.file(target).to_s.strip if !target.nil? && File.exist?(target)
 
-      ''
+      ""
     end
 
     def branch
@@ -84,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
@@ -93,7 +94,7 @@ 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?
@@ -101,8 +102,6 @@ module Raykit
       @git_directory.detached?
     end
 
-  
-
     def has_diff?(filename)
       Dir.chdir(@directory) do
         text = `git diff #{filename}`.strip
@@ -141,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
 
@@ -175,33 +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.branch'.ljust(ljust) + Rainbow(PROJECT.branch).yellow.bright
-      puts 'PROJECT.detached?'.ljust(ljust) + Rainbow(PROJECT.detached?).yellow.bright
+      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.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 ''
+      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
 
@@ -219,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}")
@@ -233,7 +232,7 @@ module Raykit
             end
           end
         else
-          puts 'warning: .gitignore not found.'
+          puts "warning: .gitignore not found."
         end
       end
       self
@@ -243,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
@@ -253,7 +250,7 @@ module Raykit
 
     def pull
       Dir.chdir(@directory) do
-        run('git pull')
+        run("git pull")
       end
       self
     end
@@ -280,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.nil? && cmd.exitstatus.zero?
-        # puts elapsed_str + " " +  Rainbow(cmd.command).yellow.bright
-        # return elapsed_str + " " + cmd.command
         else
           # display error details
           puts cmd.output

data/lib/raykit/tasks.rb

@@ -7,7 +7,7 @@ end
 
 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?
@@ -16,7 +16,7 @@ task :integrate do
     if PROJECT.outstanding_commit?
       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")
@@ -48,7 +48,7 @@ end
 
 desc "clean files not tracked by git"
 task :clean do
-  puts Rainbow(":clean").blue.bright
+  puts Rainbow(": clean").blue.bright
   PROJECT.run("git clean -dXf")
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.322
+  version: 0.0.323
 platform: ruby
 authors:
 - Lou Parslow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-27 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler