ya_queen 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 188def4d83c25a97161f7d6b4660ca7ebd7634ed
-  data.tar.gz: f185ed0ccf28d12b4446d6afb9343143ede5e0b7
+  metadata.gz: da0f3c18c135fa7c37a23c757a1d91ea35811dc5
+  data.tar.gz: 413c03e7f41c53f4d26355aefaa44c22da587cbb
 SHA512:
-  metadata.gz: 70d2e931e3e0eae926314cee099955fbcc742f5524ec88c017e3cd2cbf400dc4987c98a42a0bdad53b6fb8b12d1d0a479baaa79d4d5778de29ff8fc84e360d82
-  data.tar.gz: edb6430f18333aeac1879f2b5d96837ded83a0ca7eff8cecbb7b7364ecc3052f349cd43c2307018dad549d24a1e515917df46958d261f7f8bd1e3374a7014272
+  metadata.gz: 3a18eff162e5f202a424d324497c483c2c6a58da7830ce69bee7c45ab34df7ce2170ba1e5e13a83fda9fc01a74633ed7fbe828db29b9584bebc75a8171138c43
+  data.tar.gz: d40333158e6f91ca99af27981356ff9c01a7c2cdb14702784797a8746dbea3b103ac38bd86607493beebb712f5555f24e7f42c8d2082e8405e4a27905617f924

data/lib/ya_queen/base.rb

@@ -30,27 +30,42 @@ module YaQueen
     def define_tasks
       return if servers.nil? or servers.empty?
 
-      t = self
-      task(:"@#{name}"){ t.define_role_task }
+      define_role_task
 
       servers.each do |host, options|
         after :"@#{name}", :"@#{name}/#{host}"
-        task( :"@#{name}/#{host}"){ t.define_each_task(host, options) }
+        define_each_task(host, options)
         after :"@#{name}/#{host}", :"@#{name}/common"
       end
-      task(:"@#{name}/common") do
-        t.define_common_task
-        t.set_deploy_target("@#{name}")
-      end
+      define_common_task
     end
 
     def role_task(&block)  ; @role_task   = block; end
     def common_task(&block); @common_task = block; end
     def each_task(&block)  ; @each_task   = block; end
 
-    def define_role_task  ; @role_task.call if @role_task; end
-    def define_common_task; @common_task.call if @common_task; end
-    def define_each_task(host, options); @each_task.call(host, options) if @each_task; end
+    def implement_role_task  ; @role_task.call if @role_task; end
+    def implement_common_task; @common_task.call if @common_task; end
+    def implement_each_task(host, options); @each_task.call(host, options) if @each_task; end
+
+    def define_role_task
+      t = self
+      task(:"@#{name}"){ t.implement_role_task }
+    end
+
+    def define_common_task
+      t = self
+      task(:"@#{name}/common") do
+        t.implement_common_task
+        t.set_deploy_target("@#{name}")
+      end
+    end
+
+    def define_each_task(host, options)
+      t = self
+      task( :"@#{name}/#{host}"){ t.implement_each_task(host, options) }
+    end
+
 
     ## デプロイ先サーバ・ディレクトリ選択時に異なる種類のデプロイ対象を選択できないようにする
     ## (cap vagrant @apisrv-a01 @gotool01 deploy:update などをできないようにする)

data/lib/ya_queen/version.rb

@@ -1,3 +1,3 @@
 module YaQueen
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/test01.yml

@@ -0,0 +1,21 @@
+default: &default
+  user: 'op1'
+  repository: "git@github.com:groovenauts/ya_queen.git"
+
+api_server:
+  <<: *default
+  deploy_to: '/srv/ya_queen/api_server'
+  servers:
+    api_server01:
+      no: 1
+    api_server02:
+      no: 2
+
+backend:
+  <<: *default
+  deploy_to: '/srv/ya_queen/backend'
+  servers:
+    backend01:
+      no: 1
+    backend02:
+      no: 2

data/spec/ya_queen_spec.rb

@@ -1,11 +1,26 @@
 require 'spec_helper'
 
+require 'yaml'
+
 describe YaQueen do
   it 'should have a version number' do
     YaQueen::VERSION.should_not be_nil
   end
 
-  it 'should do something useful' do
-    false.should be_true
+  it 'should build tasks' do
+    context = mock(:context)
+    expect(context).to receive(:task).with(:"@api_server")
+
+    %w[api_server01 api_server02].each do |host|
+      expect(context).to receive(:after).with(:"@api_server", :"@api_server/#{host}")
+      expect(context).to receive(:task).with(:"@api_server/#{host}")
+      expect(context).to receive(:after).with(:"@api_server/#{host}", :"@api_server/common")
+    end
+
+    expect(context).to receive(:task).with(:"@api_server/common")
+
+    YaQueen.configure(context, File.expand_path("../test01.yml", __FILE__)) do |c|
+      c.define_server_tasks(:api_server)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ya_queen
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - lib/ya_queen/config.rb
 - lib/ya_queen/version.rb
 - spec/spec_helper.rb
+- spec/test01.yml
 - spec/ya_queen_spec.rb
 - ya_queen.gemspec
 homepage: https://github.com/groovenauts/ya_queen
@@ -99,5 +100,6 @@ specification_version: 4
 summary: ya_queen supports to define complicated capistrano tasks and roles
 test_files:
 - spec/spec_helper.rb
+- spec/test01.yml
 - spec/ya_queen_spec.rb
 has_rdoc: