raykit 0.0.64 → 0.0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 235065a51015ff26623bbc830b7d87edbe13f6831467097bd6ba772e5641ba14
-  data.tar.gz: b4a33d9443fac03ebefb0ebd4cf6a7e142d6a770cb1c449a4347096d9622b0e1
+  metadata.gz: 11c2aa65634564143fdddf693450663f18db123866b16d36cc228348c8854fd3
+  data.tar.gz: 49c469e9dfd7bfe7bcddebf843992d3992b63b462c64d61886194fb98bcb5267
 SHA512:
-  metadata.gz: aeacdbdcc4a2d498b8d89b962ee1c9fed8cd08086e5d19a6162a9211efb18aeb80f4166eaa1d3556c0e046643205f9417d621021eb7f49fc631db2d063af0753
-  data.tar.gz: e2ba522dad660625a089d7513efe2f8ad8260099a3c0bf8195d98ab1c0e979dbe1a482126c15d40a3fc168406c0c24acf664e18b3872edeec1d373021d560bd1
+  metadata.gz: 89e2e6323f18ac9388b00c98ef3b1e7b75f05bc106f882839abb6acdc058da22db46dac3da9e4820c1536483148122729aa7c0a4d3c747d490a009828f6aab92
+  data.tar.gz: 6c73dbf7d6fe5089663ce932b31fc2216587faa589221ab65ddeae09585a442b8d0c47139ad6cb0c7b015b3a8d09550a08bc2a480c8022730853c63cd9d66d15

data/lib/raykit.rb

@@ -3,17 +3,22 @@ require 'rake/clean'
 require 'open3'
 require 'rake/testtask'
 
+
+
 lib_dir=File.dirname(__FILE__)
 Dir.glob(lib_dir + '/raykit/**/*.rb') {|file| require file}
+
+PROJECT=Raykit::Project.new
+
 TIMER=Raykit::Timer.new
-LOG = Raykit::Logging.new
+
 REPOSITORIES = Raykit::Git::Repositories.new(Raykit::Environment::get_dev_dir('log') + "/Raykit.Git.Repositories.json")
 
 if(Dir.exist?('.git'))
     GIT_DIRECTORY=Raykit::Git::Directory.new(Rake.application.original_dir)
 end
 
-PROJECT=Raykit::Project.new
+
 
 module Raykit
     

data/lib/raykit/logging.rb

@@ -47,4 +47,6 @@ module Raykit
     end
 
     
-end
+end
+
+LOG = Raykit::Logging.new

data/lib/raykit/project.rb

@@ -6,11 +6,22 @@ module Raykit
         attr_accessor :name
         @directory
         @version
+        @remote
 
         def initialize()
-            @name=NAME if(defined?(NAME))
+            
             @directory=RAKE_DIRECTORY
-            @version=Raykit::Version.detect
+            
+
+            git_directory=Raykit::Git::Directory.new(@directory)
+            @remote=git_directory.remote
+
+            if(defined?(NAME))
+                @name=NAME 
+            else
+                @name=@remote.split('/')[-1].gsub('.git','')
+            end
+            @version=Raykit::Version.detect(@name)
         end
 
         def directory
@@ -21,11 +32,15 @@ module Raykit
             @version
         end
 
+        def remote
+            @remote
+        end
+
         def info
-            puts "Raykit::Environment.root_dir=#{Raykit::Environment.root_dir}"
-            puts "Raykit::Environment.home_dir=#{Raykit::Environment.home_dir}"
-            puts "PROJECT.name=#{PROJECT.name}"
-            puts "PROJECT.version=#{PROJECT.version}"
+            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
         end
 
         def commit

data/lib/raykit/version.rb

@@ -4,17 +4,17 @@ module Raykit
         attr_accessor :start_time
 
         # detect a version number based on the NAME variable, if defined
-        def self.detect
-            if(defined?(NAME))
-                csproj_filename = "#{NAME}/#{NAME}.csproj"
+        def self.detect(name)
+            #if(defined?(NAME))
+                csproj_filename = "#{name}/#{name}.csproj"
                 if(File.exists?(csproj_filename))
                     return IO.read(csproj_filename).match(/<Version>([\d.]+)</).captures[0]
                 end
-                gemspec_filename = "#{NAME}.gemspec"
+                gemspec_filename = "#{name}.gemspec"
                 if(File.exists?(gemspec_filename))
                     return IO.read(gemspec_filename).match(/version[\s]+=[\s]+['"]([\w.]+)['"]/).captures[0]
                 end
-            end
+            #end
             '0.0.0'
         end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.64
+  version: 0.0.65
 platform: ruby
 authors:
 - Lou Parslow
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ruby gem to support rake ci/cd tasks