houcho 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 861b8e2a9dba584c7491cae19e5b89af5d344b3e
-  data.tar.gz: a002ee817dac79bc4df21a13fbf13e64cea1780a
+  metadata.gz: b59ced5d69133f301f1a65871fcb2cd8378ceaca
+  data.tar.gz: 8ac6a107ea045d6353df58264fee06e99d527848
 SHA512:
-  metadata.gz: 0b7f5057e97c73796f3bad5989ff922896954c64bddef2124e0b80c77893ea38e3dc69504a7e9779331fe945da73ca41c4cca1be6450fc661f08df5a13db609e
-  data.tar.gz: 9baa6c039dd5caeecac4d9198e53979ab017cb9c0248470435aceaae02b23148c2c72df0c1056dc72029a78449e2c7bb3009a76579f5c25732b0e906e8b0c669
+  metadata.gz: fd397c0f4a66a9ad8327b83691cf2b0b77298c9611281c65835fcb9eab166fda6905c5c8de338d1b2ee10538f435c63460e1e2937011cc5740b2f39f265dc8c6
+  data.tar.gz: 9ea002fe75a457d41f320a9eb38d9a53fb875a0bb4b6c0c645f877e1e374a600546c685bd1db0c6fd8b64d412975e579ae7bb5a11d574b58ef2a91b7eda6ab82

data/lib/houcho/outerrole/cloudforecast.rb

@@ -11,15 +11,17 @@ class OuterRole
   class << CloudForecast
     def load
       cfdir = Houcho::Config::CFYAMLDIR
+      @cfrole = {}
 
       Dir::entries(cfdir).each do |file|
         next if file !~ /\.yaml$/
         yaml = "#{cfdir}/#{file}"
         group = load_group(yaml)
         cfrole = create_cf_role(yaml, group)
-
-        save_outer_role(cfrole, "CloudForecast")
+        merge_cf_role(cfrole)
       end
+
+      save_outer_role(@cfrole, "CloudForecast")
     end
 
 
@@ -49,7 +51,7 @@ class OuterRole
         doc["servers"].each do |servers|
           label = servers["label"].gsub(/\s+/, '_') if servers["label"]
           outerrole = "#{group[i]}::#{label}::#{servers["config"].sub(/\.yaml$/, "")}"
-          hosts = servers["hosts"].map { |host| host.split(/\s+/)[1] }
+          hosts = (servers["hosts"] || []).map { |host| host.split(/\s+/)[1] }
 
           cfrole[outerrole] = hosts
         end
@@ -57,6 +59,12 @@ class OuterRole
 
       cfrole
     end
+
+    def merge_cf_role(cfrole)
+      cfrole.each do |role, hosts|
+        @cfrole[role] = @cfrole[role] ? @cfrole[role].concat(hosts).uniq : hosts
+      end
+    end
   end
 end
 

data/lib/houcho/version.rb

@@ -1,3 +1,3 @@
 module Houcho
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: houcho
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Satoshi SUZUKI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor