do_snapshot 0.0.14 → 0.0.15

data/spec/shared/environment.rb

@@ -6,13 +6,14 @@ shared_context 'spec' do
 
   let(:client_key)         { 'foo' }
   let(:api_key)            { 'bar' }
+  let(:access_token)       { 'sometoken' }
   let(:event_id)           { '7501' }
   let(:droplet_id)         { '100823' }
   let(:image_id)           { '5019770' }
   let(:image_id2)          { '5019903' }
-  let(:cli_keys)           { Thor::CoreExt::HashWithIndifferentAccess.new(digital_ocean_client_id: 'NOTFOO', digital_ocean_client_bar: 'NOTBAR') }
+  let(:cli_keys)           { Thor::CoreExt::HashWithIndifferentAccess.new(digital_ocean_client_id: 'NOTFOO', digital_ocean_client_key: 'NOTBAR', digital_ocean_access_token: 'NOTTOK') }
   let(:snapshot_name)      { "foo_#{DateTime.now.strftime('%Y_%m_%d')}" }
-  let(:default_options)    { Hash[only: %w( 100823 ), exclude: %w(), keep: 3, stop: false, trace: true, clean: true, delay: 0, timeout: 600, droplets: nil, threads: []] }
+  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(:no_exclude)         { [] }
   let(:exclude)            { %w( 100824 100825 ) }
   let(:no_only)            { [] }
@@ -28,18 +29,6 @@ shared_context 'spec' do
   let(:mail_options)       { Thor::CoreExt::HashWithIndifferentAccess.new(to: 'mail@somehost.com', from: 'from@host.com') }
   let(:smtp_options)       { Thor::CoreExt::HashWithIndifferentAccess.new(address: 'smtp.gmail.com', port: '25', user_name: 'someuser', password: 'somepassword') }
   let(:log)                { Thor::CoreExt::HashWithIndifferentAccess.new(log: "#{project_path}/log/test.log") }
-  let(:api_base)           { 'https://api.digitalocean.com/v1' }
-  let(:keys_uri)           { "api_key=#{api_key}&client_id=#{client_key}" }
-  let(:droplets_api_base)  { "#{api_base}/droplets" }
-  let(:events_api_base)    { "#{api_base}/events" }
-  let(:images_api_base)    { "#{api_base}/images" }
-  let(:image_destroy_uri)  { "#{images_api_base}/[id]/destroy/?#{keys_uri}" }
-  let(:droplets_uri)       { "#{droplets_api_base}/?#{keys_uri}" }
-  let(:droplet_find_uri)   { "#{droplets_api_base}/[id]?#{keys_uri}" }
-  let(:droplet_stop_uri)   { "#{droplets_api_base}/[id]/power_off/?#{keys_uri}" }
-  let(:droplet_start_uri)  { "#{droplets_api_base}/[id]/power_on/?#{keys_uri}" }
-  let(:snapshot_uri)       { "#{droplets_api_base}/[id]/snapshot/?name=[name]&#{keys_uri}" }
-  let(:event_find_uri)     { "#{events_api_base}/[id]/?#{keys_uri}" }
 
   def stub_all_api(droplets = nil, active = false) # rubocop:disable MethodLength
     drops = []
@@ -87,11 +76,13 @@ shared_context 'spec' do
   def reset_api_keys
     ENV['DIGITAL_OCEAN_API_KEY']   = nil
     ENV['DIGITAL_OCEAN_CLIENT_ID'] = nil
+    ENV['DIGITAL_OCEAN_ACCESS_TOKEN'] = nil
   end
 
   def set_api_keys
     ENV['DIGITAL_OCEAN_API_KEY']   = api_key
     ENV['DIGITAL_OCEAN_CLIENT_ID'] = client_key
+    ENV['DIGITAL_OCEAN_ACCESS_TOKEN'] = access_token
   end
 
   before(:all) do

data/spec/shared/uri_helpers.rb

@@ -8,5 +8,6 @@ shared_context 'uri_helpers' do
   let(:event_find_url) { url_with_id(event_find_uri, event_id) }
   let(:image_destroy_url) { url_with_id(image_destroy_uri, image_id) }
   let(:image_destroy2_url) { url_with_id(image_destroy_uri, image_id2) }
+  let(:action_find_url) { url_with_id(action_find_uri, event_id) }
   let(:droplet_snapshot_url) { url_with_id_name(snapshot_uri, droplet_id, snapshot_name) }
 end

data/spec/spec_helper.rb

@@ -7,18 +7,20 @@ end
 
 require 'do_snapshot/cli'
 require 'webmock/rspec'
-require 'digitalocean'
+require 'digitalocean_c'
 require_relative 'shared/api_helpers'
+require_relative 'shared/api_v1_helpers'
+require_relative 'shared/api_v2_helpers'
 require_relative 'shared/uri_helpers'
 require_relative 'shared/environment'
 require 'do_snapshot/core_ext/hash'
 
 WebMock.disable_net_connect!(allow_localhost: true)
+WebMock.disable!(except: [:net_http])
 
 RSpec.configure do |config|
   # Pretty tests
   config.color = true
-
   config.order = :random
   config.mock_with :rspec do |mocks|
     mocks.verify_doubled_constant_names = true
@@ -30,7 +32,7 @@ def project_path
 end
 
 def fixture(fixture_name)
-  File.new(project_path + "/spec/fixtures/#{fixture_name}.json")
+  Pathname.new(project_path + '/spec/fixtures/digitalocean/').join("#{fixture_name}.json").read
 end
 
 Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support', '**', '*.rb'))].each { |f| require f }

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: do_snapshot
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Alexander Merkulov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: digitalocean
+  name: digitalocean_c
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: droplet_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -64,7 +78,10 @@ files:
 - README.md
 - bin/do_snapshot
 - lib/do_snapshot.rb
-- lib/do_snapshot/api.rb
+- lib/do_snapshot/adapter.rb
+- lib/do_snapshot/adapter/abstract.rb
+- lib/do_snapshot/adapter/digitalocean.rb
+- lib/do_snapshot/adapter/digitalocean_v2.rb
 - lib/do_snapshot/cli.rb
 - lib/do_snapshot/command.rb
 - lib/do_snapshot/core_ext/hash.rb
@@ -73,19 +90,36 @@ files:
 - lib/do_snapshot/mail.rb
 - lib/do_snapshot/version.rb
 - spec/.keep
-- spec/do_snapshot/api_spec.rb
+- spec/do_snapshot/adapter/abstract_spec.rb
+- spec/do_snapshot/adapter/digitalocean_spec.rb
+- spec/do_snapshot/adapter/digitalocean_v2_spec.rb
 - spec/do_snapshot/cli_spec.rb
 - spec/do_snapshot/command_spec.rb
 - spec/do_snapshots_spec.rb
-- spec/fixtures/error_message.json
-- spec/fixtures/response_event.json
-- spec/fixtures/show_droplet.json
-- spec/fixtures/show_droplet_inactive.json
-- spec/fixtures/show_droplets.json
-- spec/fixtures/show_droplets_empty.json
-- spec/fixtures/show_event_done.json
-- spec/fixtures/show_event_start.json
+- spec/fixtures/digitalocean/v1/error_message.json
+- spec/fixtures/digitalocean/v1/response_event.json
+- spec/fixtures/digitalocean/v1/show_droplet.json
+- spec/fixtures/digitalocean/v1/show_droplet_inactive.json
+- spec/fixtures/digitalocean/v1/show_droplets.json
+- spec/fixtures/digitalocean/v1/show_droplets_empty.json
+- spec/fixtures/digitalocean/v1/show_event_done.json
+- spec/fixtures/digitalocean/v1/show_event_start.json
+- spec/fixtures/digitalocean/v2/empty.json
+- spec/fixtures/digitalocean/v2/error_message.json
+- spec/fixtures/digitalocean/v2/response_event.json
+- spec/fixtures/digitalocean/v2/show_droplet.json
+- spec/fixtures/digitalocean/v2/show_droplet_inactive.json
+- spec/fixtures/digitalocean/v2/show_droplets.json
+- spec/fixtures/digitalocean/v2/show_droplets_empty.json
+- spec/fixtures/digitalocean/v2/show_event_done.json
+- spec/fixtures/digitalocean/v2/show_event_power_off_done.json
+- spec/fixtures/digitalocean/v2/show_event_power_off_start.json
+- spec/fixtures/digitalocean/v2/show_event_power_on_done.json
+- spec/fixtures/digitalocean/v2/show_event_power_on_start.json
+- spec/fixtures/digitalocean/v2/show_event_start.json
 - spec/shared/api_helpers.rb
