do_snapshot 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f793635439ffb9a56d8f4c2e9be57a1e9f98ab5
-  data.tar.gz: 6f2680b1346011ac73bae361e70015dd12566cad
+  metadata.gz: 77cc4c07beb253d0aa7fbe1870fb45f014c6f339
+  data.tar.gz: 0c2acaaaddadd3626423894aaf25c8fc3a84dfb1
 SHA512:
-  metadata.gz: d26d8f14434a1471f12fbea7db98be706a169c78d16f04dcc7105954b5358f33fed013f7d67b0d5a629622748be9dc68f6f2193944fe225f81f7d99628fdcc60
-  data.tar.gz: 58fccbd707e2cf5c97d725b39ad5a29caa38d2b92ce977d5bbb1c372029bca3cd9154819344695e3ad9d566b7db2b4b4f4b046c6d783a0cc24977fc1755263e0
+  metadata.gz: a15514139088299e98b567a227205cc14f6d3e71b7a19707bf1ad9520690962104b57dc3f8b80bb3bae9fa515d511b082f96adfd94ab4d8909d17a846c265369
+  data.tar.gz: 33e4c117829a0ede9809c7930426811e8110ac9fb3d8b6ee35894e0f622535cf285205ccd263d7fd66d17ee6efc82cffeecebac2805d95e292752e8bbed0ec42

data/README.md

@@ -12,6 +12,8 @@
 
 Use this tool to backup DigitalOcean droplet's via snapshot method, on the fly!
 
+## Breaking changes: now we use DO API V2 by default, due V1 deprecation at 11.2015.
+
 Here some features:
 
 - Multiple threads out of the box. No matter how much droplet's you have.
@@ -48,7 +50,7 @@ Install it yourself as:
 
     $ gem install do_snapshot
     
-Or System Wide Install (OSX, *nix):
+System Wide Install (OSX, *nix):
   
     $ sudo gem install do_snapshot
         
@@ -81,6 +83,15 @@ Mainly it's pretty simple:
 
 ### Setup 
 
+### Digitalocean API V2 (default):
+You'll need to generate an access token in Digital Ocean's control panel at https://cloud.digitalocean.com/settings/applications
+    
+    $ export DIGITAL_OCEAN_ACCESS_TOKEN="SOMETOKEN"
+    
+If you want to set keys without environment, than set it via options when you run do_snapshot:
+    
+    $ do_snapshot --digital-ocean-access-token YOURLONGTOKEN   
+    
 ### Digitalocean API V1:
 You'll need to generate an access token in Digital Ocean's control panel at https://cloud.digitalocean.com/api_access
 
@@ -89,16 +100,7 @@ You'll need to generate an access token in Digital Ocean's control panel at http
     
 If you want to set keys without environment, than set it via options when you run do_snapshot:
 
-    $ do_snapshot --digital-ocean-client-id YOURLONGAPICLIENTID --digital-ocean-api-key YOURLONGAPIKEY
-    
-### Digitalocean API V2:
-You'll need to generate an access token in Digital Ocean's control panel at https://cloud.digitalocean.com/settings/applications
-    
-    $ export DIGITAL_OCEAN_ACCESS_TOKEN="SOMETOKEN"
-    
-If you want to set keys without environment, than set it via options when you run do_snapshot:
-    
-    $ do_snapshot --digital-ocean-access-token YOURLONGTOKEN    
+    $ do_snapshot --digital-ocean-client-id YOURLONGAPICLIENTID --digital-ocean-api-key YOURLONGAPIKEY 
 
 ### How-To (Here is also [Longren Tutorial](https://longren.io/automate-making-snapshots-of-your-digitalocean-droplets/))
  
@@ -106,9 +108,9 @@ Here we `keeping` only 5 **latest** snapshots and cleanup older after new one is
 
     $ do_snapshot --keep 5 -c
 
-Using API V2:
+Using API V1:
   
-    $ do_snapshot -p 2
+    $ do_snapshot -p 1
     
 Keep latest 3 from selected droplet:
   
@@ -162,7 +164,7 @@ For working mailer you need to set e-mail settings via run options.
     
     Options:
       -p, [--protocol=1]                                             # Select api version.
-                                                                     # Default: 1
+                                                                     # Default: 2
       -o, [--only=123456 123456 123456]                              # Select some droplets.
       -e, [--exclude=123456 123456 123456]                           # Except some droplets.
       -k, [--keep=5]                                                 # How much snapshots you want to keep?

data/lib/do_snapshot/adapter.rb

@@ -10,10 +10,10 @@ module DoSnapshot
   module Adapter
     def api(protocol, options)
       case protocol
-      when 2
-        return DigitaloceanV2.new(options)
-      else
+      when 1
         return Digitalocean.new(options)
+      else
+        return DigitaloceanV2.new(options)
       end
     end
     module_function :api

data/lib/do_snapshot/cli.rb

@@ -42,7 +42,7 @@ module DoSnapshot
 
     Select api version (1, 2):
 
-    $ do_snapshot -a 2
+    $ do_snapshot -p 1
 
     Set DigitalOcean keys:
 
@@ -78,7 +78,7 @@ module DoSnapshot
     LONGDESC
     method_option :protocol,
                   type: :numeric,
-                  default: 1,
+                  default: 2,
                   aliases: %w( -p ),
                   banner: '1',
                   desc: 'Select api version.'

data/lib/do_snapshot/version.rb

@@ -2,5 +2,5 @@
 # Current version
 #
 module DoSnapshot
-  VERSION = '0.4.3'
+  VERSION = '0.5.0'
 end

data/spec/do_snapshot/adapter/digitalocean_v2_spec.rb

@@ -8,8 +8,6 @@ RSpec.describe DoSnapshot::Adapter::DigitaloceanV2 do
   subject(:api) { described_class }
   subject(:log) { DoSnapshot::Log }
 
-  let(:event_id) { '7499' }
-
   describe '.initialize' do
     describe '#delay' do
       let(:delay) { 5 }

data/spec/do_snapshot/cli_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 RSpec.describe DoSnapshot::CLI do
   include_context 'spec'
-  include_context 'api_v1_helpers'
+  include_context 'api_v2_helpers'
 
   subject(:cli)     { described_class }
   subject(:api)     { DoSnapshot::Adapter::Digitalocean }

data/spec/do_snapshot/command_spec.rb

@@ -8,12 +8,12 @@ RSpec.describe DoSnapshot::Command do
   subject(:cmd)     { DoSnapshot::Command.new }
   subject(:log)     { DoSnapshot::Log }
 
-  describe 'V2' do
-    include_context 'api_v2_helpers'
-  end
-
   describe 'V1' do
     include_context 'api_v1_helpers'
+  end
+
+  describe 'V2' do
+    include_context 'api_v2_helpers'
 
     describe '.snap' do
       context 'when success' do
@@ -215,8 +215,7 @@ RSpec.describe DoSnapshot::Command do
 
       it 'with start error' do
         stub_droplet_inactive(droplet_id)
-        stub_droplet_start_fail(droplet_id)
-        stub_event_fail(event_id)
+        stub_droplet_start_done(droplet_id)
 
         expect { cmd.fail_power_off(DoSnapshot::DropletShutdownError.new(droplet_id)) }
           .not_to raise_error
@@ -234,8 +233,8 @@ RSpec.describe DoSnapshot::Command do
   end
 
   def load_options(options = nil)
-    options ||= default_options.merge(protocol: 1)
-    cmd.load_options(options, [:log, :mail, :smtp, :trace, :digital_ocean_client_id, :digital_ocean_api_key])
+    options ||= default_options.merge(protocol: 2)
+    cmd.load_options(options, [:log, :mail, :smtp, :trace, :digital_ocean_access_token])
   end
 
   def snap_runner

data/spec/do_snapshot/runner_spec.rb

@@ -185,10 +185,6 @@ RSpec.describe DoSnapshot::Runner, type: :aruba do
       end
 
       context 'API V2' do
-        let(:default_options_cli) { default_options.reject { |key, _| %w( droplets threads ).include?(key.to_s) }.merge(protocol: 2) }
-        let(:event_id) { '7499' }
-        let(:snapshot_name) { "example.com_#{DateTime.now.strftime('%Y_%m_%d')}" }
-
         include_context 'api_v2_helpers'
         it_behaves_like '.snap methods'
 
@@ -216,6 +212,9 @@ RSpec.describe DoSnapshot::Runner, type: :aruba do
       end
 
       context 'API V1' do
+        let(:default_options_cli) { default_options.merge(protocol: 1) }
+        let(:snapshot_name) { "foo_#{DateTime.now.strftime('%Y_%m_%d')}" }
+
         include_context 'api_v1_helpers'
         it_behaves_like '.snap methods'
 

data/spec/fixtures/digitalocean/v1/response_event.json

@@ -1,4 +1,4 @@
 {
     "status": "OK",
-    "event_id": 7501
+    "event_id": 7499
 }

data/spec/shared/api_v2_helpers.rb

@@ -50,7 +50,6 @@ shared_context 'api_v2_helpers' do
   def stub_droplet_stop(id)
     stub_with_id(droplet_stop_uri, id, 'v2/show_event_power_off_start', :post,
                  type: 'power_off'
-
                 )
   end
 
@@ -66,16 +65,18 @@ shared_context 'api_v2_helpers' do
   def stub_droplet_start(id)
     stub_with_id(droplet_start_uri, id, 'v2/show_event_power_on_start', :post,
                  type: 'power_on'
+                )
+  end
 
+  def stub_droplet_start_done(id)
+    stub_with_id(droplet_start_uri, id, 'v2/show_event_power_on_done', :post,
+                 type: 'power_on'
                 )
   end
 
   def stub_droplet_start_fail(id)
     stub_with_id(droplet_start_uri, id, 'v2/error_message', :post,
-                 {
-                   type: 'power_on'
-                 },
-                 404
+                 type: 'power_on'
                 )
   end
 
@@ -85,7 +86,6 @@ shared_context 'api_v2_helpers' do
     stub_with_id_name(snapshot_uri, id, name, 'v2/response_event', :post,
                       type: 'snapshot',
                       name: name
-
                      )
   end
 

data/spec/shared/environment.rb

@@ -11,15 +11,15 @@ shared_context 'spec' do
   let(:client_key)          { 'foo' }
   let(:api_key)             { 'bar' }
   let(:access_token)        { 'sometoken' }
-  let(:event_id)            { '7501' }
+  let(:event_id)            { '7499' }
   let(:droplet_id)          { '100823' }
   let(:image_id)            { '5019770' }
   let(:image_id2)           { '5019903' }
   let(:cli_env_nil)         { Hash['DIGITAL_OCEAN_CLIENT_ID' => nil, 'DIGITAL_OCEAN_API_KEY' => nil, 'DIGITAL_OCEAN_ACCESS_TOKEN' => nil] }
   let(:cli_keys)            { Thor::CoreExt::HashWithIndifferentAccess.new(digital_ocean_client_id: client_key, digital_ocean_api_key: api_key, digital_ocean_access_token: access_token) }
   let(:cli_keys_other)      { Thor::CoreExt::HashWithIndifferentAccess.new(digital_ocean_client_id: 'NOTFOO', digital_ocean_api_key: 'NOTBAR', digital_ocean_access_token: 'NOTTOK') }
-  let(:snapshot_name)       { "foo_#{DateTime.now.strftime('%Y_%m_%d')}" }
-  let(:default_options)     { Hash[protocol: 1, only: %w( 100823 ), exclude: %w(), keep: 3, stop: false, trace: true, clean: true, delay: 0, timeout: 600, droplets: nil, threads: []] }
+  let(:snapshot_name)       { "example.com_#{DateTime.now.strftime('%Y_%m_%d')}" }
+  let(:default_options)     { Hash[protocol: 2, only: %w( 100823 ), exclude: %w(), keep: 3, stop: false, trace: true, clean: true, delay: 0, timeout: 600] }
   let(:default_options_cli) { default_options.reject { |key, _| %w( droplets threads ).include?(key.to_s) } }
   let(:no_exclude)          { [] }
   let(:exclude)             { %w( 100824 100825 ) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: do_snapshot
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Alexander Merkulov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digitalocean_c