bake-toolkit 2.68.1 → 2.69.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aedaaf58ee97493bdcc5a0002b571de20295c8ea013f3a45be44755931da8a2f
-  data.tar.gz: 66f7876ca45bf0955be3dbaa58bc522f5e5fb848c15bdf527f71d9c159a4f89a
+  metadata.gz: 9413bb4da104f832f080c5464af7fc78d3ce84a8e2117d94f0f4e6e17a396a80
+  data.tar.gz: 406602ea8421c97a5ec9c35900ac32a4b6ee18350c9e345d3b732e58b4767929
 SHA512:
-  metadata.gz: 7cc330fc24ae6454869a1dff273461784f10c4d92af7c6b144251be2606595eda7976a04772f62059963dff1ec2db4f8697eaf2e7e4a164c351e85d83e0d5b73
-  data.tar.gz: ee9003412d36a81cff6606b19783637da7379940b241a77188c48522f569b7afd01d110384827e4956397f698ea6d74654046484214e69e60f42ed4653014045
+  metadata.gz: ee29f4f63153ab875442aa3290081371fdab40b6db69ff054e37ebc0bff0ee0623a29448b6e3877ed2ec9739e3c522d6bb8fe185c0e840cbbde9eb70a9848b30
+  data.tar.gz: 6e54abc0d3c7622f83695202eeef4abe83042b6f027b9495d0659a6a69d3965b9123a3c6c1d357126e09d3e38d0124a0dd52e69b6c359d52ad28bf93ed919cf4

data/lib/bakery/toBake.rb

@@ -30,7 +30,7 @@ module Bake
     toBuildPattern = []
     @options.roots.each do |root|
       col.project.each do |p|
-        projs = Root.search_to_depth(root.dir,p.name + "/Project.meta", root.depth)
+        projs = Root.search_to_depth(root.dir,p.name + "/Project.meta", root.depth).map { |p| Pathname.new(p).cleanpath.to_s }
         if File.basename(root.dir) == p.name && File.exist?(root.dir + "/Project.meta")
           projs << root.dir + "/Project.meta"
         end

data/lib/blocks/fileutil.rb

@@ -11,6 +11,13 @@ module Bake
         @type = type
         @projectDir = projectDir
         @echo = (config.echo != "off")
+        if !@arg1 || @arg1.empty?
+          Bake.formatter.printError("Error: source of file-step must not be empty")
+          ExitHelper.exit(1)
+        elsif [:copy, :move].include?(@type) && (!@arg2 || @arg2.empty?)
+          Bake.formatter.printError("Error: target of file-step must not be empty")
+          ExitHelper.exit(1)
+        end
       end
 
       def run
@@ -20,13 +27,13 @@ module Bake
             FileUtils.touch(@arg1)
           elsif @type == :move
             puts "Moving #{@arg1} to #{@arg2}" if @echo
-            FileUtils.mv(@arg1, @arg2)
+            Dir.glob(@arg1).each {|f| FileUtils.mv(f, @arg2)}
           elsif @type == :copy
             puts "Copying #{@arg1} to #{@arg2}" if @echo
-            FileUtils.cp_r(@arg1, @arg2)
+            Dir.glob(@arg1).each {|f| FileUtils.cp_r(f, @arg2)}
           elsif @type == :remove
             puts "Removing #{@arg1}" if @echo
-            FileUtils.rm_rf(@arg1)
+            Dir.glob(@arg1).each {|f| FileUtils.rm_rf(f)}
           elsif @type == :makedir
             puts "Making #{@arg1}" if @echo
             FileUtils.mkdir_p(@arg1)

data/lib/common/root.rb

@@ -80,6 +80,7 @@ module Bake
     end
 
     def self.search_to_depth(root, baseName, depth)
+      return Dir.glob(baseName) if File.is_absolute?(baseName)
       if not File.exist?(root)
         Bake.formatter.printError("Root #{root} does not exist.")
         ExitHelper.exit(1)

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.68.1"
+      "2.69.0"
     end
 
     def self.printBakeVersion(ry = "")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.68.1
+  version: 2.69.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext