mamiya 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fa28dadde7c00c1165fb66de3fceee10b564577
-  data.tar.gz: 614971d0864612144dab18e4db4aee2c3c7a1126
+  metadata.gz: 5d26f86a476093f14e8d738041bae5acd60d9ad0
+  data.tar.gz: 09dd771694cec321f0b8c50a414671de465291e4
 SHA512:
-  metadata.gz: 494a8f6d5d1e171ec5f2a154a81c534780eb464e6bc30adff4df5e9393788a43eb57a6f2ffaea7e11ce0208c34b9f5a64547fed531149da478a083380ec18a96
-  data.tar.gz: 3cc97e2941f5a10f5ce67552ec1066431f08c1b6ffe4748a2563fa1f085229bc68074e702649529fa3492a682f36f516795b6b963c4f2dbebcf81136be52fd86
+  metadata.gz: ae5b6693750dfbff6a45d149b6ea16b1e79acae51a0c98e70b89a0217db3061eff318242a8d9637a7420eaefa4ddd41673e19d2fe6855a07a7cc2c9879610e75
+  data.tar.gz: 9d41bc38c61954f5c65609ae5e79fa6b87c402b50c88d71ad6d2577adfe7bdc6de49aac6acf49b842c17296e1a203455ef4e84fca3a376cceba674c70712d059

data/lib/mamiya/cli/client.rb

@@ -185,7 +185,7 @@ not distributed: #{dist['not_distributed_count']} agents
         @deploy_exception = nil
         # TODO: move this run on master node side
         puts "=> Deploying #{application}/#{package}"
-        puts " * with labels: #{options[:labels].inspect}" if options[:labels] && !options[:labels].empty?
+        puts " * onto agents which labeled: #{options[:labels].inspect}" if options[:labels] && !options[:labels].empty?
 
         show_package(package)
 
@@ -215,7 +215,7 @@ not distributed: #{dist['not_distributed_count']} agents
 
           s = pkg_status(package, :short)
           puts ""
-          break if 0 < s['participants_count'] && s['participants_count'] == s['prepare']['done'].size
+          break if 0 < s['participants_count'] && s['non_participants'].empty? && s['participants_count'] == s['prepare']['done'].size
           sleep 2
         end
 
@@ -382,18 +382,26 @@ not distributed: #{dist['not_distributed_count']} agents
         puts <<-EOF
 at: #{Time.now.inspect}
 application: #{application}
+agents: #{status['agents_count']} agents
 participants: #{status['participants_count']} agents
 
 major_current: #{status['major_current']}
 currents:
 #{status['currents'].sort_by { |pkg, as| -(as.size) }.flat_map { |pkg, as|
-["  - #{pkg} (#{as.size} agents)"] + (pkg == status['major_current'] ? ["    + (omitted)"] : as.map{ |_| "    * #{_['name']}" })
+["  - #{pkg} (#{as.size} agents)"] + (pkg == status['major_current'] ? [] : as.map{ |_| "    * #{_}" })
 }.join("\n")}
 
 common_previous_release: #{status['common_previous_release']}
 common_releases:
 #{status['common_releases'].map { |_| _.prepend('  - ') }.join("\n")}
         EOF
+
+        if status['non_participants'] && !status['non_participants'].empty?
+          puts "\nnon_participants:"
+          status['non_participants'].each do |agent|
+            puts "  * #{agent}"
+          end
+        end
       end
 
       def pkg_status(package, short=false)
@@ -426,6 +434,13 @@ status: #{status['status'].join(',')}
 participants: #{total} agents
 
           EOF
+
+          if status['non_participants'] && !status['non_participants'].empty?
+            status['non_participants'].each do |agent|
+              puts "  * #{agent}"
+            end
+            puts
+          end
         end
 
           %w(fetch prepare switch).each do |key|

data/lib/mamiya/master/application_status.rb

@@ -18,6 +18,8 @@ module Mamiya
           application: application,
           labels: labels,
           participants_count: participants.size,
+          agents_count: agents.size,
+          non_participants: non_participants,
 
           major_current: major_current,
           currents: currents,
@@ -39,7 +41,11 @@ module Mamiya
             (q['queue']   && q['queue'].any? { |t| t['app'] == application })
           }
         end]
-    end
+      end
+
+      def non_participants
+        agents.keys - participants.keys
+      end
 
       def currents
         @currents ||= Hash[participants.group_by do |name, status|

data/lib/mamiya/version.rb

@@ -1,3 +1,3 @@
 module Mamiya
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/mamiya.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor", ">= 0.18.1"
-  spec.add_runtime_dependency "aws-sdk-core", "2.0.0.rc15"
+  spec.add_runtime_dependency "aws-sdk-core", ">= 2.0.0"
   spec.add_runtime_dependency "term-ansicolor", ">= 1.3.0"
   unless ENV["MAMIYA_VILLEIN_PATH"]
     spec.add_runtime_dependency "villein", ">= 0.5.0"

data/spec/master/application_status_spec.rb

@@ -86,6 +86,36 @@ describe Mamiya::Master::ApplicationStatus do
     end
   end
 
+  describe "#non_participants" do
+    subject { status.non_participants }
+
+    let(:agent_statuses) do
+      {
+        'agent1' => {
+          'packages' => {'myapp' => [
+          ]},
+          'queues' => {'fetch' => {
+            'working' => nil,
+            'queue' => [
+            ]
+          }}
+        },
+        'agent2' => {
+          'queues' => {'fetch' => {
+            'working' => nil,
+            'queue' => [
+              {'app' => 'notmyapp'},
+            ]
+          }}
+        },
+      }
+    end
+
+    it "returns non participants" do
+      expect(subject.sort).to eq %w(agent2)
+    end
+  end
+
   describe "#currents" do
     subject { status.currents }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mamiya
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -28,16 +28,16 @@ dependencies:
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc15
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc15
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement