do_snapshot 0.6.4 → 1.0.0

data/spec/do_snapshot/log_spec.rb

@@ -1,8 +1,9 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe DoSnapshot::Log do
-  include_context 'environment'
+  include DoSnapshot::RSpec::Environment
 
   subject(:log) { described_class }
 

data/spec/do_snapshot/mail_spec.rb

@@ -1,8 +1,9 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe DoSnapshot::Mail do
-  include_context 'environment'
+  include DoSnapshot::RSpec::Environment
 
   subject(:mail) { described_class }
 

data/spec/do_snapshot/runner_spec.rb

@@ -1,8 +1,9 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe DoSnapshot::Runner, type: :aruba do
-  include_context 'environment'
+  include DoSnapshot::RSpec::Environment
 
   context 'commands' do
     context '.snap' do
@@ -203,7 +204,7 @@ RSpec.describe DoSnapshot::Runner, type: :aruba do
       end
 
       context 'API V2' do
-        include_context 'api_v2_helpers'
+        include DoSnapshot::RSpec::ApiV2Helpers
         it_behaves_like '.snap methods'
 
         context 'when no credentials' do

data/spec/do_snapshot_spec.rb

@@ -1,8 +1,9 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe DoSnapshot do
-  include_context 'environment'
+  include DoSnapshot::RSpec::Environment
 
   describe DoSnapshot::DropletFindError do
     subject(:error) { described_class }

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'coveralls'
 Coveralls.wear! do
   add_filter '/spec/*'
@@ -10,10 +11,7 @@ Bundler.setup
 require 'do_snapshot/cli'
 require 'webmock/rspec'
 require 'fileutils'
-require_relative 'shared/api_helpers'
-require_relative 'shared/api_v2_helpers'
-require_relative 'shared/uri_helpers'
-require_relative 'shared/environment'
+require 'do_snapshot/rspec'
 require 'do_snapshot/core_ext/hash'
 
 WebMock.disable_net_connect!(allow_localhost: true)

data/spec/support/aruba.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'aruba/rspec'
 require 'do_snapshot/runner'
 

data/spec/support/matchers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec::Matchers.define :be_found_n_times do |str, times|
   match do |output|
     matches = output.scan(str)

metadata

@@ -1,43 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: do_snapshot
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Alexander Merkulov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: barge
+  name: droplet_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 3.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 3.5.6
 - !ruby/object:Gem::Dependency
   name: pony
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +94,27 @@ files:
 - lib/do_snapshot.rb
 - lib/do_snapshot/adapter.rb
 - lib/do_snapshot/adapter/abstract.rb
-- lib/do_snapshot/adapter/digitalocean_v2.rb
+- lib/do_snapshot/adapter/droplet_kit.rb
 - lib/do_snapshot/cli.rb
 - lib/do_snapshot/command.rb
 - lib/do_snapshot/configuration.rb
 - lib/do_snapshot/core_ext/hash.rb
 - lib/do_snapshot/distribution.rb
+- lib/do_snapshot/gem_ext/resource_kit.rb
 - lib/do_snapshot/helpers.rb
 - lib/do_snapshot/log.rb
 - lib/do_snapshot/mail.rb
+- lib/do_snapshot/rspec.rb
+- lib/do_snapshot/rspec/adapter.rb
+- lib/do_snapshot/rspec/api_helpers.rb
+- lib/do_snapshot/rspec/api_v2_helpers.rb
+- lib/do_snapshot/rspec/environment.rb
+- lib/do_snapshot/rspec/uri_helpers.rb
 - lib/do_snapshot/runner.rb
 - lib/do_snapshot/version.rb
 - spec/.keep
 - spec/do_snapshot/adapter/abstract_spec.rb
-- spec/do_snapshot/adapter/digitalocean_v2_spec.rb
+- spec/do_snapshot/adapter/droplet_kit_spec.rb
 - spec/do_snapshot/adapter_spec.rb
 - spec/do_snapshot/cli_spec.rb
 - spec/do_snapshot/command_spec.rb
@@ -101,10 +136,6 @@ files:
 - 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_v2_helpers.rb
-- spec/shared/environment.rb
-- spec/shared/uri_helpers.rb
 - spec/spec_helper.rb
 - spec/support/aruba.rb
 - spec/support/matchers.rb
@@ -120,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -128,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A command-line snapshot maker for your DigitalOcean droplets. Fully Automated.
@@ -136,7 +167,7 @@ summary: A command-line snapshot maker for your DigitalOcean droplets. Fully Aut
 test_files:
 - spec/.keep
 - spec/do_snapshot/adapter/abstract_spec.rb
-- spec/do_snapshot/adapter/digitalocean_v2_spec.rb
+- spec/do_snapshot/adapter/droplet_kit_spec.rb
 - spec/do_snapshot/adapter_spec.rb
 - spec/do_snapshot/cli_spec.rb
 - spec/do_snapshot/command_spec.rb
@@ -158,10 +189,6 @@ test_files:
 - 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_v2_helpers.rb
-- spec/shared/environment.rb
-- spec/shared/uri_helpers.rb
 - spec/spec_helper.rb
 - spec/support/aruba.rb
 - spec/support/matchers.rb

data/spec/do_snapshot/adapter/digitalocean_v2_spec.rb

@@ -1,264 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
-
-RSpec.describe DoSnapshot::Adapter::DigitaloceanV2 do
-  include_context 'environment'
-  include_context 'api_v2_helpers'
-
-  subject(:api) { described_class }
-  subject(:log) { DoSnapshot::Log }
-
-  describe '.initialize' do
-    describe '#delay' do
-      let(:delay) { 5 }
-      let(:instance) { api.new(delay: delay) }
-      it('with custom delay') { expect(instance.delay).to eq delay }
-    end
-
-    describe '#timeout' do
-      let(:timeout) { 5 }
-      let(:instance) { api.new(timeout: timeout) }
-      it('with custom timeout') { expect(instance.timeout).to eq timeout }
-    end
-  end
-
-  describe 'droplets' do
-    let(:instance) { api.new(delay: delay, timeout: timeout) }
-    include_context 'uri_helpers'
-
-    describe '.droplet' do
-      it 'with droplet' do
-        stub_droplet(droplet_id)
-
-        instance.droplet(droplet_id)
-
-        expect(a_request(:get, droplet_url))
-          .to have_been_made
-      end
-
-      it 'with error' do
-        stub_droplet_fail(droplet_id)
-
-        expect { instance.droplet(droplet_id) }
-          .to raise_error(DoSnapshot::DropletFindError)
-        expect(DoSnapshot.logger.buffer)
-          .to include "Droplet id: #{droplet_id} Not Found"
-
-        expect(a_request(:get, droplet_url))
-          .to have_been_made
-      end
-    end
-
-    describe '.droplets' do
-      it 'with droplets' do
-        stub_droplets
-
-        instance.droplets
-
-        expect(a_request(:get, droplets_uri))
-          .to have_been_made
-      end
-
-      it 'with error' do
-        stub_droplets_fail
-
-        expect { instance.droplets }.to raise_error(DoSnapshot::DropletListError)
-        expect(DoSnapshot.logger.buffer)
-          .to include 'Droplet Listing is failed to retrieve'
-
-        expect(a_request(:get, droplets_uri))
-          .to have_been_made
-      end
-    end
-
-    describe '.start_droplet' do
-      it 'with event' do
-        stub_droplet_inactive(droplet_id)
-        stub_droplet_start(droplet_id)
-
-        instance.start_droplet(droplet_id)
-        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
-        expect(a_request(:get, droplet_url))
-          .to have_been_made
-      end
-
-      it 'with warning message' do
-        stub_droplet(droplet_id)
-
-        expect { instance.start_droplet(droplet_id) }
-          .not_to raise_error
-        expect(DoSnapshot.logger.buffer)
-          .to include "Droplet #{droplet_id} is still running. Skipping."
-
-        expect(a_request(:get, droplet_url))
-          .to have_been_made
-      end
-
-      it 'with error' do
-        stub_droplet_fail(droplet_id)
-
-        expect { instance.start_droplet(droplet_id) }
-          .to raise_error(DoSnapshot::DropletFindError)
-
-        expect(a_request(:get, droplet_url))
-          .to have_been_made
-      end
-    end
-
-    describe '.stop_droplet by power status' do
-      let(:instance) { api.new(delay: delay, timeout: timeout, stop_by: :power_status) }
-
-      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))
-          .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.'
-
-        expect(a_request(:post, droplet_stop_url))
-          .to have_been_made
-      end
-    end
-
-    describe '.stop_droplet by event' do
-      it 'with success' do
-        stub_event_done(event_id)
-        stub_droplet_stop(droplet_id)
-
-        instance.stop_droplet(droplet_id)
-
-        expect(a_request(:post, droplet_stop_url))
-          .to have_been_made
-        expect(a_request(:get, action_find_url))
-          .to have_been_made
-      end
-
-      it 'with error' do
-        stub_droplet_stop_fail(droplet_id)
-
-        expect { instance.stop_droplet(droplet_id) }
-          .to raise_error(DoSnapshot::DropletShutdownError)
-        expect(DoSnapshot.logger.buffer)
-          .to include 'Droplet id: 100823 is Failed to Power Off.'
-
-        expect(a_request(:post, droplet_stop_url))
-          .to have_been_made
-      end
-    end
-
-    describe '.create_snapshot' do
-      it 'with success' do
-        stub_event_done(event_id)
-        stub_droplet_snapshot(droplet_id, snapshot_name)
-
-        expect { instance.create_snapshot(droplet_id, snapshot_name) }
-          .not_to raise_error
-
-        expect(a_request(:post, droplet_snapshot_url))
-          .to have_been_made
-        expect(a_request(:get, action_find_url))
-          .to have_been_made
-      end
-
-      it 'with error' do
-        stub_droplet_snapshot_fail(droplet_id, snapshot_name)
-
-        expect { instance.create_snapshot(droplet_id, snapshot_name) }
-          .to raise_error(DoSnapshot::SnapshotCreateError)
-
-        expect(a_request(:post, droplet_snapshot_url))
-          .to have_been_made
-      end
-
-      it 'with event error' do
-        stub_droplet_snapshot(droplet_id, snapshot_name)
-        stub_event_fail(event_id)
-
-        expect { instance.create_snapshot(droplet_id, snapshot_name) }
-          .not_to raise_error
-        expect(DoSnapshot.logger.buffer)
-          .to include "Event id: #{event_id} is failed!"
-
-        expect(a_request(:post, droplet_snapshot_url))
-          .to have_been_made
-        expect(a_request(:get, action_find_url))
-          .to have_been_made
-      end
-    end
-
-    describe '.inactive?' do
-      it 'when inactive' do
-        stub_droplet_inactive(droplet_id)
-
-        expect(instance.inactive?(droplet_id))
-          .to be_truthy
-      end
-
-      it 'when active' do
-        stub_droplet(droplet_id)
-
-        expect(instance.inactive?(droplet_id))
-          .to be_falsey
-      end
-    end
-
-    describe '.cleanup_snapshots' do
-      it 'with success' do
-        stub_droplet(droplet_id)
-        stub_image_destroy(image_id)
-        stub_image_destroy(image_id2)
-
-        droplet = instance.droplet(droplet_id)
-        expect { instance.cleanup_snapshots(droplet, 1) }
-          .not_to raise_error
-        expect(DoSnapshot.logger.buffer)
-          .to include 'Snapshot: 5019770 delete requested.'
-
-        expect(a_request(:get, droplet_url))
-          .to have_been_made
-        expect(a_request(:delete, image_destroy_url))
-          .to have_been_made
-        expect(a_request(:delete, image_destroy2_url))
-          .to have_been_made
-      end
-
-      it 'with warning message' do
-        stub_droplet(droplet_id)
-        stub_image_destroy_fail(image_id)
-        stub_image_destroy_fail(image_id2)
-
-        droplet = instance.droplet(droplet_id)
-        expect { instance.cleanup_snapshots(droplet, 1) }
-          .not_to raise_error
-        expect(DoSnapshot.logger.buffer)
-          .to include 'Destroy of snapshot 5019903 for droplet id: 100823 name: example.com is failed.'
-
-        expect(a_request(:get, droplet_url))
-          .to have_been_made
-        expect(a_request(:delete, image_destroy_url))
-          .to have_been_made
-        expect(a_request(:delete, image_destroy2_url))
-          .to have_been_made
-      end
-    end
-  end
-end