bake-toolkit 2.63.1 → 2.63.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7152626f57d1a24d3b46ec135225ec6d29290ed0fe7285eccf66140a068f15c
-  data.tar.gz: e250d345fc671c0162945a86553cdd0f1d5fac111bfb872ecf6416e7b1c17c05
+  metadata.gz: 007d1495eeb33f601eb10747f21cae6b0c478041092799bcfd284ab8cdce7253
+  data.tar.gz: cabe15ec22fe017a9946b4287cc8321b5df6fd14b64dac6c0fa0b6f11c88f58a
 SHA512:
-  metadata.gz: 60e71bfaf09f2f55520a4e5be68d55ab0aa1111b0220c526ff6576e65a1a0b3bbd5ed17df608465d18d97d2599aeaaecd390515ebc59520b4c23556556039b08
-  data.tar.gz: c9231ab7d566c1863d4c2dd7ed9d8e686967e55a43235673e0bb14e4a795ea0e906296e3ec4c8c8ea6bb3b4aa92c023f7371fb2225109cc353322d34dab9ce70
+  metadata.gz: ec0beb0df1b8a9f191faba73671da192424f04714af16b80f047dac259808a778ac822a9f790ffcd679d86579a9100e1fc3325bc83b19a8d40b2b3c30ec6b769
+  data.tar.gz: 2c75dc962078394be1033cd484834b90e4fd326c83a103b8fdb780d827f8f6a78f1689d2e383bc09d6e3aee0e1c0cf2d91a5fafad868eca6e7ad8f660eb09259

data/lib/bake/cache.rb

@@ -31,7 +31,7 @@ module Bake
           @cacheFilename = Bake.options.main_dir+"/.bake/Project.meta." + sanitize_filename(Bake.options.build_config) + qacStr + ".cache"
         end
         if !Bake.options.dry
-          Utils.gitIgnore(File.dirname(@cacheFilename)) 
+          Utils.gitIgnore(File.dirname(@cacheFilename), :silent) 
         end
       end
 
@@ -187,10 +187,16 @@ module Bake
         cache.adapt_filenames = AdaptConfig.filenames
         bbdump = Marshal.dump(cache)
         begin
-          File.delete(@cacheFilename)
-        rescue
+          File.open(@cacheFilename, 'wb') {|file| file.write(bbdump) }
+        rescue Exception=>e
+          if Bake.options.verbose >= 3
+            Bake.formatter.printWarning("Warning: Could not write cache file #{@cacheFilename}")
+            if Bake.options.debug
+              puts e.message
+              puts e.backtrace
+            end
+          end
         end
-        File.open(@cacheFilename, 'wb') {|file| file.write(bbdump) }
         Bake.options.nocache = false
       end
 

data/lib/bake/model/loader.rb

@@ -9,6 +9,7 @@ require 'rgen/util/file_cache_map'
 
 require 'rtext/default_loader'
 
+require_relative '../../common/ext/rgen'
 require_relative '../../common/exit_helper'
 require_relative '../toolchain/colorizing_formatter'
 require_relative '../options/options'

data/lib/bakery/model/loader.rb

@@ -7,6 +7,7 @@ require 'rgen/fragment/fragmented_model'
 
 require 'rtext/default_loader'
 
+require_relative '../../common/ext/rgen'
 require_relative '../../common/exit_helper'
 require_relative '../../bake/toolchain/colorizing_formatter'
 

data/lib/common/ext/rgen.rb

@@ -0,0 +1,23 @@
+module RGen
+module Util
+
+  class FileCacheMap
+    alias_method :orig_store_data, :store_data
+    def store_data(key_path, value_data)
+      begin
+        orig_store_data(key_path, value_data)
+      rescue Exception=>e
+        if Bake.options.verbose >= 3
+          cf = cache_file(key_path)
+          Bake.formatter.printWarning("Warning: Could not write cache file #{cf}")
+          if Bake.options.debug
+            puts e.message
+            puts e.backtrace
+          end
+        end
+      end
+    end
+  end
+
+end
+end

data/lib/common/utils.rb

@@ -4,11 +4,21 @@ module Bake
 
   module Utils
     
-    def self.gitIgnore(folder)
-      FileUtils::mkdir_p(folder)
+    def self.gitIgnore(folder, mode = :report)
       gitignore = folder + "/.gitignore"
-      if !File.exist?(gitignore)
-        File.write(gitignore, ".\n")
+      begin
+        FileUtils::mkdir_p(folder)
+        if !File.exist?(gitignore)
+          File.write(gitignore, ".\n")
+        end
+      rescue Exception=>e
+        if mode != :silent && Bake.options.verbose >= 3
+          Bake.formatter.printWarning("Warning: Could not write file #{gitignore}")
+          if Bake.options.debug
+            puts e.message
+            puts e.backtrace
+          end
+        end
       end
     end
 

data/lib/common/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.63.1
+  version: 2.63.2
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -262,6 +262,7 @@ files:
 - lib/common/exit_helper.rb
 - lib/common/ext/dir.rb
 - lib/common/ext/file.rb
+- lib/common/ext/rgen.rb
 - lib/common/ext/rtext.rb
 - lib/common/ext/stdout.rb
 - lib/common/ide_interface.rb