+- spec/shared/api_v1_helpers.rb
+- spec/shared/api_v2_helpers.rb
 - spec/shared/environment.rb
 - spec/shared/uri_helpers.rb
 - spec/spec_helper.rb
@@ -101,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -116,19 +150,36 @@ summary: A command-line snapshot maker for your DigitalOcean droplets. Fully Aut
   Multi-threaded.
 test_files:
 - spec/.keep
-- spec/do_snapshot/api_spec.rb
+- spec/do_snapshot/adapter/abstract_spec.rb
+- spec/do_snapshot/adapter/digitalocean_spec.rb
+- spec/do_snapshot/adapter/digitalocean_v2_spec.rb
 - spec/do_snapshot/cli_spec.rb
 - spec/do_snapshot/command_spec.rb
 - spec/do_snapshots_spec.rb
-- spec/fixtures/error_message.json
-- spec/fixtures/response_event.json
-- spec/fixtures/show_droplet.json
-- spec/fixtures/show_droplet_inactive.json
-- spec/fixtures/show_droplets.json
-- spec/fixtures/show_droplets_empty.json
-- spec/fixtures/show_event_done.json
-- spec/fixtures/show_event_start.json
+- spec/fixtures/digitalocean/v1/error_message.json
+- spec/fixtures/digitalocean/v1/response_event.json
+- spec/fixtures/digitalocean/v1/show_droplet.json
+- spec/fixtures/digitalocean/v1/show_droplet_inactive.json
+- spec/fixtures/digitalocean/v1/show_droplets.json
+- spec/fixtures/digitalocean/v1/show_droplets_empty.json
+- spec/fixtures/digitalocean/v1/show_event_done.json
+- spec/fixtures/digitalocean/v1/show_event_start.json
+- spec/fixtures/digitalocean/v2/empty.json
+- spec/fixtures/digitalocean/v2/error_message.json
+- spec/fixtures/digitalocean/v2/response_event.json
+- spec/fixtures/digitalocean/v2/show_droplet.json
+- spec/fixtures/digitalocean/v2/show_droplet_inactive.json
+- spec/fixtures/digitalocean/v2/show_droplets.json
+- spec/fixtures/digitalocean/v2/show_droplets_empty.json
+- spec/fixtures/digitalocean/v2/show_event_done.json
+- spec/fixtures/digitalocean/v2/show_event_power_off_done.json
+- spec/fixtures/digitalocean/v2/show_event_power_off_start.json
+- spec/fixtures/digitalocean/v2/show_event_power_on_done.json
+- spec/fixtures/digitalocean/v2/show_event_power_on_start.json
+- spec/fixtures/digitalocean/v2/show_event_start.json
 - spec/shared/api_helpers.rb
+- spec/shared/api_v1_helpers.rb
+- spec/shared/api_v2_helpers.rb
 - spec/shared/environment.rb
 - spec/shared/uri_helpers.rb
 - spec/spec_helper.rb

data/lib/do_snapshot/api.rb

@@ -1,144 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'digitalocean'
-
-module DoSnapshot
-  # API for CLI commands
-  # Operating with Digital Ocean.
-  #
-  class API
-    attr_accessor :delay
-    attr_accessor :timeout
-
-    def initialize(options)
-      set_id
-      options.each_pair do |key, option|
-        send("#{key}=", option)
-      end
-    end
-
-    # Get single droplet from DigitalOcean
-    #
-    def droplet(id)
-      # noinspection RubyResolve
-      instance = Digitalocean::Droplet.find(id)
-      fail DropletFindError, instance.message unless instance.status.include? 'OK'
-      instance
-    end
-
-    # Get droplets list from DigitalOcean
-    #
-    def droplets
-      # noinspection RubyResolve
-      droplets = Digitalocean::Droplet.all
-      fail DropletListError, droplets.message unless droplets.status.include? 'OK'
-      droplets
-    end
-
-    # Power On request for Droplet
-    #
-    def start_droplet(id)
-      # noinspection RubyResolve
-      instance = Digitalocean::Droplet.find(id)
-
-      fail unless instance.status.include? 'OK'
-
-      if instance.droplet.status.include? 'active'
-        Log.error 'Droplet is still running.'
-      else
-        power_on id
-      end
-    end
-
-    # Power Off request for Droplet
-    #
-    def stop_droplet(id)
-      # noinspection RubyResolve,RubyResolve
-      event = Digitalocean::Droplet.power_off(id)
-
-      fail event.message unless event.status.include? 'OK'
-
-      # noinspection RubyResolve
-      wait_event(event.event_id)
-    rescue => e
-      raise DropletShutdownError.new(id), e.message, e.backtrace
-    end
-
-    # Sending event to create snapshot via DigitalOcean API and wait for success
-    #
-    def create_snapshot(id, name)
-      # noinspection RubyResolve,RubyResolve
-      event = Digitalocean::Droplet.snapshot(id, name: name)
-
-      if !event
-        fail 'Something wrong with DigitalOcean or with your connection :)'
-      elsif event && !event.status.include?('OK')
-        fail event.message
-      end
-
-      # noinspection RubyResolve
-      wait_event(event.event_id)
-    end
-
-    # Cleanup our snapshots.
-    #
-    def cleanup_snapshots(instance, size) # rubocop:disable MethodLength
-      (0..size).each do |i|
-        # noinspection RubyResolve
-        snapshot = instance.snapshots[i]
-        event = Digitalocean::Image.destroy(snapshot.id)
-
-        after_cleanup(instance.id, instance.name, snapshot, event)
-      end
-    end
-
-    protected
-
-    # Set id's of Digital Ocean API.
-    #
-    def set_id
-      Log.debug 'Setting DigitalOcean Id\'s.'
-      Digitalocean.client_id = ENV['DIGITAL_OCEAN_CLIENT_ID']
-      Digitalocean.api_key = ENV['DIGITAL_OCEAN_API_KEY']
-    end
-
-    # Waiting for event exit
-    def wait_event(id)
-      time = Time.now
-      sleep(delay) until get_event_status(id, time)
-    end
-
-    # Looking for event status.
-    # Before snapshot we to know that machine has powered off.
-    #
-    def get_event_status(id, time)
-      return true if (Time.now - time) > timeout
-      event = Digitalocean::Event.find(id)
-      fail event.message unless event.status.include?('OK')
-      # 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 = Digitalocean::Droplet.power_on(id)
-      case event && event.status
-      when 'OK'
-        Log.info 'Power On has been requested.'
-      else
-        Log.error 'Power On failed to request.'
-      end
-    end
-
-    def after_cleanup(droplet_id, droplet_name, snapshot, event)
-      if !event
-        Log.error "Destroy of snapshot #{snapshot.name} for droplet id: #{droplet_id} name: #{droplet_name} is failed."
-      elsif event && !event.status.include?('OK')
-        Log.error event.message
-      else
-        Log.debug "Snapshot name: #{snapshot.name} delete requested."
-      end
-    end
-  end
-end