raykit 0.0.466 → 0.0.468

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 942345ca52e601d5f8dbfcda26b00bade6d9cb72478383235a49126ba1a1cc1b
-  data.tar.gz: 0f14932e0f8874a31d8529b492c76b061c074384abbccafb7b33a247d934b29a
+  metadata.gz: ada348dbb3d7e03c616609130036a7ea47f6a6b7098073ca7fcb89c72fbd87ae
+  data.tar.gz: f31985daf247a7872dd22e8574bd864911bb22f4829816562c838ed4fe6a4a44
 SHA512:
-  metadata.gz: c3304c19948ff50fc429783861075fcec3c3a4250f005888ca858e5f24650558c3df233ff7138ebfab287cd862d7abf7eba27ce355acc343f4ce6a133541fc21
-  data.tar.gz: 860093f35b84ae8c84fdb4593804360a36d952099626bc998271a297a41330254f4fa6b8fca8e426f0bee888855f28b9a24e5a3d665504f7c2dc8a7be39adf22
+  metadata.gz: 5e7bf3db5b69f11d8c234c2296b39da64b093be9a6173b86c4649b2510f92d7c595e540a052fde9924eecca96a767c1ee35d27cb3e2dddacc14405fad13b885d
+  data.tar.gz: 40065e697fbe3b415d87e59f9e3122a4e7b7990a79b270e97c2ca3ad52bc8d16e4d9d0f7239920eb4f3774635cc5b4130f3c3bf86ade9abb04585c8e92f698c5

data/lib/raykit/command.rb

@@ -229,7 +229,8 @@ module Raykit
     end
 
     def details
-      puts "  exit_code: " + @exitstatus.to_s
+      #puts "  exit_code: " + @exitstatus.to_s
+      summary
       if @output.length > 0
         @output.lines.each do |line|
           puts "  " + line

data/lib/raykit/console.rb

@@ -264,7 +264,7 @@ module Raykit
 
         begin
           puts "remote: #{remote}"
-          cmd = Raykit::Rake.run(remote, "main")
+          cmd = Raykit::Rake.run(remote, "master")
           elapsed_str = Timer.get_elapsed_str(cmd.elapsed)
           if cmd.exitstatus.zero?
             puts "#{elapsed_str} #{Rainbow(SECRETS.hide(cmd.command)).yellow.bright} (#{cmd.directory})"

data/lib/raykit/git/directory.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Raykit
   module Git
     # Functionality to manage a local clone of a git repository
@@ -151,7 +152,7 @@ module Raykit
           scan = `git branch`.scan(/\*\s([\w.-]+)/)
           return scan[0][0].to_s if !scan.nil? && scan.length.positive? && scan[0].length.positive?
         end
-        "main"
+        "master"
       end
 
       def repository

data/lib/raykit/project.rb

@@ -6,10 +6,10 @@ RAKE_DIRECTORY = Rake.application.original_dir
 
 module Raykit
   class Project
-    attr_accessor :name, :timer, :verbose, :target
+    attr_accessor :name, :description, :version, :timer, :verbose, :target
 
     @directory
-    @version
+    #@version
     @remote
     @repository
     @git_directory
@@ -20,7 +20,10 @@ module Raykit
     # @log
     # @commit_message_filename
 
-    def initialize
+    # TODO: refactor to remove the defaults
+    def initialize(name = "", description = "", version = "")
+      @description = description if description.length.positive?
+      @version = version if version.length.positive?
       @timeout = 1000 * 60 * 15
       @verbose = false
       @timer = Raykit::Timer.new
@@ -37,23 +40,29 @@ module Raykit
       end
 
       # @log=Log.new("#{RAKE_DIRECTORY}/tmp/raykit.log")
-
-      if defined?(NAME)
-        @name = NAME
+      if (name.length.positive?)
+        @name = name
       else
-        slns = Dir.glob("*.sln")
-        if slns.length == 1
-          @name = slns[0].gsub(".sln", "")
+        if defined?(NAME)
+          @name = NAME
         else
-          gemspecs = Dir.glob("*.gemspec")
-          if gemspecs.length == 1
-            @name = gemspecs[0].gsub(".gemspec", "")
+          slns = Dir.glob("*.sln")
+          if slns.length == 1
+            @name = slns[0].gsub(".sln", "")
           else
-            remote_parts = @remote.split("/")
-            @name = remote_parts[-1].gsub(".git", "") if remote_parts.length.positive?
+            gemspecs = Dir.glob("*.gemspec")
+            if gemspecs.length == 1
+              @name = gemspecs[0].gsub(".gemspec", "")
+            else
+              remote_parts = @remote.split("/")
+              @name = remote_parts[-1].gsub(".git", "") if remote_parts.length.positive?
+            end
           end
         end
       end
+
+      @version = Raykit::Version.detect(@name, true) if version.length.zero?
+
       @repository = Raykit::Git::Repository.new(@remote)
       @values = Hash::new()
       @commands = Array::new()
@@ -124,19 +133,12 @@ module Raykit
       end
     end
 
-    def version
-      if @version.nil?
-        # Dir.chdir(@directory) do
-        #    if(Dir.glob("*.gemspec").length > 0)
-        #        @version=`bump current`.gsub('Current version:','').strip
-        #    else
-        #        @version=Raykit::VersionHelper.detect(@name,@verbose)
-        #    end
-        @version = Raykit::Version.detect(@name, @verbose)
-        # end
-      end
-      @version
-    end
+    #def version
+    #  if @version.nil?
+    #    @version = Raykit::Version.detect(@name, @verbose)
+    #  end
+    #  @version
+    #end
 
     def set_version(version)
       @version = version

data/lib/raykit/tasks.rb

@@ -60,12 +60,20 @@ task :tag do
   if PROJECT.read_only?
     puts "  read only state, skipping tag operation"
   else
-    if (PROJECT.version != PROJECT.latest_tag)
-      try "git tag -a #{PROJECT.version} -m\"version #{PROJECT.version}\""
-      try "git push --tags"
-    else
+    if (GIT_DIRECTORY.has_tag "v#{PROJECT.version}")
       puts "  tag #{PROJECT.latest_tag} already exists."
+    else
+      GIT_DIRECTORY.tag_version PROJECT.version
+      try "git push --tags"
     end
+    #if (PROJECT.latest_tag != "v#{PROJECT.version}")
+    #  GIT_DIRECTORY.tag_version PROJECT.version
+    #if (PROJECT.version != PROJECT.latest_tag)
+    #try "git tag -a #{PROJECT.version} -m\"version #{PROJECT.version}\""
+    #  try "git push --tags"
+    #else
+    #  puts "  tag #{PROJECT.latest_tag} already exists."
+    #end
   end
 end
 

data/lib/raykit/zip.rb

@@ -60,5 +60,14 @@ module Raykit
         puts "  added " << count.to_s << " files to " << @filename
       }
     end
+
+    def self.zip_directory(directory, zipfile_name, overwrite = true)
+      File.delete(zipfile_name) if File.exist?(zipfile_name) && overwrite
+      ::Zip::File.open(zipfile_name, ::Zip::File::CREATE) do |zipfile|
+        Dir[File.join(directory, "**", "**")].each do |file|
+          zipfile.add(file.sub(directory + "/", ""), file)
+        end
+      end
+    end
   end
 end

data/lib/raykit.rb

@@ -16,15 +16,6 @@ SECRETS = Raykit::Secrets.new
 REPOSITORIES = Raykit::Git::Repositories.new("#{Raykit::Environment.get_dev_dir("log")}/Raykit.Git.Repositories.json")
 GIT_DIRECTORY = Raykit::Git::Directory.new(Rake.application.original_dir)
 
-def backup_git_directory
-  if ENV["GIT_BACKUP_DIR"] && !ENV["GIT_BACKUP_DIR"].empty?
-    puts "Backing up #{GIT_DIRECTORY.repository.url}"
-    Raykit::Git::Repository::backup GIT_DIRECTORY.repository.url, "#{ENV["GIT_BACKUP_DIR"]}/#{GIT_DIRECTORY.repository.relative_path}"
-  else
-    puts "Environment variable GIT_BACKUP_DIR is not set"
-  end
-end
-
 NUGET_DIR = Raykit::Environment::get_dev_dir("nuget")
 PUBLISH_DIR = Raykit::Environment::get_dev_dir("publish")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.466
+  version: 0.0.468
 platform: ruby
 authors:
 - Lou Parslow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2023-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: ruby gem to support rake ci/cd tasks