do_snapshot 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21efe1c089acf9072715fbb30f61344f0cd7f5df
-  data.tar.gz: 9f4fce0343830350f4c5e5305274ef9d7ac9903c
+  metadata.gz: 06606ebf6e8df99c994ce845c7f5fa63996f53e1
+  data.tar.gz: 42f86fa15f04f5e5d43e7785b0fcd46b6c0875e1
 SHA512:
-  metadata.gz: 2c97b328614cf2d9154c972862aaea983b1e9bf3087a90ea18679bc8f6d18f5a0119b924d24d1b055aa658954ca1a085ddcd5318f75c8fd6f7afa053c6910352
-  data.tar.gz: 9c917c20fdd446c6161b69f339d907453dc3ccb639ff9017ed9aee8f7ea580ee67a8e1acfb3f75d9981b7c342082aa227e5a9c90553c0b72d6620a7a4ae26c0e
+  metadata.gz: cbaea0198b09721b86e4419b5fb1aba1c1935469be3a7fb0fe16d9be044857767150fa7b5e5cc4da3b546b6e5ee353ce5466ca3cd096ba5fa8156f067d8ce499
+  data.tar.gz: f04fe0b3897ca82876cbc33b7b952017bcd9e569953c101486eae2a34304c73fffb90d3b56deb63bfa78931a8576a2a83ede049087586405f78286cac6d4d93f

data/README.md

@@ -193,7 +193,7 @@ Support this project and others by [merqlove](https://gratipay.com/~merqlove/) v
 
 - [Thor](https://github.com/erikhuda/thor) for CLI.
 - [Digitalocean](https://github.com/scottmotte/digitalocean) for API V1 requests.
-- [DropletKit](https://github.com/digitalocean/droplet_kit) for API V2 requests.
+- [Barge](https://github.com/blom/barge) for API V2 requests.
 - [Pony](https://github.com/benprew/pony) for mail notifications.
 
 ## Contributing

data/lib/do_snapshot.rb

@@ -1,6 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'active_support/multibyte' # ActiveSupport 3.2 & Mail gem fix to work together.
-
 require_relative 'do_snapshot/version'
 require_relative 'do_snapshot/configuration'
 
@@ -77,7 +75,7 @@ module DoSnapshot
   #
   class DropletFindError < RequestError
     def initialize(*args)
-      DoSnapshot.logger.error 'Droplet Not Found'
+      DoSnapshot.logger.error "Droplet id: #{args[0]} Not Found"
       super
     end
   end

data/lib/do_snapshot/adapter/digitalocean.rb

@@ -12,7 +12,7 @@ module DoSnapshot
       def droplet(id)
         # noinspection RubyResolve
         response = ::DigitaloceanC::Droplet.find(id)
-        fail DropletFindError, response.message unless response.status.include? 'OK'
+        fail DropletFindError.new(id), response.message unless response.status.include? 'OK'
         response.droplet
       end
 
@@ -124,9 +124,9 @@ module DoSnapshot
         event = ::DigitaloceanC::Droplet.power_on(id)
         case event && event.status
         when 'OK'
-          logger.info 'Power On has been requested.'
+          logger.info "Droplet id: #{id} is requested for Power On."
         else
-          logger.error 'Power On failed to request.'
+          logger.error "Droplet id: #{id} is failed to request for Power On."
         end
       end
     end

data/lib/do_snapshot/adapter/digitalocean_v2.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-require 'droplet_kit' unless defined?(::DropletKit)
+require 'barge' unless defined?(::Barge)
 
 module DoSnapshot
   module Adapter
@@ -13,22 +13,18 @@ module DoSnapshot
       #
       def droplet(id)
         # noinspection RubyResolve
-        response = client.droplets.find(id: id)
-        fail DropletFindError unless response
-        response
-      rescue => e
-        raise DropletFindError, e.message
+        response = client.droplet.show(id)
+        fail DropletFindError.new(id), response.message unless response.respond_to?(:droplet)
+        response.droplet
       end
 
       # Get droplets list from DigitalOcean
       #
       def droplets
         # noinspection RubyResolve
-        response = client.droplets.all
-        fail DropletListError unless response
-        response.each
-      rescue => e
-        raise DropletListError, e.message
+        response = client.droplet.all
+        fail DropletListError, response.message unless response.respond_to?(:droplets)
+        response.droplets
       end
 
       def snapshots(instance)
@@ -41,7 +37,7 @@ module DoSnapshot
         # noinspection RubyResolve
         instance = droplet(id)
 
-        return power_on(id) unless instance.status && instance.status.include?('active')
+        return power_on(id) unless instance.status.include?('active')
 
         logger.error "Droplet #{id} is still running. Skipping."
       end
@@ -50,24 +46,24 @@ module DoSnapshot
       #
       def stop_droplet(id)
         # noinspection RubyResolve,RubyResolve
-        client.droplet_actions.power_off(droplet_id: id)
+        response = client.droplet.power_off(id)
+
+        fail DropletShutdownError.new(id), response.message unless response.respond_to?(:action)
 
         # noinspection RubyResolve
-        wait_shutdown(id)
-      rescue => e
-        raise DropletShutdownError.new(id), e.message, e.backtrace
+        wait_event(response.action.id)
       end
 
       # Sending event to create snapshot via DigitalOcean API and wait for success
       #
       def create_snapshot(id, name)
         # noinspection RubyResolve,RubyResolve
-        event = client.droplet_actions.snapshot(droplet_id: id, name: name)
+        response = client.droplet.snapshot(id, name: name)
 
-        fail DoSnapshot::SnapshotCreateError.new(id), name unless event && event.respond_to?(:id)
+        fail DoSnapshot::SnapshotCreateError.new(id), response.message unless response.respond_to?(:action)
 
         # noinspection RubyResolve
-        wait_event(event.id)
+        wait_event(response.action.id)
       end
 
       # Checking if droplet is powered off.
@@ -84,14 +80,11 @@ module DoSnapshot
         (0..size).each do |i|
           # noinspection RubyResolve
           snapshot = instance.snapshot_ids[i]
-          event = client.images.delete(id: snapshot)
+          action = client.image.destroy(snapshot)
 
-          unless event.is_a?(TrueClass)
-            logger.debug event
-            event = false
-          end
+          logger.debug action unless action.success?
 
-          after_cleanup(instance.id, instance.name, snapshot, event)
+          after_cleanup(instance.id, instance.name, snapshot, action)
         end
       end
 
@@ -106,13 +99,13 @@ module DoSnapshot
       #
       def set_id
         logger.debug 'Setting DigitalOcean Access Token.'
-        @client = ::DropletKit::Client.new(access_token: ENV['DIGITAL_OCEAN_ACCESS_TOKEN'])
+        @client = ::Barge::Client.new(access_token: ENV['DIGITAL_OCEAN_ACCESS_TOKEN'], timeout: 15, open_timeout: 15)
       end
 
       protected
 
-      def after_cleanup(droplet_id, droplet_name, snapshot, event)
-        if !event
+      def after_cleanup(droplet_id, droplet_name, snapshot, action)
+        if !action.success?
           logger.error "Destroy of snapshot #{snapshot} for droplet id: #{droplet_id} name: #{droplet_name} is failed."
         else
           logger.debug "Snapshot: #{snapshot} delete requested."
@@ -124,23 +117,26 @@ module DoSnapshot
       def get_event_status(id, time)
         return true if timeout?(id, time)
 
-        action = client.actions.find(id: id)
+        response = client.action.show(id)
 
-        fail DoSnapshot::EventError.new(id), 'Check your connection' unless action && action.respond_to?(:status)
+        fail DoSnapshot::EventError.new(id), response.message unless response.respond_to?(:action)
 
         # noinspection RubyResolve,RubyResolve
-        action.status.include?('completed') ? true : false
+        response.action.status.include?('completed') ? true : false
       end
 
       # Request Power On for droplet
       #
       def power_on(id)
         # noinspection RubyResolve
-        event = client.droplet_actions.power_on(droplet_id: id)
-        if event.status.include?('in-progress')
-          logger.info 'Power On has been requested.'
+        response = client.droplet.power_on(id)
+
+        fail DoSnapshot::EventError.new(id), response.message unless response.respond_to?(:action)
+
+        if response.action.status.include?('in-progress')
+          logger.info "Droplet id: #{id} is requested for Power On."
         else
-          logger.error 'Power On failed to request.'
+          logger.error "Droplet id: #{id} is failed to request for Power On."
         end
       end
     end

data/lib/do_snapshot/command.rb

@@ -14,6 +14,7 @@ module DoSnapshot
     def snap
       logger.info 'Start performing operations'
       work_with_droplets
+      power_on_failed_droplets
       logger.info 'All operations has been finished.'
 
       mailer.notify if mailer && notify && !quiet
@@ -82,10 +83,24 @@ module DoSnapshot
       end
     end
 
+    def power_on_failed_droplets
+      processed_droplet_ids
+        .select { |id| api.inactive?(id) }
+        .each   { |id| api.start_droplet(id) }
+    end
+
+    # API launcher
+    #
     def api
       @api ||= DoSnapshot::Adapter.api(protocol, delay: delay, timeout: timeout)
     end
 
+    # Processed droplets
+    #
+    def processed_droplet_ids
+      @droplet_ids ||= %w()
+    end
+
     protected
 
     attr_accessor :droplets, :exclude, :only
@@ -154,6 +169,7 @@ module DoSnapshot
       return unless droplet
       logger.info "Preparing droplet id: #{droplet.id} name: #{droplet.name} to take snapshot."
       return if too_much_snapshots(droplet)
+      processed_droplet_ids << droplet.id
       thread_runner(droplet)
     end
 

data/lib/do_snapshot/version.rb

@@ -2,5 +2,5 @@
 # Current version
 #
 module DoSnapshot
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

data/spec/do_snapshot/adapter/digitalocean_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe DoSnapshot::Adapter::Digitalocean do
         expect { instance.droplet(droplet_id) }
           .to raise_error(DoSnapshot::DropletFindError)
         expect(DoSnapshot.logger.buffer)
-          .to include 'Droplet Not Found'
+          .to include "Droplet id: #{droplet_id} Not Found"
 
         expect(a_request(:get, droplet_url))
           .to have_been_made
@@ -77,7 +77,7 @@ RSpec.describe DoSnapshot::Adapter::Digitalocean do
         stub_droplet_start(droplet_id)
 
         instance.start_droplet(droplet_id)
-        expect(DoSnapshot.logger.buffer).to include 'Power On has been requested.'
+        expect(DoSnapshot.logger.buffer).to include "Droplet id: #{droplet_id} is requested for Power On."
 
         expect(a_request(:get, droplet_start_url))
           .to have_been_made

data/spec/do_snapshot/adapter/digitalocean_v2_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe DoSnapshot::Adapter::DigitaloceanV2 do
         expect { instance.droplet(droplet_id) }
           .to raise_error(DoSnapshot::DropletFindError)
         expect(DoSnapshot.logger.buffer)
-          .to include 'Droplet Not Found'
+          .to include "Droplet id: #{droplet_id} Not Found"
 
         expect(a_request(:get, droplet_url))
           .to have_been_made
@@ -79,7 +79,7 @@ RSpec.describe DoSnapshot::Adapter::DigitaloceanV2 do
         stub_droplet_start(droplet_id)
 
         instance.start_droplet(droplet_id)
-        expect(DoSnapshot.logger.buffer).to include 'Power On has been requested.'
+        expect(DoSnapshot.logger.buffer).to include "Droplet id: #{droplet_id} is requested for Power On."
 
         expect(a_request(:post, droplet_start_url))
           .to have_been_made
@@ -114,23 +114,20 @@ RSpec.describe DoSnapshot::Adapter::DigitaloceanV2 do
       it 'with success' do
         stub_event_done(event_id)
         stub_droplet_stop(droplet_id)
-        stub_droplet_inactive(droplet_id)
 
         instance.stop_droplet(droplet_id)
 
         expect(a_request(:post, droplet_stop_url))
           .to have_been_made
-        expect(a_request(:get, droplet_url))
+        expect(a_request(:get, action_find_url))
           .to have_been_made
       end
 
       it 'with error' do
         stub_droplet_stop_fail(droplet_id)
-        stub_droplet(droplet_id)
-        instance.timeout = 1
+
         expect { instance.stop_droplet(droplet_id) }
           .to raise_error(DoSnapshot::DropletShutdownError)
-        instance.timeout = timeout
         expect(DoSnapshot.logger.buffer)
           .to include 'Droplet id: 100823 is Failed to Power Off.'
 

data/spec/do_snapshot/command_spec.rb

@@ -88,6 +88,32 @@ RSpec.describe DoSnapshot::Command do
       end
     end
 
+    describe '.power_on_failed_droplets' do
+      it 'when nothing' do
+        stub_droplet_start(droplet_id)
+        stub_droplet(droplet_id)
+
+        load_options
+        cmd.processed_droplet_ids << droplet_id
+        expect { cmd.power_on_failed_droplets }
+          .not_to raise_error
+        expect(DoSnapshot.logger.buffer)
+          .not_to include "Droplet id: #{droplet_id} is requested for Power On."
+      end
+
+      it 'when one' do
+        stub_droplet_start(droplet_id)
+        stub_droplet_inactive(droplet_id)
+
+        load_options
+        cmd.processed_droplet_ids << droplet_id
+        expect { cmd.power_on_failed_droplets }
+          .not_to raise_error
+        expect(DoSnapshot.logger.buffer)
+          .to include "Droplet id: #{droplet_id} is requested for Power On."
+      end
+    end
+
     describe '.stop_droplet' do
       it 'when raised with error' do
         stub_droplet_stop_fail(droplet_id)
@@ -150,7 +176,7 @@ RSpec.describe DoSnapshot::Command do
         expect { cmd.fail_power_off(DoSnapshot::DropletShutdownError.new(droplet_id)) }
           .not_to raise_error
         expect(DoSnapshot.logger.buffer)
-          .to include 'Power On has been requested.'
+          .to include "Droplet id: #{droplet_id} is requested for Power On."
       end
 
       it 'with request error' do
@@ -161,7 +187,7 @@ RSpec.describe DoSnapshot::Command do
         expect(DoSnapshot.logger.buffer)
           .to include 'Droplet id: 100823 is Failed to Power Off.'
         expect(DoSnapshot.logger.buffer)
-          .to include 'Droplet Not Found'
+          .to include "Droplet id: #{droplet_id} Not Found"
       end
 
       it 'with start error' do
@@ -172,7 +198,7 @@ RSpec.describe DoSnapshot::Command do
         expect { cmd.fail_power_off(DoSnapshot::DropletShutdownError.new(droplet_id)) }
           .not_to raise_error
         expect(DoSnapshot.logger.buffer)
-          .to include 'Power On failed to request.'
+          .to include "Droplet id: #{droplet_id} is failed to request for Power On."
       end
     end
   end

data/spec/do_snapshot_spec.rb

@@ -8,9 +8,9 @@ RSpec.describe DoSnapshot do
     subject(:error) { described_class }
 
     it 'should work' do
-      error.new
+      error.new(droplet_id)
       expect(DoSnapshot.logger.buffer)
-        .to include 'Droplet Not Found'
+        .to include "Droplet id: #{droplet_id} Not Found"
     end
   end
 

data/spec/shared/api_v2_helpers.rb

@@ -9,13 +9,13 @@ shared_context 'api_v2_helpers' do
   let(:actions_api_base)   { "#{api_base}/actions" }
   let(:images_api_base)    { "#{api_base}/images" }
   let(:image_destroy_uri)  { "#{images_api_base}/[id]" }
-  let(:droplets_uri)       { "#{droplets_api_base}?page=1&per_page=20" }
-  let(:droplet_find_uri)   { "#{droplets_api_base}/[id]" }
+  let(:droplets_uri)       { "#{droplets_api_base}?per_page=200" }
+  let(:droplet_find_uri)   { "#{droplets_api_base}/[id]?per_page=200" }
   let(:droplet_stop_uri)   { "#{droplets_api_base}/[id]/actions" }
   let(:droplet_start_uri)  { "#{droplets_api_base}/[id]/actions" }
   let(:snapshot_uri)       { "#{droplets_api_base}/[id]/actions" }
   let(:event_find_uri)     { "#{events_api_base}/[id]" }
-  let(:action_find_uri)    { "#{actions_api_base}/[id]" }
+  let(:action_find_uri)    { "#{actions_api_base}/[id]?per_page=200" }
 
   # List of droplets
   #

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: do_snapshot
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Alexander Merkulov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: digitalocean_c
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: droplet_kit
+  name: barge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement