raykit 0.0.78 → 0.0.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6f6c226590ce474b86d043126f2f50b8036d96a6ae87fb55adbbfb94108eee0
-  data.tar.gz: 3fc0bc65e376b5fd02c2344c775a4ce8eba54b10b7eaf8bc3fd849d685163b2a
+  metadata.gz: 7358ba0f5ed5825bbf7bc6a7dcf1c6856f8339c62c456f0175f0d2478c16e131
+  data.tar.gz: 323480501634d62fe55df078779729dc18903942a7846dce4d3839a8092b35d3
 SHA512:
-  metadata.gz: 5dddd10d8afb2965f25625a3eae53891223e4fbac3434aff317c8e15dc996b9eea3182b54949ff1096e8f55899e6f4b4e8396502e175a552fa807fb7371b051b
-  data.tar.gz: 83329ce09fe77124ae251db8e762a03247357c1896dd06605e3126b5eff07081dc71dbfcf89904a3c956aea9d1cff4aa54f9da217d4536e11572cd5ab003351d
+  metadata.gz: cfd3792dcc24a75592447fba59ad2812ae7c141f5d3f490522bc3d372443cf142d84eeeeda029ee9fd23b42613fb7035ba0578bd4f54660f4dd6da429b14e2d5
+  data.tar.gz: e95f61d363a57bd1ba98543a01ff7cffbdecbf81e324b3d0cc0c1d4b01563b0ea31b9ed0ebeb42b2ea3ba296794ad593ba8935529fbda2ce51e93d04c337c912

data/lib/raykit/command.rb

@@ -7,6 +7,7 @@ BUFFER_SIZE=1024 if(!defined?(BUFFER_SIZE))
 module Raykit
     # Functionality to support executing and logging system commands
     class Command
+        @@commands
         # The timeout in seconds, defaults to 0 if not specified
         attr_accessor :timeout
         # The working directory, defaults the current directory if not specified
@@ -26,6 +27,7 @@ module Raykit
         end
 
         def initialize(command,timeout=0)
+            @@commands=Array.new
             init_defaults
             @command=command
             @timeout=timeout
@@ -77,6 +79,24 @@ module Raykit
             else
                 LOG.log('Raykit.Command',Logger::Severity::ERROR,JSON.generate(to_hash))
             end
+            @@commands.insert(-1,self)
+        end
+
+        def elapsed_str()
+            if(elapsed < 1.0)
+                "%.0f" % (elapsed) + "s"
+            else
+                "%.0f" % (elapsed) + "s"
+            end
+        end
+
+        def summary
+            checkmark="\u2713"
+            warning="\u26A0"
+            error="\u0058"
+            symbol=Rainbow(checkmark.encode('utf-8')).green
+            symbol=Rainbow(error.encode('utf-8')).red if(exitstatus!=0)
+            puts symbol + "  " + elapsed_str.rjust(4) + " " + Rainbow(@command).yellow
         end
 
         def to_hash()

data/lib/raykit/git/repository.rb

@@ -82,7 +82,8 @@ module Raykit
             private def update_local_clone_directory
                 if(Dir.exist?(local_clone_directory))
                     Dir.chdir(local_clone_directory) do
-                        `git pull`
+                        Raykit::Command.new('git pull')
+                        #t = `git pull`
                     end
                 else
                     PROJECT.run("git clone #{@url} #{local_clone_directory}")
@@ -95,7 +96,7 @@ module Raykit
                     Dir.chdir(local_clone_directory) do
                         check=`git branch`
                         if(!check.include?("* #{branch}"))
-                            `git checkout #{branch}`
+                            t = `git checkout #{branch}`
                         end
                         check=`git branch`
                         return check.include?("* #{branch}")

data/lib/raykit/project.rb

@@ -1,22 +1,26 @@
 require 'rake/clean'
 RAKE_DIRECTORY=Rake.application.original_dir
-puts "RAKE_DIRECTORY #{RAKE_DIRECTORY}"
+#puts "RAKE_DIRECTORY #{RAKE_DIRECTORY}"
 module Raykit
     class Project
         attr_accessor :name
         attr_accessor :timer
+        attr_accessor :verbose
         @directory
         @version
         @remote
+        @repository
+        @git_directory
 
         def initialize()
+            @verbose=false
             @timer=Raykit::Timer.new
             @remote=''
             if(Dir.exist?(RAKE_DIRECTORY))
                 @directory=RAKE_DIRECTORY
                 if(Dir.exist?("#{RAKE_DIRECTORY}/.git") && Dir.exist?(@directory))
-                    git_directory=Raykit::Git::Directory.new(@directory)
-                    @remote=git_directory.remote
+                    @git_directory=Raykit::Git::Directory.new(@directory)
+                    @remote=@git_directory.remote
                 end
             else
                 @directory=''
@@ -34,6 +38,7 @@ module Raykit
                 end
             end
             @version=Raykit::Version.detect(@name)
+            @repository=Raykit::Git::Repository.new(@remote)
         end
 
         def get_dev_dir(subdir)
@@ -43,6 +48,13 @@ module Raykit
         def directory
             @directory
         end
+        def branch
+            @git_directory.branch
+        end
+
+        def latest_commit
+            @repository.latest_commit(branch)
+        end
 
         def version
             @version
@@ -68,17 +80,21 @@ module Raykit
         end
 
         def info
+            ljust=35
             puts ''
-            puts "PROJECT.name = " + Rainbow(PROJECT.name).yellow.bright
-            puts "PROJECT.version = " + Rainbow(PROJECT.version).yellow.bright
-            puts "PROJECT.remote = " + Rainbow(PROJECT.remote).yellow.bright
-            puts "PROJECT.last_modified_filename = " + Rainbow(PROJECT.last_modified_filename).yellow.bright
-            puts "PROJECT.elapsed = " + Rainbow(PROJECT.elapsed).yellow.bright
+            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.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 ''
             self
         end
 
         def summary
+            info if(@verbose)
             
             puts "[" + elapsed + "] " + Rainbow(@name).yellow.bright + " " + Rainbow(version).yellow.bright
         end
@@ -137,14 +153,15 @@ module Raykit
                 command.each{|subcommand| run(subcommand,quit_on_failure)}
             else
                 cmd = Command.new(command)
+                cmd.summary
                 elapsed_str = Timer.get_elapsed_str(cmd.elapsed,0)
                 if(cmd.exitstatus == 0)
-                    puts elapsed_str + " " +  Rainbow(cmd.command).yellow.bright
+                    #puts elapsed_str + " " +  Rainbow(cmd.command).yellow.bright
                     #return elapsed_str + " " + cmd.command
                 else
-                    puts "\r\n" + cmd.command + "\r\n"
-                    system(cmd.command)
-                    puts ''
+                    #puts "\r\n" + cmd.command + "\r\n"
+                    #system(cmd.command)
+                    #puts ''
                     if(quit_on_failure)
                         abort Rainbow(elapsed_str).red.bright + " " +  Rainbow(cmd.command).white
                     end

data/lib/raykit/timer.rb

@@ -22,7 +22,8 @@ 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)
+            #"[" + "%.0f" % (elapsed) + "s]".ljust(pad)
+            "%.0f" % (elapsed) + "s".ljust(pad)
         end
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.78
+  version: 0.0.79
 platform: ruby
 authors:
 - Lou Parslow