do_snapshot 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06606ebf6e8df99c994ce845c7f5fa63996f53e1
-  data.tar.gz: 42f86fa15f04f5e5d43e7785b0fcd46b6c0875e1
+  metadata.gz: 46aad1fb16f689f6ceb2a36e2213b8cb84953edd
+  data.tar.gz: 611d90d5c0c746df41b371b642769073e9c083ab
 SHA512:
-  metadata.gz: cbaea0198b09721b86e4419b5fb1aba1c1935469be3a7fb0fe16d9be044857767150fa7b5e5cc4da3b546b6e5ee353ce5466ca3cd096ba5fa8156f067d8ce499
-  data.tar.gz: f04fe0b3897ca82876cbc33b7b952017bcd9e569953c101486eae2a34304c73fffb90d3b56deb63bfa78931a8576a2a83ede049087586405f78286cac6d4d93f
+  metadata.gz: d002bcb79714fb283d8ba1e45b69f48fbf91abe7c5eb48b58051f9ad7bde60f6546cd7b9e52232193751b9beac51e94c3fc3cead6f08655f05926981c8de7730
+  data.tar.gz: 3d7ca6ca589ac35fecee9605b26cf08d4a36aa031eebdce33e02845c47ca2d076d3d333d6803b8286dd743328ce9a48bb4a1f7dd9ca03611ea994b70151bd0d7

data/lib/do_snapshot/adapter/digitalocean.rb

@@ -40,6 +40,19 @@ module DoSnapshot
         logger.error "Droplet #{id} is still running. Skipping."
       end
 
+      # Request Power On for droplet
+      #
+      def power_on(id)
+        # noinspection RubyResolve
+        event = ::DigitaloceanC::Droplet.power_on(id)
+        case event && event.status
+        when 'OK'
+          logger.info "Droplet id: #{id} is requested for Power On."
+        else
+          logger.error "Droplet id: #{id} is failed to request for Power On."
+        end
+      end
+
       # Power Off request for Droplet
       #
       def stop_droplet(id)
@@ -49,7 +62,7 @@ module DoSnapshot
         fail event.message unless event.status.include? 'OK'
 
         # noinspection RubyResolve
-        wait_shutdown(id)
+        wait_event(event.event_id)
       rescue => e
         raise DropletShutdownError.new(id), e.message, e.backtrace
       end
@@ -116,19 +129,6 @@ module DoSnapshot
         # noinspection RubyResolve,RubyResolve
         event.event.percentage && event.event.percentage.include?('100') ? true : false
       end
-
-      # Request Power On for droplet
-      #
-      def power_on(id)
-        # noinspection RubyResolve
-        event = ::DigitaloceanC::Droplet.power_on(id)
-        case event && event.status
-        when 'OK'
-          logger.info "Droplet id: #{id} is requested for Power On."
-        else
-          logger.error "Droplet id: #{id} is failed to request for Power On."
-        end
-      end
     end
   end
 end

data/lib/do_snapshot/adapter/digitalocean_v2.rb

@@ -42,6 +42,21 @@ module DoSnapshot
         logger.error "Droplet #{id} is still running. Skipping."
       end
 
+      # Request Power On for droplet
+      #
+      def power_on(id)
+        # noinspection RubyResolve
+        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 "Droplet id: #{id} is failed to request for Power On."
+        end
+      end
+
       # Power Off request for Droplet
       #
       def stop_droplet(id)
@@ -124,21 +139,6 @@ module DoSnapshot
         # noinspection RubyResolve,RubyResolve
         response.action.status.include?('completed') ? true : false
       end
-
-      # Request Power On for droplet
-      #
-      def power_on(id)
-        # noinspection RubyResolve
-        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 "Droplet id: #{id} is failed to request for Power On."
-        end
-      end
     end
   end
 end

data/lib/do_snapshot/command.rb

@@ -86,7 +86,7 @@ module DoSnapshot
     def power_on_failed_droplets
       processed_droplet_ids
         .select { |id| api.inactive?(id) }
-        .each   { |id| api.start_droplet(id) }
+        .each   { |id| api.power_on(id) }
     end
 
     # API launcher

data/lib/do_snapshot/version.rb

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

data/spec/do_snapshot/adapter/digitalocean_spec.rb

@@ -112,24 +112,20 @@ RSpec.describe DoSnapshot::Adapter::Digitalocean 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(:get, droplet_stop_url))
           .to have_been_made
-        expect(a_request(:get, droplet_url))
+        expect(a_request(:get, event_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.'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: do_snapshot
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Alexander Merkulov