mamiya 0.0.1.alpha4 → 0.0.1.alpha5

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: 8b7c302118f29ce87893d3a0d6881ed60452f576
4
- data.tar.gz: 94f44fc20b1175190e5a670727d7cf89243ddd53
3
+ metadata.gz: b2781a38f674237c266a6bfd3dc7631c319d01a1
4
+ data.tar.gz: 6a6f56108eb2e3bee73e0cfc7372ee7f335e3862
5
5
  SHA512:
6
- metadata.gz: b956bb10cdb0fc730714ab045240876708bb66a6cc38e8b6fcbed293eea1ac6089d12f5c312b7211342e86c0512df986152d2ff3bba0c395d30373640eba75ed
7
- data.tar.gz: 314d2937a7502d78faf95f63f359cbd372755f36cb2995608ac2204927a9f001adcc3621739375bb55acb88747e85f266356db6a810e113e04bd194c9f3824d2
6
+ metadata.gz: 50ec070e1b96998ae3f3418fdce0495d8987be9369a93f3bce3bd1c303089d20cbea523442b7a284e4cee071f1d307e6ae32662674752680212520bac4371a32
7
+ data.tar.gz: 76e450334e725a817532dbb8c851b1468e31fb0eafac92088b4e536cfe28f6cdc92a80ece0e4e08f50f3950f70f36a5d6f18b4c390b0462d2b4186d1a27cf718
@@ -264,9 +264,11 @@ module Mamiya
264
264
  def merge_serf_option!
265
265
  (config[:serf] ||= {})[:agent] ||= {}
266
266
 
267
- options[:serf].flat_map{ |_| _.split(/,/) }.each do |conf|
268
- k,v = conf.split(/=/,2)
269
- config[:serf][:agent][k.to_sym] = v
267
+ if options[:serf]
268
+ options[:serf].flat_map{ |_| _.split(/,/) }.each do |conf|
269
+ k,v = conf.split(/=/,2)
270
+ config[:serf][:agent][k.to_sym] = v
271
+ end
270
272
  end
271
273
  end
272
274
 
@@ -1,3 +1,3 @@
1
1
  module Mamiya
2
- VERSION = "0.0.1.alpha4"
2
+ VERSION = "0.0.1.alpha5"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mamiya
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.1.alpha4
4
+ version: 0.0.1.alpha5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Shota Fukumori (sora_h)
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-05-30 00:00:00.000000000 Z
11
+ date: 2014-06-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor