MrMurano 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 582e59cb41974922ea200196ccdaa17f61791ca7
-  data.tar.gz: 6daed3f5cecd632b93fa95b335126efb84bb75bb
+  metadata.gz: ac2a53f721bb1eb5785155d07e9a0f63afb07b43
+  data.tar.gz: d0deb6961935b84b30766580fb1f3e66dc1439ac
 SHA512:
-  metadata.gz: 723355b78007243ccdd74e4362969cbc7ce5dc27ecd1a722e267bb99ab795c872be7bb56da3e77b01ac3627239118676be1f7438f72eeba12ab8cd5dd3d9ac2f
-  data.tar.gz: 43df4f2518b7df9d1830b0fdc0aba4946c1871a107830e146378b5151e7b48486a8fff3cf16bd4b303cbec16212644e9f5593711de568e590fe746d3ee2573d6
+  metadata.gz: 3694669cfcc0b7a9588cff924ac3aa9516e5a30194a9884cdb3911617542d813a3015f3b7cc4a72cf08eaf71f6dcd886d63cd8fa029297316627fb2f49aa5d1c
+  data.tar.gz: 0a510f4d9d497057a7b3371be4f792720f4d84eb9ee815be2dfcbcd580329835f4f0461c7bf746785482285514ce31045a414e523575ac66d173b84646a14c75

data/lib/MrMurano/Solution-Services.rb

@@ -3,6 +3,7 @@ require 'net/http'
 require 'json'
 require 'yaml'
 require 'date'
+require 'digest/sha1'
 require 'MrMurano/Solution'
 
 module MrMurano
@@ -94,18 +95,22 @@ module MrMurano
 
     def cacheUpdateTimeFor(local_path, time=nil)
       time = Time.now.getutc if time.nil?
+      entry = {
+        :sha1=>Digest::SHA1.file(local_path.to_s).hexdigest,
+        :updated_at=>time.to_datetime.iso8601(3)
+      }
       cacheFile = $cfg.file_at("cache.#{self.class.to_s}.yaml")
       if cacheFile.file? then
         cacheFile.open('r+') do |io|
           cache = YAML.load(io)
           io.rewind
-          cache[local_path.to_s] = time.to_datetime.iso8601(3)
+          cache[local_path.to_s] = entry
           io << cache.to_yaml
         end
       else
         cacheFile.open('w') do |io|
           cache = {}
-          cache[local_path.to_s] = time.to_datetime.iso8601(3)
+          cache[local_path.to_s] = entry
           io << cache.to_yaml
         end
       end
@@ -113,13 +118,22 @@ module MrMurano
     end
 
     def cachedUpdateTimeFor(local_path)
+      cksm = Digest::SHA1.file(local_path.to_s).hexdigest
       cacheFile = $cfg.file_at("cache.#{self.class.to_s}.yaml")
       return nil unless cacheFile.file?
       ret = nil
       cacheFile.open('r') do |io|
         cache = YAML.load(io)
         if cache.has_key?(local_path.to_s) then
-          ret = DateTime.parse(cache[local_path.to_s])
+          entry = cache[local_path.to_s]
+          debug("For #{local_path}:")
+          debug(" cached: #{entry.to_s}")
+          debug(" cm: #{cksm}")
+          if entry.kind_of?(Hash) then
+            if entry[:sha1] == cksm and entry.has_key?(:updated_at) then
+              ret = DateTime.parse(entry[:updated_at])
+            end
+          end
         end
       end
       ret

data/lib/MrMurano/commands/productSpec.rb

@@ -55,11 +55,11 @@ command 'product spec' do |c|
     file = $cfg["p-#{prid}.spec"] unless prid.nil? or $cfg["p-#{prid}.spec"].nil?
     file = options.file unless options.file.nil?
 
-    if FileTest.exist?(file) then
+    if not file.nil? and FileTest.exist?(file) then
       prd = MrMurano::Product.new
       pp prd.update(file)
     else
-      say_error "File Missing: #{file}"
+      say_error "No spec file to push: #{file}"
     end
   end
 end

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.5.2'.freeze
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander