raykit 0.0.500 → 0.0.501

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b2a3e1c22735ebdacb0d6e65529afda2553beb7e3035c015b894523ec839fc3
-  data.tar.gz: a70d5d46c87f1eb517020af2e59f0e3efd3fde472d9aed2a6d9d63be769680a9
+  metadata.gz: 030637eb6f5b006e96bdc07f68426d12e5c3e847681f9ce8d92f7579cc81ffd8
+  data.tar.gz: a1eae5cf64d7ce6f2a30e56bc0b01b341c882dfd2820020218814ad2aa6546a0
 SHA512:
-  metadata.gz: d5062b8fff78d1a0c5321afa51f6171cff9aa77e344dbbf6be70119d2ba502934156c671600dc4ca526ba2962d19f14d75331fb13c8ddb7d283877cb58ebcbe8
-  data.tar.gz: 7713d9d0f5a112b570ed6eee588e8d491ed9a075ea7747ea5a8695d24c115233fccbfdd88341748134b898848c8490d76892c5e2f4892327959cb21dbbf58e56
+  metadata.gz: eaecd3d17476fdfcdec18204073c711c409446dd90f18f9739c6b8bcd0386eaba2da0f2fbf88ff86f7f2ab72c00200e259312f1606007052159daaa6da8e3b0e
+  data.tar.gz: 55b7481f38dc0ee2d687af3165e81b90dbd1309d94e291a30ee46e490906f82acf34a52ce67df7d8e5ba8c0a4df57b172789b827b635f5b2f596f94681892d64

data/lib/raykit/command.rb

@@ -203,11 +203,13 @@ module Raykit
     end
 
     def summary(show_directory = false)
-      checkmark = "\u2713"
+      #checkmark = "\u2713"
       # warning="\u26A0"
-      error = "\u0058"
-      symbol = Rainbow(checkmark.encode("utf-8")).green
-      symbol = Rainbow(error.encode("utf-8")).red if @exitstatus != 0
+      #error = "\u0058"
+      #symbol = Rainbow(checkmark.encode("utf-8")).green
+      #symbol = Rainbow(error.encode("utf-8")).red if @exitstatus != 0
+      symbol = Raykit::Symbols::checkmark if @exitstatus.zero?
+      symbol = Raykit::Symbols::error if @exitstatus != 0
       cmd = "#{Rainbow(SECRETS.hide(@command)).yellow}"
       if show_directory
         puts "#{symbol} #{cmd} " + Rainbow("#{elapsed_str}").cyan

data/lib/raykit/console.rb

@@ -9,18 +9,32 @@ module Raykit
   class Console
     attr_accessor :opts
 
-    def initialize
-      @opts = Slop.parse do |o|
+    def self.get_opts
+      Slop.parse do |o|
         o.string "-t", "--task", "rake task", default: "default"
         o.bool "-v", "--verbose", "print detailed output", default: false
         o.bool "-q", "--quiet", "minimal output", default: false
         o.bool "-s", "--stop", "stop on error", default: true
       end
+    end # def self.get_opts
 
-      if opts.verbose?
-        puts "options: #{Rainbow(@opts.to_hash).yellow.bright}"
-        puts "arguments:#{Rainbow(@opts.arguments).yellow.bright}"
+    def initialize(opts = nil)
+      if opts.nil?
+        @opts = Console.get_opts
+      else
+        @opts = opts
       end
+      #@opts = Slop.parse do |o|
+      #  o.string "-t", "--task", "rake task", default: "default"
+      #  o.bool "-v", "--verbose", "print detailed output", default: false
+      #  o.bool "-q", "--quiet", "minimal output", default: false
+      #  o.bool "-s", "--stop", "stop on error", default: true
+      #end
+
+      #if opts.verbose?
+      #  puts "options: #{Rainbow(@opts.to_hash).yellow.bright}"
+      #  puts "arguments:#{Rainbow(@opts.arguments).yellow.bright}"
+      #end
     end
 
     def run
@@ -33,6 +47,8 @@ module Raykit
         add
       when "remove"
         remove
+      when "list"
+        list
       when "show"
         show
       when "work"
