MrMurano 1.10.0 → 1.10.1

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: 2c82aba3bbc43dfbfaca479de9eb3387f7aa1e65
4
- data.tar.gz: 485cb4bec0fbab31b06e00d6af5bc474c346fe8b
3
+ metadata.gz: 5f9edf8b7079752afb880ba2aa6e93fbeedbd739
4
+ data.tar.gz: d8078798fdce5eb32c16e36a09af8a4606866dc9
5
5
  SHA512:
6
- metadata.gz: 79ba743c1656d07acf3871c7353b4f193be8b10bb2adc67ac377843a4152a0362966e6ab43594272bea3f429873f51c6331c34736d1081a5e8c6afca31c87df4
7
- data.tar.gz: 644ff5cfcaa83e77384a44996f1e28758e681e19b6ed1491097f97f835c2d88b3ef3d224f01d27c231d30d4c8a675266297eaded396d3ddfbc0b5c45d43dae83
6
+ metadata.gz: 5b504c19847428c5f4d53d12b15a2d2f222d08884656b41001f0fee418ea243f926a7f67fd6d77dab761b2e1a60bc12a00978302cd43e6bbde321e5f2244db83
7
+ data.tar.gz: 2289bb1ae17b7a19e36cc1e1e23d8d8aba4f3c6963622989396184c4636e45b7008c19cc88949ded8960376bd765e9ab26df49576632f1ec1477e7804317b781
data/README.markdown CHANGED
@@ -211,7 +211,7 @@ spec/cico.murano.spec
211
211
  MrMurano uses [git flow](https://github.com/nvie/gitflow#getting-started) for
212
212
  [managing branches](http://nvie.com/posts/a-successful-git-branching-model/).
213
213
 
214
- MrMurano also uses [bunder](http://bundler.io).
214
+ MrMurano also uses [bundler](http://bundler.io).
215
215
 
216
216
  ## Windows
217
217
 
@@ -94,13 +94,20 @@ module MrMurano
94
94
  return itemA[:updated_at].to_time.round != itemB[:updated_at].to_time.round
95
95
  end
96
96
 
97
+ def cacheFileName
98
+ ['cache',
99
+ self.class.to_s.gsub(/\W+/,'_'),
100
+ @sid,
101
+ 'yaml'].join('.')
102
+ end
103
+
97
104
  def cacheUpdateTimeFor(local_path, time=nil)
98
105
  time = Time.now.getutc if time.nil?
99
106
  entry = {
100
107
  :sha1=>Digest::SHA1.file(local_path.to_s).hexdigest,
101
108
  :updated_at=>time.to_datetime.iso8601(3)
102
109
  }
103
- cacheFile = $cfg.file_at("cache.#{self.class.to_s.gsub(/\W+/,'_')}.yaml")
110
+ cacheFile = $cfg.file_at(cacheFileName)
104
111
  if cacheFile.file? then
105
112
  cacheFile.open('r+') do |io|
106
113
  cache = YAML.load(io)
@@ -120,7 +127,7 @@ module MrMurano
120
127
 
121
128
  def cachedUpdateTimeFor(local_path)
122
129
  cksm = Digest::SHA1.file(local_path.to_s).hexdigest
123
- cacheFile = $cfg.file_at("cache.#{self.class.to_s.gsub(/\W+/,'_')}.yaml")
130
+ cacheFile = $cfg.file_at(cacheFileName)
124
131
  return nil unless cacheFile.file?
125
132
  ret = nil
126
133
  cacheFile.open('r') do |io|
@@ -95,6 +95,6 @@ command 'product spec pull' do |c|
95
95
  io.close unless io.nil?
96
96
  end
97
97
  end
98
- alias_command 'product spec list', 'product spec pull', '--astable'
98
+ alias_command 'product spec list', 'product spec pull'
99
99
 
100
100
  # vim: set ai et sw=2 ts=2 :
@@ -145,8 +145,10 @@ Also, many date-time formats can be parsed and will be converted to microseconds
145
145
 
146
146
  # A query without any metrics is invalid. So if the user didn't provide any,
147
147
  # look up all of them (well, frist however many) and use that list.
148
- ret = sol.listMetrics
149
- query[:metrics] = ret[:metrics]
148
+ if query[:metrics].nil? or query[:metrics].empty? then
149
+ ret = sol.listMetrics
150
+ query[:metrics] = ret[:metrics]
151
+ end
150
152
 
151
153
  unless options.start_time.nil? then
152
154
  query[:start_time] = sol.str_to_timestamp(options.start_time)
@@ -1,4 +1,4 @@
1
1
  module MrMurano
2
- VERSION = '1.10.0'.freeze
2
+ VERSION = '1.10.1'.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.10.0
4
+ version: 1.10.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Conrad Tadpol Tilstra