bellbro 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ddf069f8fb7bf7c4cb1d241cbbaf0071605de1f
-  data.tar.gz: 1acbf9a7c2014a9c5bd08865555690c73b1b9050
+  metadata.gz: 8ab7478116c23d04ae5d103a43267dc6ad90563c
+  data.tar.gz: 259f5b67b770f5d6a4fa997eac99c3d2cb17ca92
 SHA512:
-  metadata.gz: e9d3ed63c20286ba8dadd89324fadfd0acf4b246bfd60b83df84ff55405c409c89e871b798db87b193acf30279deff3ab36950b74dd1fdff89f54fc3cb23b684
-  data.tar.gz: 3cfd2c21df9e06166be02c4567e0a64d11b19f92c076e6e502f0df09bffadfa7a096356d0799a60428cbd3fa50f6e18c13a368a356502cde962593fc7cefe366
+  metadata.gz: 3d6c331e559941c713cacf0e4325bc5a55742b953c10d5a82494cd8cc8d6b98da78127e262e0877af93e43fae4aeeb4da6dbd112b40fe3f946ff79ac28e6523d
+  data.tar.gz: 39a37fb409cf9005de5b7ec609b7f6afb382e519eda35ec8bf1716e51c199c504c074a0764c72c36d7c9b5e90cdf5df59c6a289cd31dc6401dcff32d995434e4

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'shout', path: '../shout'
+
 # Specify your gem's dependencies in bellbro.gemspec
 gemspec

data/bellbro.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sidekiq"
   spec.add_dependency "redis"
   spec.add_dependency "airbrake"
-
+  spec.add_dependency 'retryable'
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/bellbro.rb

@@ -6,26 +6,15 @@ require 'yaml'
 require 'digest'
 require 'sidekiq'
 require 'airbrake'
+require 'retryable'
+require 'shout'
 
 %w(
-    bellbro/settings.rb
     bellbro/hooks.rb
-    bellbro/keyable.rb
-    bellbro/retryable.rb
-    bellbro/ringable.rb
     bellbro/trackable.rb
-    bellbro/redis_pool.rb
     bellbro/sidekiq_utils.rb
-    bellbro/bell.rb
     bellbro/service.rb
     bellbro/worker.rb
-    bellbro/initialize.rb
 ).each do |path|
   require File.join(File.dirname(__FILE__),path)
-end
-
-module Bellbro
-  def self.logger
-    Bellbro::Settings.logger
-  end
 end

data/lib/bellbro/service.rb

@@ -1,9 +1,10 @@
 require 'digest'
 
 module Bellbro
-  class Service < Bellbro::Bell
+  class Service
     include Bellbro::SidekiqUtils
     include Bellbro::Trackable
+    include Shout
 
     attr_reader :thread, :thread_error, :jid
 
@@ -36,7 +37,7 @@ module Bellbro
         begin
           run
         rescue Exception => @thread_error
-          ring "#{@thread_error.inspect}", type: :error
+          log "#{@thread_error.inspect}", type: :error
           Airbrake.notify(@thread_error)
           raise @thread_error
         end
@@ -45,13 +46,13 @@ module Bellbro
 
     def stop
       @done = true
-      ring "Stopping #{self.class} service..."
+      log "Stopping #{self.class} service..."
       @thread.join
-      ring "#{self.class.to_s.capitalize} service stopped."
+      log "#{self.class.to_s.capitalize} service stopped."
     end
 
     def run
-      ring "Starting #{self.class} service."
+      log "Starting #{self.class} service."
       self.class.mutex.synchronize { track }
       begin
         self.class.mutex.synchronize { start_jobs }
@@ -64,7 +65,7 @@ module Bellbro
     def start_jobs
       each_job do |job|
         jid = worker_class.perform_async(job)
-        ring "Starting job #{jid} #{worker_class.name} with #{job.inspect}."
+        log "Starting job #{jid} #{worker_class.name} with #{job.inspect}."
         record_incr(:jobs_started)
       end
     end

