houcho 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dfa40a671511626f2a5665f70339de35d40004c
-  data.tar.gz: 63d63e7aa834a00738aab1d6550b532149dd8100
+  metadata.gz: 0d83d0e90621526a1a46014365dc3a97deb67f9a
+  data.tar.gz: cc2c9dc65df3b0b5145d9c3f02769f2b2c555fb6
 SHA512:
-  metadata.gz: 20f31de24421b105522f7bc2e089c6d21fc3e96cb6c67649c4321b82cd9baf1b4e9318f42969b0d7a14b9f9571359ea2891212df9d29efe153e12a03ae25ba12
-  data.tar.gz: cb9831aa6687b2a89c3104bda38b65fb58e487e3b815c32772f724a6cb3d6911eb24ae87e2eb451ac2d3659f2ef46404577bf0f43f613acd2562a311b9e43a20
+  metadata.gz: f6fa79952eacf76bc3ba07ce6b9b8007a51d4ca7b5fe9d3b679f7d909fa8844fe3c01acc95e213ba60fe06bdc74212d3223ff36d5551920c04337a7494f5b1ef
+  data.tar.gz: 07aece03104359e42827386d89869fc6229cfeb283c45bf66cbea6de42db114151728bdca051593e41b5ba43d5ccf18f985ab899b08849fbdf8f21309ba6dd16

data/.gitignore

@@ -5,4 +5,4 @@ coverage.data
 rdoc
 .yardoc
 .bundle
-
+*.db

data/Gemfile.lock

@@ -0,0 +1,32 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.4)
+    highline (1.6.19)
+    net-ssh (2.6.8)
+    parallel (0.7.1)
+    parallel_tests (0.15.0)
+      parallel
+    rainbow (1.1.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    serverspec (0.7.0)
+      highline
+      net-ssh
+      rspec (~> 2.13.0)
+    systemu (2.5.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  parallel_tests
+  rainbow
+  serverspec
+  systemu

data/bin/houcho

@@ -1,263 +1,4 @@
 #!/usr/bin/env ruby
-# -*- encoding: utf-8 -*-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-
-require 'rubygems'
-require 'thor'
-require 'houcho'
-
-include Houcho
-
-module Helper
-  module_function
-
-  def empty_args(klass, chell, mesod)
-    klass.class.task_help(chell, mesod)
-    exit
-  end
-end
-
-class Thor::MyHelper < Thor
-  class_option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
-
-  no_tasks do
-    def invoke_task(task, *args)
-      if options[:help] && task.name != 'help'
-        self.class.task_help(shell, task.name)
-      else
-        super
-      end
-    end
-  end
-
-  def self.banner(task, namespace = false, subcommand = true)
-    super
-  end
-end
-
-
-class SpecConduct < Thor::MyHelper
-  namespace :spec
-
-  desc 'details [spec1 spec2 spec3...]', 'show details about spec'
-  def details(*args)
-    Helper.empty_args(self, shell, __method__) if args.empty?
-    puts_details(Spec.details(args))
-  end
-
-  desc 'show', 'show all of specs'
-  def show
-    puts Spec.elements.sort.join("\n")
-  end
-
-  desc 'attach [spec1 spec2 spec3...] --roles [role1 role2...]', 'attach spec to role'
-  option :roles, :type => :array, :required => true, :desc => 'specify the roles separated by spaces.'
-  def attach(*args)
-    Helper.empty_args(self, shell, __method__) if args.empty?
-    Spec.attach(args, options[:roles]) rescue puts $!.message; exit!
-  end
-
-  desc 'detach [spec1 spec2 spec3...] --roles [role1 role2...]', 'detach spec from spec'
-  option :roles, :type => :array, :required => true, :desc => 'specify the roles separated by spaces.'
-  def detach(*args)
-    Helper.empty_args(self, shell, __method__) if args.empty?
-    Spec.detach(args, options[:roles]) rescue puts $!.message; exit!
-  end
-
-  desc 'check [options]', 'run the spec sampled appropriately to the associated host'
-  option :sample_host_count, :type => :numeric, :default => 5, :desc => 'number of sample hosts'
-  def check(*args)
-    Helper.empty_args(self, shell, __method__) if args.empty?
-
-    begin
-      messages = Spec::Runner.check(args, options[:sample_host_count])
-    rescue
-      puts $!.message
-      exit!
-    end
-
-    messages.each do |msg|
-      puts msg
-    end
-  end
-
-  desc 'exec (spec1 spec2..) [options]', 'run serverspec manually'
-  option :hosts,   :type => :array,   :desc => '--hosts host1 host2 host3...', :required => true
-  option :ukigumo, :type => :boolean, :desc => 'post results to UkigumoServer'
-  option :ikachan, :type => :boolean, :desc => 'post fail results to Ikachan'
-  option :dry_run, :type => :boolean, :desc => 'show commands that may exexute'
-  def exec(*args)
-    Helper.empty_args(self, shell, __method__) if args.empty?
-
-    begin
-      messages = Spec::Runner.exec(
-        [], [], options[:hosts], args,
-        {
-          ukigumo: options[:ukigumo],
-          ikachan: options[:ikachan],
-        },
-        options[:dry_run],
-      )
-    rescue
-      puts $!.message
-      exit!
-    end
-
-    messages.each do |msg|
-      puts msg
-    end
-  end
-end
-
-
-class HostConduct < Thor::MyHelper
-  namespace :host
-
-  desc 'details [host1 host2 host3...]', 'show details about host'
-  def details(*args)
-    Helper.empty_args(self, shell, __method__) if args.empty?
-    puts_details(Host.details(args))
-  end
-
-  desc 'show', 'show all of hosts'
-  def show
-    puts (Host.elements + CloudForecast::Host.all).join("\n")
-  end
-
-  desc 'attach [host1 host2 host3...] --roles [role1 role2...]', 'attach host to role'
-  option :roles, :type => :array, :required => true, :desc => 'specify the roles separated by spaces.'
-  def attach(*args)
-    Helper.empty_args(self, shell, __method__) if args.empty?
-    Host.attach(args, options[:roles]) rescue puts $!.message; exit!
-  end
-
-  desc 'detach [host1 host2 host3...] --roles [role1 role2...]', 'detach host from role'
-  option :roles, :type => :array, :required => true, :desc => 'specify the roles separated by spaces.'
-  def detach(*args)
-    Helper.empty_args(self, shell, __method__) if args.empty?
-    Host.detach(args, options[:roles]) rescue puts $!.message; exit!
-  end
-end
-
-
-class RoleConduct < Thor::MyHelper
-  namespace :role
-
-  desc 'create [role1 role2 role3...]', 'cretate role'
-  def create(*args)
-    Helper.empty_args(self, shell, __method__) if args.empty?
-    Role.create(args) rescue puts $!.message; exit!
-  end
-
-  desc 'delete [role1 role2 role3...]', 'delete a role'
-  def delete(*args)
-    Helper.empty_args(self, shell, __method__) if args.empty?
-    Role.delete(args) rescue puts $!.message; exit!
-  end
-
-  desc 'rename [exist role] [name]', 'rename a role'
-  def rename(role, rename)
-    Role.rename(role, rename) rescue puts $!.message; exit!
-  end
-
-  desc 'details [role1 role2...]', 'show details about role'
-  def details(*args)
-    Helper.empty_args(self, shell, __method__) if args.empty?
-    puts_details(Role.details(args))
-  end
-
-  desc 'show', 'show all of roles'
-  def show
-    puts Role.all.join("\n")
-  end
-
-  desc 'exec (role1 role2..) [options]', 'run role'
-  option :exclude_hosts, :type => :array, :desc => '--exclude-hosts host1 host2 host3...'
-  option :ukigumo, :type => :boolean, :desc => 'post results to UkigumoServer'
-  option :ikachan, :type => :boolean, :desc => 'post fail results to Ikachan'
-  option :dry_run, :type => :boolean, :desc => 'show commands that may exexute'
-  def exec(*args)
-    Helper.empty_args(self, shell, __method__) if args.empty?
-
-    begin
-      messages = Spec::Runner.exec(
-        args, (options[:exclude_hosts]||[]), [], [],
-        {
-          ukigumo: options[:ukigumo],
-          ikachan: options[:ikachan],
-        },
-        options[:dry_run],
-      )
-    rescue
-      puts $!.message
-      exit!
-    end
-
-    messages.each do |msg|
-      puts msg
-    end
-  end
-end
-
-
-class CFConduct < Thor::MyHelper
-  namespace :cf
-
-  desc "details [cf1 cf2 cf3...]", "show details about cloudforecast's role"
-  def details(*args)
-    Helper.empty_args(self, shell, __method__) if args.empty?
-    puts_details(CloudForecast::Role.details(args))
-  end
-
-  desc 'show', "show all of cloudforecast's roles"
-  def show
-    puts CloudForecast::Role.all.sort.join("\n")
-  end
-
-  desc 'attach [cf1 cf2 cf3...] --roles [role1 role2...]', "attach cloudforecast's role to role"
-  option :roles, :type => :array, :required => true, :desc => 'specify the roles separated by spaces.'
-  def attach(*args)
-    Helper.empty_args(self, shell, __method__) if args.empty?
-    CloudForecast::Role.attach(args, options[:roles]) rescue puts $!.message; exit!
-  end
-
-  desc 'detach [cf1 cf2 cf3...] --roles [role1 role2...]', "detach cloudforecast's role from role"
-  option :roles, :type => :array, :required => true, :desc => 'specify the roles separated by spaces.'
-  def detach(*args)
-    Helper.empty_args(self, shell, __method__) if args.empty?
-    CloudForecast::Role.detach(args, options[:roles]) rescue puts $!.message; exit!
-  end
-
-  desc 'load', '(re)loading yamls of cloudforecast'
-  def load
-    CloudForecast.load_yaml
-  end
-end
-
-
-class Main < Thor
-  register(CFConduct,   'cf',   'cf [attach|detach|show|details|load]', 'operate relevant to CloudForecast')
-  register(RoleConduct, 'role', 'role [create|delete|rename|show|details|exec]', 'operate roles')
-  register(HostConduct, 'host', 'host [attach|detach|show|details]', 'operate hosts')
-  register(SpecConduct, 'spec', 'spec [attach|detach|show|details|exec|check]', 'operate specs')
-
-  class_option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
-  no_tasks do
-    def invoke_task(task, *args)
-      if options[:help] && ! %w{role host spec cf help}.include?(task.name)
-        Houcho.task_help(shell, task.name)
-      else
-        super
-      end
-    end
-  end
-
-  desc 'init', 'set houcho repository on current directory'
-  def init
-    init_repo
-  end
-
-end
-
-Main.start
-exit! if $houcho_fail
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'houcho/cli'
+Houcho::CLI::Main.start

data/houcho.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'rainbow'
-  spec.add_runtime_dependency 'parallel_tests'
+  spec.add_runtime_dependency 'parallel'
   spec.add_runtime_dependency 'systemu'
   spec.add_runtime_dependency 'serverspec'
+  spec.add_runtime_dependency 'sqlite3-ruby'
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "tmpdir"

data/lib/houcho/attribute.rb

@@ -0,0 +1,99 @@
+require "houcho/database"
+
+module Houcho
+  class AttributeExceptiotn < Exception; end
+
+  module Attribute
+    def attr_id(attr_name)
+      id = @db.execute("SELECT id FROM attribute WHERE name = ?", attr_name)
+      raise AttributeExceptiotn, "attribute does not exist - #{attr_name}" unless id
+      id.flatten.first
+    end
+
+
+    def set_attr!(target, attr)
+      set_attr(target, attr, true)
+    end
+
+    def set_attr(target, attr, force = false)
+      target_id = id(target)
+      raise_target_does_not_exist(target) if target_id.nil?
+      @db.transaction do
+
+      attr.each do |name, attr_value|
+        attr_name = name.to_s
+
+        begin
+          @db.execute("INSERT INTO attribute(name) VALUES(?)", attr_name)
+        rescue SQLite3::ConstraintException, "column name is not unique"
+        end
+
+        begin
+          @db.execute(
+            "INSERT INTO attribute_value(attr_id, element_type, element_id, value) VALUES(?,?,?,?)",
+            attr_id(attr_name),
+            @type_id,
+            target_id,
+            attr_value
+          )
+        rescue SQLite3::ConstraintException, "columns attr_id, element_type, element_id are not unique"
+          if force
+            @db.execute("
+              UPDATE attribute_value SET value = ?
+              WHERE attr_id = ? AND element_type = ? AND element_id = ?
+            ", attr_value, attr_id(attr_name), @type_id, target_id)
+          else
+            raise AttributeExceptiotn, "attribute has already defined value in #{@type} - #{attr_name}"
+          end
+        end
+      end
+
+      end #end of transaction
+    end
+
+
+    def get_attr_json(target, name = nil)
+      get_attr(target, name, true)
+    end
+
+
+    def get_attr(target, attr_name = nil, json = false)
+      target_id = id(target)
+      return json ? "{}" : {} if target_id.nil?
+      attr = {}
+
+      id_value = @db.execute("
+        SELECT attr_id, value FROM attribute_value
+        WHERE element_type = ? AND element_id = ?
+      ", @type_id, target_id)
+
+      id_value.each do |iv|
+        name = @db.execute("SELECT name FROM attribute WHERE id = ?", iv[0]).first.first
+        attr[name.to_sym] = iv[1]
+      end
+
+      attr = attr.select { |k,v| k == attr_name.to_sym } if attr_name
+      attr = JSON.generate(attr) if json
+      attr
+    end
+
+
+    def del_attr(target, attr_name = nil)
+      before_delete = get_attr(target, attr_name)
+      sql = "DELETE FROM attribute_value WHERE element_type = ? AND element_id = ?"
+
+      @db.transaction do
+
+      if attr_name
+        sql += " AND attr_id = ?"
+        @db.execute(sql, @type_id, id(target), attr_id(attr_name))
+      else
+        @db.execute(sql, @type_id, id(target))
+      end
+
+      end #end of transaction
+
+      before_delete
+    end
+  end
+end

data/lib/houcho/ci.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require 'net/http'
 require 'uri'
 
@@ -9,17 +10,18 @@ end
 module Houcho::CI
   class UkigumoClient
     def initialize(server, port = 80, url = "http://#{server}:#{port}")
-      @ukigumo_server      = server
+      @ukigumo_server = server
       @ukigumo_listen_port = port
-      @ukigumo_base_url    = url
+      @ukigumo_base_url = url
     end
 
     def search(elements, limit = 1)
-      query_string = 
-        URI.encode("project")  + "=" + URI.encode(elements[:project].to_s)  + "&" +
-        URI.encode("branch")   + "=" + URI.encode(elements[:branch].to_s)   + "&" +
-        URI.encode("revision") + "=" + URI.encode(elements[:revision].to_s) + "&" +
-        URI.encode("limit")    + "=" + URI.encode(limit.to_s)
+      query_string = URI.encode_www_form({
+        :project  => elements[:project].to_s,
+        :branch   => elements[:branch].to_s,
+        :revision => elements[:revision].to_s,
+        :limit    => limit.to_s,
+      })
 
       Net::HTTP.start(@ukigumo_server, @ukigumo_listen_port) do |http|
         responce = http.get("/api/v1/report/search?#{query_string}")
@@ -28,7 +30,7 @@ module Houcho::CI
     end
 
     def post(elements)
-      Net::HTTP.post_form(
+      response = Net::HTTP.post_form(
         URI.parse("#{@ukigumo_base_url}/api/v1/report/add"),
         {
           :status   => elements[:status],
@@ -39,26 +41,29 @@ module Houcho::CI
           :vc_log   => elements[:vc_log],
           :body     => elements[:body],
         }
-      ).body
+      )
+      response.body
     end
   end
 
   class IkachanClient
     def initialize(channel, server, port = 4979)
-      @ikachan_server      = server
+      @ikachan_server = server
       @ikachan_listen_port = port
-      @ikachan_channels    = channel.instance_of?(Array) ? channel : [channel]
+      @ikachan_channels = channel.is_a?(Array) ? channel : [channel]
     end
 
+    # return が @ikachan_channels の最後の要素だけになってるからどうにかする
     def post(message)
       @ikachan_channels.each do |channel|
-        Net::HTTP.post_form(
+        response = Net::HTTP.post_form(
           URI.parse("http://#{@ikachan_server}:#{@ikachan_listen_port}/notice"),
           {
             :channel => channel,
             :message => message,
           }
-        ).body
+        )
+        response.body
       end
     end
   end

data/lib/houcho/cli/attribute.rb

@@ -0,0 +1,70 @@
+require "thor"
+require "houcho/attribute"
+
+module Houcho
+  module CLI
+    class Attribute < Thor
+      namespace :attr
+
+
+      def self.target_type_obj(target_type)
+        case target_type
+        when "role"
+          Houcho::Role.new
+        when "outerrole"
+          Houcho::OuterRole.new
+        when "host"
+          Houcho::Host.new
+        else
+          Houcho::CLI::Main.empty_args(self, shell, __method__)
+          # puts helps and exit(1)
+        end
+      end
+
+
+      desc "set", "set attribute"
+      option :target, :type => :hash, :required => true, :desc => "assign target of hash"
+      option :value, :type => :hash, :required => true, :desc => "assign attribute of hash"
+      option :force, :type => :boolean, :desc => "update attribute if defined already"
+      def set
+        options[:target].each do |target_type, target_name|
+          obj = Houcho::CLI::Attribute.target_type_obj(target_type)
+          begin
+            if options[:force]
+              obj.set_attr!(target_name, options[:value])
+            else
+              obj.set_attr(target_name, options[:value])
+            end
+          rescue Houcho::AttributeExceptiotn=> e
+            puts e.message
+            exit!
+          end
+        end
+      end
+
+
+      desc "get [attr name](optional)", "get attribute"
+      option :target, :type => :hash, :required => true, :desc => "assign target of hash"
+      def get(attr_name = nil)
+        options[:target].each do |target_type, target_name|
+          obj = Houcho::CLI::Attribute.target_type_obj(target_type)
+          obj.get_attr(target_name, attr_name).each do |k,v|
+            puts "#{k.to_s.color(:red)}:#{v}"
+          end
+        end
+      end
+
+
+      desc "delete [attr name](optional)", "delete attribute of host"
+      option :target, :type => :hash, :required => true, :desc => "assign target of hash"
+      def delete(attr_name = nil)
+        options[:target].each do |target_type, target_name|
+          obj = Houcho::CLI::Attribute.target_type_obj(target_type)
+          obj.del_attr(target_name, attr_name).each do |k,v|
+            print "#{k}:#{v} "
+          end
+        end
+      end
+    end
+  end
+end

data/lib/houcho/cli/host.rb

@@ -0,0 +1,46 @@
+require 'thor'
+require 'houcho/host'
+
+module Houcho
+  module CLI
+    class Host < Thor
+      namespace :host
+
+      @@h = Houcho::Host.new
+
+      desc 'list', 'show all of host list'
+      def list
+        puts @@h.list.sort.join("\n")
+      end
+
+
+      desc 'attach [host1 host2 host3...] --roles [role1 role2...]', 'attach host to role'
+      option :roles, :type => :array, :required => true, :desc => 'specify the roles separated by spaces.'
+      def attach(*args)
+        Houcho::CLI::Main.empty_args(self, shell, __method__) if args.empty?
+        @@h.attach(args, options[:roles])
+      rescue RoleExistenceException, SpecFileException, SQLite3::ConstraintException => e
+        puts e.message
+        exit!
+      end
+
+
+      desc 'detach [spec1 spec2 spec3...] --roles [role1 role2...]', 'detach spec from spec'
+      option :roles, :type => :array, :required => true, :desc => 'specify the roles separated by spaces.'
+      def detach(*args)
+        Houcho::CLI::Main.empty_args(self, shell, __method__) if args.empty?
+        @@h.detach(args, options[:roles])
+      rescue RoleExistenceException, SQLite3::ConstraintException => e
+        puts e.message
+        exit!
+      end
+
+
+      desc 'details [spec1 spec2 spec3...]', 'show details about spec'
+      def details(*args)
+        Houcho::CLI::Main.empty_args(self, shell, __method__) if args.empty?
+        Houcho::CLI::Main.puts_details(@@h.details(args))
+      end
+    end
+  end
+end

data/lib/houcho/cli/outerrole.rb

@@ -0,0 +1,53 @@
+require 'thor'
+require 'houcho/outerrole'
+require 'houcho/outerrole/cloudforecast'
+
+module Houcho
+  module CLI
+    class OuterRole < Thor
+      namespace :host
+
+      @@or = Houcho::OuterRole.new
+
+      desc 'list', 'show all of host list'
+      def list
+        puts @@or.list.sort.join("\n")
+      end
+
+
+      desc 'attach [outerrole1 outerrole2 outerrole3...] --roles [role1 role2...]', 'attach outer role to role'
+      option :roles, :type => :array, :required => true, :desc => 'specify the roles separated by spaces.'
+      def attach(*args)
+        Houcho::CLI::Main.empty_args(self, shell, __method__) if args.empty?
+        @@or.attach(args, options[:roles])
+      rescue RoleExistenceException, SpecFileException, SQLite3::ConstraintException => e
+        puts e.message
+        exit!
+      end
+
+
+      desc 'detach [outerrole1 outerrole2 outerrole3...] --roles [role1 role2...]', 'detach outer role from role'
+      option :roles, :type => :array, :required => true, :desc => 'specify the roles separated by spaces.'
+      def detach(*args)
+        Houcho::CLI::Main.empty_args(self, shell, __method__) if args.empty?
+        @@or.detach(args, options[:roles])
+      rescue RoleExistenceException, SQLite3::ConstraintException => e
+        puts e.message
+        exit!
+      end
+
+
+      desc 'details [outerrole1 outerrole2 outerrole3...]', 'show details about outerrole'
+      def details(*args)
+        Houcho::CLI::Main.empty_args(self, shell, __method__) if args.empty?
+        Houcho::CLI::Main.puts_details(@@or.details(args))
+      end
+
+
+      desc 'load', 'load role data from outer system'
+      def load
+        Houcho::OuterRole::CloudForecast.load
+      end
+    end
+  end
+end