houcho 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b59ced5d69133f301f1a65871fcb2cd8378ceaca
-  data.tar.gz: 8ac6a107ea045d6353df58264fee06e99d527848
+  metadata.gz: c7c23a4ef5cf93e240094423d9ac76d943403b3f
+  data.tar.gz: 9194233d1018017bcdcdee212947f957c1b1c7c6
 SHA512:
-  metadata.gz: fd397c0f4a66a9ad8327b83691cf2b0b77298c9611281c65835fcb9eab166fda6905c5c8de338d1b2ee10538f435c63460e1e2937011cc5740b2f39f265dc8c6
-  data.tar.gz: 9ea002fe75a457d41f320a9eb38d9a53fb875a0bb4b6c0c645f877e1e374a600546c685bd1db0c6fd8b64d412975e579ae7bb5a11d574b58ef2a91b7eda6ab82
+  metadata.gz: 34ec4bece0fdbd4a3c67d4841c2d9351449b2d090065f992c9c7ce91ad88d263fd83f38ab2c8ca42b23c6d6dac90a581b323eb48a65b0a2ff796e9b105572a81
+  data.tar.gz: f78039031014a62a8f0afc7248c2fd4b249b9681e2f7f713cce724b4603d6c60e7a68157844c29cc1e2b0bdb2f6181bc07020c23652528515deac0edc0d541a3

data/lib/houcho/spec/runner.rb

@@ -84,6 +84,7 @@ class Spec
     end
 
 
+    private
     def run(target, dryrun, ci = false, console_output = false)
       messages = []
       failure = false
@@ -92,6 +93,7 @@ class Spec
         @spec.check_existence(v["spec"])
         spec = v["spec"].map { |spec| "#{@specdir}/#{spec}_spec.rb" }
         command = "rspec --format documentation #{spec.sort.uniq.join(" ")}"
+        defined_spec_attr = grep_spec_attr(spec)
 
         if dryrun
           v["host"].each do |host|
@@ -103,50 +105,40 @@ class Spec
         end
 
         Parallel.each(v["host"], :in_threads => Parallel.processor_count)  do |host|
-          attr_role = @role.get_attr(role)
-          attr_host = @host.get_attr(host)
-          attr_outerrole = {}
-          outerrole = []
-          
-          @host.details(host).each do |h, v|
-            outerrole = outerrole.concat((v["outer role"] || [])).uniq
-          end
-
-          outerrole.each do |o|
-            attr_outerrole.merge!(@outerrole.get_attr(o))
-          end
-
-          attr = attr_role.merge(attr_outerrole)
-          attr = attr.merge(attr_host)
-
-          logmesg = ""
-          if attr != {} && attr_host == {} && outerrole.size > 1
-            logmsg = "might not be given the appropriate attribute value, because #{host} have no attributes and belongs to more than one outer role - #{outerrole.join(", ")}"
-            @logger.warn(host) { logmsg }
-            logmsg += "\n"
+          if !defined_spec_attr.empty?
+            attr = generate_attr(role, host)
+            attr.delete_if { |name, value| !defined_spec_attr.include?(name.to_s) }
           end
 
           result = systemu(
             command,
             :env => {
               "TARGET_HOST" => host,
-              "TARGET_HOST_ATTR" => JSON.generate(attr)
+              "TARGET_HOST_ATTR" => attr ? JSON.generate(attr) : "{}"
             },
             :cwd => File.join(@specdir, "..")
           )
 
-          @logger.info(host) { "#{result[1]}\n#{result[2]}" }
+          logmsg = attr.empty? ? "" : "attribute that has been set: #{attr}"
+          if !result[1].empty?
+            @logger.info(host) { logmsg } unless result[1].empty?
+            @logger.info(host) { result[1] }
+          end
+          @logger.warn(host) { result[2] } unless result[2].empty?
+
           failure = true if result[0] != 0
 
-          msg = result[1].scan(/\d* examples?, \d* failures?\n/).first
-          msg = msg ? msg.chomp : "error"
-          msg += "\t#{host} => #{v["spec"].join(", ")}\n"
-          puts msg if console_output
+          if console_output
+            msg = result[1].scan(/\d* examples?, \d* failures?\n/).first
+            msg = msg ? msg.chomp : "error"
+            msg += "\t#{host} => #{v["spec"].join(", ")}\n"
+            puts msg
+          end
 
           if ci
             begin
               post_result(result, role, host, v["spec"], command, logmsg)
-            rescue
+            rescue => e
               ci = false
             end
           end
@@ -157,10 +149,51 @@ class Spec
     end
 
 
-    private
+    def grep_spec_attr(spec)
+      attr = []
+
+      spec.each do |s|
+        File.open(s).each_line do |l|
+          /attr\[\:(?<name>.+)\]/ =~ l
+          attr << name
+        end
+      end
+
+      attr.compact.uniq
+    end
+
+
+    def generate_attr(role, host)
+      attr_role = @role.get_attr(role)
+      attr_host = @host.get_attr(host)
+      attr_outerrole = {}
+      outerrole = []
+
+      @host.details(host).each do |h, v|
+        outerrole = outerrole.concat((v["outer role"] || [])).uniq
+      end
+
+      outerrole.each do |o|
+        attr_outerrole.merge!(@outerrole.get_attr(o))
+      end
+
+      attr = attr_role.merge(attr_outerrole)
+      attr = attr.merge(attr_host)
+
+      if attr != {} && attr_host == {} && outerrole.size > 1
+        log = "might not be given the appropriate attribute value, because #{host} have no attributes and belongs to more than one outer role - #{outerrole.join(", ")}"
+        @logger.warn(host) { log }
+      end
+
+      return attr
+    end
+
+
     def post_result(result, role, host, spec, command, message)
       result_status = result[0] == 0 ? 1 : 2
+      result_status = result[2].empty? ? result_status : 3
 
+      # willing to mv to constractor
       conf = YAML.load_file(Houcho::Config::FILE)
       ukigumo = conf["ukigumo"]
       ikachan = conf["ikachan"]
@@ -169,12 +202,12 @@ class Spec
         u = CI::UkigumoClient.new(ukigumo["host"], ukigumo["port"])
         ukigumo_report = u.post({
           :status   => result_status,
-          :project  => host.gsub(/\./, "-"),
+          :project  => "This is test " + host.gsub(/\./, "-"),
           :branch   => role,
           :repo     => "_",
           :revision => spec.join(", "),
           :vc_log   => command,
-          :body     => ( message || "" ) + result[1],
+          :body     => [message, result[1], result[2]].join("\n\n")
         })
       end
 

data/lib/houcho/version.rb

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

metadata

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