data/lib/bellbro/sidekiq_utils.rb

@@ -1,14 +1,16 @@
+require 'retryable'
+
 module Bellbro
   module SidekiqUtils
 
     def _workers
-      retryable(on: Redis::TimeoutError) do
+      Retryable.retryable(on: Redis::TimeoutError) do
         workers_for_class("#{self.name}")
       end
     end
 
     def _jobs
-      retryable(on: Redis::TimeoutError) do
+      Retryable.retryable(on: Redis::TimeoutError) do
         jobs_for_class("#{self.name}")
       end
     end

data/lib/bellbro/trackable.rb

@@ -1,7 +1,5 @@
 module Bellbro
   module Trackable
-    include Bellbro::Retryable
-
     attr_reader :record
 
     def self.included(base)
@@ -32,13 +30,13 @@ module Bellbro
     end
 
     def status_update(force = false)
-      return unless @log_record_schema && Bellbro.logger
+      return unless @log_record_schema && Shout.logger
       return unless force || ((@count += 1) % @write_interval) == 0
-      retryable { write_log(@record.to_json) }
+      Retryable.retryable { write_log(@record.to_json) }
     end
 
     def write_log(line)
-      Bellbro.logger.info line
+      Shout.logger.info line
     end
 
     def record_set(attr, value)

data/lib/bellbro/version.rb

@@ -1,3 +1,3 @@
 module Bellbro
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

data/lib/bellbro/worker.rb

@@ -1,5 +1,6 @@
 module Bellbro
-  class Worker < Bellbro::Bell
+  class Worker
+    include Shout
     include Sidekiq::Worker
     include Bellbro::Trackable
     include Bellbro::Hooks

data/spec/support/{bellbro.rb → shout.rb}

@@ -2,6 +2,6 @@ logger = Yell.new do |l|
   l.level = [:debug, :info, :warn, :error]
 end
 
-Bellbro::Settings.configure do |config|
+Shout::Settings.configure do |config|
   config.logger = logger
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bellbro
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Jon Stokes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: retryable
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -136,21 +150,14 @@ files:
 - Rakefile
 - bellbro.gemspec
 - lib/bellbro.rb
-- lib/bellbro/bell.rb
 - lib/bellbro/hooks.rb
-- lib/bellbro/initialize.rb
-- lib/bellbro/keyable.rb
-- lib/bellbro/redis_pool.rb
-- lib/bellbro/retryable.rb
-- lib/bellbro/ringable.rb
 - lib/bellbro/service.rb
-- lib/bellbro/settings.rb
 - lib/bellbro/sidekiq_utils.rb
 - lib/bellbro/trackable.rb
 - lib/bellbro/version.rb
 - lib/bellbro/worker.rb
 - spec/spec_helper.rb
-- spec/support/bellbro.rb
+- spec/support/shout.rb
 - spec/support/sidekiq.rb
 - spec/trackable_spec.rb
 - spec/worker_spec.rb
@@ -174,13 +181,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Helps with sidekiq.
 test_files:
 - spec/spec_helper.rb
-- spec/support/bellbro.rb
+- spec/support/shout.rb
 - spec/support/sidekiq.rb
 - spec/trackable_spec.rb
 - spec/worker_spec.rb

data/lib/bellbro/bell.rb

@@ -1,7 +0,0 @@
-module Bellbro
-  class Bell
-    include Bellbro::Retryable
-    include Bellbro::Ringable
-  end
-end
-

data/lib/bellbro/initialize.rb

