houcho 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2d8f35e74b7f3cd8939a62d0d5c35f29b5f5920
-  data.tar.gz: 22d10e8bb0db16d9ca931c6192987a27b6d3bc3e
+  metadata.gz: faf0bd15776ab9a902d2770798e258d20c7cc4e0
+  data.tar.gz: 862315e86a7307b23f0cde6f2b2ae349fe95be06
 SHA512:
-  metadata.gz: 9bde052dcc898119dbcdf5d44745e4251942ae0b3a3e90aad9d82fa67f3c402c683fc3a7f985d02f16daa60a7233ccf6e553f95fca9a3d668b5db8890917981f
-  data.tar.gz: 329947f03908790e3af09a020238697b5c715ba46d00e4a2e3a028ed7399c0bed48ececcf88147123958099f01491f820e294e0dbf3c79313b3138425fc0b934
+  metadata.gz: cf01e0af237e984edc44bec9ffa7559e6395725f965a46217db8ed87878827ce569d6b8a9e145234791c830acc7799f062f4a7e9cb8c99b5121068bd1e634606
+  data.tar.gz: 2d6c8f6fc7f1d066c465dd8a2b08bba8c4d8240b9ca741d82846b814a9c43eb935c5e6818739c5864ec1b877ee676ad3ff407507eca4253420a709697090ce93

data/lib/houcho/cli/spec.rb

@@ -82,6 +82,7 @@ module Houcho
       desc 'exec [spec1 spec2..]', 'run spec'
       option :hosts,   :type => :array,   :desc => '--hosts host1 host2 host3...', :required => true
       option :dry_run, :type => :boolean, :default => false, :desc => 'show commands that may exexute'
+      option :attr, :type => :hash, :default => false, :desc => 'set attribute'
       def exec(*args)
         Houcho::CLI::Main.empty_args(self, shell, __method__) if args.empty?
         runner = Houcho::Spec::Runner.new
@@ -90,8 +91,9 @@ module Houcho
           exit! unless runner.execute_manually(
             options[:hosts],
             args,
-            options[:dry_run],
-            true #output to console
+            dryrun: options[:dry_run],
+            console_output: true,
+            attr: options[:attr]
           )
         rescue Houcho::SpecFileException => e
           puts e.message

data/lib/houcho/outerrole.rb

@@ -12,6 +12,21 @@ module Houcho
       @type_id = 1
     end
 
+
+    def list(opt = {})
+      sql = "SELECT T1.name FROM outerrole T1, role_outerrole T2"
+      sql += " WHERE T1.data_source LIKE ?"
+      ds = opt[:data_source]
+
+      if opt[:role_id]
+        sql += " AND T1.id = T2.outerrole_id AND T2.role_id = ?"
+        return @db.execute(sql, ds ? ds : "%", opt[:role_id]).flatten
+      else
+        return @db.execute(sql, ds ? ds : "%").flatten
+      end
+    end
+
+
     def details(outer_role)
       outer_role = outer_role.is_a?(Array) ? outer_role : [outer_role]
       result = {}
@@ -26,6 +41,7 @@ module Houcho
       result
     end
 
+
     def hostlist(outer_role)
       outer_role = outer_role.is_a?(Array) ? outer_role : [outer_role]
       hosts = []

data/lib/houcho/outerrole/yabitz.rb

@@ -25,7 +25,7 @@ class OuterRole
 
 
     private
