mamiya 0.0.1.alpha9 → 0.0.1.alpha10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f7822be0f2ea92b439156730db75fc2608820ec
-  data.tar.gz: 34495ba570dab6778304c2f0cc68b2fdc9914477
+  metadata.gz: 759f3b4c1591ed1aadc5ec73dfea2ec3fb262d52
+  data.tar.gz: b28cb4415f67b1a49c1c6f77deac0324eb165283
 SHA512:
-  metadata.gz: a15d9f6afd8b69c60e12e22609fe1e713f5da3d85c1272923b171fc04946655e2cc6c19142e9af7d1b6e44927a80a59ccc79b59644dc15700a8b898da2a48a19
-  data.tar.gz: c3fddda1d60e1e2b348c6c0b635426abc9d265fe9a42bcbb9b22908063a62e41a4e32f536299d5c69f7841b7e99b5625ce995a4f311a00e25c0e30cd12ec2b64
+  metadata.gz: fac824c20946f70f0ca4223a97db53b7868186ef7470ec7dcc99d9fa3ca51e672aa479dd53955a139f984373a13ae231c37f433de3c74cc23a81746ff1572780
+  data.tar.gz: c694781fe55e32e16f1fdb8caaa9c7b9180e7fcf994efc517bbbd8ad18c1bfd2bb0e8ef5467beefdebeb4163b6cac1558c320aa8f1bbd39a4c7e6c821182bea9

data/lib/mamiya/agent.rb

@@ -1,5 +1,7 @@
 require 'thread'
 require 'villein'
+require 'mamiya/version'
+
 require 'mamiya/logger'
 
 require 'mamiya/steps/fetch'
@@ -76,6 +78,7 @@ module Mamiya
       {}.tap do |s|
         s[:master] = false
         s[:name] = serf.name
+        s[:version] = Mamiya::VERSION
 
         s[:fetcher] = {
           fetching: fetcher.current_job,

data/lib/mamiya/cli/client.rb

@@ -91,23 +91,33 @@ module Mamiya
           return
         end
 
-        total = dist['distributed_count'] + dist['not_distributed_count']
-        puts <<-EOF
-Distribution status of #{application}/#{package}
+        total = dist['distributed_count'] + dist['fetching_count'] +
+          dist['queued_count'] + dist['not_distributed_count'] 
 
-ratio (distributed:total-agents):    #{"%.1f" % ((dist['distributed_count']/total.to_f)*100)}%
-number of agents have package:       #{dist['distributed_count']}
-number of agents don't have package: #{dist['not_distributed_count']}
+        progress = "%.1f" % ((dist['distributed_count']/total.to_f)*100)
+        puts <<-EOF
+package:         #{application}/#{package}
+status:          #{dist['status']}
+progress:        #{progress}
+
+distributed:     #{dist['distributed_count']} agents
+fetching:        #{dist['fetching_count']} agents
+queued:          #{dist['queued_count']} agents
+not distributed: #{dist['not_distributed_count']} agents
         EOF
 
         if options[:verbose]
           puts ""
-          dist['not_distributed'].each do |name|
-            puts "#{name}\tnot_distributed"
-          end
           dist['distributed'].each do |name|
             puts "#{name}\tdistributed"
           end
+          dist['queued'].each do |name|
+            puts "#{name}\tqueued"
+          end
+          dist['not_distributed'].each do |name|
+            puts "#{name}\tnot_distributed"
+          end
+
         end
       end
 

data/lib/mamiya/master/web.rb

@@ -74,27 +74,64 @@ module Mamiya
           next {error: 'not found'}.to_json
         end
 
-        result = {application: params[:application], package: params[:package], distributed: [], not_distributed: []}
+        result = {
+          application: params[:application],
+          package: params[:package],
+          distributed: [],
+          fetching: [],
+          queued: [],
+          not_distributed: []
+        }
         statuses = agent_monitor.statuses
 
+        pkg_array = [params[:application], params[:package]]
+
         statuses.each do |name, status|
           next if status["master"]
           if status["packages"] && status["packages"][params[:application]] &&
             status["packages"][params[:application]].include?(params[:package])
 
             result[:distributed] << name
+          elsif status["fetcher"] && status["fetcher"]["fetching"] && status["fetcher"]["fetching"] == pkg_array
+            result[:fetching] << name
+          elsif status["fetcher"]["pending_jobs"] &&
+                status["fetcher"]["pending_jobs"].include?(pkg_array)
+            result[:queued] << name
           else
             result[:not_distributed] << name
           end
         end
 
         result[:distributed_count] = result[:distributed].size
+        result[:fetching_count] = result[:fetching].size
         result[:not_distributed_count] = result[:not_distributed].size
+        result[:queued_count] = result[:queued].size
+
+        total = statuses.size
+
+        case
+        when 0 < result[:queued_count] || 0 < result[:fetching_count]
+          status = :distributing
+        when 0 < result[:distributed_count] && result[:distributed_count] < total
+          status = :well_distributed
+        when result[:distributed_count] == total
+          status = :distributed
+        else
+          status = :unknown
+        end
+
+        result[:status] = status
+
+        if params[:count_only]
+          result.delete :distributed
+          result.delete :fetching
+          result.delete :queued
+          result.delete :not_distributed
+        end
 
         result.to_json
       end
 
-
       get '/agents' do
         statuses = agent_monitor.statuses
         members = agent_monitor.agents

data/lib/mamiya/version.rb

@@ -1,3 +1,3 @@
 module Mamiya
-  VERSION = "0.0.1.alpha9"
+  VERSION = "0.0.1.alpha10"
 end

data/spec/agent_spec.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 require 'json'
 require 'villein/event'
 
+require 'mamiya/version'
 require 'mamiya/agent'
 require 'mamiya/agent/fetcher'
 require 'mamiya/agent/actions'
@@ -117,6 +118,10 @@ describe Mamiya::Agent do
 
     subject(:status) { agent.status }
 
+    it "includes version identifier" do
+      expect(status[:version]).to eq Mamiya::VERSION
+    end
+
     it "includes agent name" do
       expect(status[:name]).to eq serf.name
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mamiya
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha9
+  version: 0.0.1.alpha10
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor