raykit 0.0.400 → 0.0.403

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 051c41fec4ffa38c63e0ce608dec916b4b3c43faa9b6cefb14cb025482c3a5ad
-  data.tar.gz: bcf3c976b55c4d21b22621404f76e203cb5c975b6bb8cefd719b7e6a40838461
+  metadata.gz: 87a638c355ecf27ad31cebb32d137ef7be99b7364bb80b024df3b1f90db66340
+  data.tar.gz: 73cc4db1b21b8f4979eab0037884fe8640e2982c6a23772eef9897ff5ca1e2da
 SHA512:
-  metadata.gz: 6a282efb131e22be6044acd0dd6cc57fb1f0c2508281afe228555a6b33d346ef339b3e71b73828a647c9b180b02dadd966d65ff816ecae330ac288a9344f77bb
-  data.tar.gz: 14aceb73b2e35bae2751366c1d85b0ec27566bf9fd1fbcef9e6b7bf16de8baeae8520f137c9e3263d731599dc9414b25049bc8f3bd6577a065a8fafcea1fb573
+  metadata.gz: b72587d9510e9990e70d38838b1fa5c37319031f99a8c8a76874aaa5a4bc84a008173263eedc0813df3d754886837b0f8605dc7723748d4303c71489b53c9dfd
+  data.tar.gz: 16da3264e487ce6da4e73b6c03ed83dd4fce3c3fca410c1bbab38e87c622d4101d6130ff7b24caacc082cc488b076bcfc12661ecc9a4e5fd2a832fbaf7342644

data/lib/raykit/conanpackage.rb

@@ -0,0 +1,47 @@
+# 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
+
+    def self.set_version_in_file(filename, name, version)
+      text = set_version(IO.read(filename), name, version)
+      orig = IO.read(filename)
+      File.open(filename, "w") { |f| f.puts text } if (text != orig)
+    end
+  end
+end

data/lib/raykit/nugetpackage.rb

@@ -1,12 +1,54 @@
 # 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
+
+    def self.set_version_in_file(filename, name, version)
+      text = set_version(IO.read(filename), name, version)
+      orig = IO.read(filename)
+      File.open(filename, "w") { |f| f.puts text } if (text != orig)
+    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.400
+  version: 0.0.403
 platform: ruby
 authors:
 - Lou Parslow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-08-05 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.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: ruby gem to support rake ci/cd tasks