mamiya 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36bd9c34a4fd00eeaa86b5cf5beee9fb61f73a4a
-  data.tar.gz: 94961d874eed9777d6f281a0e154c15807990c20
+  metadata.gz: 8f6320e41f8d3a3c92628c2f4a97b9c6cb650638
+  data.tar.gz: 63e601a5888ffb6c6bb8a09cb3e74ce9fd620097
 SHA512:
-  metadata.gz: f9c8f23fc8874eb97f98c2f8591aa4d3f6c48d7d5c9b8593dc383280bda9401a2c5151e2785ccbeac3defbcabd12061c4d73d3fcff47747dac6bd7aa88cd02f5
-  data.tar.gz: bc1b2048ec6f901d3cc98f08c0b02a5e84784c7e98374db56b4d736ced5fb59d64be8c2736df82b610ce8b3c94e3e1501b1b628a29916bb769a5ff9f23f7877d
+  metadata.gz: 2e934e133d36bb1386e99e86c786bb8ba41831b6e9c44a708c1e4aa38da34738364b01cb221a3965e07e2cf6efce0415fb919676eabfe5ab2730ab940c3a97b4
+  data.tar.gz: f781c7ef2f4c22d5f62462aac173f43381509835784b2e0da8ba0104f309daa02a9d1c503052b6774eda743b737012ed3828f27609c34428485eb0a01557c2de

data/lib/mamiya/cli.rb

@@ -124,6 +124,16 @@ module Mamiya
       ).run!
     end
 
+    desc "prune NUMS_TO_KEEP", "Delete old packages, but keep last $NUMS_TO_KEEP packages"
+    def prune(nums_to_keep)
+      puts "Pruning packages from #{application} (keeping last #{nums_to_keep.to_i} packages)..."
+
+      removed = storage.prune(nums_to_keep.to_i)
+
+      puts "Pruned #{removed.size} packages:"
+      puts removed.join(?\n)
+    end
+
     desc "fetch PACKAGE DESTINATION", "Retrieve package from storage"
     def fetch(package_atom, destination)
       Mamiya::Steps::Fetch.new(
@@ -293,7 +303,12 @@ module Mamiya
     end
 
     def application
-      options[:application] || config[:application] || script.application
+      @_application ||=
+        options[:application] \
+        || ENV['MAMIYA_APP'] \
+        || ENV['MAMIYA_APPLICATION'] \
+        || config[:application] \
+        || script.application
     end
 
     def storage

data/lib/mamiya/cli/client.rb

@@ -178,86 +178,16 @@ not distributed: #{dist['not_distributed_count']} agents
       method_option :no_switch, type: :boolean, default: false
       method_option :synced_release, type: :boolean, default: false
       def deploy(package)
-        @deploy_exception = nil
-        synced_release = options[:synced_release] || (config && config.synced_release)
-
-        # TODO: move this run on master node side
-        puts "=> Deploying #{application}/#{package}"
-        puts " * onto agents which labeled: #{options[:labels].inspect}" if options[:labels] && !options[:labels].empty?
-        puts " * releasing will be synced in all agents" if synced_release
-
-        show_package(package)
-
-        if config
-          config.set :application, application
-          config.set :package_name, package
-          config.set :package, @meta
-
-          config.before_deploy_or_rollback[]
-          config.before_deploy[]
-        end
-
-        do_prep = -> do
-          puts "=> Preparing..."
-          prepare(package)
-        end
-
-        do_prep[]
-
-        puts " * Wait until prepared"
-        puts ""
-
-        i = 0
-        loop do
-          i += 1
-          do_prep[] if i % 25 == 0
-
-          s = pkg_status(package, :short)
-          puts ""
-          break if 0 < s['participants_count'] && s['non_participants'].empty? && s['participants_count'] == s['prepare']['done'].size
-          sleep 2
-        end
-
-        ###
-        #
-
-        unless options[:no_switch]
-          puts "=> Switching..."
-          switch_(package, no_release: synced_release)
-
-          puts " * Wait until switch"
-          puts ""
-          loop do
-            s = pkg_status(package, :short)
-            puts ""
-            break if s['participants_count'] == s['switch']['done'].size
-            sleep 2
-          end
-
-          if synced_release
-            puts "=> Releasing..."
-            switch_(package, do_release: true)
-
-            puts " * due to current implementation's limitation, releasing will be untracked."
-          end
-        end
-      rescue Exception => e
-        @deploy_exception = e
-        $stderr.puts "ERROR: #{e.inspect}"
-        $stderr.puts "\t#{e.backtrace.join("\n\t")}"
-      ensure
-        config.after_deploy[@deploy_exception] if config
-        config.after_deploy_or_rollback[@deploy_exception] if config
-        puts "=> Done."
+        deploy_or_rollback(:deploy, package)
       end
 
-      desc "rollback", "Switch back to previous release then finalize"
+      desc "rollback", "Switch back to previous release"
       method_option :labels, type: :string
       method_option :no_release, type: :boolean, default: false
       method_option :config, aliases: '-C', type: :string
+      method_option :no_switch, type: :boolean, default: false
+      method_option :synced_release, type: :boolean, default: false
       def rollback
-        @deploy_exception = nil
-        # TODO: move this run on master node side
         appstatus = master_get("/applications/#{application}/status", options[:labels] ? {labels: options[:labels]} : {})
         package = appstatus['common_previous_release']
 
@@ -265,37 +195,7 @@ not distributed: #{dist['not_distributed_count']} agents
           raise 'there is no common_previous_release for specified application'
         end
 
-        puts "=> Rolling back #{application} to #{package}"
-        puts " * with labels: #{options[:labels].inspect}" if options[:labels] && !options[:labels].empty?
-
-        show_package(package)
-
-        if config
-          config.set :application, application
-          config.set :package_name, package
-          config.set :package, @meta
-
-          config.before_deploy_or_rollback[]
-          config.before_rollback[]
-        end
-
-        switch(package)
-
-        puts " * Wait until switch"
-        puts ""
-        loop do
-          s = pkg_status(package, :short)
-          puts ""
-          break if 0 < s['participants_count'] && s['participants_count'] == s['switch']['done'].size
-          sleep 2
-        end
-      rescue Exception => e
-        @deploy_exception = e
-        raise e
-      ensure
-        config.after_rollback[@deploy_exception] if config
-        config.after_deploy_or_rollback[@deploy_exception] if config
-        puts "=> Done."
+        deploy_or_rollback(:rollback, package)
       end
 
       desc "join HOST", "let serf to join to HOST"
@@ -311,7 +211,11 @@ not distributed: #{dist['not_distributed_count']} agents
       end
 
       def application
-        options[:application] or fatal!('specify application')
+        @_application ||=
+          ENV['MAMIYA_APP'] \
+          || ENV['MAMIYA_APPLICATION'] \
+          || options[:application] \
+          or fatal!('specify application')
       end
 
       def config
@@ -365,6 +269,88 @@ not distributed: #{dist['not_distributed_count']} agents
         p master_post("/packages/#{application}/#{package}/switch", params.merge(type: :json))
       end
 
+      def deploy_or_rollback(type, package)
+        @deploy_exception = nil
+        synced_release = options[:synced_release] || (config && config.synced_release)
+
+        # TODO: move this run on master node side
+        if type == :deploy
+          puts "=> Deploying #{application}/#{package}"
+        else
+          puts "=> Rolling back #{application} to #{package}"
+        end
+        puts " * onto agents which labeled: #{options[:labels].inspect}" if options[:labels] && !options[:labels].empty?
+        puts " * releasing will be synced in all agents" if synced_release
+
+        show_package(package)
+
+        if config
+          config.set :application, application
+          config.set :package_name, package
+          config.set :package, @meta
+
+          config.before_deploy_or_rollback[]
+          (type == :deploy ? config.before_deploy : config.before_rollback)[]
+        end
+
+        if type == :deploy
+          do_prep = -> do
+            puts "=> Preparing..."
+            prepare(package)
+          end
+
+          do_prep[]
+
+          puts " * Wait until prepared"
+          puts ""
+
+          i = 0
+          loop do
+            i += 1
+            do_prep[] if i % 25 == 0
+
+            s = pkg_status(package, :short)
+            puts ""
+            break if 0 < s['participants_count'] && s['non_participants'].empty? && s['participants_count'] == s['prepare']['done'].size
+            sleep 2
+          end
+        end
+
+        ###
+        #
+
+        unless options[:no_switch]
+          puts "=> Switching..."
+          switch_(package, no_release: synced_release)
+
+          puts " * Wait until switch"
+          puts ""
+          loop do
+            s = pkg_status(package, :short)
+            puts ""
+            break if s['participants_count'] == s['switch']['done'].size
+            sleep 2
+          end
+
+          if synced_release
+            puts "=> Releasing..."
+            switch_(package, do_release: true)
+
+            puts " * due to current implementation's limitation, releasing will be untracked."
+          end
+        end
+      rescue Exception => e
+        @deploy_exception = e
+        $stderr.puts "ERROR: #{e.inspect}"
+        $stderr.puts "\t#{e.backtrace.join("\n\t")}"
+      ensure
+
+        (type == :deploy ? config.after_deploy : config.after_rollback)[@deploy_exception] if config
+        config.after_deploy_or_rollback[@deploy_exception] if config
+        puts "=> Done."
+
+      end
+
       def master_http
         url = master_url
         Net::HTTP.new(url.host, url.port).tap do |http|

data/lib/mamiya/master/agent_monitor_handlers.rb

@@ -75,8 +75,12 @@ module Mamiya
       def task___switch__finish(status, task)
         status['currents'] ||= {}
         status['currents'][task['app']] = task['pkg']
-      end
 
+        status['releases'] ||= {}
+        status['releases'][task['app']] ||= []
+        status['releases'][task['app']].push task['pkg']
+        status['releases'][task['app']].uniq!
+      end
 
       def pkg__remove(status, payload, event)
         status['packages'] ||= {}

data/lib/mamiya/storages/abstract.rb

@@ -39,7 +39,7 @@ module Mamiya
 
       def prune(nums_to_keep)
         packages = self.packages()
-        (packages - packages.last(nums_to_keep)).each do |package|
+        packages[0...-nums_to_keep].each do |package|
           self.remove(package)
         end
       end

data/lib/mamiya/version.rb

@@ -1,3 +1,3 @@
 module Mamiya
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/master/agent_monitor_spec.rb

@@ -714,7 +714,7 @@ describe Mamiya::Master::AgentMonitor do
       describe "switch" do
         describe "success" do
           let(:status) do
-            {currents: {}}
+            {currents: {}, releases: {}}
           end
 
           it "updates current" do
@@ -724,6 +724,40 @@ describe Mamiya::Master::AgentMonitor do
             expect(new_status["currents"]['myapp']).to eq "pkg"
           end
 
+          it "adds release" do
+            commit('mamiya:task:finish',
+                   task: {task: 'switch', app: 'myapp', pkg: 'pkg'})
+
+            expect(new_status["releases"]['myapp']).to eq ["pkg"]
+          end
+
+          context "with existing release" do
+            let(:status) do
+              {currents: {}, releases: {'myapp' => ['pkg2']}}
+            end
+
+            it "adds release" do
+              commit('mamiya:task:finish',
+                     task: {task: 'switch', app: 'myapp', pkg: 'pkg'})
+
+              expect(new_status["releases"]['myapp']).to eq ["pkg2", 'pkg']
+            end
+          end
+
+
+          context "with release with same name" do
+            let(:status) do
+              {currents: {}, releases: {'myapp' => ['pkg2', 'pkg']}}
+            end
+
+            it "adds release" do
+              commit('mamiya:task:finish',
+                     task: {task: 'switch', app: 'myapp', pkg: 'pkg'})
+
+              expect(new_status["releases"]['myapp']).to eq ["pkg2", "pkg"]
+            end
+          end
+
           context "with existing current" do
             let(:status) do
               {currents: {'myapp' => 'pkg1'}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mamiya
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor