MrMurano 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37c49c0b975dd14d40e55d57a2c806931d442423
-  data.tar.gz: 98a232cf51e5155d5943ff02f5d2b32a62a76cb3
+  metadata.gz: b30c051164d206ea8803801def2814e56b53c5d4
+  data.tar.gz: 58bfc2487e906542bc9e75a947838d98313016d7
 SHA512:
-  metadata.gz: e40e5b6b729e25dec8ec4f07785805b2185ee9106dfe7bfc07e31ba75703ca14d56272056f6815aa7f3accaa3809fd200f5541b3fa8c9d2a576566c498d19e29
-  data.tar.gz: 1e067ca68bbc3948af5540d8c89afc1a2f3508b3466ee253dab8ec989cd8834fc80e2d91fe33b1a38f7aeed4b4b89cb3c609a58ab3b7dd0cb83b8ab92057ce2e
+  metadata.gz: a306b2126c6023bea0c8f20f0e8d285f66d5c564609b9658ee3ecfd83bf7415b51f6ce9cc18fe02b600afc8b7d4bb7612060c78a3861229e8c267356a5577ec3
+  data.tar.gz: 7ae234da9d3a0bf0d39abdb8311d55da2f59c652633efd7f91bfcd036cc21aec8fa042f2f514de3cf785775190bbc2d23ff8f9528a40f46efa17a583e2315c30

data/bin/mr

@@ -52,7 +52,7 @@ pgds = [
 if not ARGV.include? '--skip-plugins' then
   pgds << Pathname.new(ENV['MR_MURANO_PLUGIN_DIR']) if ENV.has_key? 'MR_MURANO_PLUGIN_DIR'
   pgds.each do |path|
-    ext unless path.exist?
+    next unless path.exist?
     path.each_child do |plugin|
       next if plugin.directory?
       next unless plugin.readable?

data/lib/MrMurano/Solution-File.rb

@@ -6,7 +6,7 @@ require 'mime/types'
 require 'pp'
 
 module MrMurano
-  # …/file 
+  # …/file
   class File < SolutionBase
     def initialize
       super
@@ -52,7 +52,7 @@ module MrMurano
     end
 
     def curldebug(request)
-      # The upload will get printed out inside of upload. 
+      # The upload will get printed out inside of upload.
       # Because we don't have the correct info here.
       if request.method != 'PUT' then
         super(request)
@@ -120,6 +120,7 @@ module MrMurano
 
       mime = MIME::Types.type_for(path.to_s)[0] || MIME::Types["application/octet-stream"][0]
 
+      # TODO: are we doing the correct calculation here?
       sha1 = Digest::SHA1.file(path.to_s).hexdigest
 
       {:path=>name, :mime_type=>mime.simplified, :checksum=>sha1}

data/lib/MrMurano/Solution-Services.rb

@@ -83,6 +83,8 @@ module MrMurano
       elsif itemB[:updated_at].kind_of? String then
         itemB[:updated_at] = DateTime.parse(itemB[:updated_at]).to_time.getutc
       end
+      # It is a common thing that the thing in murano has a newer updated timestamp
+      # than the file here on disk.
       return itemA[:updated_at] != itemB[:updated_at]
     end
 

data/lib/MrMurano/configFile.rb

@@ -43,8 +43,10 @@ module MrMurano
       @paths << ConfigFile.new(:internal, nil, IniFile.new())
       # :specified --configfile FILE goes here. (see load_specific)
       prjfile = findProjectFile()
-      @paths << ConfigFile.new(:private, prjfile.dirname + CFG_PRVT_NAME)
-      @paths << ConfigFile.new(:project, prjfile)
+      unless prjfile.nil? then
+        @paths << ConfigFile.new(:private, prjfile.dirname + CFG_PRVT_NAME)
+        @paths << ConfigFile.new(:project, prjfile)
+      end
       @paths << ConfigFile.new(:user, Pathname.new(Dir.home) + CFG_FILE_NAME)
       @paths << ConfigFile.new(:system, Pathname.new('/etc') + CFG_FILE_NAME.sub(/^\./,''))
       @paths << ConfigFile.new(:defaults, nil, IniFile.new())
@@ -55,7 +57,7 @@ module MrMurano
 
       set('net.host', 'bizapi.hosted.exosite.io', :defaults)
 
-      set('location.base', prjfile.dirname, :defaults)
+      set('location.base', prjfile.dirname, :defaults) unless prjfile.nil?
       set('location.files', 'files', :defaults)
       set('location.endpoints', 'endpoints', :defaults)
       set('location.modules', 'modules', :defaults)
@@ -76,7 +78,7 @@ module MrMurano
       result=nil
       home = Pathname.new(Dir.home)
       pwd = Pathname.new(Dir.pwd)
-      return a if home == pwd
+      return nil if home == pwd
       pwd.dirname.ascend do |i| 
         break if i == home
         if (i + CFG_FILE_NAME).exist? then

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-	VERSION = '1.1.2'.freeze
+	VERSION = '1.1.3'.freeze
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra