do_snapshot 0.0.15 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daa05c7961b1c4dbf9275fb6242817289a52f9c8
-  data.tar.gz: fc001ff0e7c71e660220972f9494106d1293e162
+  metadata.gz: 25e673a7db69593b0007d27f55f873b12b2efad6
+  data.tar.gz: 159359c4f15b5a85163b660b84e994c742f3cccd
 SHA512:
-  metadata.gz: a1fd3c4e7b308883ffd689aadfaed8cc45295879ad471636ce0735e63f3e426387caca44ed110f5de6fc3190871f953c11cafd27121e45038c4bf7aa51bd1dc1
-  data.tar.gz: 754e0414a459cc7125ca7991068cde13f3e12cfe82adbd8c07ad62f9d07ab6cd662c1a5a2a794b1320993d3fee816813163548304e5dd268767e2625a606cf52
+  metadata.gz: bb017632d9bdcff73d39310c7d5754fd0579f3975d23f6e16824797e3cf2afc7dfeeb041d645db05df370e1dd45b37842b4150d0f02d5e9158a8577d8e51c566
+  data.tar.gz: 1ef277c08b234bc7925d9e797c85c1e3179d475512ee8debe4159bc4ec818ac274e596e30643f7c2551e92f46451ff5f9d748f86a3113e1ada5766084af401c0

data/lib/do_snapshot/adapter/abstract.rb

@@ -6,10 +6,11 @@ module DoSnapshot
     # Operating with Digital Ocean.
     #
     class Abstract
-      attr_accessor :delay
-      attr_accessor :timeout
+      include DoSnapshot::Log
 
-      def initialize(options)
+      attr_accessor :delay, :timeout
+
+      def initialize(options = {})
         check_keys
         set_id
         options.each_pair do |key, option|
@@ -25,18 +26,18 @@ module DoSnapshot
 
       # Waiting for event exit
       def wait_event(id)
-        Log.debug "Event Id: #{id}"
+        log.debug "Event Id: #{id}"
         time = Time.now
         sleep(delay) until get_event_status(id, time)
       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."
+          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
+          log.error event.message
         else
-          Log.debug "Snapshot name: #{snapshot.name} delete requested."
+          log.debug "Snapshot name: #{snapshot.name} delete requested."
         end
       end
     end

data/lib/do_snapshot/adapter/digitalocean.rb

@@ -36,7 +36,7 @@ module DoSnapshot
         instance = droplet(id)
 
         if instance.status.include? 'active'
-          Log.error 'Droplet is still running.'
+          log.error 'Droplet is still running.'
         else
           power_on id
         end
@@ -74,7 +74,7 @@ module DoSnapshot
 
       # Cleanup our snapshots.
       #
-      def cleanup_snapshots(instance, size) # rubocop:disable MethodLength
+      def cleanup_snapshots(instance, size)
         (0..size).each do |i|
           # noinspection RubyResolve
           snapshot = instance.snapshots[i]
@@ -85,9 +85,9 @@ module DoSnapshot
       end
 
       def check_keys
-        Log.debug 'Checking DigitalOcean Id\'s.'
+        log.debug 'Checking DigitalOcean Id\'s.'
         %w( DIGITAL_OCEAN_CLIENT_ID DIGITAL_OCEAN_API_KEY ).each do |key|
-          Log.error "You must have #{key} in environment or set it via options." if ENV[key].blank?
+          log.error "You must have #{key} in environment or set it via options." if ENV[key].blank?
         end
       end
 
@@ -96,7 +96,7 @@ module DoSnapshot
       # Set id's of Digital Ocean API.
       #
       def set_id
-        Log.debug 'Setting DigitalOcean Id\'s.'
+        log.debug 'Setting DigitalOcean Id\'s.'
         ::DigitaloceanC.client_id = ENV['DIGITAL_OCEAN_CLIENT_ID']
         ::DigitaloceanC.api_key = ENV['DIGITAL_OCEAN_API_KEY']
       end
@@ -105,10 +105,7 @@ module DoSnapshot
       # Before snapshot we to know that machine has powered off.
       #
       def get_event_status(id, time)
-        if (Time.now - time) > @timeout
-          Log.debug "Event #{id} finished by timeout #{time}"
-          return true
-        end
+        return true if timeout?(id, time)
 
         event = ::DigitaloceanC::Event.find(id)
         fail event.message unless event.status.include?('OK')
@@ -116,6 +113,12 @@ module DoSnapshot
         event.event.percentage && event.event.percentage.include?('100') ? true : false
       end
 
+      def timeout?(id, time)
+        return false unless (Time.now - time) > @timeout
+        log.debug "Event #{id} finished by timeout #{time}"
+        true
+      end
+
       # Request Power On for droplet
       #
       def power_on(id)
@@ -123,9 +126,9 @@ module DoSnapshot
         event = ::DigitaloceanC::Droplet.power_on(id)
         case event && event.status
         when 'OK'
-          Log.info 'Power On has been requested.'
+          log.info 'Power On has been requested.'
         else
-          Log.error 'Power On failed to request.'
+          log.error 'Power On failed to request.'
         end
       end
     end

data/lib/do_snapshot/adapter/digitalocean_v2.rb

@@ -42,7 +42,7 @@ module DoSnapshot
         instance = droplet(id)
 
         if instance.status && instance.status.include?('active')
-          Log.error 'Droplet is still running.'
+          log.error 'Droplet is still running.'
         else
           power_on id
         end
@@ -74,14 +74,14 @@ module DoSnapshot
 
       # Cleanup our snapshots.
       #
-      def cleanup_snapshots(instance, size) # rubocop:disable MethodLength
+      def cleanup_snapshots(instance, size)
         (0..size).each do |i|
           # noinspection RubyResolve
           snapshot = instance.snapshot_ids[i]
           event = client.images.delete(id: snapshot)
 
           unless event.is_a?(TrueClass)
-            Log.debug event
+            log.debug event
             event = false
           end
 
@@ -90,16 +90,16 @@ module DoSnapshot
       end
 
       def check_keys
-        Log.debug 'Checking DigitalOcean Access Token.'
+        log.debug 'Checking DigitalOcean Access Token.'
         %w( DIGITAL_OCEAN_ACCESS_TOKEN ).each do |key|
-          Log.error "You must have #{key} in environment or set it via options." if ENV[key].blank?
+          log.error "You must have #{key} in environment or set it via options." if ENV[key].blank?
         end
       end
 
       # Set id's of Digital Ocean API.
       #
       def set_id
-        Log.debug 'Setting DigitalOcean Access Token.'
+        log.debug 'Setting DigitalOcean Access Token.'
         @client = ::DropletKit::Client.new(access_token: ENV['DIGITAL_OCEAN_ACCESS_TOKEN'])
       end
 
@@ -107,9 +107,9 @@ module DoSnapshot
 
       def after_cleanup(droplet_id, droplet_name, snapshot, event)
         if !event
-          Log.error "Destroy of snapshot #{snapshot} for droplet id: #{droplet_id} name: #{droplet_name} is failed."
+          log.error "Destroy of snapshot #{snapshot} for droplet id: #{droplet_id} name: #{droplet_name} is failed."
         else
-          Log.debug "Snapshot: #{snapshot} delete requested."
+          log.debug "Snapshot: #{snapshot} delete requested."
         end
       end
 
@@ -118,7 +118,7 @@ module DoSnapshot
       #
       def get_event_status(id, time)
         if (Time.now - time) > @timeout
-          Log.debug "Event #{id} finished by timeout #{time}"
+          log.debug "Event #{id} finished by timeout #{time}"
           return true
         end
 
@@ -135,9 +135,9 @@ module DoSnapshot
         # noinspection RubyResolve
         event = client.droplet_actions.power_on(droplet_id: id)
         if event.status.include?('in-progress')
-          Log.info 'Power On has been requested.'
+          log.info 'Power On has been requested.'
         else
-          Log.error 'Power On failed to request.'
+          log.error 'Power On failed to request.'
         end
       end
     end

data/lib/do_snapshot/cli.rb

@@ -1,14 +1,17 @@
 # -*- encoding : utf-8 -*-
 require 'thor'
 require 'do_snapshot'
-require_relative 'command'
-require_relative 'mail'
 require_relative 'log'
+require_relative 'mail'
+require_relative 'command'
 
 module DoSnapshot
   # CLI is here
   #
   class CLI < Thor # rubocop:disable ClassLength
+    include DoSnapshot::Log
+    include DoSnapshot::Mail
+
     default_task :snap
 
     map %w( c s create )  => :snap
@@ -154,11 +157,10 @@ module DoSnapshot
                   desc: 'DIGITAL_OCEAN_API_KEY. if you can\'t use environment.'
 
     def snap
-      Command.load_options options, %w( log mail smtp trace digital_ocean_client_id digital_ocean_api_key digital_ocean_access_token )
-      Command.snap
+      command.snap
     rescue => e
-      Command.fail_power_off(e) if [SnapshotCreateError, DropletShutdownError].include?(e.class)
-      Log.error e.message
+      command.fail_power_off(e) if [SnapshotCreateError, DropletShutdownError].include?(e.class)
+      log.error e.message
       backtrace(e) if options.include? 'trace'
       send_error
     end
@@ -169,22 +171,30 @@ module DoSnapshot
     end
 
     no_commands do
+      def command
+        @command ||= Command.new(options,
+                                 %w( log smtp mail trace digital_ocean_client_id digital_ocean_api_key digital_ocean_access_token ))
+      end
+
+      def update_command
+        command.load_options(options,
+                             %w( log smtp mail trace digital_ocean_client_id digital_ocean_api_key digital_ocean_access_token ))
+      end
+
       def set_mailer
-        Mail.opts = options['mail']
-        Mail.smtp = options['smtp']
+        Mail.load_options(opts: options['mail'], smtp: options['smtp'])
       end
 
       def send_error
-        return unless Mail.opts
+        return unless mailer.opts
 
         Mail.opts[:subject] = 'Digital Ocean: Error.'
         Mail.opts[:body] = 'Please check your droplets.'
-        Mail.notify
+        mailer.notify
       end
 
       def set_logger
-        Log.quiet = options['quiet']
-        Log.verbose = options['trace']
+        Log.load_options(quiet: options['quiet'], verbose: options['trace'])
         # Use Thor shell
         Log.shell = shell unless options['quiet']
         init_logger if options.include?('log')
@@ -197,7 +207,7 @@ module DoSnapshot
 
       def backtrace(e)
         e.backtrace.each do |t|
-          Log.error t
+          log.error t
         end
       end
     end

data/lib/do_snapshot/command.rb

@@ -5,167 +5,179 @@ module DoSnapshot
   # Our commands live here :)
   #
   class Command # rubocop:disable ClassLength
-    class << self
-      def snap
-        Log.info 'Start performing operations'
-        work_with_droplets
-        Log.info 'All operations has been finished.'
+    include DoSnapshot::Log
+    include DoSnapshot::Mail
 
-        Mail.notify if notify && !quiet
-      end
+    def initialize(*args)
+      load_options(*args)
+    end
 
-      def load_options(options = {}, skip = %w())
-        options.each_pair do |key, option|
-          send("#{key}=", option) unless skip.include?(key)
-        end if options
-      end
+    def snap
+      log.info 'Start performing operations'
+      work_with_droplets
+      log.info 'All operations has been finished.'
 
-      def fail_power_off(e)
-        return unless e && e.id
-        api.start_droplet(e.id)
-      rescue
-        raise DropletFindError, e.message, e.backtrace
-      end
+      mailer.notify if notify && !quiet
+    end
+
+    def fail_power_off(e)
+      return unless e && e.id
+      api.start_droplet(e.id)
+    rescue
+      raise DropletFindError, e.message, e.backtrace
+    end
+
+    def load_options(options = {}, skip = %w())
+      reset_options
+      options.each_pair do |key, option|
+        send("#{key}=", option) unless skip.include?(key)
+      end if options
+    end
 
-      def stop_droplet(droplet)
-        Log.debug 'Shutting down droplet.'
-        api.stop_droplet(droplet.id) unless droplet.status.include? 'off'
+    def reset_options
+      %i(droplets exclude only keep quiet stop clean timeout delay protocol threads api).each do |key|
+        send("#{key}=", nil)
       end
+    end
 
-      # Trying to create a snapshot.
-      #
-      def create_snapshot(droplet) # rubocop:disable MethodLength,Metrics/AbcSize
-        Log.info "Start creating snapshot for droplet id: #{droplet.id} name: #{droplet.name}."
+    def stop_droplet(droplet)
+      log.debug 'Shutting down droplet.'
+      api.stop_droplet(droplet.id) unless droplet.status.include? 'off'
+    end
 
-        today         = DateTime.now
-        name          = "#{droplet.name}_#{today.strftime('%Y_%m_%d')}"
-        # noinspection RubyResolve
-        snapshot_size = api.snapshots(droplet).size
+    # Trying to create a snapshot.
+    #
+    def create_snapshot(droplet) # rubocop:disable MethodLength,Metrics/AbcSize
+      log.info "Start creating snapshot for droplet id: #{droplet.id} name: #{droplet.name}."
 
-        Log.debug 'Wait until snapshot will be created.'
+      today         = DateTime.now
+      name          = "#{droplet.name}_#{today.strftime('%Y_%m_%d')}"
+      # noinspection RubyResolve
+      snapshot_size = api.snapshots(droplet).size
 
-        api.create_snapshot droplet.id, name
+      log.debug 'Wait until snapshot will be created.'
 
-        snapshot_size += 1
+      api.create_snapshot droplet.id, name
 
-        Log.info "Snapshot name: #{name} created successfully."
-        Log.info "Droplet id: #{droplet.id} name: #{droplet.name} snapshots: #{snapshot_size}."
+      snapshot_size += 1
 
-        # Cleanup snapshots.
-        cleanup_snapshots droplet, snapshot_size if clean
-      rescue => e
-        case e.class.to_s
-        when 'DoSnapshot::SnapshotCleanupError'
-          raise e.class, e.message, e.backtrace
-        else
-          raise SnapshotCreateError.new(droplet.id), e.message, e.backtrace
-        end
-      end
+      log.info "Snapshot name: #{name} created successfully."
+      log.info "Droplet id: #{droplet.id} name: #{droplet.name} snapshots: #{snapshot_size}."
 
-      def api
-        @api ||= DoSnapshot::Adapter.api(protocol, delay: delay, timeout: timeout)
+      # Cleanup snapshots.
+      cleanup_snapshots droplet, snapshot_size if clean
+    rescue => e
+      case e.class.to_s
+      when 'DoSnapshot::SnapshotCleanupError'
+        raise e.class, e.message, e.backtrace
+      else
+        raise SnapshotCreateError.new(droplet.id), e.message, e.backtrace
       end
+    end
 
-      protected
+    def api
+      @api ||= DoSnapshot::Adapter.api(protocol, delay: delay, timeout: timeout)
+    end
 
-      attr_accessor :droplets, :exclude, :only
-      attr_accessor :keep, :quiet, :stop, :clean, :timeout, :delay, :protocol
+    protected
 
-      attr_writer :notify, :threads, :api
+    attr_accessor :droplets, :exclude, :only
+    attr_accessor :keep, :quiet, :stop, :clean, :timeout, :delay, :protocol
 
-      def notify
-        @notify ||= false
-      end
+    attr_writer :threads, :api
 
-      def threads
-        @threads ||= []
-      end
+    def notify
+      @notify ||= false
+    end
 
-      # Working with list of droplets.
-      #
-      def work_with_droplets
-        load_droplets
-        dispatch_droplets
-        Log.debug 'Working with list of DigitalOcean droplets'
-        thread_chain
-      end
+    def threads
+      @threads ||= []
+    end
 
-      # Getting droplets list from API.
-      # And store into object.
-      #
-      def load_droplets
-        Log.debug 'Loading list of DigitalOcean droplets'
-        self.droplets = api.droplets
-      end
+    # Working with list of droplets.
+    #
+    def work_with_droplets
+      load_droplets
+      dispatch_droplets
+      log.debug 'Working with list of DigitalOcean droplets'
+      thread_chain
+    end
 
-      # Dispatch received droplets, each by each.
-      #
-      def dispatch_droplets
-        droplets.each do |droplet|
-          id = droplet.id.to_s
-          next if exclude.include? id
-          next unless only.empty? || only.include?(id)
+    # Getting droplets list from API.
+    # And store into object.
+    #
+    def load_droplets
+      log.debug 'Loading list of DigitalOcean droplets'
+      self.droplets = api.droplets
+    end
 
-          prepare_droplet id, droplet.name
-        end
-      end
+    # Dispatch received droplets, each by each.
+    #
+    def dispatch_droplets
+      droplets.each do |droplet|
+        id = droplet.id.to_s
+        next if exclude.include? id
+        next unless only.empty? || only.include?(id)
 
-      # Join threads
-      #
-      def thread_chain
-        threads.each(&:join)
+        prepare_droplet id, droplet.name
       end
+    end
 
-      # Run threads
-      #
-      def thread_runner(droplet)
-        threads << Thread.new do
-          stop_droplet droplet
-          create_snapshot droplet
-        end
-      end
+    # Join threads
+    #
+    def thread_chain
+      threads.each(&:join)
+    end
 
-      # Preparing droplet to take a snapshot.
-      # Droplet instance must be powered off first!
-      #
-      def prepare_droplet(id, name)
-        Log.debug "Droplet id: #{id} name: #{name} "
-        droplet = api.droplet id
-
-        return unless droplet
-        Log.info "Preparing droplet id: #{droplet.id} name: #{droplet.name} to take snapshot."
-        return if too_much_snapshots(droplet)
-        thread_runner(droplet)
+    # Run threads
+    #
+    def thread_runner(droplet)
+      threads << Thread.new do
+        stop_droplet droplet
+        create_snapshot droplet
       end
+    end
 
-      def too_much_snapshots(instance)
-        # noinspection RubyResolve
-        return false unless api.snapshots(instance).size >= keep
-        warning_size(instance.id, instance.name, keep)
-        stop ? true : false
-      end
+    # Preparing droplet to take a snapshot.
+    # Droplet instance must be powered off first!
+    #
+    def prepare_droplet(id, name)
+      log.debug "Droplet id: #{id} name: #{name} "
+      droplet = api.droplet id
+
+      return unless droplet
+      log.info "Preparing droplet id: #{droplet.id} name: #{droplet.name} to take snapshot."
+      return if too_much_snapshots(droplet)
+      thread_runner(droplet)
+    end
+
+    def too_much_snapshots(instance)
+      # noinspection RubyResolve
+      return false unless api.snapshots(instance).size >= keep
+      warning_size(instance.id, instance.name, keep)
+      stop ? true : false
+    end
 
-      # Cleanup our snapshots.
-      #
-      def cleanup_snapshots(droplet, size) # rubocop:disable Metrics/AbcSize
-        return unless size > keep
+    # Cleanup our snapshots.
+    #
+    def cleanup_snapshots(droplet, size) # rubocop:disable Metrics/AbcSize
+      return unless size > keep
 
-        warning_size(droplet.id, droplet.name, size)
+      warning_size(droplet.id, droplet.name, size)
 
-        Log.debug "Cleaning up snapshots for droplet id: #{droplet.id} name: #{droplet.name}."
+      log.debug "Cleaning up snapshots for droplet id: #{droplet.id} name: #{droplet.name}."
 
-        api.cleanup_snapshots(droplet, size - keep - 1)
-      rescue => e
-        raise SnapshotCleanupError, e.message, e.backtrace
-      end
+      api.cleanup_snapshots(droplet, size - keep - 1)
+    rescue => e
+      raise SnapshotCleanupError, e.message, e.backtrace
+    end
 
-      # Helpers
-      #
-      def warning_size(id, name, keep)
-        message = "For droplet with id: #{id} and name: #{name} the maximum number #{keep} of snapshots is reached."
-        Log.warning message
-        self.notify = true
-      end
+    # Helpers
+    #
+    def warning_size(id, name, keep)
+      message = "For droplet with id: #{id} and name: #{name} the maximum number #{keep} of snapshots is reached."
+      log.warn message
+      @notify = true
     end
   end
 end

data/lib/do_snapshot/log.rb

@@ -4,33 +4,32 @@ require 'logger'
 module DoSnapshot
   # Shared logger
   #
-  class Log
-    class << self
-      attr_accessor :logger, :shell, :quiet, :verbose
-      attr_writer :buffer
-
-      def buffer
-        @buffer ||= %w()
-      end
+  module Log
+    def log
+      UniversalLogger
+    end
 
-      def info(message)
-        log :info, message
+    # UniversalLogger is module to deal with singleton methods.
+    # Used to give classes access only for selected methods
+    #
+    module UniversalLogger
+      %i(info warn error debug).each do |type|
+        define_singleton_method(type) { |message| Log.log type, message }
       end
+    end
 
-      def warning(message)
-        log :warn, message
-      end
+    class << self
+      attr_accessor :logger, :shell, :quiet, :verbose
+      attr_writer   :buffer
 
-      def error(message)
-        log :error, message
+      def load_options(options = {})
+        options.each { |key, option| send("#{key}=", option) }
       end
 
-      def debug(message)
-        log :debug, message
+      def buffer
+        @buffer ||= %w()
       end
 
-      protected
-
       def log(type, message)
         buffer << message
         logger.send(type, message) if logger
@@ -38,6 +37,8 @@ module DoSnapshot
         say message, color(type) unless print?(type)
       end
 
+      protected
+
       def print?(type)
         (type == :debug && !verbose) || quiet
       end

data/lib/do_snapshot/mail.rb

@@ -2,17 +2,63 @@
 require 'date'
 require 'pony'
 require_relative 'core_ext/hash'
+require_relative 'log'
 
 module DoSnapshot
   # Shared mailer.
   #
-  class Mail
+  module Mail
+    def mailer
+      UniversalMailer
+    end
+
+    # UniversalMailer is module to deal with singleton methods.
+    # Used to give classes access only for selected methods
+    #
+    module UniversalMailer
+      module_function
+
+      def notify
+        Mail.notify
+      end
+    end
+
     class << self
-      attr_accessor :opts
-      attr_writer :smtp, :opts_default, :smtp_default
+      include DoSnapshot::Log
+
+      attr_writer :mailer, :opts_default, :smtp_default
+
+      def load_options(options = {})
+        options.each { |key, option| send("#{key}=", option) }
+      end
+
+      def reset_options
+        @opts = opts_default
+        @smtp = smtp_default
+      end
+
+      def mailer
+        @mailer ||= Pony.method(:mail)
+      end
 
       def smtp
-        @smtp ||= {}
+        @smtp ||= smtp_default.dup
+      end
+
+      def opts
+        @opts ||= opts_default.dup
+      end
+
+      def smtp=(options)
+        options.each_pair do |key, value|
+          smtp[key.to_sym] = value
+        end if options
+      end
+
+      def opts=(options)
+        options.each_pair do |key, value|
+          opts[key.to_sym] = value
+        end if options
       end
 
       # Sending message via Hash params.
@@ -20,17 +66,10 @@ module DoSnapshot
       # Options:: --mail to:mail@somehost.com from:from@host.com --smtp address:smtp.gmail.com user_name:someuser password:somepassword
       #
       def notify
-        return unless opts
-
-        opts.symbolize_keys!
-        smtp.symbolize_keys!
-
-        opts_setup
-        smtp_setup
-
-        Log.debug 'Sending e-mail notification.'
+        setup_notify
+        log.debug 'Sending e-mail notification.'
         # Look into your inbox :)
-        Pony.mail(opts)
+        mailer.call(opts)
       end
 
       protected
@@ -52,17 +91,8 @@ module DoSnapshot
         }
       end
 
-      def opts_setup
-        opts_default.each_pair do |key, value|
-          opts[key] = value unless opts.include? key
-        end
-        opts[:body]    = "#{opts[:body]}\n\nTrace: #{DateTime.now}\n#{Log.buffer.join("\n")}"
-      end
-
-      def smtp_setup
-        smtp_default.each_pair do |key, value|
-          smtp[key] = value unless smtp.include? key
-        end
+      def setup_notify
+        opts[:body] = "#{opts[:body]}\n\nTrace: #{DateTime.now}\n#{Log.buffer.join("\n")}"
         opts[:via_options] = smtp
       end
     end

data/lib/do_snapshot/version.rb

@@ -2,5 +2,5 @@
 # Current version
 #
 module DoSnapshot
-  VERSION = '0.0.15'
+  VERSION = '0.2.2'
 end

data/lib/do_snapshot.rb

@@ -22,7 +22,7 @@ module DoSnapshot
   #
   class DropletShutdownError < RequestActionError
     def initialize(*args)
-      Log.error "Droplet id: #{args[0]} is Failed to Power Off."
+      Log.log :error, "Droplet id: #{args[0]} is Failed to Power Off."
       super
     end
   end
@@ -32,7 +32,7 @@ module DoSnapshot
   #
   class SnapshotCreateError < RequestActionError
     def initialize(*args)
-      Log.error "Droplet id: #{args[0]} is Failed to Snapshot."
+      Log.log :error, "Droplet id: #{args[0]} is Failed to Snapshot."
       super
     end
   end
@@ -42,7 +42,7 @@ module DoSnapshot
   #
   class DropletFindError < RequestError
     def initialize(*args)
-      Log.error 'Droplet Not Found'
+      Log.log :error, 'Droplet Not Found'
       super
     end
   end
@@ -52,7 +52,7 @@ module DoSnapshot
   #
   class DropletListError < RequestError
     def initialize(*args)
-      Log.error 'Droplet Listing is failed to retrieve'
+      Log.log :error, 'Droplet Listing is failed to retrieve'
       super
     end
   end

data/spec/do_snapshot/cli_spec.rb

@@ -6,7 +6,6 @@ describe DoSnapshot::CLI do
   include_context 'api_v1_helpers'
 
   subject(:cli)     { described_class }
-  subject(:command) { DoSnapshot::Command }
   subject(:api)     { DoSnapshot::Adapter::Digitalocean }
 
   describe '.initialize' do
@@ -28,7 +27,7 @@ describe DoSnapshot::CLI do
         stub_all_api(%w(100825 100823))
         hash_attribute_eq_no_stub(exclude: excluded_droplets, only: %w())
 
-        expect(command.send('exclude'))
+        expect(@cli.command.send('exclude'))
           .to eq excluded_droplets
       end
 
@@ -37,7 +36,7 @@ describe DoSnapshot::CLI do
         stub_all_api(selected_droplets)
         hash_attribute_eq_no_stub(only: selected_droplets)
 
-        expect(command.send('only'))
+        expect(@cli.command.send('only'))
           .to eq selected_droplets
       end
 
@@ -93,19 +92,19 @@ describe DoSnapshot::CLI do
       end
 
       it 'with mail' do
-        hash_attribute_eq(mail_options)
+        hash_attribute_eq(mail: mail_options)
       end
 
       it 'with no mail' do
-        without_hash_attribute_eq(mail_options)
+        without_hash_attribute_eq(mail: mail_options)
       end
 
       it 'with smtp' do
-        hash_attribute_eq(smtp_options)
+        hash_attribute_eq(smtp: smtp_options)
       end
 
       it 'with no smtp' do
-        without_hash_attribute_eq(smtp_options)
+        without_hash_attribute_eq(smtp: smtp_options)
       end
 
       it 'with log' do
@@ -153,9 +152,9 @@ describe DoSnapshot::CLI do
       stub_all_api
       options = default_options.merge!(:"#{name}" => value)
       @cli.options = @cli.options.merge(options)
-      @cli.snap
+      @cli.update_command
 
-      expect(command.send(name))
+      expect(@cli.command.send(name))
         .to eq value
     end
 
@@ -163,7 +162,7 @@ describe DoSnapshot::CLI do
       stub_all_api
       options = default_options.merge!(hash)
       @cli.options = @cli.options.merge(options)
-      @cli.snap
+      @cli.update_command
     end
 
     def with_hash_attribute_eq(hash)
@@ -181,11 +180,11 @@ describe DoSnapshot::CLI do
     def hash_attribute_eq_no_stub(hash)
       options = default_options.merge!(hash)
       @cli.options = @cli.options.merge(options)
-      @cli.snap
+      @cli.update_command
     end
 
     def set_api_attribute(options = { delay: delay, timeout: timeout }) # rubocop:disable Style/AccessorMethodName
-      command.send('api=', api.new(options))
+      @cli.command.send('api=', api.new(options))
     end
 
     before(:each) do

data/spec/do_snapshot/command_spec.rb

@@ -6,7 +6,7 @@ describe DoSnapshot::Command do
   include_context 'uri_helpers'
   include_context 'api_v1_helpers'
 
-  subject(:cmd)     { DoSnapshot::Command }
+  subject(:cmd)     { DoSnapshot::Command.new }
   subject(:log)     { DoSnapshot::Log }
 
   describe '.snap' do
@@ -144,7 +144,6 @@ describe DoSnapshot::Command do
 
   def load_options(options = nil)
     options ||= default_options
-    cmd.send('api=', nil)
     cmd.load_options(options, [:log, :mail, :smtp, :trace, :digital_ocean_client_id, :digital_ocean_api_key])
   end
 

data/spec/do_snapshot/mail_spec.rb

@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe DoSnapshot::Mail do
+  include_context 'spec'
+
+  describe 'will send mail with options' do
+    it '#notify' do
+      DoSnapshot::Mail.reset_options
+      DoSnapshot::Mail.load_options(opts: mail_options, smtp: smtp_options)
+      expect { DoSnapshot::Mail.notify }.not_to raise_error
+      expect(DoSnapshot::Mail.smtp[:address]).to eq(smtp_options[:address])
+    end
+  end
+end

data/spec/shared/environment.rb

@@ -4,6 +4,10 @@ require 'spec_helper'
 shared_context 'spec' do
   include_context 'api_helpers'
 
+  def do_not_send_email
+    allow(Pony).to receive(:deliver)
+  end
+
   let(:client_key)         { 'foo' }
   let(:api_key)            { 'bar' }
   let(:access_token)       { 'sometoken' }
@@ -11,7 +15,7 @@ shared_context 'spec' do
   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_key: 'NOTBAR', digital_ocean_access_token: 'NOTTOK') }
+  let(:cli_keys)           { 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(:no_exclude)         { [] }
@@ -30,7 +34,7 @@ shared_context 'spec' do
   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") }
 
-  def stub_all_api(droplets = nil, active = false) # rubocop:disable MethodLength
+  def stub_all_api(droplets = nil, active = false)
     drops = []
     droplets ||= [droplet_id]
     droplets.each do |droplet|
@@ -90,6 +94,7 @@ shared_context 'spec' do
   end
 
   before(:each) do
+    do_not_send_email
     set_api_keys
   end
 end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@
 require 'coveralls'
 Coveralls.wear! do
   add_filter '/spec/*'
-  add_filter '/lib/do_snapshot/mail.rb'
 end
 
 require 'do_snapshot/cli'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: do_snapshot
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.2.2
 platform: ruby
 authors:
 - Alexander Merkulov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: digitalocean_c
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +109,7 @@ files:
 - spec/do_snapshot/adapter/digitalocean_v2_spec.rb
 - spec/do_snapshot/cli_spec.rb
 - spec/do_snapshot/command_spec.rb
+- spec/do_snapshot/mail_spec.rb
 - spec/do_snapshots_spec.rb
 - spec/fixtures/digitalocean/v1/error_message.json
 - spec/fixtures/digitalocean/v1/response_event.json
@@ -155,6 +170,7 @@ test_files:
 - spec/do_snapshot/adapter/digitalocean_v2_spec.rb
 - spec/do_snapshot/cli_spec.rb
 - spec/do_snapshot/command_spec.rb
+- spec/do_snapshot/mail_spec.rb
 - spec/do_snapshots_spec.rb
 - spec/fixtures/digitalocean/v1/error_message.json
 - spec/fixtures/digitalocean/v1/response_event.json