raykit 0.0.245 → 0.0.246

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f873a2d375ce490d06e47a6720e43392b68ecb67633dcb1c411d7454b36c7cc
-  data.tar.gz: 9e71ec5fb38920593c1d9a03226862d885fcdf9ed1519d157ee656f4460c3aba
+  metadata.gz: 61bc9da800c4c3e58ceffd425012b641585cc37d083e1f242545a85de244f16c
+  data.tar.gz: e81087a065f0c397b46e0d4c26c67b932051d1dd825bf70050d7a6b2d961bc7c
 SHA512:
-  metadata.gz: 70ac08aa8403ac092dbfb31662bf8bf589a8b4b09408427cc4e1e1bd1cf1b6c36396b958b4f807b6cab9050df388925ebd84a09ba71ec618de7ad0d0196a2338
-  data.tar.gz: 4edc773d0a9989646b7cd4027f4e1f178c316192125e743e54856cbc525617170ac4427cb6e1d8e8ae1d0032144cbab1dfc535d9cc5ce509378afffb903d99d4
+  metadata.gz: ffca4d20e996678f6b60605bdff24f184cd7d8d7b9d258c5cdfd27aa687ffe81cf0fea633f23d823b60221bb3f48faec76c803fb2608a19971fc337c8b435d62
+  data.tar.gz: 7f2134f08965d2865b7adec7620a373b50bc9277c82a3d97bb09aa99e41148b7ab99084800ccc6717e91ac75145fbaeaa625381a192bb5102b079b015f7693c6

data/lib/raykit/sourceImport.rb

@@ -1,8 +1,9 @@
 
 module Raykit
     class SourceImport < Hash
-        def initialize(url,glob,target,commit)
+        def initialize(url,source,glob,target,commit)
             self['remote'] = url
+            self['source'] = source
             self['glob'] = glob
             self['target'] = target
             self['commit']=commit
@@ -12,6 +13,10 @@ module Raykit
             self['remote']
         end
 
+        def source
+            self['source']
+        end
+
         def target
             self['target']
         end
@@ -47,17 +52,19 @@ module Raykit
                 source_names = []
                 work=self['remote'].work_dir
                 Dir.chdir(work) do
-                    if(File.exist?('rakefile.rb'))
-                        cmd = Command.new('rake clean')
+                    Dir.chdir(source) do
+                        if(File.exist?('rakefile.rb'))
+                            cmd = Command.new('rake clean')
+                        end
+                        source_names=Dir.glob(self['glob'])
                     end
-                    source_names=Dir.glob(self['glob'])
                 end
                 source_names.each{|source_name|
-                    source=work + "/" + source_name
+                    source_file =work + "/" + source + "/" + source_name
                     target_name = target + "/" + source_name
                     target_parent = File.dirname(target_name)
                     FileUtils.mkdir_p(target_parent) if(!Dir.exist?(target_parent))
-                    FileUtils.copy(source,target_name)
+                    FileUtils.copy(source_file,target_name)
                     count += 1
                 }
                 puts '        copied ' + count.to_s + ' files to ' + target

data/lib/raykit/sourceImports.rb

@@ -4,7 +4,7 @@ module Raykit
 
         def initialize(urls)
             urls.each{|url|
-                self << SourceImport.new(url,'**/*.cs','src','')
+                self << SourceImport.new(url,'src','**/*.cs','dep','')
             }
         end
 
@@ -37,7 +37,7 @@ module Raykit
             sourceImports = SourceImports.new([])
             array=JSON.parse(IO.read(filename))
             array.each{|hash|
-                sourceImport = SourceImport.new(hash['remote'],hash['glob'],hash['target'],hash['commit'])
+                sourceImport = SourceImport.new(hash['remote'],hash['source'],hash['glob'],hash['target'],hash['commit'])
                 sourceImports << sourceImport
             }
             sourceImports

data/lib/raykit/tasks.rb

@@ -6,11 +6,6 @@ end
 
 desc "integrate changes into the git repository"
 task :integrate do
-    #if(File.exist?('sourceImports.json'))
-    #    if(Rake::Task.task_defined?("update_source"))
-    #        Rake::Task["update_source"].invoke
-    #    end 
-    #end
     if(PROJECT.outstanding_commit?)
         if(Rake::Task.task_defined?("test"))
             Rake::Task["test"].invoke

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.245
+  version: 0.0.246
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ruby gem to support rake ci/cd tasks