@@ -56,6 +72,7 @@ module Raykit
     def verb_descriptions
       { "add" => "add a git url",
         "remove" => "remove one or more git urls",
+        "list" => "list summaries of repositories",
         "show" => "show git urls matching a specific pattern",
         "work" => "clone and rake a git repository",
         "import" => "import git urls matching a specific pattern",
@@ -121,6 +138,16 @@ module Raykit
       end
     end
 
+    def list
+      pattern = ""
+      pattern = @opts.arguments[1] if @opts.arguments.length > 1
+      REPOSITORIES.matches(pattern).each do |url|
+        repo = Raykit::Git::Repository.new(url)
+        puts repo.to_s
+        #puts url
+      end
+    end
+
     def show
       pattern = ""
       pattern = @opts.arguments[1] if @opts.arguments.length > 1
@@ -154,7 +181,7 @@ module Raykit
     #puts cmd.to_s
 
     def work_url(url)
-      return 0 if url == "https://gitlab.com/lou-parslow/raykit.git"
+      return 0 if url == "https://gitlab.com/gems-rb/raykit.git"
 
       puts Rainbow(url).yellow.bright if @opts.verbose?
       repo = Raykit::Git::Repository.new(url)

data/lib/raykit/git/repository.rb

@@ -6,7 +6,7 @@ module Raykit
     # Functionality to manage a remote git repository
     class Repository
       # The url of the remote repository
-      attr_accessor :url
+      attr_accessor :url, :latest_commit_id, :latest_commit_exit_status
       attr_accessor :clone_directory, :work_directory
 
       def initialize(url)
@@ -16,6 +16,41 @@ module Raykit
         @url = url
         @clone_directory = Raykit::Git::Directory.new(get_dev_dir("clone"))
         @work_directory = Raykit::Git::Directory.new(get_dev_dir("work"))
+        load
+      end
+
+      def filename
+        Environment.get_dev_dir("data") + File::SEPARATOR + "repository" + File::SEPARATOR + Raykit::FileSystem::replace_invalid_chars(relative_path.gsub("/", ".").gsub("\\", ".")) + ".json"
+      end
+
+      def save
+        # Create the config directory if it doesn't exist.
+        dir = File.dirname(filename)
+        FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
+
+        File.write(filename, {
+          latest_commit_id: @latest_commit_id,
+          latest_commit_exit_status: @latest_commit_exit_status,
+        }.to_json)
+      end
+
+      def load
+        if (File.exist?(filename))
+          data = JSON.parse(File.read(filename))
+          @latest_commit_id = data["latest_commit_id"]
+          @latest_commit_exit_status = data["latest_commit_exit_status"]
+        end
+      end
+
+      def update
+        @latest_commit_id = latest_commit(default_branch)
+        if (@latest_commit_id.nil? || @latest_commit_id.empty?)
+          cmd = get_make_command(@latest_commit_id, "rake default")
+          if (!cmd.nil?)
+            @latest_commit_exit_status = cmd.exitstatus
+          end
+        end
+        save
       end
 
       def short_name()
@@ -117,6 +152,18 @@ module Raykit
         ""
       end
 
+      def latest_commit_date(branch)
+        if checkout_local_clone_directory_branch(branch)
+          update_local_clone_directory
+          Dir.chdir(local_clone_directory) do
+            text = `git log -n 1`
+            scan = text.scan(/Date:\s+(.*)/)
+            return scan[0][0].to_s
+          end # Dir.chdir
+        end # if checkout_local_clone_directory_branch
+        ""
+      end
+
       # The latest tag for a branch of the repository
       def latest_tag(branch)
         return `git describe --abbrev=0`.strip if checkout_local_clone_directory_branch(branch)
@@ -125,7 +172,7 @@ module Raykit
       end
 
       private def local_clone_directory
-        clone_dir = "#{Environment.get_dev_dir("clone")}/#{relative_path}"
+        clone_dir = Environment::normalize_path("#{Environment.get_dev_dir("clone")}/#{relative_path}")
       end
 
       public def update_local_clone_directory
@@ -170,12 +217,15 @@ module Raykit
       end
 
       def pull
+        #repo = Raykit::Git::Repository.new(url)
+        #work_dir = repo.get_dev_dir("work")
+        #repo.clone(work_dir) if !Dir.exist?(work_dir)
         Raykit::Git::Repository::work_pull(url)
         update_local_clone_directory
       end
 
       def work(command, force = false)
-        pull if (!Dir.exist?(get_dev_dir("work")))
+        #pull if (!Dir.exist?(get_dev_dir("work")))
         fcommand = Raykit::FileSystem::replace_invalid_chars(command)
         filename = "#{Raykit::Environment::log_dir}/work_#{fcommand}_#{relative_path.gsub("/", "-")}.json"
         if (Raykit::Git::Directory.new(get_dev_dir("work")).outstanding_commit? || force)
@@ -189,11 +239,20 @@ module Raykit
           else
             work_cmd = Raykit::Git::Repository::work_url(url, command)
             work_cmd.save_as(filename)
+            update
           end
           #
         end
       end
 
+      def get_make_command(commit_id, command)
+        make_id = "make_#{relative_path.gsub("/", "-")}_#{commit_id}"
+        fcommand = Raykit::FileSystem::replace_invalid_chars(command)
+        filename = "#{Raykit::Environment::log_dir}/#{make_id}_#{fcommand}.json"
+        return Raykit::Command::parse(IO.read(filename)) if (File.exist?(filename))
+        nil
+      end
+
       def make(command, force = false)
         commit_id = "#{latest_commit(default_branch)}"
         make_id = "make_#{relative_path.gsub("/", "-")}_#{commit_id}"
@@ -204,6 +263,7 @@ module Raykit
         else
           make_cmd = Raykit::Git::Repository::make_url(url, commit_id, "rake default")
           make_cmd.save_as(filename)
+          update
           return make_cmd
         end
       end
@@ -271,7 +331,21 @@ module Raykit
       end # def self.backup
 
       def to_s
-        "Name: #{short_name}\nUrl: #{@url}\nRelative Path: #{relative_path}"
+        #short_name
+        latest_commit_id = @latest_commit_id.nil? ? "" : @latest_commit_id # latest_commit(default_branch)
+        latest_commit_exit_status = @latest_commit_exit_status.nil? ? nil : @latest_commit_exit_status # latest_commit(default_branch)
+        symbol = Raykit::Symbols::warning
+        symbol = Raykit::Symbols::success if (!latest_commit_exit_status.nil? && latest_commit_exit_status == 0)
+        symbol = Raykit::Symbols::success if (!latest_commit_exit_status.nil? && latest_commit_exit_status != 0)
+        #latest_make_cmd = get_make_command(latest_commit_id, "rake default")
+        #commit = Rainbow(latest_commit(default_branch)[0..8]).cyan
+        #if (latest_make_cmd.nil?)
+        #  symbol = Raykit::Symbols::warning
+        #else
+        #  symbol = latest_make_cmd.exitstatus == 0 ? Raykit::Symbols::success : Raykit::Symbols::error
+        #end
+        commit = latest_commit_id[0..8]
+        "#{symbol} #{commit} #{short_name}"
       end # def to_s
 
       def to_table
@@ -282,11 +356,18 @@ module Raykit
         table = header
         table += "\n" + to_table_row("Name", short_name)
         table += "\n" + to_table_row("Url", @url)
+        table += "\n" + to_table_row("Default Branch", default_branch)
+        table += "\n" + to_table_row("Latest Commit", latest_commit(default_branch))
+        table += "\n" + to_table_row("Latest Commit Date", latest_commit_date(default_branch))
+        table += "\n" + to_table_row("Latest Commit Make", make("rake default").summary(false))
+        table += "\n" + to_table_row("Clone Directory", local_clone_directory)
+        table += "\n" + to_table_row("Work Directory", get_dev_dir("work"))
+        table += "\n" + to_table_row("Latest Tag", latest_tag(default_branch))
         table
       end # def to_table
 
       def to_table_row(name, value)
-        max_name_width = 10
+        max_name_width = 20
         max_value_width = 30
         Rainbow(name.rjust(max_name_width, " ")).cyan + " | " + Rainbow(value).white.bold
       end

data/lib/raykit/sourceImport.rb

@@ -27,7 +27,9 @@ module Raykit
     end
 
     def update
-      work = self["remote"].work_dir
+      repo = Raykit::Git::Repository.new(remote)
+      work = repo.get_dev_dir("work")
+      #work = self["remote"].work_dir
       work_parent = File.dirname(work)
       FileUtils.mkdir_p(work_parent) unless Dir.exist?(work_parent)
       if Dir.exist?(work)

data/lib/raykit/symbols.rb

@@ -0,0 +1,16 @@
+module Raykit
+  class Symbols
+    def self.checkmark
+      Rainbow("\u2713").green
+    end
+    def self.success
+      Rainbow("\u2713").green
+    end
+    def self.error
+      Rainbow("\u0058").red
+    end
+    def self.warning
+      Rainbow("\u26A0").yellow
+    end
+  end # class Symbols
+end # module Raykit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.500
+  version: 0.0.501
 platform: ruby
 authors:
 - Lou Parslow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-02 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,7 @@ files:
 - lib/raykit/sourceImport.rb
 - lib/raykit/sourceImports.rb
 - lib/raykit/string.rb
+- lib/raykit/symbols.rb
 - lib/raykit/tasks.rb
 - lib/raykit/text.rb
 - lib/raykit/timer.rb