MrMurano 1.1.2 → 1.1.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 37c49c0b975dd14d40e55d57a2c806931d442423
4
- data.tar.gz: 98a232cf51e5155d5943ff02f5d2b32a62a76cb3
3
+ metadata.gz: b30c051164d206ea8803801def2814e56b53c5d4
4
+ data.tar.gz: 58bfc2487e906542bc9e75a947838d98313016d7
5
5
  SHA512:
6
- metadata.gz: e40e5b6b729e25dec8ec4f07785805b2185ee9106dfe7bfc07e31ba75703ca14d56272056f6815aa7f3accaa3809fd200f5541b3fa8c9d2a576566c498d19e29
7
- data.tar.gz: 1e067ca68bbc3948af5540d8c89afc1a2f3508b3466ee253dab8ec989cd8834fc80e2d91fe33b1a38f7aeed4b4b89cb3c609a58ab3b7dd0cb83b8ab92057ce2e
6
+ metadata.gz: a306b2126c6023bea0c8f20f0e8d285f66d5c564609b9658ee3ecfd83bf7415b51f6ce9cc18fe02b600afc8b7d4bb7612060c78a3861229e8c267356a5577ec3
7
+ data.tar.gz: 7ae234da9d3a0bf0d39abdb8311d55da2f59c652633efd7f91bfcd036cc21aec8fa042f2f514de3cf785775190bbc2d23ff8f9528a40f46efa17a583e2315c30
data/bin/mr CHANGED
@@ -52,7 +52,7 @@ pgds = [
52
52
  if not ARGV.include? '--skip-plugins' then
53
53
  pgds << Pathname.new(ENV['MR_MURANO_PLUGIN_DIR']) if ENV.has_key? 'MR_MURANO_PLUGIN_DIR'
54
54
  pgds.each do |path|
55
- ext unless path.exist?
55
+ next unless path.exist?
56
56
  path.each_child do |plugin|
57
57
  next if plugin.directory?
58
58
  next unless plugin.readable?
@@ -6,7 +6,7 @@ require 'mime/types'
6
6
  require 'pp'
7
7
 
8
8
  module MrMurano
9
- # …/file
9
+ # …/file
10
10
  class File < SolutionBase
11
11
  def initialize
12
12
  super
@@ -52,7 +52,7 @@ module MrMurano
52
52
  end
53
53
 
54
54
  def curldebug(request)
55
- # The upload will get printed out inside of upload.
55
+ # The upload will get printed out inside of upload.
56
56
  # Because we don't have the correct info here.
57
57
  if request.method != 'PUT' then
58
58
  super(request)
@@ -120,6 +120,7 @@ module MrMurano
120
120
 
121
121
  mime = MIME::Types.type_for(path.to_s)[0] || MIME::Types["application/octet-stream"][0]
122
122
 
123
+ # TODO: are we doing the correct calculation here?
123
124
  sha1 = Digest::SHA1.file(path.to_s).hexdigest
124
125
 
125
126
  {:path=>name, :mime_type=>mime.simplified, :checksum=>sha1}
@@ -83,6 +83,8 @@ module MrMurano
83
83
  elsif itemB[:updated_at].kind_of? String then
84
84
  itemB[:updated_at] = DateTime.parse(itemB[:updated_at]).to_time.getutc
85
85
  end
86
+ # It is a common thing that the thing in murano has a newer updated timestamp
87
+ # than the file here on disk.
86
88
  return itemA[:updated_at] != itemB[:updated_at]
87
89
  end
88
90
 
@@ -43,8 +43,10 @@ module MrMurano
43
43
  @paths << ConfigFile.new(:internal, nil, IniFile.new())
44
44
  # :specified --configfile FILE goes here. (see load_specific)
45
45
  prjfile = findProjectFile()
46
- @paths << ConfigFile.new(:private, prjfile.dirname + CFG_PRVT_NAME)
47
- @paths << ConfigFile.new(:project, prjfile)
46
+ unless prjfile.nil? then
47
+ @paths << ConfigFile.new(:private, prjfile.dirname + CFG_PRVT_NAME)
48
+ @paths << ConfigFile.new(:project, prjfile)
49
+ end
48
50
  @paths << ConfigFile.new(:user, Pathname.new(Dir.home) + CFG_FILE_NAME)
49
51
  @paths << ConfigFile.new(:system, Pathname.new('/etc') + CFG_FILE_NAME.sub(/^\./,''))
50
52
  @paths << ConfigFile.new(:defaults, nil, IniFile.new())
@@ -55,7 +57,7 @@ module MrMurano
55
57
 
56
58
  set('net.host', 'bizapi.hosted.exosite.io', :defaults)
57
59
 
58
- set('location.base', prjfile.dirname, :defaults)
60
+ set('location.base', prjfile.dirname, :defaults) unless prjfile.nil?
59
61
  set('location.files', 'files', :defaults)
60
62
  set('location.endpoints', 'endpoints', :defaults)
61
63
  set('location.modules', 'modules', :defaults)
@@ -76,7 +78,7 @@ module MrMurano
76
78
  result=nil
77
79
  home = Pathname.new(Dir.home)
78
80
  pwd = Pathname.new(Dir.pwd)
79
- return a if home == pwd
81
+ return nil if home == pwd
80
82
  pwd.dirname.ascend do |i|
81
83
  break if i == home
82
84
  if (i + CFG_FILE_NAME).exist? then
@@ -1,4 +1,4 @@
1
1
  module MrMurano
2
- VERSION = '1.1.2'.freeze
2
+ VERSION = '1.1.3'.freeze
3
3
  end
4
4
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: MrMurano
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Conrad Tadpol Tilstra