raykit 0.0.77 → 0.0.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a28cadbedc28eca6dd1c582331efdb312faafd2bac31bd751aa42ce144660e6
-  data.tar.gz: dfc6b16692a60a4322c96123738f1eede2bc238d5cdc1ab4d521e31aefaac7eb
+  metadata.gz: b6f6c226590ce474b86d043126f2f50b8036d96a6ae87fb55adbbfb94108eee0
+  data.tar.gz: 3fc0bc65e376b5fd02c2344c775a4ce8eba54b10b7eaf8bc3fd849d685163b2a
 SHA512:
-  metadata.gz: de6230296bb8227aeafea4543fa46368024af4b8d3d95a31702b685ac70fe3496dafb0595d48a6b11ebbf495e669dfeddcf58f42f90218135d8ce0453ebd2caf
-  data.tar.gz: df9f3d982ed2a7f243907f59bca62a58afd231a9519303ba7bbdbe8a0afa757d371cea503e20b045a51385fb17a40628fb98329bc5bb3f092953945ef4dd59bb
+  metadata.gz: 5dddd10d8afb2965f25625a3eae53891223e4fbac3434aff317c8e15dc996b9eea3182b54949ff1096e8f55899e6f4b4e8396502e175a552fa807fb7371b051b
+  data.tar.gz: 83329ce09fe77124ae251db8e762a03247357c1896dd06605e3126b5eff07081dc71dbfcf89904a3c956aea9d1cff4aa54f9da217d4536e11572cd5ab003351d

data/bin/raykit

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
 require_relative '../lib/raykit.rb'
-Raykit::Console::run
+#Raykit::Console::run
+CONSOLE.run

data/lib/raykit.rb

@@ -3,12 +3,9 @@ require 'rake/clean'
 require 'open3'
 require 'rake/testtask'
 
-
-
 lib_dir=File.dirname(__FILE__)
 Dir.glob(lib_dir + '/raykit/**/*.rb') {|file| require file}
 
-
 PROJECT=Raykit::Project.new
 #TIMER=Raykit::Timer.new
 

data/lib/raykit/console.rb

@@ -1,79 +1,84 @@
 require 'optparse'
+require 'slop'
 
 module Raykit
-    # Parses the command line arguments for the Raykit console application
-    class Parser
-        def self.parse(options)
-            hash=Hash.new
-            opt_parser = OptionParser.new do |opts|
-                opts.banner = "Usage: raykit [options]"
-                opts.on('-l','--list [PATTERN]','list remotes') do |pattern|
-                    hash[:verb]="list"
-                    hash[:pattern]=pattern
-                    return hash
-                end
-
-                opts.on('-i','--import','import remotes') do |import|
-                    hash[:verb]="import"
-                    return hash
-                end
-
-                opts.on('-r','--rake [PATTERN]','rake [PATTERN]') do |pattern|
-                    hash[:verb]="rake"
-                    if(pattern.nil?)
-                        hash[:pattern] = ''
-                    else
-                        hash[:pattern]=pattern
-                    end
-                    return hash
-                end
-
-                opts.on('-w','--work [PATTERN]','work [PATTERN]') do |pattern|
-                    hash[:verb]="work"
-                    if(pattern.nil?)
-                        hash[:pattern] = ''
-                    else
-                        hash[:pattern]=pattern
-                    end
-                    return hash
-                end
+    
 
-                opts.on('-h','--help','help') do
-                    puts opts
-                    exit
-                end
+    # The implementation for the raykit console application
+    class Console
+        attr_accessor :opts
+        def initialize
+            @opts = Slop.parse do |o|
+                o.string '-r', '--remote', 'remote name or substring', default: ''
+                #o.string '-b', '--branch','branch name'
+                o.string '-t','--task','rake task', default: 'default'
+                o.bool '-v', '--verbose', 'enable verbose mode'
+                o.bool '-i','--import','import remotes from work directory'
+                o.bool '-p','--pull','pull work directory'
+                o.bool '-w','--work','rake work directory'
+                o.bool '-m','--make','make latest commit'
             end
 
-            opt_parser.parse!(options)
-            hash
+            if(opts.verbose?)
+                puts "options: " + Rainbow(@opts.to_hash).yellow.bright
+            end
         end
-    end
 
-    # The implementation for the raykit console application
-    class Console
-        def self.run
+        def run
             if(ARGV.length == 0)
-                Parser.parse %w[--help]
+                puts @opts
                 0
             else
-                hash = Parser.parse ARGV
-                if(hash.include?(:verb))
-                    verb = hash[:verb]
-                    case verb
-                    when 'list'
-                        list(hash)
-                    when 'import'
-                        import(hash)
-                    when 'rake'
-                        rake(hash)
-                    when 'work'
-                        work(hash)
-                    end
+                if(@opts.import?)
+                    puts Rainbow('import').yellow.bright
+                    puts "scanning #{REPOSITORIES.work_dir} for .git directories"
+                    count=REPOSITORIES.length
+                    REPOSITORIES.import(@opts[:remote])
+                    new_count=REPOSITORIES.length-count
+                    puts "imported #{new_count} remotes"
+                    return 0
                 end
+                REPOSITORIES.select{|r| r.include?(@opts[:remote])}.each{|remote|
+                    repo=Raykit::Git::Repository.new(remote)
+                    work=Raykit::Git::Directory.new(repo.get_dev_dir('work'))
+                    make=Raykit::Git::Directory.new(repo.get_dev_dir('make'))
+
+                    puts Rainbow(remote).green.bright
+                    if(@opts.pull?)
+                        work.pull
+                    end
+                    if(@opts.work?)
+                        if(!Dir.exist?(make.directory))
+                            puts `git clone #{remote} #{work.directory}`
+                        end
+                        work.rake(@opts[:task])
+                    end
+                    if(@opts.make?)
+                        if(!Dir.exist?(make.directory))
+                            puts `git clone #{remote} #{make.directory}`
+                        end
+                        make.rake(@opts[:task])
+                    end
+                }
+
+                #hash = Parser.parse ARGV
+                #if(hash.include?(:verb))
+                #    verb = hash[:verb]
+                #    case verb
+                #    when 'list'
+                #        list(hash)
+                #    when 'import'
+                #        import(hash)
+                #    when 'rake'
+                #        rake(hash)
+                #    when 'work'
+                #        work(hash)
+                #    end
+                #end
             end
         end
 
-        def self.list(hash)
+        def list(hash)
             pattern=''
             if(hash.include?(:pattern))
                 pattern=hash["pattern"]
@@ -87,7 +92,7 @@ module Raykit
             }
         end
 
-        def self.import(hash)
+        def import(hash)
             pattern=''
             pattern=hash["pattern"] if(hash.include?("pattern"))
             puts 'scanning...'
@@ -97,7 +102,7 @@ module Raykit
             puts "imported #{new_count} git repositories"
         end
 
-        def self.rake(hash)
+        def rake(hash)
             REPOSITORIES.each{|remote|
                 if(remote.include?(hash[:pattern]))
                     begin
@@ -120,7 +125,7 @@ module Raykit
             }
         end
 
-        def self.work(hash)
+        def work(hash)
             REPOSITORIES.each{|remote|
                 if(remote.include?(hash[:pattern]))
                     puts "remote: #{remote}"
@@ -134,5 +139,56 @@ module Raykit
             }
         end
     end
+
+    
+
+    # Parses the command line arguments for the Raykit console application
+    class Parser
+        def self.parse(options)
+            hash=Hash.new
+            opt_parser = OptionParser.new do |opts|
+                opts.banner = "Usage: raykit [options]"
+                opts.on('-l','--list [PATTERN]','list remotes') do |pattern|
+                    hash[:verb]="list"
+                    hash[:pattern]=pattern
+                    return hash
+                end
+
+                opts.on('-i','--import','import remotes') do |import|
+                    hash[:verb]="import"
+                    return hash
+                end
+
+                opts.on('-r','--rake [PATTERN]','rake [PATTERN]') do |pattern|
+                    hash[:verb]="rake"
+                    if(pattern.nil?)
+                        hash[:pattern] = ''
+                    else
+                        hash[:pattern]=pattern
+                    end
+                    return hash
+                end
+
+                opts.on('-w','--work [PATTERN]','work [PATTERN]') do |pattern|
+                    hash[:verb]="work"
+                    if(pattern.nil?)
+                        hash[:pattern] = ''
+                    else
+                        hash[:pattern]=pattern
+                    end
+                    return hash
+                end
+
+                opts.on('-h','--help','help') do
+                    puts opts
+                    exit
+                end
+            end
+
+            opt_parser.parse!(options)
+            hash
+        end
+    end
 end
 
+CONSOLE=Raykit::Console.new

data/lib/raykit/git/directory.rb

@@ -4,6 +4,7 @@ module Raykit
         class Directory
             # The directory name of the local repository clone
             attr_accessor :directory
+            @repository
 
             def initialize(directory)
                 @directory=directory
@@ -26,15 +27,36 @@ module Raykit
             end
 
             def rake(task)
-                Dir.chdir(directory) do
+                sub_dir='work'
+                sub_dir='make' if(@directory.include?('/make/'))
+                rake_log=repository.get_dev_dir('log') + "/#{sub_dir}.rake.#{task}.json"
+                if(File.exist?(rake_log))
+                    if(File.mtime(rake_log) > last_modified_time)
+                        cmd=Raykit::Command::parse(File.read(rake_log))
+                        puts 'up to date'
+                        return
+                    end
+                end
+
+                Dir.chdir(@directory) do
                     if(File.exist?('rakefile.rb'))
-                        PROJECT.run("rake #{task}")
+                        cmd = PROJECT.run("rake #{task}")
+                        if(cmd.exitstatus == 0)
+                            FileUtils.mkdir_p(File.dirname(rake_log))
+                            File.open(rake_log, 'w') {|f| f.write(JSON.generate(cmd.to_hash)) }
+                        end
                     else
                         puts 'rakefile.rb not found'
                     end
                 end
             end
 
+            def last_modified_time
+                Dir.chdir(@directory) do
+                    File.mtime(Dir.glob("**/*.*").select{|f| File.file?(f)}.max_by {|f| File.mtime(f)})
+                end
+            end
+
             # The latest tag for a branch of the repository
             def latest_tag(branch)
                 Dir.chdir(directory) do
@@ -65,6 +87,13 @@ module Raykit
                 'master'
             end
 
+            def repository
+                if(@repository.nil?)
+                    @repository = Raykit::Git::Repository.new(remote)
+                end
+                @repository
+            end
+
             def remote
                 if(Dir.exist?(directory))
                     Dir.chdir(directory) do

data/lib/raykit/git/repositories.rb

@@ -27,9 +27,13 @@ module Raykit
                 }
             end
 
+            def work_dir
+                Environment::get_dev_dir('work')
+            end
+
             def import(pattern)
                 git_dirs = Array.new
-                Dir.chdir(Environment::get_dev_dir('work')) do
+                Dir.chdir(work_dir) do
                     Dir.glob('**/.git'){|git_dir|
                         dir = File.expand_path('..',git_dir)
                         if(dir.length > 0)

data/lib/raykit/project.rb

@@ -140,7 +140,7 @@ module Raykit
                 elapsed_str = Timer.get_elapsed_str(cmd.elapsed,0)
                 if(cmd.exitstatus == 0)
                     puts elapsed_str + " " +  Rainbow(cmd.command).yellow.bright
-                    return elapsed_str + " " + cmd.command
+                    #return elapsed_str + " " + cmd.command
                 else
                     puts "\r\n" + cmd.command + "\r\n"
                     system(cmd.command)
@@ -149,6 +149,7 @@ module Raykit
                         abort Rainbow(elapsed_str).red.bright + " " +  Rainbow(cmd.command).white
                     end
                 end
+                cmd
             end
         end 
     end 

metadata

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