raykit 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc2266065d0df37a80226e779a8f26f4b5c601799f3d192f0f9bbe4b3993a83f
-  data.tar.gz: 2abf6c259c946bfd87daeb4ff8a8a998051c966ef566d305f4a622f994893bc3
+  metadata.gz: 218589240662e60620c795592b3267c89889088de85c49c89cb1c967d6261c64
+  data.tar.gz: baf5ea297191fd2b3df63b3a18bd40dc62a4b682a28a1bb0e80234b569bd0b69
 SHA512:
-  metadata.gz: dadbae23b9756844415cfbbc2bb62dae2fbee6816d81e1cc2417693182a9d8f8dbb4193583d6e6f3b51c19315c7bf869de2bc816982031da0b8fce0ae2826dfd
-  data.tar.gz: b4a29ab8e2c314440e2ba491589392535a4aefd18bbb97e77162ab19012418f89e10637c2a0be8ded613a782b649b821818814483f7519c4251fc8078052a1b3
+  metadata.gz: 6ad342a4609e7d3bee552f752b090925f396a69cab4754914dd90a1e68c9eddfb73242a63d7e0176767c59edde05adf6228a1706478cd075f6e5a4cff4d278f0
+  data.tar.gz: 80b3c4ab5631bdd3857caa4dca78f452015d620aa643c413859fdd09afb3f6a137606b9532139d771a8428988f1ee6e4eeb9b21abe1ed1da0b2b9b5fba685f76

data/lib/raykit.rb

@@ -5,7 +5,8 @@ require_relative './raykit/version.rb'
 require_relative './raykit/environment.rb'
 require_relative './raykit/logging.rb'
 require_relative './raykit/command.rb'
-require_relative './raykit/runner.rb'
+require_relative './raykit/rake.rb'
+#require_relative './raykit/runner.rb'
 require_relative './raykit/console.rb'
 require 'rainbow'
 require 'rake/clean'
@@ -15,9 +16,9 @@ require 'open3'
 
 module Raykit
     def Raykit.run(command) 
-        cmd = Command.new
-        cmd.command = command
-        cmd.run()#command)
+        cmd = Command.new(command)
+        #cmd.command = command
+        #cmd.run()#command)
         elapsed_str = Timer.get_elapsed_str(cmd.elapsed)
         if(cmd.exitstatus == 0)
             puts elapsed_str + " " +  Rainbow(cmd.command).yellow.bright

data/lib/raykit/command.rb

@@ -6,10 +6,11 @@ BUFFER_SIZE=1024 if(!defined?(BUFFER_SIZE))
 
 module Raykit
     class Command
-        attr_accessor :directory,:timeout,:start_time,:elapsed
+        attr_accessor :timeout
+        attr_accessor :directory,:start_time,:elapsed
         attr_accessor :command,:output,:error,:exitstatus
 
-        def initialize()
+        def init_defaults 
             @timeout=0
             @directory = Dir.pwd
             @output = ''
@@ -17,6 +18,16 @@ module Raykit
             @exitstatus = 0
         end
 
+        def initialize(command,timeout=0)
+            init_defaults
+            @command=command
+            @timeout=timeout
+            if(@command.length > 0)
+                run
+            end
+            self
+        end
+
         def run() 
             @start_time = Time.now
             timer = Timer.new
@@ -73,5 +84,22 @@ module Raykit
             hash[:exitstatus] = @exitstatus
             hash
         end
+
+        def from_hash(hash)
+            @command = hash["command"]
+            @directory=hash["directory"]
+            @timeout=hash["timeout"]
+            @start_time=hash["start_time"]
+            @elapsed=hash["elapsed"]
+            @output=hash["output"]
+            @error=hash["error"]
+            @exitstatus=hash["exitstatus"]
+        end
+
+        def self.parse(json)
+            cmd=Command.new('')
+            cmd.from_hash(JSON.parse(json))
+            cmd
+        end
     end
 end

data/lib/raykit/console.rb

@@ -6,35 +6,25 @@ module Raykit
 
     class Parser
         def self.parse(options)
+            hash=Hash.new
             args = Options.new("world")
             opt_parser = OptionParser.new do |opts|
                 opts.banner = "Usage: raykit [options]"
                 opts.on('-l','--list [PATTERN]','list remotes') do |pattern|