@@ -1,61 +0,0 @@
-module Bellbro
-  def self.initialize_redis!
-    return unless defined?(Rails)
-    filename = "#{Rails.root}/config/redis.yml"
-    return unless File.exists?(filename)
-    config = YAML.load_file(filename)[Rails.env].symbolize_keys
-    configure_bellbro(config)
-    setup_pool(config)
-  end
-
-  def self.configure_bellbro(config)
-    redis_config = ThreadSafe::Cache.new
-
-    config.each do |name, c|
-      base_url = Figaro.env.send c['url'].downcase
-      db = c['database']
-      url = generate_full_url(base_url, db)
-
-      redis_config[name] = {
-          size:            c['pool'],
-          url:             url,
-          database:        db,
-          timeout:         c['timeout'] || 5,
-          network_timeout: c['network_timeout'] || 5
-      }
-    end
-
-    Bellbro::Settings.configure do |con|
-      con.redis_config = redis_config
-    end
-  end
-
-  def self.setup_pool(config)
-    redis_pool = ThreadSafe::Cache.new
-    redis_config = Bellbro::Settings.redis_config
-
-    config.each_key do |name|
-      next if name == :sidekiq
-      puts "# Configuring pool #{name} with size #{redis_config[name][:size]} on #{redis_config[name][:url]}"
-      redis_pool[name] = ConnectionPool.new(
-         redis_config[name].slice(:size, :timeout)
-      ) do
-        Redis.new(
-          redis_config[name].slice(:url, :network_timeout)
-        )
-      end
-    end
-
-    Bellbro::Settings.configure do |con|
-      con.redis_pool = redis_pool
-    end
-  end
-
-  def self.generate_full_url(base_url, db)
-    if base_url[-1,1] == "/"
-      "#{base_url}#{db}"
-    else
-      "#{base_url}/#{db}"
-    end
-  end
-end

data/lib/bellbro/keyable.rb

@@ -1,70 +0,0 @@
-module Bellbro
-  module Keyable
-    def self.included(base)
-      base.class_eval do
-        extend ClassMethods
-      end
-    end
-
-    def respond_to?(method)
-      return true if @respond_to && @respond_to.include?(method.to_sym)
-      super
-    end
-
-    module ClassMethods
-      def delegate_all_keys(*methods)
-        delegate_getter_keys(*methods)
-        delegate_setter_keys(*methods)
-        delegate_status_keys(*methods)
-      end
-
-      def delegate_getter_keys(*methods)
-        options = extract_methods(methods)
-        options[:methods].each do |key|
-          @respond_to << key
-          define_method key do
-            send(options[:to])[key]
-          end
-        end
-      end
-
-      def delegate_setter_keys(*methods)
-        options = extract_methods(methods)
-        options[:methods].each do |key|
-          @respond_to << "#{key}="
-          define_method "#{key}=" do |value|
-            send(options[:to])[key] = value
-          end
-        end
-      end
-
-      def delegate_status_keys(*methods)
-        options = extract_methods(methods)
-        options[:methods].each do |key|
-          @respond_to << "#{key}?"
-          define_method "#{key}?" do
-            !!send(options[:to])[key]
-          end
-        end
-      end
-
-      private
-
-      def extract_methods(methods)
-        options = methods.pop
-        unless options.is_a?(Hash) && to = options[:to].try(:to_sym)
-          raise ArgumentError, 'Delegation needs a target. Supply an options hash with a :to key as the last argument (e.g. delegate :hello, to: :greeter).'
-        end
-
-        # Set up the data hash, if needed
-        if respond_to?(to) && !send(to).respond_to?(:[]) && !send(to).respond_to?(:[]=)
-          raise ArgumentError, 'Target must be a hash-like object.'
-        end
-
-        @respond_to ||= []
-        { methods: methods.map(&:to_sym), to: to }
-      end
-
-    end
-  end
-end

data/lib/bellbro/redis_pool.rb

@@ -1,31 +0,0 @@
-module Bellbro
-  module RedisPool
-    def with_connection
-      self.class.with_connection do |c|
-        yield c
-      end
-    end
-
-    def self.included(klass)
-      class << klass
-
-        def set_db(default)
-          @default_db_name = default.to_sym
-        end
-
-        def with_connection
-          retryable(sleep: 0.5) do
-            model_pool.with do |c|
-              yield c
-            end
-          end
-        end
-
-        def model_pool
-          @model_pool ||= Bellbro::Settings.redis_pool[@default_db_name]
-        end
-      end
-
-    end
-  end
-end

data/lib/bellbro/retryable.rb

@@ -1,67 +0,0 @@
-module Bellbro
-  module Retryable
-    def self.included(klass)
-      klass.extend(self)
-    end
-
-    # Options:
-    # * :tries - Number of retries to perform. Defaults to 1.
-    # * :on - The Exception on which a retry will be performed. Defaults to Exception, which retries on any Exception.
-    #
-    # Example
-    # =======
-    #   retryable(:tries => 1, :on => OpenURI::HTTPError) do
-    #     # your code here
-    #   end
-    #
-
-    def retryable(options = {}, &block)
-      opts = { :tries => 5, :on => Exception, :sleep => 1 }.merge(options)
-      retry_exception, retries, interval = opts[:on], opts[:tries], opts[:sleep]
-
-      begin
-        return yield
-      rescue retry_exception
-        sleep interval
-        retry unless (retries -= 1).zero?
-      end
-      yield
-    end
-
-    def retryable_with_success(options = {}, &block)
-      opts = { :tries => 5, :on => Exception, :sleep => 1 }.merge(options)
-      retry_exception, retries, interval = opts[:on], opts[:tries], opts[:sleep]
-
-      success = false
-      begin
-        yield
-        success = true
-      rescue retry_exception
-        sleep interval
-        retry unless (retries -= 1).zero?
-      end
-      success
-    end
-
-    def retryable_with_aws(options = {}, &block)
-      # This is for use with AWS-based models. I find I get a lot of these timeouts and
-      # OpenSSL errors, and sometimes the connection dies and I need to create a new
-      # connection object. I put this in a method called aws_connect!.
-      #
-      opts = { :tries => 10, :on => Exception, :sleep => 1 }.merge(options)
-      retry_exception, retries, interval = opts[:on], opts[:tries], opts[:sleep]
-
-      begin
-        return yield
-      rescue OpenSSL::SSL::SSLError, Timeout::Error
-        sleep interval
-        aws_connect!
-        retry unless (retries -= 1).zero?
-      rescue retry_exception
-        sleep interval
-        retry unless (retries -= 1).zero?
-      end
-      yield
-    end
-  end
-end

data/lib/bellbro/ringable.rb

@@ -1,14 +0,0 @@
-module Bellbro
-  module Ringable
-    def self.included(klass)
-      klass.extend(self)
-    end
-
-    def ring(logline, opts={})
-      domain_insert = @domain ? "[#{@domain}]": ""
-      error_insert = (opts[:type] == :error) ? "##ERROR## " : ""
-      complete_logline = "[#{self.class}](#{Thread.current.object_id})#{domain_insert}: #{error_insert}#{logline}"
-      Bellbro.logger.info complete_logline
-    end
-  end
-end

data/lib/bellbro/settings.rb

@@ -1,46 +0,0 @@
-module Bellbro
-  module Settings
-
-    class SettingsData < Struct.new(
-        :logger, :env, :redis_config, :redis_pool
-    )
-    end
-
-    def self.configuration
-      @configuration ||= Bellbro::Settings::SettingsData.new
-    end
-
-    def self.configure
-      yield configuration
-    end
-
-    def self.env
-      return unless configured?
-      configuration.env
-    end
-
-    def self.test?
-      return unless configured?
-      configuration.env == 'test'
-    end
-
-    def self.redis_pool
-      return unless configured?
-      configuration.redis_pool
-    end
-
-    def self.redis_config
-      return unless configured?
-      configuration.redis_config
-    end
-
-    def self.logger
-      return unless configured?
-      configuration.logger
-    end
-
-    def self.configured?
-      !!configuration
-    end
-  end
-end