do_snapshot 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd8a67c728fd77180645b3ea87ee37db50ab627e
-  data.tar.gz: e3196ed56ad208a890c3be2f55bb02cb7499a06f
+  metadata.gz: d5378c837dccf17028be844060295b82be0349b8
+  data.tar.gz: 4c548fa5590fb87b696c7dba43a6fa5330e2dc32
 SHA512:
-  metadata.gz: 1f91dd0dc2e68e03eb59a48e7e2077893d2d4574d6f2fc2900070adcaa1c9c580b9d001ece9283d34da67fdbe4ec93e0ed8894d0f74e446b774f3837ed4f1a44
-  data.tar.gz: 7a27ff1d46bc31ffd257ae77f0e474408172d4dc6dd755615215dedf280e842f88c1fe543b099ca522bf552a8ec070744d4d7ee661a712638e9d0211495aafbb
+  metadata.gz: f97a8affb32bd8e371df9ec8646cc46ac6ef66f624bc9939bc156a6ce703b7055096ab0b4cfc15c1c162e25a55abf333578ce977bb0afdaee6ca662dfa11b643
+  data.tar.gz: b67bd75db1fe228f4e1cbd624a5ba4b2fa0f3e0c8e827e1cdcac2f8af38dab941bfb68f970a8ff2b9faaf097acb5fef9c62e33ee3d65c97a60217d6b54001bf7

data/lib/do_snapshot/cli.rb

@@ -26,8 +26,6 @@ module DoSnapshot
       %w( digital_ocean_client_id digital_ocean_api_key ).each do |key|
         ENV[key.upcase] = options[key] if options.include? key
       end
-
-      try_keys_first
     end
 
     desc 'c / s / snap / create', 'DEFAULT. Create and cleanup snapshot\'s'
@@ -137,6 +135,7 @@ module DoSnapshot
                   desc: 'DIGITAL_OCEAN_API_KEY. if you can\'t use environment.'
 
     def snap
+      try_keys_first
       Command.load_options options, %w( log mail smtp trace digital_ocean_client_id digital_ocean_api_key )
       Command.snap
     rescue => e
@@ -188,7 +187,7 @@ module DoSnapshot
       def try_keys_first
         Log.debug 'Checking DigitalOcean Id\'s.'
         %w( DIGITAL_OCEAN_CLIENT_ID DIGITAL_OCEAN_API_KEY ).each do |key|
-          Log.fail Thor::Error, "You must have #{key} in environment or set it via options." if !ENV[key] || ENV[key].empty?
+          Log.error "You must have #{key} in environment or set it via options." if ENV[key].blank?
         end
       end
     end

data/lib/do_snapshot/version.rb

@@ -2,5 +2,5 @@
 # Current version
 #
 module DoSnapshot
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

data/spec/do_snapshot/cli_spec.rb

@@ -8,182 +8,212 @@ describe DoSnapshot::CLI do
   subject(:command) { DoSnapshot::Command }
   subject(:api)     { DoSnapshot::API }
 
-  describe '.snap' do
-    it 'with exclude' do
-      excluded_droplets = %w( 100824 )
-      stub_all_api(%w(100825 100823))
-      hash_attribute_eq_no_stub(exclude: excluded_droplets, only: %w())
-
-      expect(command.send('exclude'))
-        .to eq excluded_droplets
+  describe '.initialize' do
+    it 'with args & options' do
+      dev_null do
+        cli_obj = cli.new(%w(help snap), cli_keys)
+        expect(cli_obj.args)
+          .to include('help')
+        expect(cli_obj.options)
+          .to include('digital_ocean_client_id')
+      end
     end
+  end
 
-    it 'with only' do
-      selected_droplets = %w( 100823 )
-      stub_all_api(selected_droplets)
-      hash_attribute_eq_no_stub(only: selected_droplets)
+  context 'commands' do
+    context '.snap' do
+      it 'with exclude' do
+        excluded_droplets = %w( 100824 )
+        stub_all_api(%w(100825 100823))
+        hash_attribute_eq_no_stub(exclude: excluded_droplets, only: %w())
 
-      expect(command.send('only'))
-        .to eq selected_droplets
-    end
+        expect(command.send('exclude'))
+          .to eq excluded_droplets
+      end
+
+      it 'with only' do
+        selected_droplets = %w( 100823 )
+        stub_all_api(selected_droplets)
+        hash_attribute_eq_no_stub(only: selected_droplets)
+
+        expect(command.send('only'))
+          .to eq selected_droplets
+      end
+
+      it 'with 1 delay' do
+        set_api_attribute(delay: 1, timeout: timeout)
+        attribute_eq 'delay', 1
+      end
+
+      it 'with 0 delay' do
+        set_api_attribute(delay: 0, timeout: timeout)
+        attribute_eq 'delay', 0
+      end
+
+      it 'with custom timeout' do
+        set_api_attribute(timeout: 1, delay: delay)
+        attribute_eq 'timeout', 1
+      end
+
+      it 'with keep' do
+        attribute_eq 'keep', 7
+      end
+
+      it 'with quiet' do
+        attribute_eq 'quiet', true
+      end
+
+      it 'with no quiet' do
+        attribute_eq 'quiet', false
+      end
+
+      it 'with stop' do
+        attribute_eq 'stop', true
+      end
 
-    it 'with 1 delay' do
-      set_api_attribute(delay: 1, timeout: timeout)
-      attribute_eq 'delay', 1
-    end
+      it 'with no stop' do
+        attribute_eq 'stop', false
+      end
+
+      it 'with clean' do
+        attribute_eq 'clean', true
+      end
 
-    it 'with 0 delay' do
-      set_api_attribute(delay: 0, timeout: timeout)
-      attribute_eq 'delay', 0
-    end
+      it 'with no clean' do
+        attribute_eq 'clean', false
+      end
 
-    it 'with custom timeout' do
-      set_api_attribute(timeout: 1, delay: delay)
-      attribute_eq 'timeout', 1
-    end
+      it 'with digital ocean credentials' do
+        with_hash_attribute_eq(cli_keys)
+      end
 
-    it 'with keep' do
-      attribute_eq 'keep', 7
-    end
+      it 'with no digital ocean credentials' do
+        without_hash_attribute_eq(cli_keys)
+      end
 
-    it 'with quiet' do
-      attribute_eq 'quiet', true
-    end
+      it 'with mail' do
+        hash_attribute_eq(mail_options)
+      end
 
-    it 'with no quiet' do
-      attribute_eq 'quiet', false
-    end
+      it 'with no mail' do
+        without_hash_attribute_eq(mail_options)
+      end
 
-    it 'with stop' do
-      attribute_eq 'stop', true
-    end
+      it 'with smtp' do
+        hash_attribute_eq(smtp_options)
+      end
 
-    it 'with no stop' do
-      attribute_eq 'stop', false
-    end
+      it 'with no smtp' do
+        without_hash_attribute_eq(smtp_options)
+      end
 
-    it 'with clean' do
-      attribute_eq 'clean', true
-    end
+      it 'with log' do
+        hash_attribute_eq(log)
+      end
 
-    it 'with no clean' do
-      attribute_eq 'clean', false
+      it 'with no log' do
+        without_hash_attribute_eq(log)
+      end
     end
 
-    it 'with digital ocean credentials' do
-      with_hash_attribute_eq(cli_keys)
-    end
+    context '.version' do
+      it 'shows the correct version' do
+        @cli.options = @cli.options.merge(version: true)
+        @cli.version
 
-    it 'with no digital ocean credentials' do
-      without_hash_attribute_eq(cli_keys)
+        expect($stdout.string.chomp)
+          .to eq("#{DoSnapshot::VERSION}")
+      end
     end
 
-    it 'with mail' do
-      hash_attribute_eq(mail_options)
-    end
+    context '.help' do
+      it 'shows a help message' do
+        @cli.help
+        expect($stdout.string)
+          .to match('Commands:')
+      end
 
-    it 'with no mail' do
-      without_hash_attribute_eq(mail_options)
-    end
+      it 'shows a help message for specific commands' do
+        @cli.help 'snap'
+        expect($stdout.string)
+          .to match('Usage:')
+      end
 
-    it 'with smtp' do
-      hash_attribute_eq(smtp_options)
+      it 'without API keys' do
+        reset_api_keys
+        cli.new.help
+        expect($stdout.string)
+          .not_to match('You must have DIGITAL_OCEAN_CLIENT_ID in environment')
+        set_api_keys
+      end
     end
 
-    it 'with no smtp' do
-      without_hash_attribute_eq(smtp_options)
-    end
+    def attribute_eq(name, value)
+      stub_all_api
+      options = default_options.merge!(:"#{name}" => value)
+      @cli.options = @cli.options.merge(options)
+      @cli.snap
 
-    it 'with log' do
-      hash_attribute_eq(log)
+      expect(command.send(name))
+        .to eq value
     end
 
-    it 'with no log' do
-      without_hash_attribute_eq(log)
+    def hash_attribute_eq(hash)
+      stub_all_api
+      options = default_options.merge!(hash)
+      @cli.options = @cli.options.merge(options)
+      @cli.snap
     end
-  end
-
-  describe '.version' do
-    it 'shows the correct version' do
-      @cli.options = @cli.options.merge(version: true)
-      @cli.version
 
-      expect($stdout.string.chomp)
-        .to eq("#{DoSnapshot::VERSION}")
+    def with_hash_attribute_eq(hash)
+      hash_attribute_eq hash
+      expect(@cli.options)
+        .to include(hash)
     end
-  end
 
-  describe '.help' do
-    it 'shows a help message' do
-      @cli.help
-      expect($stdout.string)
-        .to match('Commands:')
+    def without_hash_attribute_eq(hash)
+      hash_attribute_eq({})
+      expect(@cli.options)
+        .not_to include(hash)
     end
 
-    it 'shows a help message for specific commands' do
-      @cli.help 'snap'
-      expect($stdout.string)
-        .to match('Usage:')
+    def hash_attribute_eq_no_stub(hash)
+      options = default_options.merge!(hash)
+      @cli.options = @cli.options.merge(options)
+      @cli.snap
     end
-  end
-
-  def attribute_eq(name, value)
-    stub_all_api
-    options = default_options.merge!(:"#{name}" => value)
-    @cli.options = @cli.options.merge(options)
-    @cli.snap
-
-    expect(command.send(name))
-      .to eq value
-  end
-
-  def hash_attribute_eq(hash)
-    stub_all_api
-    options = default_options.merge!(hash)
-    @cli.options = @cli.options.merge(options)
-    @cli.snap
-  end
-
-  def with_hash_attribute_eq(hash)
-    hash_attribute_eq hash
-    expect(@cli.options)
-      .to include(hash)
-  end
-
-  def without_hash_attribute_eq(hash)
-    hash_attribute_eq({})
-    expect(@cli.options)
-      .not_to include(hash)
-  end
 
-  def hash_attribute_eq_no_stub(hash)
-    options = default_options.merge!(hash)
-    @cli.options = @cli.options.merge(options)
-    @cli.snap
-  end
+    def set_api_attribute(options = { delay: delay, timeout: timeout }) # rubocop:disable Style/AccessorMethodName
+      command.send('api=', api.new(options))
+    end
 
-  def set_api_attribute(options = { delay: delay, timeout: timeout }) # rubocop:disable Style/AccessorMethodName
-    command.send('api=', api.new(options))
-  end
+    before(:each) do
+      $stdout.sync = true
+      $stderr.sync = true
 
-  before(:each) do
-    $stdout.sync = true
-    $stderr.sync = true
+      @cli = cli.new
 
-    @cli = cli.new
+      # Keep track of the old stderr / out
+      @orig_stderr = $stderr
+      @orig_stdout = $stdout
 
-    # Keep track of the old stderr / out
-    @orig_stderr = $stderr
-    @orig_stdout = $stdout
+      # Make them strings so we can manipulate and compare.
+      $stderr = StringIO.new
+      $stdout = StringIO.new
+    end
 
-    # Make them strings so we can manipulate and compare.
-    $stderr = StringIO.new
-    $stdout = StringIO.new
+    after(:each) do
+      # Reassign the stderr / out so rspec can have it back.
+      $stderr = @orig_stderr
+      $stdout = @orig_stdout
+    end
   end
 
-  after(:each) do
-    # Reassign the stderr / out so rspec can have it back.
-    $stderr = @orig_stderr
-    $stdout = @orig_stdout
+  def dev_null
+    orig_stdout = $stdout.dup # does a dup2() internally
+    $stdout.reopen('/dev/null', 'w')
+    yield
+  ensure
+    $stdout.reopen(orig_stdout)
   end
 end

data/spec/shared/environment.rb

@@ -84,12 +84,21 @@ shared_context 'spec' do
     end
   end
 
+  def reset_api_keys
+    ENV['DIGITAL_OCEAN_API_KEY']   = nil
+    ENV['DIGITAL_OCEAN_CLIENT_ID'] = nil
+  end
+
+  def set_api_keys
+    ENV['DIGITAL_OCEAN_API_KEY']   = api_key
+    ENV['DIGITAL_OCEAN_CLIENT_ID'] = client_key
+  end
+
   before(:all) do
     WebMock.reset!
   end
 
   before(:each) do
-    ENV['DIGITAL_OCEAN_API_KEY']   = api_key
-    ENV['DIGITAL_OCEAN_CLIENT_ID'] = client_key
+    set_api_keys
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: do_snapshot
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Alexander Merkulov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digitalocean
@@ -52,160 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.7
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.24'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.24'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.18'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: s3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Snapshot creator for Digital Ocean droplets. Multi-threading inside.
   Auto-cleanup feature. No matter how much droplets you have. Cron optimized.
 email: