raykit 0.0.399 → 0.0.402

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7b05f830a5453ee89a4deb45c07985abd2da04438f1f245232439acfa7712a0
-  data.tar.gz: 10ad2273ce10bbd102fd6a284f4c508e759f738691baa32dac1db320f7b9d685
+  metadata.gz: b64a21afba23dbd86cd8881f871550de514b684970d2d8256a9c4272c9a52e12
+  data.tar.gz: 9d8cfa0d75b233fd76c1130ca3be3afc1c8444315ad4f67a1484b8a3da3d8f29
 SHA512:
-  metadata.gz: dc5e4a82d286210f8a9d9bb4cc332dde18820fd1e57fbf2fe368b5f5e3ac3ee01e45cc57355cdf065382be93bc848a1ac24a34c76d2a04c004da99bc9364ba9d
-  data.tar.gz: 52458eace0ae6f78d09a506435efd016ff0c00fd412ba6dda823f2e915552b71a9cc89d29d82b84c588d98bd3648cb03c693cfb919d59e8e7205efe9b53fa93e
+  metadata.gz: 85065d4043132ef762c92644a911ef5df3a5359eecad4fcf776247fd889612ef81be7b41ab4b86af7c03748b9798440698ae191be56b89e3cf17bd884f3a6f90
+  data.tar.gz: 50d35fff071962a50638973fc21ae44aea109b281360417cffb116e3dcf16859f5ff7253a9c1f58f8b79f31d1977dd7768322b929d83645d8bcccc8213573f03

data/lib/raykit/conanpackage.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Raykit
+  class ConanPackage
+    attr_accessor :name, :version
+
+    def initialize(name, version)
+      @name = name
+      @version = version
+    end
+
+    def self.get_version(text, name)
+      # "roam/0.0.14@my+channel.com/branch"
+      [/\"#{name}\/([\d\.]+)/].each { |regex|
+        matches = text.scan(regex)
+        if matches.length > 0 && matches[0].length > 0
+          return matches[0][0]
+        end
+      }
+      ""
+    end
+
+    def self.set_version(text, name, version)
+      puts "ConanPackage::set_version"
+      new_text = text
+      [/(\"#{name}\/[\d\.]+)/].each { |regex|
+        matches = text.scan(regex)
+        if matches.length > 0 && matches[0].length > 0
+          orig = matches[0][0]
+          oversion = get_version(orig, name)
+          mod = orig.sub(oversion, version)
+          puts "match[0][0] " + matches[0][0]
+          puts "old version " + oversion
+          puts "new version " + version
+          new_text = new_text.gsub(orig, mod)
+        end
+      }
+      new_text
+    end
+  end
+end

data/lib/raykit/filesystem.rb

@@ -13,7 +13,7 @@ module Raykit
         file_count = file_count + 1
       }
       #end
-      puts "  copied " + file_count.to_s + " file from #{source_dir} to #{target_dir}"
+      puts "  copied " + file_count.to_s + " file(s) from #{source_dir} to #{target_dir}"
     end
 
     def self.copy_file_to_dir(file, dir)

data/lib/raykit/git/directory.rb

@@ -78,6 +78,24 @@ module Raykit
         end
       end
 
+      # git ls-tree -r master --name-only
+      def src_files
+        files = Array.new
+        Dir.chdir(@directory) do
+          `git ls-tree -r #{branch} --name-only`.each_line { |line|
+            file = line.strip
+            files << file if file.length > 0
+          }
+        end
+        files
+      end
+
+      def last_modified_src_time
+        Dir.chdir(@directory) do
+          File.mtime(src_files.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

data/lib/raykit/nugetpackage.rb

@@ -1,12 +1,48 @@
 # frozen_string_literal: true
 
 module Raykit
-  class NugetPackage
+  class NuGetPackage
     attr_accessor :name, :version
 
     def initialize(name, version)
       @name = name
       @version = version
     end
+
+    def self.get(text, name)
+      Raykit::NugetPackage.new(name, get_version(text, name))
+    end
+
+    def self.get_version(text, name)
+      [/<PackageReference[\s]+Include=\"#{name}\"[\s]+Version=\"([\d\.]+)/,
+       /<Reference[\s]+Include=\"#{name},[\s]+Version=([\d\.]+)/,
+       /<HintPath>[\.\\\/\w\d]+#{name}.([\d\.]+)/].each { |regex|
+        matches = text.scan(regex)
+        if matches.length > 0 && matches[0].length > 0
+          return matches[0][0]
+        end
+      }
+      ""
+    end
+
+    def self.set_version(text, name, version)
+      puts "NuGetPackage::set_version"
+      new_text = text
+      [/(<PackageReference[\s]+Include=\"#{name}\"[\s]+Version=\"[\d\.]+)/,
+       /(<Reference[\s]+Include=\"#{name},[\s]+Version=[\d\.]+)/,
+       /(<HintPath>[\.\\\/\w\d]+#{name}.[\d\.]+)/].each { |regex|
+        matches = text.scan(regex)
+        if matches.length > 0 && matches[0].length > 0
+          orig = matches[0][0]
+          oversion = get_version(orig, name)
+          mod = orig.sub(oversion, version)
+          puts "match[0][0] " + matches[0][0]
+          puts "old version " + oversion
+          puts "new version " + version
+          new_text = new_text.gsub(orig, mod)
+        end
+      }
+      new_text
+    end
   end
 end

data/lib/raykit/tasks.rb

@@ -27,12 +27,9 @@ task :integrate do
       else
         PROJECT.run("git add --all")
         unless `git status`.include?("nothing to commit")
-          # if(PROJECT.outstanding_commit?)
           commit_message = "integrate"
           PROJECT.run("git commit -m\"#{commit_message}\"") if PROJECT.outstanding_commit?
-          PROJECT.run("git pull")
-          # PROJECT.run("git push")
-          # PROJECT.run("git push --tags")
+          PROJECT.run("git pull", false)
         end
       end
     end

data/lib/raykit.rb

@@ -33,6 +33,10 @@ if defined?(RAYKIT_GLOBALS)
     Raykit::TopLevel.run(command, quit_on_failure)
   end
 
+  def try(command)
+    Raykit::TopLevel.run(command, false)
+  end
+
   def start_task(task_name)
     Raykit::Log.start_task(task_name)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.399
+  version: 0.0.402
 platform: ruby
 authors:
 - Lou Parslow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,6 +93,7 @@ files:
 - lib/raykit.rb
 - lib/raykit/command.rb
 - lib/raykit/conan/buildinfo.rb
+- lib/raykit/conanpackage.rb
 - lib/raykit/console.rb
 - lib/raykit/dir.rb
 - lib/raykit/dotnet.rb
@@ -144,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.2.22
 signing_key:
 specification_version: 4
 summary: ruby gem to support rake ci/cd tasks