onlyoffice_digitalocean_wrapper 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab5d384e54522d5e32c96089492303e10cd3243ed0f167d7fdbf4fd0a20b4786
-  data.tar.gz: 7df0fc6a8ff136cf2de91791e8301b3ab9acc2e8b05a0adfe9750b6979610a1a
+  metadata.gz: 2a48169cbc53f211b24f0956d8591465c7569450a04fa7f38a4614d004f7e748
+  data.tar.gz: aeda8616dfbc66abe0674cd79daf564b1aa98941b1eb66cc08aa03c9af831282
 SHA512:
-  metadata.gz: 406592b3cc7107311271454d6af88b98a5eda6cfd3edc18e50b2a6a6168ec72cf946d92398189588f6e9c1d734f8416fa6368f43dc02f16cf7d520f77d38b5dd
-  data.tar.gz: d3854132511ae1441671a5924655bd49898d415e19ad0d295257c043a861328e93201bae94d2737bef7d659b9ff15af7393fa8ef07065d423505e8ff4cbb37f2
+  metadata.gz: 05c74d20d448499946ef83c8710aed8f7fcdf2bebd65b6f522c672f602956868920b4377056fc505ce5ac6b0a6fef364f9a0a23547cdab43713cbc24112a4902
+  data.tar.gz: 7da944f64237a89ecf4bc966099c8ab102e783ca5d262075159bb8e5b2fbf37c44e2379ed6307d0c3880bdbbd361eb2b40787527b66139df3b910ab099cfe8e6

data/lib/onlyoffice_digitalocean_wrapper/digitalocean_wrapper.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require 'droplet_kit'
-require 'onlyoffice_logger_helper'
 require_relative 'digitalocean_wrapper/digitalocean_exceptions'
 require_relative 'digitalocean_wrapper/exceptions_retryer'
 require_relative 'digitalocean_wrapper/getters'
+require_relative 'digitalocean_wrapper/logger_wrapper'
 require_relative 'digitalocean_wrapper/power_actions'
 require_relative 'digitalocean_wrapper/token_methods'
 
@@ -13,6 +13,7 @@ module OnlyofficeDigitaloceanWrapper
   # Class for wrapping DigitalOcean API gem
   class DigitalOceanWrapper
     include Getters
+    include LoggerWrapper
     include ExceptionsRetryer
     include PowerActions
     include TokenMethods
@@ -38,8 +39,8 @@ module OnlyofficeDigitaloceanWrapper
       while get_droplet_status_by_name(droplet_name) != status && counter < timeout
         counter += 10
         sleep 10
-        OnlyofficeLoggerHelper.log("waiting for droplet (#{droplet_name}) to have "\
-                                   "status: #{status} for #{counter} seconds of #{timeout}")
+        logger.info("waiting for droplet (#{droplet_name}) to have "\
+                    "status: #{status} for #{counter} seconds of #{timeout}")
       end
       raise DropletOperationTimeout, "#{droplet_name} was not #{status} for #{timeout}s" if counter >= timeout
 
@@ -70,7 +71,7 @@ module OnlyofficeDigitaloceanWrapper
                                         monitoring: true,
                                         size: size)
       created = @client.droplets.create(droplet)
-      OnlyofficeLoggerHelper.log("restore_image_by_name(#{image_name}, #{droplet_name})")
+      logger.info("restore_image_by_name(#{image_name}, #{droplet_name})")
       if created.is_a?(String)
         raise "Problem, while creating '#{droplet_name}' from image '#{image_name}'\n" \
               "Error: #{created}"
@@ -84,7 +85,7 @@ module OnlyofficeDigitaloceanWrapper
     def destroy_droplet_by_name(droplet_name = 'nct-at1')
       droplet_id = get_droplet_id_by_name(droplet_name)
       client.droplets.delete(id: droplet_id)
-      OnlyofficeLoggerHelper.log("destroy_droplet_by_name(#{droplet_name})")
+      logger.info("destroy_droplet_by_name(#{droplet_name})")
       wait_until_droplet_have_status(droplet_name, nil)
     end
   end

data/lib/onlyoffice_digitalocean_wrapper/digitalocean_wrapper/exceptions_retryer.rb

@@ -15,7 +15,7 @@ module OnlyofficeDigitaloceanWrapper
         yield
       rescue exception => e
         try += 1
-        OnlyofficeLoggerHelper.log("Error '#{exception}, #{e}' happened during "\
+        logger.error("Error '#{exception}, #{e}' happened during "\
                                    "operation. Retrying #{try} of #{retries}")
         sleep timeout # Time to cooldown error
         try <= retries ? retry : raise

data/lib/onlyoffice_digitalocean_wrapper/digitalocean_wrapper/getters.rb

@@ -8,7 +8,7 @@ module OnlyofficeDigitaloceanWrapper
       image = all_droplets.find { |x| x.name == image_name }
       raise DigitalOceanImageNotFound, image_name if image.nil?
 
-      OnlyofficeLoggerHelper.log("get_image_id_by_name(#{image_name}): #{image.id}")
+      logger.info("get_image_id_by_name(#{image_name}): #{image.id}")
       image.id
     end
 
@@ -28,10 +28,10 @@ module OnlyofficeDigitaloceanWrapper
     def get_droplet_id_by_name(droplet_name)
       droplet = droplet_by_name(droplet_name)
       if droplet.nil?
-        OnlyofficeLoggerHelper.log("get_droplet_id_by_name(#{droplet_name}): not found any droplets")
+        logger.info("get_droplet_id_by_name(#{droplet_name}): not found any droplets")
         nil
       else
-        OnlyofficeLoggerHelper.log("get_droplet_id_by_name(#{droplet_name}): #{droplet.id}")
+        logger.info("get_droplet_id_by_name(#{droplet_name}): #{droplet.id}")
         droplet.id
       end
     end
@@ -42,12 +42,12 @@ module OnlyofficeDigitaloceanWrapper
     def get_droplet_ip_by_name(droplet_name)
       droplet = droplet_by_name(droplet_name)
       if droplet.nil?
-        OnlyofficeLoggerHelper.log("There is no created droplet with name: #{droplet_name}")
+        logger.info("There is no created droplet with name: #{droplet_name}")
         return
       end
       retry_exception do
         ip = public_ip(droplet)
-        OnlyofficeLoggerHelper.log("get_droplet_ip_by_name(#{droplet_name}): #{ip}")
+        logger.info("get_droplet_ip_by_name(#{droplet_name}): #{ip}")
         ip
       end
     end
@@ -58,13 +58,13 @@ module OnlyofficeDigitaloceanWrapper
     def get_droplet_status_by_name(droplet_name)
       droplet = droplet_by_name(droplet_name)
       if droplet.nil?
-        OnlyofficeLoggerHelper.log("get_droplet_status_by_name(#{droplet_name}): not found any droplets")
+        logger.info("get_droplet_status_by_name(#{droplet_name}): not found any droplets")
         nil
       else
         retry_exception do
           status = droplet.status
           status = :locked if droplet.locked
-          OnlyofficeLoggerHelper.log("get_droplet_status_by_name(#{droplet_name}): #{status}")
+          logger.info("get_droplet_status_by_name(#{droplet_name}): #{status}")
           status
         end
       end

data/lib/onlyoffice_digitalocean_wrapper/digitalocean_wrapper/logger_wrapper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+module OnlyofficeDigitaloceanWrapper
+  # Logger module for logging stuff
+  module LoggerWrapper
+    # @return [Logger] default logger
+    def logger
+      @logger ||= Logger.new($stdout)
+    end
+  end
+end

data/lib/onlyoffice_digitalocean_wrapper/version.rb

@@ -2,7 +2,7 @@
 
 module OnlyofficeDigitaloceanWrapper
   # @return [String] version of gem
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
   # @return [String] name of gem
   NAME = 'onlyoffice_digitalocean_wrapper'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_digitalocean_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: droplet_kit
@@ -26,20 +26,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: onlyoffice_logger_helper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -144,14 +130,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +165,7 @@ files:
 - lib/onlyoffice_digitalocean_wrapper/digitalocean_wrapper/digitalocean_exceptions.rb
 - lib/onlyoffice_digitalocean_wrapper/digitalocean_wrapper/exceptions_retryer.rb
 - lib/onlyoffice_digitalocean_wrapper/digitalocean_wrapper/getters.rb
+- lib/onlyoffice_digitalocean_wrapper/digitalocean_wrapper/logger_wrapper.rb
 - lib/onlyoffice_digitalocean_wrapper/digitalocean_wrapper/power_actions.rb
 - lib/onlyoffice_digitalocean_wrapper/digitalocean_wrapper/token_methods.rb
 - lib/onlyoffice_digitalocean_wrapper/version.rb
@@ -206,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.9
 signing_key: 
 specification_version: 4
 summary: Wrapper gem for DigitalOcean