rbbt-util 5.24.5 → 5.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5ee6863707b6c58f334ce4056a1791b4cb64e20
-  data.tar.gz: 7c944aa3a6d82bbe8d075cf6e6fd1af05f49d4fd
+  metadata.gz: 794b4ce4b3d681a3431389504612ad12726ae0b6
+  data.tar.gz: c56db77f71c8f9b5110e42263ba7ef8b20d810dc
 SHA512:
-  metadata.gz: 71a9a5b458cb139a31f9781fc5b1d626a6340fa0519bea6ac2bcc9f8eeb281f06634fe012cbcef86363395c010884ea2a335706fedf76e84b4bfc13242068f24
-  data.tar.gz: e54204fe8ff0e70e55f3d04f04c95110dd03963c59cccb31f600b74da938d8dcdacd4e07f679dbb752a5df8682f56ba6debc10af481b0556b5359ab9daf8e052
+  metadata.gz: 2cb32a3508d30939014a28320fe56a420a76e0fffcb61326b3ade4b1440595f78bfac7fd8ce582b811442e3c81116142207b5d70be5707645c00c35e42d7c3cd
+  data.tar.gz: 418f3e57524983b2837fa573b9c970e3e1db41cb1e8ff6a2bf99381ce25e264320c1d5c613b69736db86a6b0dd9d8e4ba996086aba7280ec46c4bd4179c0450b

data/lib/rbbt/resource.rb

@@ -125,7 +125,7 @@ module Resource
     case
     when @resources.include?(path)
       type, content = @resources[path]
-    when @resources.include?(path.original)
+    when (Path === path && @resources.include?(path.original))
       type, content = @resources[path.original]
     when has_rake(path)
       type = :rake
@@ -151,12 +151,12 @@ module Resource
       final_path = path
     end
 
-    if not File.exist? final_path or force
+    if type and not File.exist?(final_path) or force
       Log.medium "Producing: #{ final_path }"
       lock_filename = Persist.persistence_path(final_path, {:dir => Resource.lock_dir})
       Misc.lock lock_filename do
         FileUtils.rm_rf final_path if force and File.exist? final_path
-        if not File.exist? final_path or force
+        if not File.exist?(final_path) or force
           (remote_server and get_from_server(path, final_path)) or
           begin
             case type

data/lib/rbbt/workflow/definition.rb

@@ -153,4 +153,19 @@ module Workflow
   end
 
   alias export export_asynchronous
+
+  def import(source, *args)
+    if args.empty?
+      tasks = source.tasks.collect{|n,t| n} + source.helpers.collect{|n,h| n }
+    else
+      tasks = args.flatten
+    end
+
+    tasks.each do |task|
+      self.tasks[task.to_sym] = source.tasks[task.to_sym] if source.tasks.include? task.to_sym
+      self.task_dependencies[task.to_sym] = source.task_dependencies[task.to_sym] if source.tasks.include? task.to_sym
+      self.task_description[task.to_sym] = source.task_description[task.to_sym] if source.tasks.include? task.to_sym
+      self.helpers[task.to_sym] = source.helpers[task.to_sym] if source.helpers.include? task.to_sym
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.24.5
+  version: 5.25.0
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake