do_snapshot 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3d032d3f0b49ab4934028b7cdf53afe136cb31d
-  data.tar.gz: 0a65ff53e0105584a803c22814837a43b30f231f
+  metadata.gz: 8803902d64a76db013fb9c2866ef0e04c79ef2de
+  data.tar.gz: 22589c3aa8c1eef2af78aefd89f6cf04b959340b
 SHA512:
-  metadata.gz: cb714515796586f65b5d3d25a19a5aa54c281297eb7a00b6b1a259711eb577265ea73194728393d15602f149eecc6300a32a1372dcd86ecd98a0026025074979
-  data.tar.gz: 42939c0a5ef8789584e6f8b6afd80c23993c07378053fded1c80effdbfbcca8038421f46e870891c4003616733ba36b7790087b1abbb851ef205a77025b4a6ef
+  metadata.gz: bcb151a013ef7ec0d78dd35132c5f9e6c9cfdce35e55ec0d918331247f63d616f330b8713d0b11101d7d503fff80d39677f1873a7d044961b0c15425726a3cc8
+  data.tar.gz: 1b300fb97331704010d0167949345fcb238296d82321e907fa62d13808816227ed2d30476d6ace14db77b7b437300dacb2a76558273927c4e92106c8dbe37f1d

data/README.md

@@ -27,7 +27,7 @@ Here some features:
 
 Ruby versions: 1.9.3 and higher. JRuby in 1.9 mode is also supported.
 
-![DoSnaphot example](https://raw.githubusercontent.com/merqlove/do_snapshot/master/assets/example.png)
+<img src="https://raw.githubusercontent.com/merqlove/do_snapshot/master/assets/example.png" style="max-width:100%" alt="DoSnaphot example">
 
 ### You can ask me, "Why you made this tool?"
 
@@ -45,7 +45,7 @@ Install it yourself as:
 
     $ gem install do_snapshot
     
-For **OSX** users ([Homebrew Tap](http://github.com/merqlove/do_snapshot/tap)):
+For **OSX** users ([Homebrew Tap](http://github.com/merqlove/homebrew-do-snapshot)):
 
     $ brew tap merqlove/do-snapshot && brew install do_snapshot
     
@@ -97,7 +97,7 @@ Keep latest 5 snapshots, send mail notification instead of creating new one:
   
     $ do_snapshot --keep 10 --stop --mail to:yourmail@example.com
     
-![DoSnapshot Safe Mode Example](https://raw.githubusercontent.com/merqlove/do_snapshot/master/assets/safe_mode.png)    
+<img src="https://raw.githubusercontent.com/merqlove/do_snapshot/master/assets/safe_mode.png" style="max-width:100%" alt="DoSnapshot Safe Mode Example">
     
 E-mail notifications disabled out of the box. 
 For working mailer you need to set e-mail settings via run options.

data/lib/do_snapshot/api.rb

@@ -117,7 +117,7 @@ module DoSnapshot
     # Before snapshot we to know that machine has powered off.
     #
     def get_event_status(id, time)
-      return true if (Time.now.to_f - time.to_f) > timeout
+      return true if (Time.now - time) > timeout
       event = Digitalocean::Event.find(id)
       fail event.message unless event.status.include?('OK')
       # noinspection RubyResolve,RubyResolve

data/lib/do_snapshot/command.rb

@@ -31,9 +31,9 @@ module DoSnapshot
       protected
 
       attr_accessor :droplets, :exclude, :only
-      attr_accessor :keep, :quiet, :stop, :clean
+      attr_accessor :keep, :quiet, :stop, :clean, :timeout, :delay
 
-      attr_writer :notify, :delay, :timeout, :threads, :api
+      attr_writer :notify, :threads, :api
 
       def api
         @api ||= API.new(delay: delay, timeout: timeout)
@@ -47,14 +47,6 @@ module DoSnapshot
         @threads ||= []
       end
 
-      def timeout
-        @timeout ||= 600
-      end
-
-      def delay
-        @delay ||= 10
-      end
-
       # Working with list of droplets.
       #
       def work_with_droplets
@@ -80,6 +72,7 @@ module DoSnapshot
           next if exclude.include? id
           next if !only.empty? && !only.include?(id)
 
+          Log.debug "Droplet id: #{id} name: #{droplet.name} "
           instance = api.droplet id
 
           prepare_instance instance.droplet

data/lib/do_snapshot/log.rb

@@ -35,7 +35,11 @@ module DoSnapshot
         buffer << message
         logger.send(type, message) if logger
 
-        say message, color(type) unless (type == :debug && !verbose) || quiet
+        say message, color(type) unless print?(type)
+      end
+
+      def print?(type)
+        (type == :debug && !verbose) || quiet
       end
 
       def say(message, color)

data/lib/do_snapshot/version.rb

@@ -2,5 +2,5 @@
 # Current version
 #
 module DoSnapshot
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/spec/do_snapshot/api_spec.rb

@@ -210,10 +210,6 @@ describe DoSnapshot::API do
         .to have_been_made
       end
     end
-
-    after(:all) do
-      WebMock.reset!
-    end
   end
 
   before(:each) do

data/spec/do_snapshot/command_spec.rb

@@ -46,30 +46,23 @@ describe DoSnapshot::Command do
       end
     end
 
-    # TODO: MUST HAVE! Now when this two works others can fail...
-    # I think it's threading problem with RSpec
-    # context 'when droplet failed for shutdown' do
-    #   it 'raised with error' do
-    #     fail = stub_droplet_stop_fail(droplet_id)
-    #
-    #     expect { snap_runner }
-    #       .to raise_error(DoSnapshot::DropletShutdownError)
-    #
-    #     remove_request_stub(fail)
-    #   end
-    # end
-
-    # context 'when no snapshot created' do
-    #   it 'raised with error' do
-    #     # no_snapshot =
-    #         stub_droplet_snapshot_fail(droplet_id, snapshot_name)
-    #
-    #     expect { snap_runner }
-    #       .to raise_error(DoSnapshot::SnapshotCreateError)
-    #
-    #     # remove_request_stub(no_snapshot)
-    #   end
-    # end
+    context 'when droplet failed for shutdown' do
+      it 'raised with error' do
+        stub_droplet_stop_fail(droplet_id)
+
+        expect { snap_runner }
+          .to raise_error(DoSnapshot::DropletShutdownError)
+      end
+    end
+
+    context 'when no snapshot created' do
+      it 'raised with error' do
+        stub_droplet_snapshot_fail(droplet_id, snapshot_name)
+
+        expect { snap_runner }
+          .to raise_error(DoSnapshot::SnapshotCreateError)
+      end
+    end
   end
 
   describe  '.fail_power_off' do
@@ -106,7 +99,6 @@ describe DoSnapshot::Command do
   end
 
   before(:each) do
-    # @cmd = DoSnapshot::Command
     stub_all_api(nil, true)
     log.buffer = %w()
     log.verbose = false
@@ -115,6 +107,7 @@ describe DoSnapshot::Command do
 
   def snap_runner(options = nil)
     options ||= default_options
+    cmd.send('api=', nil)
     cmd.snap(options, [:log, :mail, :smtp, :trace, :digital_ocean_client_id, :digital_ocean_api_key])
   end
 end

data/spec/shared/environment.rb

@@ -12,7 +12,7 @@ shared_context 'spec' do
   let(:image_id2)          { '5019903' }
   let(:cli_keys)           { Thor::CoreExt::HashWithIndifferentAccess.new(digital_ocean_client_id: 'NOTFOO', digital_ocean_client_bar: 'NOTBAR') }
   let(:snapshot_name)      { "foo_#{DateTime.now.strftime('%Y_%m_%d')}" }
-  let(:default_options)    { Hash[only: %w( 100823 ), exclude: %w(), keep: 3, trace: true, clean: true, delay: 0, timeout: 600, droplets: nil, threads: []] }
+  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(:no_exclude)         { [] }
   let(:exclude)            { %w( 100824 100825 ) }
   let(:no_only)            { [] }
@@ -88,12 +88,7 @@ shared_context 'spec' do
     WebMock.reset!
   end
 
-  after(:all) do
-    # sleep(1)
-  end
-
   before(:each) do
-    # stub_cleanup
     ENV['DIGITAL_OCEAN_API_KEY']   = api_key
     ENV['DIGITAL_OCEAN_CLIENT_ID'] = client_key
   end

metadata

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