-                    Raykit::Git::remote_urls.each{|url| 
-                        if(pattern.nil? || url.include?(pattern))
-                            puts Rainbow(url).yellow.bright
-                        end
-                    }
-                    exit
+                    hash[:verb]="list"
+                    hash[:pattern]=pattern
+                    return hash
                 end
 
                 opts.on('-i','--import','import remotes') do |import|
-                    puts 'scanning...'
-                    scanned_remotes = Raykit::Git::scan_remote_urls
-                    remotes = Raykit::Git::remote_urls
-                    count = 0
-                    scanned_remotes.each{|remote|
-                        if(!remotes.include?(remote))
-                            puts "imported " + Rainbow(remote).yellow.bright
-                            remotes.insert(0,remote)
-                            count = count + 1
-                        end
-                    }
-                    if(count > 0)
-                        puts 'updating Raykit::Git::remote_urls'
-                        Raykit::Git::remote_urls = remotes
-                    end
-                    exit
+                    hash[:verb]="import"
+                    return hash
+                end
+
+                opts.on('-r','--rake [REMOTE]','rake [REMOTE]') do |remote|
+                    hash[:verb]="rake"
+                    hash[:remote]=remote
+                    return hash
                 end
 
                 opts.on('-h','--help','help') do
@@ -44,7 +34,7 @@ module Raykit
             end
 
             opt_parser.parse!(options)
-            return args
+            hash
         end
     end
 
@@ -54,7 +44,64 @@ module Raykit
                 Parser.parse %w[--help]
                 0
             else
-                Parser.parse ARGV
+                hash = Parser.parse ARGV
+                #puts "hash: #{hash.to_s}"
+                if(hash.include?(:verb))
+                    verb = hash[:verb]
+                    case verb
+                    when 'list'
+                        list(hash)
+                    when 'import'
+                        import(hash)
+                    when 'rake'
+                        rake(hash)
+                    end
+                end
+            end
+        end
+
+        def self.list(hash)
+            pattern=nil
+            if(hash.include?(:pattern))
+                pattern=hash[:pattern]
+            end
+            Raykit::Git::remote_urls.each{|url| 
+                if(pattern.nil? || url.include?(pattern))
+                    puts Rainbow(url).yellow.bright
+                end
+            }
+        end
+
+        def self.import(hash)
+            puts 'scanning...'
+            scanned_remotes = Raykit::Git::scan_remote_urls
+            remotes = Raykit::Git::remote_urls
+            count = 0
+            scanned_remotes.each{|remote|
+                if(!remotes.include?(remote))
+                    puts "imported " + Rainbow(remote).yellow.bright
+                    remotes.insert(0,remote)
+                    count = count + 1
+                end
+            }
+            if(count > 0)
+                puts 'updating Raykit::Git::remote_urls'
+                Raykit::Git::remote_urls = remotes
+            end
+        end
+
+        def self.rake(hash)
+            cmd = Raykit::Rake::run(hash[:remote],'master')
+            elapsed_str = Timer.get_elapsed_str(cmd.elapsed)
+            if(cmd.exitstatus == 0)
+                puts elapsed_str + " " +  Rainbow(cmd.command).yellow.bright + " (#{cmd.directory})"
+                return elapsed_str + " " + cmd.command
+            else
+                puts "\r\n" + cmd.command + "\r\n"
+                puts "\r\n" + cmd.output + "\r\n"
+                puts "\r\n" + cmd.error + "\r\n"
+                puts ''
+                abort Rainbow(elapsed_str).red.bright + " " +  Rainbow(cmd.command).white
             end
         end
     end

data/lib/raykit/environment.rb

@@ -32,6 +32,22 @@ module Raykit
             end
             work_dir
         end
+
+        def self.clone_dir
+            work_dir = "#{Environment::root_dir}/work"
+            if(!Dir.exist?(work_dir))
+                Dir.mkdir(work_dir)
+            end
+            work_dir
+        end
+
+        def self.tmp_dir
+            dir = "#{Environment::root_dir}/tmp"
+            if(!Dir.exist?(dir))
+                Dir.mkdir(dir)
+            end
+            dir
+        end
     end
 end
 

