houcho 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzYzYmQ5YzQzYmZjZTM1ODk1Yzk5Y2ExMmY3N2JjMGM3ZDk1YTIwYg==
+    OTA0ZGY2OTllZjYyMGQ1Y2FiZTVmMDkzYzkwMzMxNGNkOTRiNTg0Nw==
   data.tar.gz: !binary |-
-    NWY1YjUyYmZjMmY5YjVhMDVjYjFhMzkxMWNhZDNhMTQ3ZTA4YzExNA==
+    NjIwNWRmMjljNWRlZTIxMjhiMjhkOWM2ZjM4MmMzMjhjOWNjNjRmNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODFlOGNkZTA0OWJkZjI4MDgzMGI0NmFkOTIxMDgyMzkxYjgyYzhiZGJmZjk5
-    ZWQ5ODZiMGVkNjhjOTM4NWU2OWY0MTUyNmIwMzJiOTBhMGY3ZGU1N2JkNzk2
-    MDRlYWQwY2YzMGQ4YmQ0ZGYzMjAwMTNjOGI0ZTM5Zjk1NDk3YTk=
+    YjMwMWI2NGNkMDE0OWRlNDViYjEwNjc2Y2E4MjhkZTc1OGM3NWFmMDVkZWUx
+    NTUwZjRmNjk3MDBkMzg2YjFiN2YxNmJkMGEwYzFhZTUyYWVlYjM1MTVjNjRh
+    ZjFkYjc2N2E2ZTJiNWY3NTQ4YmU3ZmRhZmE0OGU1NTgwMzA5OGY=
   data.tar.gz: !binary |-
-    YTUxMzQ3YzE1ZmEyZjk4ZmQyODVkZDc4ZGYwYmFhYTUxZmU5Zjg0YzYyZTZh
-    YmYwMmUzMGU3ZGQzZWRjNmI5YTUyOWU2NTU5MzA2YWQzMjA0NDY1ODc4YWMz
-    Y2QzZWQ5MGJhM2Q5ODc2OGQxNjIyYzQ2ZTMwM2I2ZDZhNDViNmE=
+    M2IyNTQ4ZmZmYTY4MThlN2YwMzM1MDhhZDMzOThlNTgzNDc3NjJjYmQwZDI5
+    YzNlZTBiZDJhYjJjMzcxNzZhNzFlMWRhYzFlNGNhZmY3NzViMTVmMTE0MjBk
+    MzZhNTYxNTkwN2M5NTg1MDNhM2E4OWNhYjFiYjNjOGNmYjViOWU=

data/README.md

@@ -1,5 +1,6 @@
 # Houcho
 - wrapping to execute serverspec
+- depends on ruby 1.9 later.
 
 ## Install and Initialize
 - install houcho from ruby gems
@@ -9,9 +10,8 @@
   ```
 
 - make working directory and initialize.
-  - このディレクトリ配下にrole情報やspecなどが蓄積されます。
-  - `houcho init` `git init`されます。
-  
+  - when `houcho init` then `git init`
+
   ```sh
 $ mkdir houcho-repo
 $ cd houcho-repo
@@ -22,15 +22,15 @@ $ houcho init
 - example of the most simplest use case
 
   ```sh
-  $ houcho spec exec --specs houcho_sample --hosts test.studio3104.com 
+  $ houcho spec exec houcho_sample --hosts test.studio3104.com 
   ```
 
-  - run `houcho_sample_spec.rb` ro `test.studio3104.com`
-  - arguments of `--specs` and `--hosts` are able to specify multiple space-delimited.
-  - argument of `--specs` is able to specify exception of `_spec.rb`, and relative path from `spec/` under working directory.
+  - run `houcho_sample_spec.rb` to `test.studio3104.com`
+  - arguments are able to specify multiple space-delimited.
+  - argument of `spec exec` is able to specify exception of `_spec.rb`, and relative path from `spec/` under working directory.
 
 ## Create Role, Run Role
-よく使う組み合わせをroleとして定義しておくことが出来ます。
+Houcho is able to define role of combination to be used well.
 
 - create role at first.
 
@@ -38,104 +38,92 @@ $ houcho init
   $ houcho role create studio3104::www
   ```
 
-- attach a host to role just created.
+- attach hosts to role just created.
 
   ```sh
-  $ houcho host attach www01.studio3104.com studio3104::www
-  $ houcho host attach www02.studio3104.com studio3104::www
+  $ houcho host attach www01.studio3104.com www02.studio3104.com --roles studio3104::www
   ```
     
-- attach a spec to role.
+- attach specs to role.
 - argument is able to specify exception of `_spec.rb`, and relative path from `spec/` under working directory same as simple usage.
     
   ```sh
