redis_cloud_auto_upgrade 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2db871f69cbadb7c351fed5915610fefec43aac7
-  data.tar.gz: ceb75e6153ab57d20e8d682418fd2495420f67de
+  metadata.gz: 494f5b0990ddbf04156d7d310084dcd1baacbe60
+  data.tar.gz: 551620dfdcb94c70813279385311f7ce5c419a43
 SHA512:
-  metadata.gz: 6347ceefcea9f63e783b59201daeedca16ada8f66db7f963ba355c7c4aad03081660a926328b17bce62a7557ef903eb91e538f432e24216d2f3631b587e8b5ef
-  data.tar.gz: ee380942da44a27f296751c2914cfa11820ee6cfc19ceaf8167b7a358d3aa590dfd2330e03421704040c4df8925db98149c86218bf252fea47663e854de58806
+  metadata.gz: 6d09a535c278efa6d9989553683a6d6013962c17a1c356b4a88fbe04d9113b7f18455a97f1bdd3fad4c38b6c287ad52f15894de68327ec2a83aaf55f168558a9
+  data.tar.gz: 20abd85a69edcb43abca63d2afc5686b565a92b0dd082fe9c46fd9b6946d2184cc12b1b5ebc9ef4e1c71eb8fc34e9ee50a9918c48610b307d191de4da8bd2ab2

data/lib/redis_cloud_auto_upgrade.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
 require_relative './redis_cloud_auto_upgrade/version'
 require_relative './redis_cloud_auto_upgrade/exceptions'
 require_relative './redis_cloud_auto_upgrade/configuration'
+require_relative './redis_cloud_auto_upgrade/dependent_values'
+require_relative './redis_cloud_auto_upgrade/class_methods'
 
 require_relative './redis_cloud_auto_upgrade/heroku_api'
 
@@ -8,14 +11,12 @@ require 'redis'
 
 # See README.md for details
 class RedisCloudAutoUpgrade
-  class << self
-    def potential_upgrade!(conf, &blk)
-      updated_conf = conf.merge(on_upgrade: blk)
-      new
-        .configure(updated_conf)
-        .potential_upgrade!
-    end
-  end # class << self
+  include self::DependentValues
+  extend  self::ClassMethods
+
+  def initialize
+    @config = Configuration.new
+  end
 
   def configure(config)
     @config.configure config
@@ -24,7 +25,7 @@ class RedisCloudAutoUpgrade
 
   def current_redis_cloud_plan
     @__current_redis_cloud_plan ||=
-    HerokuAPI.current_redis_cloud_plan(**heroku_params)
+      HerokuAPI.current_redis_cloud_plan(**heroku_params)
   end
 
   # Memoize from lab42_core gem?
@@ -35,29 +36,23 @@ class RedisCloudAutoUpgrade
   end
 
   def needs_to_upgrade?
-    !(current_redis_mem_usage <  currently_available_memory * config.treshhold)
+    !(current_redis_mem_usage < currently_available_memory * config.treshhold)
   end
 
   def potential_upgrade!
-    if config.valid?
-      do_potential_upgrade!
-    else
-      fail IllegalConfiguration, config.errors_human_readable
-    end
+    raise IllegalConfiguration, config.errors_human_readable unless config.valid?
+    do_potential_upgrade!
   end
 
   private
 
-  def initialize
-    @config = Configuration.new
-  end
-
   attr_reader :config
 
   def currently_available_memory
     @__currently_available_memory__ ||=
       HerokuAPI.currently_available_memory(
-        **config.only(:heroku_api_key, :heroku_app_name))
+        **config.only(:heroku_api_key, :heroku_app_name)
+      )
   end
 
   def do_potential_upgrade!
@@ -65,7 +60,7 @@ class RedisCloudAutoUpgrade
       do_upgrade!
       true
     else
-      info "no upgrade needed #{config.heroku_app_name} mem usage #{current_redis_mem_usage / 1_000_000}MB"
+      info_no_upgrade
       false
     end
   end
@@ -85,7 +80,7 @@ upgraded RedisCloud plan for app: #{config.heroku_app_name}
 mem usage was approximately #{current_redis_mem_usage / 1_000_000}MB
 old_plan was #{old_plan}
 new_plan is #{new_plan}
-        EOS
+EOS
   end
 
   def heroku_params
@@ -98,9 +93,16 @@ new_plan is #{new_plan}
     config.logger.info([self.class.name, str].join(' '))
   end
 
-  def mem_usage_in_percent
-    @__mem_usage_in_percent__ ||=
-      current_redis_mem_usage * 100 / currently_available_memory
+  def info_no_upgrade
+    msg = format(
+      'no upgrade needed %s mem usage %dMB or %d%%, treshhold: %d%%, current plan: %s',
+      config.heroku_app_name,
+      current_redis_mem_usage_megab,
+      current_redis_mem_usage_percent,
+      treshhold_in_percent,
+      current_redis_cloud_plan
+    )
+    info msg
   end
 
   def update_data(old_plan, new_plan)
@@ -109,13 +111,8 @@ new_plan is #{new_plan}
       new_plan: new_plan,
       upgraded_at: Time.now,
       mem_usage: current_redis_mem_usage,
-      mem_usage_in_percent: mem_usage_in_percent,
+      mem_usage_in_percent: current_redis_mem_usage_percent,
       treshhold_in_percent: treshhold_in_percent
     )
   end
-
-  def treshhold_in_percent
-    @__treshhold_in_percent__ ||=
-      (config.treshhold * 100).round
-  end
 end # class RedisCloudAutoUpgrade

data/lib/redis_cloud_auto_upgrade/class_methods.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+# class level methods
+module RedisCloudAutoUpgrade::ClassMethods
+  def potential_upgrade!(conf, &blk)
+    updated_conf = conf.merge(on_upgrade: blk)
+    new
+      .configure(updated_conf)
+      .potential_upgrade!
+  end
+end

data/lib/redis_cloud_auto_upgrade/configuration.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Configuration part
 class RedisCloudAutoUpgrade
   Configuration = Struct.new(
@@ -18,7 +19,7 @@ class RedisCloudAutoUpgrade
     end
 
     def only(*keys)
-      keys.inject({})do |h, k|
+      keys.inject({}) do |h, k|
         h.merge(k => send(k))
       end
     end

data/lib/redis_cloud_auto_upgrade/dependent_values.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+# Extracting behavior for compution of
+# dependent values
+module RedisCloudAutoUpgrade::DependentValues
+  private
+
+  def current_redis_mem_usage_megab
+    @__current_redis_mem_usage_megab__ ||=
+      current_redis_mem_usage / 1_000_000
+  rescue
+    0
+  end
+
+  def current_redis_mem_usage_percent
+    @__current_redis_mem_usage_percent__ ||=
+      current_redis_mem_usage * 100 / currently_available_memory
+  rescue
+    0
+  end
+
+  def treshhold_in_percent
+    @__treshhold_in_percent__ ||=
+      (config.treshhold * 100).round
+  end
+end

data/lib/redis_cloud_auto_upgrade/exceptions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class RedisCloudAutoUpgrade
   IllegalConfiguration = Class.new RuntimeError
 end # class RedisCloudAutoUpgrade

data/lib/redis_cloud_auto_upgrade/heroku_api.rb

@@ -1,99 +1,102 @@
+# frozen_string_literal: true
 require 'platform-api'
 # A function wrapper accessing the Heroku Platform API in a functional way
-class RedisCloudAutoUpgrade
-  module HerokuAPI
-    class << self
-      def available_memory(plan)
-        plan_memory
-          .fetch(plan) do
-          fail ArgumentError, "the plan #{plan.inspect} does not exist"
-        end
+module RedisCloudAutoUpgrade::HerokuAPI
+  class << self
+    def available_memory(plan)
+      plan_memory
+        .fetch(plan) do
+        raise ArgumentError, "the plan #{plan.inspect} does not exist"
       end
+    end
 
-      def current_redis_cloud_plan(heroku_api_key:, heroku_app_name:)
-        heroku(heroku_api_key)
-          .addon
-          .list_by_app(heroku_app_name)
-          .find(&select_redis_cloud_addon)['plan']['name']
-      end
+    def current_redis_cloud_plan(heroku_api_key:, heroku_app_name:)
+      heroku(heroku_api_key)
+        .addon
+        .list_by_app(heroku_app_name)
+        .find(&select_redis_cloud_addon)['plan']['name']
+    end
 
-      def currently_available_memory(heroku_api_key:, heroku_app_name:)
-        available_memory(
-          current_redis_cloud_plan(
-            heroku_api_key: heroku_api_key, heroku_app_name: heroku_app_name))
-      end
+    def currently_available_memory(heroku_api_key:, heroku_app_name:)
+      available_memory(
+        current_redis_cloud_plan(
+          heroku_api_key: heroku_api_key, heroku_app_name: heroku_app_name
+        )
+      )
+    end
 
-      def next_plan_to_upgrade_to(heroku_api_key:, heroku_app_name:)
-        next_plan(
-          current_redis_cloud_plan(
-            heroku_api_key: heroku_api_key, heroku_app_name: heroku_app_name))
-      end
+    def next_plan_to_upgrade_to(heroku_api_key:, heroku_app_name:)
+      next_plan(
+        current_redis_cloud_plan(
+          heroku_api_key: heroku_api_key, heroku_app_name: heroku_app_name
+        )
+      )
+    end
 
-      def upgrade_plan!(heroku_api_key:, heroku_app_name:)
-        next_plan =
-          next_plan_to_upgrade_to(heroku_api_key: heroku_api_key, heroku_app_name: heroku_app_name)
-        heroku(heroku_api_key)
-          .addon
-          .update(heroku_app_name, 'rediscloud', plan: next_plan)
-        next_plan
-      end
+    def upgrade_plan!(heroku_api_key:, heroku_app_name:)
+      next_plan =
+        next_plan_to_upgrade_to(heroku_api_key: heroku_api_key, heroku_app_name: heroku_app_name)
+      heroku(heroku_api_key)
+        .addon
+        .update(heroku_app_name, 'rediscloud', plan: next_plan)
+      next_plan
+    end
 
-      private
+    private
 
-      def heroku(api_key)
-        PlatformAPI.connect api_key
-      end
+    def heroku(api_key)
+      PlatformAPI.connect api_key
+    end
 
-      def next_plan(plan)
-        plan_transitions
-          .fetch(plan) do
-          fail ArgumentError, "the plan #{plan.inspect} does not exist or cannot be upgraded"
-        end
+    def next_plan(plan)
+      plan_transitions
+        .fetch(plan) do
+        raise ArgumentError, "the plan #{plan.inspect} does not exist or cannot be upgraded"
       end
+    end
 
-      # rubocop:disable Metrics/MethodLength
-      def plan_transitions
-        {
-          'rediscloud:30' => 'rediscloud:100',
-          'rediscloud:100' => 'rediscloud:250',
-          'rediscloud:250' => 'rediscloud:500',
-          'rediscloud:500' => 'rediscloud:1_000',
-          'rediscloud:1_000' => 'rediscloud:2_500',
-          'rediscloud:2_500' => 'rediscloud:5_000',
-          'rediscloud:5_000' => 'rediscloud:10_000',
-          'rediscloud:10_000' => 'rediscloud:15_000',
-          'rediscloud:15_000' => 'rediscloud:20_000',
-          'rediscloud:20_000' => 'rediscloud:25_000',
-          'rediscloud:25_000' => 'rediscloud:50_000'
-        }
-      end
+    # rubocop:disable Metrics/MethodLength
+    def plan_transitions
+      {
+        'rediscloud:30' => 'rediscloud:100',
+        'rediscloud:100' => 'rediscloud:250',
+        'rediscloud:250' => 'rediscloud:500',
+        'rediscloud:500' => 'rediscloud:1000',
+        'rediscloud:1000' => 'rediscloud:2500',
+        'rediscloud:2500' => 'rediscloud:5000',
+        'rediscloud:5000' => 'rediscloud:10000',
+        'rediscloud:10000' => 'rediscloud:15000',
+        'rediscloud:15000' => 'rediscloud:20000',
+        'rediscloud:20000' => 'rediscloud:25000',
+        'rediscloud:25000' => 'rediscloud:50000'
+      }
+    end
 
-      def plan_memory
-        {
-          'rediscloud:30' => 30_000_000,
-          'rediscloud:100' => 100_000_000,
-          'rediscloud:250' => 250_000_000,
-          'rediscloud:500' => 500_000_000,
-          'rediscloud:1000' => 1_000_000_000,
-          'rediscloud:2500' => 2_500_000_000,
-          'rediscloud:5000' => 5_000_000_000,
-          'rediscloud:10000' => 10_000_000_000,
-          'rediscloud:15000' => 15_000_000_000,
-          'rediscloud:20000' => 20_000_000_000,
-          'rediscloud:25000' => 25_000_000_000,
-          'rediscloud:50000' => 50_000_000_000
-        }
-      end
+    def plan_memory
+      {
+        'rediscloud:30' => 30_000_000,
+        'rediscloud:100' => 100_000_000,
+        'rediscloud:250' => 250_000_000,
+        'rediscloud:500' => 500_000_000,
+        'rediscloud:1000' => 1_000_000_000,
+        'rediscloud:2500' => 2_500_000_000,
+        'rediscloud:5000' => 5_000_000_000,
+        'rediscloud:10000' => 10_000_000_000,
+        'rediscloud:15000' => 15_000_000_000,
+        'rediscloud:20000' => 20_000_000_000,
+        'rediscloud:25000' => 25_000_000_000,
+        'rediscloud:50000' => 50_000_000_000
+      }
+    end
 
-      def select_redis_cloud_addon
-        lambda  do |addon|
-          begin
-            addon['addon_service']['name'] == 'rediscloud'
-          rescue
-            nil
-          end
+    def select_redis_cloud_addon
+      lambda do |addon|
+        begin
+          addon['addon_service']['name'] == 'rediscloud'
+        rescue
+          nil
         end
       end
-    end # class << self
-  end # module HerokuAPI
-end # class RCAU
+    end
+  end # class << self
+end # class RCAU::HerokuApi

data/lib/redis_cloud_auto_upgrade/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class RedisCloudAutoUpgrade
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end # class RedisCloudAutoUpgrade

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_cloud_auto_upgrade
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Robert Dober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +132,9 @@ files:
 - LICENSE
 - README.md
 - lib/redis_cloud_auto_upgrade.rb
+- lib/redis_cloud_auto_upgrade/class_methods.rb
 - lib/redis_cloud_auto_upgrade/configuration.rb
+- lib/redis_cloud_auto_upgrade/dependent_values.rb
 - lib/redis_cloud_auto_upgrade/exceptions.rb
 - lib/redis_cloud_auto_upgrade/heroku_api.rb
 - lib/redis_cloud_auto_upgrade/version.rb
@@ -148,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="