-    def http_get(host, port, path, params)
+    def http_get(host, port, path, params = {})
       Net::HTTP.get(
         host,
         "#{path}?".concat(
@@ -38,22 +38,11 @@ class OuterRole
     end
 
     def download_json(host, port)
-      JSON.load(
-        http_get(
-          host, port, "/ybz/search.json",
-          {
-            andor: "AND",
-            cond0: 0,
-            field0: "os",
-            value0: " ",
-            status: "IN_SERVICE",
-            ex_andor: "AND",
-            ex_cond0: 0,
-            ex_field0: "not_selected",
-            ex_value0: nil,
-          },
-        )
+      metadata = JSON.load(
+        http_get( host, port, "/ybz/hosts/all.json" )
       )
+
+      metadata.select { |md| md["content"]["status"] == "IN_SERVICE" }
     end
 
     def create_yabitz_role(host, port)

data/lib/houcho/role.rb

@@ -92,7 +92,7 @@ module Houcho
         id.each do |i|
           hosts = hostobj.list(i)
           specs = specobj.list(i)
-          outerroles = orobj.list(i)
+          outerroles = orobj.list(role_id: i)
           outerhosts = orobj.details(outerroles)
 
           tmp = {}

data/lib/houcho/spec/runner.rb

@@ -22,7 +22,7 @@ class Spec
     end
 
 
-    def check(spec, host_count, dry_run = false, console_output = false) #dry_run for test
+    def check(spec, host_count, opt = {})
       spec = spec.is_a?(Array) ? spec : [spec]
       role = spec.map { |s| @spec.details(s)[s]["role"] }.flatten
       host = []
@@ -37,24 +37,28 @@ class Spec
         end
       end
 
-      execute_manually(host.sample(host_count), spec, dry_run, console_output)
+      execute_manually(
+        host.sample(host_count), spec,
+        dryrun: opt[:dryrun], console_output: opt[:console_output])
+      # dry run for test
     end
 
 
-    def execute_manually(host, spec, dryrun = false, console_output = false)
+    def execute_manually(host, spec, opt = {})
       host = host.is_a?(Array) ? host : [host]
       spec = spec.is_a?(Array) ? spec : [spec]
 
       run(
         { rand(36**50).to_s(36) => { "host" => host, "spec" => spec } },
-        dryrun,
-        false,
-        console_output
+        opt[:dryrun],
+        false, # ci
+        opt[:console_output],
+        opt[:attr]
       )
     end
 
 
-    def execute_role(role, ex_host = [], dryrun = false, console_output = false)
+    def execute_role(role, ex_host = [], dryrun = false, console_output = false, attr = nil)
       role = role.is_a?(Array) ? role : [role]
       ex_host = ex_host.is_a?(Array) ? ex_host : [ex_host]
 
@@ -80,12 +84,12 @@ class Spec
         role_valiables[rolename] = rv
       end
 
-      run(role_valiables, dryrun, true, console_output)
+      run(role_valiables, dryrun, true, console_output, attr)
     end
 
 
     private
-    def run(target, dryrun, ci = false, console_output = false)
+    def run(target, dryrun, ci = false, console_output = false, manually_attr = nil)
       messages = []
       failure = false
 
@@ -105,9 +109,13 @@ class Spec
         end
 
         Parallel.each(v["host"], :in_threads => Parallel.processor_count)  do |host|
-          if !defined_spec_attr.empty?
-            attr = generate_attr(role, host)
-            attr.delete_if { |name, value| !defined_spec_attr.include?(name.to_s) }
+          if manually_attr.is_a?(Hash)
+            attr = manually_attr
+          else
+            if !defined_spec_attr.empty?
+              attr = generate_attr(role, host)
+              attr.delete_if { |name, value| !defined_spec_attr.include?(name.to_s) }
+            end
           end
 
           result = systemu(
@@ -119,7 +127,7 @@ class Spec
             :cwd => File.join(@specdir, "..")
           )
 
-          logmsg = attr.empty? ? "" : "attribute that has been set: #{attr}"
+          logmsg = attr ? "" : "attribute that has been set: #{attr}"
           if !result[1].empty?
             @logger.info(host) { logmsg } unless result[1].empty?
             @logger.info(host) { result[1] }

data/lib/houcho/version.rb

@@ -1,3 +1,3 @@
 module Houcho
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/spec/houcho_spec.rb

@@ -381,7 +381,7 @@ YAML
         expect(@specrunner.execute_manually(
           ["test3.studio3104.com", "test4.studio3104.com"],
           "specA",
-          true
+          dryrun: true
         )).to eq([
           "TARGET_HOST=test3.studio3104.com rspec --format documentation #{Houcho::Config::SPECDIR}/specA_spec.rb",
           "TARGET_HOST=test4.studio3104.com rspec --format documentation #{Houcho::Config::SPECDIR}/specA_spec.rb"
@@ -389,14 +389,14 @@ YAML
       end
 
       it "case of spec not exist" do
-        expect { @specrunner.execute_manually("test5.studio3104.com", ["specA", "specX"], true) }.to(
+        expect { @specrunner.execute_manually("test5.studio3104.com", ["specA", "specX"], dryrun: true) }.to(
           raise_error Houcho::SpecFileException, "No such spec file - specX"
         )
       end
     end
 
     context "check spec" do
-      it { expect(@specrunner.check("specA", 2, true).size).to be(2) }
+      it { expect(@specrunner.check("specA", 2, dryrun: true).size).to be(2) }
 
       it "case of spec not exist" do
         expect { @specrunner.check("specX", 2) }.to(

metadata

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