-  $ houcho spec attach houcho_sample studio3104::www
+  $ houcho spec attach houcho_sample houcho_sample2 --roles studio3104::www
   ```
 
 - show details of a role just created.
 
   ```sh
 $ houcho role details studio3104::www
-studio3104::www
-
-   [host]
+[studio3104::www]
+   host
    ├─ www01.studio3104.com
    └─ www02.studio3104.com
 
-   [spec]
-   └─ houcho_sample
+   spec
+   ├─ houcho_sample
+   └─ houcho_sample2
   ```
 
 - execute role.
 - it can specify multiple space-delimited.
   
   ```sh
-  $ houcho spec exec --roles studio3104::www
+  $ houcho role exec studio3104::www
   ```
   
 - it is also possible to use regular expressions.
   
   ```sh
-  $ houcho spec exec --roles studio3104.+
+  $ houcho role exec studio3104.+
   ```
 
 
 ## Include CloudForecast's yaml file
-houcho can load yaml of CloudForecast, and attach to the role defined.
+Houcho is able to load yaml of CloudForecast, and attach to the role defined.
 
 - install yaml of CloudForecast to `role/cloudforecast/` under working directory.
-- 拡張子を`yaml`にしておく必要があります。
+- extension have to be yaml.
   
-- cloudforecastのyamlを読み込みます。(例では`role/cloudforecast/houcho_sample.yaml`を読み込んでいます。)
-  - yamlを置き換えるたびに実行してください。毎回実行する必要はありません。
+- load cloudforecast's yaml.
+  - run each time you replace the yaml. do not need to run every time.
   
   ```sh
-$ houcho cfrole configure
-$ houcho cfrole show
+$ houcho cf load
+$ houcho cf show
 houcho::author::studio3104
-$ houcho cfrole details houcho::author::studio3104
-[host(s)]
-studio3104.test
-studio3105.test
-studio3106.test
-studio3107.test
-studio3108.test
-studio3109.test
-studio3110.test
+$ houcho cf details houcho::author::studio3104
+[houcho::author::studio3104]
+   host
+   ├─ studio3104.test
+   └─ studio3105.test
   ```
     
-- cloudforecastから読み込んだroleを、定義済みのオリジナルroleにattachします。
-  - TODO: 複数指定出来るようにする。
+- attach to the original role defined, the role read from cloudforecast.
 
   ```sh
-$ houcho cfrole attach houcho::author::studio3104 studio3104::www
+$ houcho cf attach houcho::author::studio3104 --roles studio3104::www
 $ houcho role details studio3104::www
-studio3104::www
-
-   [host]
+[studio3104::www]
+   host
    ├─ www01.studio3104.com
    └─ www02.studio3104.com
 