data/lib/raykit/git.rb

@@ -33,24 +33,49 @@ module Raykit
             end
         end
 
-        def self.get_remote
-            if(Dir.exist?('.git'))
+        def self.get_current_branch
+            `git branch`.scan(/\*\s([\w\.-]+)/)[0][0].to_s
+        end
+
+        def self.get_latest_commit(remote,branch)
+            clone_dir="#{Environment::clone_dir}/#{get_relative_path(remote)}"
+            if(!Dir.exist?(clone_dir))
+                parent_dir = File.expand_path('..',clone_dir)
+                if(!Dir.exist?(parent_dir))
+                    FileUtils.mkdir_p(parent_dir)
+                end 
                 cmd = Command.new
-                cmd.command = 'git config --get remote.origin.url'
+                cmd.command = "git clone #{remote} #{clone_dir}"
                 cmd.run
+            else
+                Dir.chdir(clone_dir) do
+                    cmd = Command.new('git pull')
+                    #cmd.run
+                    if(get_current_branch != branch)
+                        cmd.command = "git checkout #{branch}"
+                    end
+                    return `git log --name-status HEAD^..HEAD`.scan(/commit ([\w]+)\s/)[0][0].to_s
+                end 
+            end   
+        end
+
+        def self.get_relative_path(remote)
+            remote.gsub('https://','').gsub('.git','')
+        end
+
+        def self.get_remote
+            if(Dir.exist?('.git'))
+                cmd = Command.new('git config --get remote.origin.url')
+                #cmd.run
                 return cmd.output.strip
             else
                 ``
             end
         end
+
         def self.add_remote
             remote = get_remote
             if(remote.length > 0)
-            #if(Dir.exist?('.git'))
-                #cmd = Command.new
-                #cmd.command = 'git config --get remote.origin.url'
-                #cmd.run
-                #remote = cmd.output.strip
                 remote_urls_copy = remote_urls
                 if(!remote_urls_copy.include?(remote))
                     remote_urls_copy.insert(0,remote)

data/lib/raykit/rake.rb

@@ -0,0 +1,34 @@
+require 'time'
+
+module Raykit
+    class Rake
+        def self.run(remote,branch,task='default')
+            rel_dir=Raykit::Git::get_relative_path(remote)
+            commit=Raykit::Git::get_latest_commit(remote,branch)
+            log_filename="#{Environment::log_dir}/RayKit.Runner/#{rel_dir}/#{branch}/#{commit}.json"
+            if(File.exist?(log_filename))
+                return Command.parse(File.read(log_filename))
+            else
+                run_dir="#{Environment::tmp_dir}/#{Git::get_relative_path(remote)}.#{branch}.#{commit}"
+                if(!Dir.exist?(run_dir))
+                    parent_dir = File.expand_path('..',run_dir)
+                    if(!Dir.exist?(parent_dir))
+                        FileUtils.mkdir_p(parent_dir)
+                    end 
+                    cmd = Command.new("git clone #{remote} #{run_dir}")
+                end
+                Dir.chdir(run_dir) do
+                    cmd = Command.new("rake #{task}")
+                    parent_dir = File.dirname(log_filename)
+                    if(!Dir.exist?(parent_dir))
+                        FileUtils.mkdir_p(parent_dir)
+                    end 
+                    File.open(log_filename,'w'){|f|
+                        f.write(JSON.generate(cmd.to_hash))
+                    }
+                    return cmd
+                end
+            end
+        end
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Lou Parslow
@@ -69,7 +69,7 @@ files:
 - lib/raykit/environment.rb
 - lib/raykit/git.rb
 - lib/raykit/logging.rb
-- lib/raykit/runner.rb
+- lib/raykit/rake.rb
 - lib/raykit/timer.rb
 - lib/raykit/version.rb
 homepage: http://rubygems.org/gems/raykit
@@ -91,7 +91,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: ruby gem to support rake ci/cd tasks

data/lib/raykit/runner.rb

@@ -1,10 +0,0 @@
-require 'time'
-
-module Raykit
-    class Runner
-
-
-        def self.run(remote)
-        end
-    end
-end