mamiya 0.0.1.alpha19 → 0.0.1.alpha20

data/spec/master/web_spec.rb

@@ -27,8 +27,16 @@ describe Mamiya::Master::Web do
     end
   end
 
+  let(:agent_statuses) do
+    {}
+  end
+
+  let(:agent_monitor) do
+    double('agent_monitor', statuses: agent_statuses)
+  end
+
   let(:master) do
-    double('master', config: config).tap do |m|
+    double('master', config: config, agent_monitor: agent_monitor).tap do |m|
       allow(m).to receive(:storage) do |app|
         Mamiya::Storages::Mock.new(application: app)
       end
@@ -118,4 +126,335 @@ describe Mamiya::Master::Web do
       end
     end
   end
+
+  describe "GET /package/:application/:package/distribution" do
+    subject(:distribution) do
+      res = get('/packages/myapp/mypackage/distribution')
+      expect(res.status).to eq 200
+      JSON.parse res.body
+    end
+
+    context "when package exists" do
+      describe "about status" do
+        subject { distribution['status'] }
+
+        context "if there's fetching agents" do
+          let(:agent_statuses) do
+            {
+              'agent1' => {
+                'packages' => {'myapp' => [
+                ]},
+                'queues' => {'fetch' => {
+                  'working' => {
+                    'task' => 'fetch',
+                    'app' => 'myapp',
+                    'pkg' => 'mypackage'
+                  },
+                  'queue' => [
+                  ]
+                }}
+              },
+              'agent2' => {
+                'packages' => {'myapp' => [
+                  'mypackage',
+                ]},
+                'queues' => {'fetch' => {
+                  'working' => nil,
+                  'queue' => [
+                  ]
+                }}
+              }
+            }
+          end
+
+          it { should eq 'distributing' }
+        end
+
+        context "if there's queued agents" do
+          let(:agent_statuses) do
+            {
+              'agent1' => {
+                'packages' => {'myapp' => [
+                ]},
+                'queues' => {'fetch' => {
+                  'working' => nil,
+                  'queue' => [
+                    {
+                      'task' => 'fetch',
+                      'app' => 'myapp',
+                      'pkg' => 'mypackage'
+                    }
+                  ]
+                }}
+              },
+              'agent2' => {
+                'packages' => {'myapp' => [
+                  'mypackage',
+                ]},
+                'queues' => {'fetch' => {
+                  'working' => nil,
+                  'queue' => [
+                  ]
+                }}
+              }
+            }
+          end
+
+          it { should eq 'distributing' }
+        end
+
+        context "if any agents have the package" do
+          let(:agent_statuses) do
+            {
+              'agent1' => {
+                'packages' => {'myapp' => [
+                  'mypackage',
+                ]},
+                'queues' => {'fetch' => {
+                  'working' => nil,
+                  'queue' => [
+                  ]
+                }},
+              },
+              'agent2' => {
+                'packages' => {'myapp' => [
+                ]},
+                'queues' => {'fetch' => {
+                  'working' => nil,
+                  'queue' => [
+                  ]
+                }}
+              }
+            }
+          end
+
+          it { should eq 'partially_distributed' }
+        end
+
+        context "if all agents have the package" do
+          let(:agent_statuses) do
+            {
+              'agent1' => {
+                'packages' => {'myapp' => [
+                  'mypackage',
+                ]},
+                'queues' => {'fetch' => {
+                  'working' => nil,
+                  'queue' => [
+                  ]
+                }},
+              },
+              'agent2' => {
+                'packages' => {'myapp' => [
+                  'mypackage',
+                ]},
+                'queues' => {'fetch' => {
+                  'working' => nil,
+                  'queue' => [
+                  ]
+                }}
+              }
+            }
+          end
+
+          it { should eq 'distributed' }
+        end
+
+        context "if no agents relate to the package" do
+          let(:agent_statuses) do
+            {
+              'agent1' => {
+                'packages' => {'myapp' => [
+                ]},
+                'queues' => {'fetch' => {
+                  'working' => nil,
+                  'queue' => [
+                  ]
+                }},
+              },
+              'agent2' => {
+                'packages' => {'myapp' => [
+                ]},
+                'queues' => {'fetch' => {
+                  'working' => nil,
+                  'queue' => [
+                  ]
+                }}
+              }
+            }
+          end
+
+          it { should eq 'unknown' }
+        end
+      end
+
+      describe "about fetching agents" do
+        let(:agent_statuses) do
+          {
+            'agent1' => {
+              'packages' => {'myapp' => [
+              ]},
+              'queues' => {'fetch' => {
+                'working' => {
+                  'task' => 'fetch',
+                  'app' => 'myapp',
+                  'pkg' => 'mypackage',
+                },
+                'queue' => [
+                ]
+              }},
+            },
+            'agent2' => {
+              'packages' => {'myapp' => [
+                'mypackage'
+              ]},
+              'queues' => {'fetch' => {
+                'working' => nil,
+                'queue' => [
+                ]
+              }}
+            }
+          }
+        end
+
+        it "show in fetching" do
+          expect(distribution['fetching']).to eq %w(agent1)
+          expect(distribution['fetching_count']).to eq 1
+        end
+      end
+
+      describe "about distribued agents" do
+        let(:agent_statuses) do
+          {
+            'agent1' => {
+              'packages' => {'myapp' => [
+              ]},
+              'queues' => {'fetch' => {
+                'working' => {
+                  'task' => 'fetch',
+                  'app' => 'myapp',
+                  'pkg' => 'mypackage',
+                },
+                'queue' => [
+                ]
+              }},
+            },
+            'agent2' => {
+              'packages' => {'myapp' => [
+                'mypackage'
+              ]},
+              'queues' => {'fetch' => {
+                'working' => nil,
+                'queue' => [
+                ]
+              }}
+            }
+          }
+        end
+
+        it "show in distributed" do
+          expect(distribution['distributed']).to eq %w(agent2)
+          expect(distribution['distributed_count']).to eq 1
+        end
+      end
+
+      describe "about queued agents" do
+        let(:agent_statuses) do
+          {
+            'agent1' => {
+              'packages' => {'myapp' => [
+              ]},
+              'queues' => {'fetch' => {
+                'working' => {
+                    'task' => 'fetch',
+                    'app' => 'myapp',
+                    'pkg' => 'anotherpackage',
+                },
+                'queue' => [
+                  {
+                    'task' => 'fetch',
+                    'app' => 'myapp',
+                    'pkg' => 'mypackage',
+                  }
+                ]
+              }},
+            },
+            'agent2' => {
+              'packages' => {'myapp' => [
+                'mypackage'
+              ]},
+              'queues' => {'fetch' => {
+                'working' => nil,
+                'queue' => [
+                ]
+              }}
+            }
+          }
+        end
+
+        it "show in queued" do
+          expect(distribution['queued']).to eq %w(agent1)
+          expect(distribution['queued_count']).to eq 1
+        end
+      end
+
+      describe "about unknown agents" do
+        let(:agent_statuses) do
+          {
+            'agent1' => {
+              'packages' => {'myapp' => [
+              ]},
+              'queues' => {'fetch' => {
+                'working' => nil,
+                'queue' => [
+                ]
+              }},
+            },
+            'agent2' => {
+              'packages' => {'myapp' => [
+                'mypackage'
+              ]},
+              'queues' => {'fetch' => {
+                'working' => nil,
+                'queue' => [
+                ]
+              }}
+            }
+          }
+        end
+
+        it "show in not_distributed" do
+          expect(distribution['not_distributed']).to eq %w(agent1)
+          expect(distribution['not_distributed_count']).to eq 1
+        end
+      end
+
+      context "with count_only" do
+        subject(:distribution) do
+          res = get('/packages/myapp/mypackage/distribution?count_only=1')
+          expect(res.status).to eq 200
+          JSON.parse res.body
+        end
+
+        it "returns only count columns" do
+          expect(distribution.keys).not_to include('distributed')
+          expect(distribution.keys).not_to include('fetching')
+          expect(distribution.keys).not_to include('queued')
+          expect(distribution.keys).not_to include('not_distributed')
+
+          expect(distribution.keys).to include('distributed_count')
+          expect(distribution.keys).to include('fetching_count')
+          expect(distribution.keys).to include('queued_count')
+          expect(distribution.keys).to include('not_distributed_count')
+        end
+      end
+    end
+
+    context "when package not found" do
+      it "returns 404" do
+        get '/packages/myapp/noexist/distribution'
+        expect(last_response.status).to eq 404
+      end
+    end
+  end
 end

data/spec/master_spec.rb

@@ -35,27 +35,6 @@ describe Mamiya::Master do
     expect(described_class.superclass).to eq Mamiya::Agent
   end
 
-  describe "#distribute" do
-    # let!(:tmpdir) { Dir.mktmpdir('maimya-master-spec') }
-    # after { FileUtils.remove_entry_secure(tmpdir) }
-
-    # let(:package) do
-    #   File.write File.join(tmpdir, 'mypackage.tar.gz'), "\n"
-    #   File.write File.join(tmpdir, 'mypackage.json'), "#{{meta: 'data'}.to_json}\n"
-    #   Mamiya::Package.new(File.join(tmpdir, 'mypackage'))
-    # end
-
-    # before do
-    #   Mamiya::Storages::Mock.new(application: 'myapp').push(package)
-    # end
-
-    it "triggers fetch event" do
-      expect(master).to receive(:trigger).with(:fetch, coalesce: false, application: 'myapp', package: 'mypackage')
-
-      master.distribute('myapp', 'mypackage')
-    end
-  end
-
   it "starts agent monitor"
 
   describe "(member join event)" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mamiya
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha19
+  version: 0.0.1.alpha20
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc14
+        version: 2.0.0.rc15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc14
+        version: 2.0.0.rc15
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -174,9 +174,13 @@ files:
 - lib/mamiya.rb
 - lib/mamiya/agent.rb
 - lib/mamiya/agent/actions.rb
-- lib/mamiya/agent/fetcher.rb
 - lib/mamiya/agent/handlers/abstract.rb
-- lib/mamiya/agent/handlers/fetch.rb
+- lib/mamiya/agent/handlers/task.rb
+- lib/mamiya/agent/task_queue.rb
+- lib/mamiya/agent/tasks/abstract.rb
+- lib/mamiya/agent/tasks/clean.rb
+- lib/mamiya/agent/tasks/fetch.rb
+- lib/mamiya/agent/tasks/notifyable.rb
 - lib/mamiya/cli.rb
 - lib/mamiya/cli/client.rb
 - lib/mamiya/config.rb
@@ -204,8 +208,12 @@ files:
 - mamiya.gemspec
 - misc/logger_test.rb
 - spec/agent/actions_spec.rb
-- spec/agent/fetcher_spec.rb
-- spec/agent/handlers/fetch_spec.rb
+- spec/agent/handlers/task_spec.rb
+- spec/agent/task_queue_spec.rb
+- spec/agent/tasks/abstract_spec.rb
+- spec/agent/tasks/clean_spec.rb
+- spec/agent/tasks/fetch_spec.rb
+- spec/agent/tasks/notifyable_spec.rb
 - spec/agent_spec.rb
 - spec/config_spec.rb
 - spec/dsl_spec.rb
@@ -259,8 +267,12 @@ specification_version: 4
 summary: Fast deploy tool using tarballs and serf
 test_files:
 - spec/agent/actions_spec.rb
-- spec/agent/fetcher_spec.rb
-- spec/agent/handlers/fetch_spec.rb
+- spec/agent/handlers/task_spec.rb
+- spec/agent/task_queue_spec.rb
+- spec/agent/tasks/abstract_spec.rb
+- spec/agent/tasks/clean_spec.rb
+- spec/agent/tasks/fetch_spec.rb
+- spec/agent/tasks/notifyable_spec.rb
 - spec/agent_spec.rb
 - spec/config_spec.rb
 - spec/dsl_spec.rb