-   [spec]
-   └─ houcho_sample
-
-   [cloudforecast's]
+   spec
+   ├─ houcho_sample
+   └─ houcho_sample2
+   
+   cf
       houcho::author::studio3104
-         [host]
+         host
          ├─ studio3104.test
-         ├─ studio3105.test
-         ├─ studio3106.test
-         ├─ studio3107.test
-         ├─ studio3108.test
-         ├─ studio3109.test
-         └─ studio3110.test
+         └─ studio3105.test
   ```
   
 ## Applied Usage
-- specを修正したときに、該当のspecが関連付けられているホストを適当にサンプリングして実行する。
-  - 複数指定可能。
-  - `--sample-host-count`でサンプル数を指定。(default: 5)
-  - simple usageと同じように、作業ディレクトリの`spec/`からの相対パスで、`_spec.rb`を除いて指定します。
+- at modified specs, run specs by sampling appropriately host.
+  - `--sample-host-count` can specifies the number of samples(default: 5)
+  - argument is able to specify exception of `_spec.rb`, and relative path from `spec/` under working directory same as simple usage.
   
   ```sh
 $ houcho spec check houcho_sample hogehogechan
@@ -147,36 +135,11 @@ $ houcho spec check houcho_sample hogehogechan
 hogehogechan has not attached to any roles
   ```
 
-- cloudforecastのroleに含まれている一部のホストを実行対象から外す。
+- Run exclude from the target some hosts that are included in the role of cloudforecast.
 
   ```sh
-$ houcho host ignore studio3109.test
-$ houcho role details studio3104::www
-studio3104::www
-
-   [host]
-   ├─ www01.studio3104.com
-   └─ www02.studio3104.com
-
-   [spec]
-   └─ houcho_sample
-
-   [cloudforecast's]
-      houcho::author::studio3104
-         [host]
-         ├─ <ignored>studio3109.test</ignored>
-         ├─ studio3104.test
-         ├─ studio3105.test
-         ├─ studio3106.test
-         ├─ studio3107.test
-         ├─ studio3108.test
-         └─ studio3110.test
+$ houcho role exec studio3104::www --exclude-hosts studio3104.test
   ```
 
 ## TODO
-- testがない
-- attach|detachの引数を複数取れるようにする
-- host ignore|disignoreはなにやら変なので他のやりかた考える
-  - 引数を複数取れるようにもする
-  - disignoreって英語として変
-  - include|excludeにすれば実装はそのままでいいかな・・・
+- there is no tests…

data/bin/houcho

@@ -1,13 +1,20 @@
 #!/usr/bin/env ruby
 # -*- encoding: utf-8 -*-
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-app_dir = File.expand_path("#{File.dirname(__FILE__)}/..")
 require 'rubygems'
 require 'thor'
-require app_dir + '/lib/Conductor'
+require 'houcho'
 
-def conduct
-  Conductor.new
+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
@@ -29,57 +36,51 @@ class Thor::MyHelper < Thor
 end
 
 
-class Spec < Thor::MyHelper
+class SpecConduct < Thor::MyHelper
   namespace :spec
 
-  desc 'details [spec]', 'show details about a spec'
-  def details(spec)
-    conduct.show_spec_details(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
-    conduct.show_all_specs
+    puts Spec.elements.sort.join("\n")
   end
 
-  desc 'attach [spec] [role]', 'attach a spec to a role'
-  def attach(spec, role)
-    conduct.attach_spec_to_role(spec, role)
+  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])
   end
 
-  desc 'detach [spec] [role]', 'detach a spec from a role'
-  def detach(spec, role)
-    conduct.detach_spec_from_role(spec, role)
+  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])
   end
 
-  desc 'check [options]', '指定specを、関連付けられているhostを適当に選んで実行させる'
-  option :sample_host_count, :type => :numeric, :default => 5, :desc => 'サンプルホスト数'
+  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)
-    if args.empty?
-      self.class.task_help(shell, __method__)
-      exit
-    end
-    conduct.check_specs(options[:sample_host_count], args)
+    Helper.empty_args(self, shell, __method__) if args.empty?
+    Spec::Runner.check(args, options[:sample_host_count])
   end
 
-  desc 'exec [options]', 'run serverspec'
-  option :hosts,   :type => :array,   :desc => 'hosts that run specs (required: --specs)'
-  option :specs,   :type => :array,   :desc => 'run specs (requied: --hosts)'
-  option :roles,   :type => :array,   :desc => 'runspecs by role'
+  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
-    hosts, specs, roles =
-      (options[:hosts]||[]), (options[:specs]||[]), (options[:roles]||[])
-
-    if (hosts + specs + roles).empty? || (hosts.empty? && ! specs.empty?) || (! hosts.empty? && specs.empty?)
-      self.class.task_help(shell, __method__)
-      exit
-    end
+  def exec(*args)
+    Helper.empty_args(self, shell, __method__) if args.empty?
 
-    conduct.runspec_prepare(
-      roles, hosts, specs,
+    Spec::Runner.exec(
+      [], [], options[:hosts], args,
       {
         ukigumo: options[:ukigumo],
         ikachan: options[:ikachan],
@@ -90,152 +91,132 @@ class Spec < Thor::MyHelper
 end
 
 
-class Host < Thor::MyHelper
+class HostConduct < Thor::MyHelper
   namespace :host
 
-  desc 'details [host]', 'show details about a host'
-  def details(host)
-    conduct.show_host_details(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
-    conduct.show_all_hosts
-  end
-
-  desc 'attach [host] [role]', 'attach a host to a role'
-  def attach(host, role)
-    conduct.attach_host_to_role(host, role)
-  end
-
-  desc 'detach [host] [role]', 'detach a host from a role'
-  def detach(host, role)
-    conduct.detach_host_from_role(host, role)
+    puts (Host.elements + CloudForecast::Host.all).join("\n")
   end
 
-  desc "ignore [host]", "add host to ignore list"
-  def ignore(host)
-    conduct.ignore_host(host)
+  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])
   end
 
-  desc "disignore [host]", "delete host from ignore list"
-  def disignore(host)
-    conduct.disignore_host(host)
+  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])
   end
 end
 
 
-class Role < Thor::MyHelper
+class RoleConduct < Thor::MyHelper
   namespace :role
 
-  desc 'create [role]', 'cretate a role'
-  def create(role)
-    conduct.create_role(role)
+  desc 'create [role1 role2 role3...]', 'cretate role'
+  def create(*args)
+    Helper.empty_args(self, shell, __method__) if args.empty?
+    Role.create(args)
   end
 
-  desc 'delete [role]', 'delete a role'
-  def delete(role)
-    conduct.delete_role(role)
+  desc 'delete [role1 role2 role3...]', 'delete a role'
+  def delete(*args)
+    Helper.empty_args(self, shell, __method__) if args.empty?
+    Role.delete(args)
   end
 
   desc 'rename [exist role] [name]', 'rename a role'
   def rename(role, rename)
-    conduct.rename_role(role, rename)
+    Role.rename(role, rename)
   end
 
-  desc 'details [role]', 'show details about a role'
-  def details(role)
-    conduct.show_role_details(role)
+  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
-    conduct.show_all_roles
-  end
-end
-
-
-class CloudForecast < Thor::MyHelper
-  namespace :cfrole
-
-  desc "details [cfrole]", "show details about a cf's role"
-  def details(cf_role)
-    conduct.show_cf_role_details(cf_role)
+    puts Role.all.join("\n")
   end
 
-  desc 'show', "show all of cf's roles"
-  def show
-    conduct.show_all_cf_roles
-  end
-
-  desc 'attach [cfrole] [role]', 'attach a cf role to a role'
-  def attach(cf_role, role)
-    conduct.attach_cfrole_to_role(cf_role, role)
-  end
-
-  desc 'detach [cfrole] [role]', 'detach a cf role from a role'
-  def detach(cf_role, role)
-    conduct.detach_cfrole_from_role(cf_role, role)
-  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?
 
-  desc 'configure', '(re)loading yamls of cloudforecast'
-  def configure
-    conduct.configure_houcho
+    Spec::Runner.exec(
+      args, (options[:exclude_hosts]||[]), [], [],
+      {
+        ukigumo: options[:ukigumo],
+        ikachan: options[:ikachan],
+      },
+      options[:dry_run],
+    )
   end
-
 end
 
 
-class Runlist < Thor::MyHelper
-  namespace :runlist
-
-  desc 'create [runlist]', 'cretate a runlist'
-  def create(runlist)
-    conduct.create_runlist(runlist)
-  end
+class CFConduct < Thor::MyHelper
+  namespace :cf
 
-  desc 'delete [runlist]', 'delete a runlist'
-  def delete(runlist)
-    conduct.delete_runlist(runlist)
+  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 'include [role] [runlist]', 'include a role among a runlist'
-  def include(role, runlist)
-    conduct.include_role_among_runlist(role, runlist)
-  end
-
-  desc 'exclude [role] [runlist]', 'exclude a role from a runlist'
-  def exclude(role, runlist)
-    conduct.exclude_role_from_runlist(role, runlist)
+  desc 'show', "show all of cloudforecast's roles"
+  def show
+    puts CloudForecast::Role.all.sort.join("\n")
   end
 
-  desc 'rename [exist runlist] [name]', 'rename a runlist'
-  def rename(runlist, rename)
-    conduct.rename_runlist(runlist, rename)
+  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])
   end
 
-  desc 'details [runlist]', 'show details about a runlist'
-  def details(runlist)
-    conduct.show_runlist_details(runlist)
+  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])
   end
 
-  desc 'show', 'show all of runlists'
-  def show
-    conduct.show_all_runlists
+  desc 'load', '(re)loading yamls of cloudforecast'
+  def load
+    CloudForecast.load_yaml
   end
 end
 
 
-class Houcho < Thor
-  register(CloudForecast, 'cfrole', 'cfrole [attach|detach|show|details|configure]', 'cloudforecastをのyamlから情報を読み込んで操作します')
-  register(Role, 'role', 'role [create|delete|rename|details|show]', 'roleを追加したり情報を表示したり')
-  register(Host, 'host', 'host [attach|detach|show|details|ignore|disignore]', 'hostを追加したり情報を表示したり')
-  register(Spec, 'spec', 'spec [attach|detach|show|details|exec|check]', 'specを追加したり情報を表示したり')
+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 exec cf help}.include?(task.name)
+      if options[:help] && ! %w{role host spec cf help}.include?(task.name)
         Houcho.task_help(shell, task.name)
       else
         super
@@ -245,10 +226,10 @@ class Houcho < Thor
 
   desc 'init', 'set houcho repository on current directory'
   def init
-    conduct.initialize_houcho
+    Initialize
   end
 
 end
 
-Houcho.start
-exit! if $fail_runspec
+Main.start
+exit! if $houcho_fail