mamiya 0.0.1.alpha24 → 0.0.1.beta1

data/spec/master/web_spec.rb

@@ -4,6 +4,8 @@ require 'fileutils'
 
 require 'mamiya/storages/mock'
 require 'mamiya/package'
+require 'mamiya/master/package_status'
+require 'mamiya/master/application_status'
 
 require 'mamiya/master/web'
 
@@ -31,8 +33,25 @@ describe Mamiya::Master::Web do
     {}
   end
 
+  let(:package_status) do
+    Mamiya::Master::PackageStatus.new(agent_monitor, 'myapp', 'mypackage')
+  end
+
+  let(:application_status) do
+    Mamiya::Master::ApplicationStatus.new(agent_monitor, 'myapp')
+  end
+
+
   let(:agent_monitor) do
-    double('agent_monitor', statuses: agent_statuses)
+    double('agent_monitor', statuses: agent_statuses).tap do |a|
+      allow(a).to receive(:package_status).with('myapp','mypackage',labels: nil) do
+        package_status
+      end
+
+      allow(a).to receive(:application_status).with('myapp', labels: nil) do
+        application_status
+      end
+    end
   end
 
   let(:master) do
@@ -67,6 +86,36 @@ describe Mamiya::Master::Web do
     end
   end
 
+  describe "GET /applications/:application/status" do
+    subject(:status) do
+      res = get('/applications/myapp/status')
+      expect(res.status).to eq 200
+      JSON.parse res.body
+    end
+
+    context "when application exists" do
+      before do
+        allow(application_status).to receive(:to_hash).and_return(foo: :bar)
+        allow(application_status).to receive(:participants).and_return('foo' => {'currents' => {'myapp' => nil}})
+      end
+
+      it "returns status.to_hash JSON" do
+        expect(status).to eq('foo' => 'bar')
+      end
+    end
+
+    context "when application has no participants" do
+      before do
+        allow(application_status).to receive(:participants).and_return({})
+      end
+
+      it "returns 404" do
+        res = get('/applications/myapp/status')
+        expect(res.status).to eq 404
+      end
+    end
+  end
+
   describe "GET /packages/:application" do
     it "returns package list" do
       get '/packages/myapp'
@@ -168,8 +217,74 @@ describe Mamiya::Master::Web do
     end
   end
 
+  describe "POST /packages/:application/:package/switch" do
+    it "dispatchs switch request" do
+      expect(master).to receive(:switch).with('myapp', 'mypackage', labels: nil, no_release: false)
+
+      post '/packages/myapp/mypackage/switch'
+
+      expect(last_response.status).to eq 204 # no content
+    end
+
+    context "with no_release" do
+      it "dispatchs switch request" do
+        expect(master).to receive(:switch).with('myapp', 'mypackage', labels: nil, no_release: true)
+
+        post '/packages/myapp/mypackage/switch',
+          {'no_release' => true}.to_json,
+          'CONTENT_TYPE' => 'application/json'
+
+        expect(last_response.status).to eq 204 # no content
+      end
+    end
+
+    context "with labels" do
+      it "dispatchs prepare request with labels" do
+        expect(master).to receive(:switch).with('myapp', 'mypackage', labels: ['foo'], no_release: false)
+
+        post '/packages/myapp/mypackage/switch',
+          {'labels' =>  ["foo"]}.to_json,
+          'CONTENT_TYPE' => 'application/json'
+
+        expect(last_response.status).to eq 204 # no content
+      end
+    end
+
+    context "when package not found" do
+      it "returns 404" do
+        post '/packages/myapp/noexist/prepare'
+        expect(last_response.status).to eq 404
+      end
+    end
+  end
+
+  describe "GET /package/:application/:package/status" do
+    subject(:status) do
+      res = get('/packages/myapp/mypackage/status')
+      expect(res.status).to eq 200
+      JSON.parse res.body
+    end
+
+    context "when package exists" do
+      before do
+        allow(package_status).to receive(:to_hash).and_return(foo: :bar)
+      end
+
+      it "returns package_status.to_hash JSON" do
+        expect(status).to eq('foo' => 'bar')
+      end
+    end
+
+    context "when package not found" do
+      it "returns 404" do
+        get '/packages/myapp/noexist/status'
+        expect(last_response.status).to eq 404
+      end
+    end
+  end
 
   describe "GET /package/:application/:package/distribution" do
+    # TODO: Deprecated. Remove this
     subject(:distribution) do
       res = get('/packages/myapp/mypackage/distribution')
       expect(res.status).to eq 200

data/spec/steps/build_spec.rb

@@ -235,7 +235,7 @@ describe Mamiya::Steps::Build do
 
         # Default candidates
         expect(received.size).to eq 2
-        expect(received[0]).to match(/\A\d{4}-\d{2}-\d{2}_\d{2}\.\d{2}\.\d{2}\z/)
+        expect(received[0]).to match(/\A\d{14}\z/)
         expect(received[1]).to eq script.application
       end
 

data/spec/steps/prepare_spec.rb

@@ -23,6 +23,7 @@ describe Mamiya::Steps::Prepare do
 
   let(:script) do
     double('script',
+      application: 'myapp',
       before_prepare: proc {},
       prepare: proc {},
       after_prepare: proc {},
@@ -30,7 +31,10 @@ describe Mamiya::Steps::Prepare do
   end
 
   let(:config) do
-    double('config')
+    double('config').tap do |config|
+      allow(config).to receive(:deploy_to_for).with('myapp') \
+        .and_return(Pathname.new('/dev/null'))
+    end
   end
 
   let(:options) do
@@ -109,6 +113,7 @@ describe Mamiya::Steps::Prepare do
     end
 
     it "sets release_path" do
+      expect(script).to receive(:set).with(:deploy_to, Pathname.new('/dev/null'))
       expect(script).to receive(:set).with(:release_path, target_dir.realpath)
       expect(script).to receive(:set).with(:logger, step.logger)
       step.run!

data/spec/steps/switch_spec.rb

@@ -25,7 +25,7 @@ describe Mamiya::Steps::Switch do
 
   let(:script) do
     double('script',
-      deploy_to: deploy_to,
+      application: 'myapp',
       before_switch: proc {},
       release: proc {},
       after_switch: proc {},
@@ -34,7 +34,10 @@ describe Mamiya::Steps::Switch do
   end
 
   let(:config) do
-    double('config')
+    double('config').tap do |config|
+      allow(config).to receive(:deploy_to_for).with('myapp') \
+        .and_return(deploy_to)
+    end
   end
 
   let(:options) do
@@ -94,6 +97,7 @@ describe Mamiya::Steps::Switch do
     end
 
     it "sets release_path" do
+      expect(script).to receive(:set).with(:deploy_to, deploy_to)
       expect(script).to receive(:set).with(:release_path, release_path.realpath)
       expect(script).to receive(:set).with(:logger, step.logger)
       step.run!

data/spec/storages/filesystem_spec.rb

@@ -111,28 +111,9 @@ describe Mamiya::Storages::Filesystem do
       end
     end
 
-    context "when meta already exists" do
+    context "when meta and tarball already exists" do
       before do
         File.write metafile, "\n"
-      end
-
-      it "raises error" do
-        expect {
-          fetch
-        }.to raise_error(Mamiya::Storages::Abstract::AlreadyFetched)
-      end
-
-      it "doesn't remove anything" do
-        begin
-          fetch
-        rescue Mamiya::Storages::Abstract::AlreadyFetched; end
-
-        expect(File.exist?(metafile)).to be_true
-      end
-    end
-
-    context "when tarball already exists" do
-      before do
         File.write tarball, "\n"
       end
 
@@ -147,7 +128,7 @@ describe Mamiya::Storages::Filesystem do
           fetch
         rescue Mamiya::Storages::Abstract::AlreadyFetched; end
 
-        expect(File.exist?(tarball)).to be_true
+        expect(File.exist?(metafile)).to be_true
       end
     end
 

data/spec/storages/s3_proxy_spec.rb

@@ -95,29 +95,9 @@ describe Mamiya::Storages::S3Proxy do
       end
     end
 
-    context "when meta already exists" do
+    context "when meta and tarball already exists" do
       before do
         File.write metafile, "\n"
-      end
-
-      it "raises error" do
-        expect {
-          fetch
-        }.to raise_error(Mamiya::Storages::Abstract::AlreadyFetched)
-      end
-
-      it "doesn't remove anything" do
-        begin
-          fetch
-        rescue Mamiya::Storages::Abstract::AlreadyFetched; end
-
-        expect(File.exist?(metafile)).to be_true
-      end
-
-    end
-
-    context "when tarball already exists" do
-      before do
         File.write tarball, "\n"
       end
 
@@ -132,7 +112,7 @@ describe Mamiya::Storages::S3Proxy do
           fetch
         rescue Mamiya::Storages::Abstract::AlreadyFetched; end
 
-        expect(File.exist?(tarball)).to be_true
+        expect(File.exist?(metafile)).to be_true
       end
     end
   end

data/spec/storages/s3_spec.rb

@@ -154,9 +154,10 @@ describe Mamiya::Storages::S3 do
       end
     end
 
-    context "when meta already exists" do
+    context "when meta and tarball already exists" do
       before do
         File.write metafile, "\n"
+        File.write tarball, "\n"
       end
 
       it "raises error" do
@@ -174,25 +175,6 @@ describe Mamiya::Storages::S3 do
       end
     end
 
-    context "when tarball already exists" do
-      before do
-        File.write tarball, "\n"
-      end
-
-      it "raises error" do
-        expect {
-          fetch
-        }.to raise_error(Mamiya::Storages::Abstract::AlreadyFetched)
-      end
-
-      it "doesn't remove anything" do
-        begin
-          fetch
-        rescue Mamiya::Storages::Abstract::AlreadyFetched; end
-
-        expect(File.exist?(tarball)).to be_true
-      end
-    end
 
     context "when name has .json" do
       let(:package_name) { 'test.json' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mamiya
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha24
+  version: 0.0.1.beta1
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -201,6 +201,7 @@ files:
 - lib/mamiya/agent/tasks/fetch.rb
 - lib/mamiya/agent/tasks/notifyable.rb
 - lib/mamiya/agent/tasks/prepare.rb
+- lib/mamiya/agent/tasks/switch.rb
 - lib/mamiya/cli.rb
 - lib/mamiya/cli/client.rb
 - lib/mamiya/configuration.rb
@@ -210,6 +211,8 @@ files:
 - lib/mamiya/master.rb
 - lib/mamiya/master/agent_monitor.rb
 - lib/mamiya/master/agent_monitor_handlers.rb
+- lib/mamiya/master/application_status.rb
+- lib/mamiya/master/package_status.rb
 - lib/mamiya/master/web.rb
 - lib/mamiya/package.rb
 - lib/mamiya/script.rb
@@ -238,6 +241,7 @@ files:
 - spec/agent/tasks/fetch_spec.rb
 - spec/agent/tasks/notifyable_spec.rb
 - spec/agent/tasks/prepare_spec.rb
+- spec/agent/tasks/switch_spec.rb
 - spec/agent_spec.rb
 - spec/configuration_spec.rb
 - spec/dsl_spec.rb
@@ -250,6 +254,8 @@ files:
 - spec/fixtures/test.yml
 - spec/logger_spec.rb
 - spec/master/agent_monitor_spec.rb
+- spec/master/application_status_spec.rb
+- spec/master/package_status_spec.rb
 - spec/master/web_spec.rb
 - spec/master_spec.rb
 - spec/package_spec.rb
@@ -301,6 +307,7 @@ test_files:
 - spec/agent/tasks/fetch_spec.rb
 - spec/agent/tasks/notifyable_spec.rb
 - spec/agent/tasks/prepare_spec.rb
+- spec/agent/tasks/switch_spec.rb
 - spec/agent_spec.rb
 - spec/configuration_spec.rb
 - spec/dsl_spec.rb
@@ -313,6 +320,8 @@ test_files:
 - spec/fixtures/test.yml
 - spec/logger_spec.rb
 - spec/master/agent_monitor_spec.rb
+- spec/master/application_status_spec.rb
+- spec/master/package_status_spec.rb
 - spec/master/web_spec.rb
 - spec/master_spec.rb
 - spec/package_spec.rb