bogo 0.2.14 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 730a00461fb1d2b71a79a959bec8085111781a1ac542443566f875f9c9560e45
-  data.tar.gz: 7225927bd86221c434caf7f9808f87c17c7b71a1e7839ec172157521876bf551
+  metadata.gz: '005490ecb547fbeb1d4b941787e8a963c3c17ac8403527deb3ed6b33614312da'
+  data.tar.gz: f6c08b295196223458fa8649fd2224d8f46cd0e641545bed5c4173bdccda8c88
 SHA512:
-  metadata.gz: c3351892aae400d4035470522093bd231f6611d8e955338ac29af84d7ff594b498b863ee63fce80272b42cb3aa3bb4e13e32f3c95f67fe6c66c73ea8ac8cdfed
-  data.tar.gz: a9cac6cfbb9df030f965ca3e6d180343ba8445a1bbffd7ea029b02a45dc05f4846d81211e5ba3c8cbc2a99b83c4683715e3e62179c1e879c9a866502692ca49d
+  metadata.gz: a501ec13801d316df3d9fccec43bb86dbb6b3cb4847fc6645b266aeff41bebd51107090b733287650badbe038cfeb37cb59a6254fa366b74a65a3c4dce4b38e9
+  data.tar.gz: 25ff9327f54f0b8f3d4602e9834d87548a959f14a767fa9243d75037fe542efbc83eae002ca6dd9e2e461b2dda8c474d84bbcb4f0b1699aebfe551b5f86ae251

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.2.16
+* [Lazy] Fix synchronization (#8)
+* [Memoization] Check for data before deleting 
+
+# v0.2.15
+* [Logger] Fix frozen string modification (#6)
+* [Stack] Add stack
+
 # v0.2.14
 * [Logger] Add logging helpers
 

data/CONTRIBUTING.md

@@ -1,22 +1,18 @@
 # Contributing
 
-## Branches
+## Fixes
 
-### `master` branch
+Have a fix to some bug you want to submit? Well you're
+awesome. Please just include a description of the bug
+(or link to originating issue) and test coverage on the
+modifications.
 
-The master branch is the current stable released version.
+## New Features
 
-### `develop` branch
-
-The develop branch is the current edge of development.
-
-## Pull requests
-
-* https://github.com/spox/bogo/pulls
-
-Please base all pull requests of the `develop` branch. Merges to
-`master` only occur through the `develop` branch. Pull requests
-based on `master` will likely be cherry picked.
+Have a new feature you want to add? Well you're awesome
+too! It may be a good idea to submit an issue first to
+describe the desired feature and get any feedback. Please
+be sure to include tests.
 
 ## Issues
 

data/LICENSE

@@ -1,4 +1,4 @@
-   Copyright 2018 Chris Roberts
+   Copyright 2022 Chris Roberts
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -10,4 +10,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

data/bogo.gemspec

@@ -12,9 +12,8 @@ Gem::Specification.new do |s|
   s.license = "Apache 2.0"
   s.add_runtime_dependency "hashie"
   s.add_runtime_dependency "multi_json"
-  s.add_runtime_dependency "concurrent-ruby", "~> 1.1.3"
   s.add_development_dependency "pry"
   s.add_development_dependency "minitest"
-  s.add_development_dependency "rake", "~> 10"
+  s.add_development_dependency "rake"
   s.files = Dir["lib/**/*"] + %w(bogo.gemspec README.md CHANGELOG.md CONTRIBUTING.md LICENSE)
 end

data/lib/bogo/animal_strings.rb

@@ -1,5 +1,3 @@
-require 'bogo'
-
 module Bogo
   # Animal stylings on strings
   module AnimalStrings
@@ -24,7 +22,5 @@ module Bogo
     def snake(string)
       string.to_s.gsub(/([a-z])([A-Z])/, '\1_\2').gsub('-', '_').downcase
     end
-
   end
-
 end

data/lib/bogo/constants.rb

@@ -1,10 +1,6 @@
-require 'bogo'
-
 module Bogo
-
   # Constant helper
   module Constants
-
     # Convert string to constant
     #
     # @param string [String] full constant name
@@ -40,7 +36,5 @@ module Bogo
         constantize(klass.join('::'))
       end
     end
-
   end
-
 end

data/lib/bogo/ephemeral_file.rb

@@ -1,15 +1,12 @@
-require 'bogo'
 require 'tempfile'
 
 module Bogo
   # Tempfile that will destroy itself when closed
   class EphemeralFile < Tempfile
-
     # Override to remove file after close
     def close
       super
       delete
     end
-
   end
 end

data/lib/bogo/http_proxy.rb

@@ -7,7 +7,6 @@ require 'http/request'
 # library to allow easy sharing. It is the responsibility of the user
 # to ensure the http gem is available!
 class HTTP::Request
-
   # Override to implicitly apply proxy as required
   #
   # NOTE: If dealing with https request, force port so CONNECT request
@@ -54,5 +53,4 @@ class HTTP::Request
     end
     "CONNECT #{@uri.host}:#{dest_port} HTTP/#{version}"
   end
-
 end

data/lib/bogo/lazy.rb

@@ -1,21 +1,32 @@
-require 'bogo'
 require 'multi_json'
+require 'monitor'
 require 'digest/sha2'
 
 module Bogo
   # Adds functionality to facilitate laziness
   module Lazy
-
     # Instance methods for laziness
     module InstanceMethods
 
+      def self.included(klass)
+        klass.include(MonitorMixin)
+        klass.instance_variable_set(:@calling_on_missing, false)
+      end
+
+      # @return [Monitor] Monitor instance for synchronization
+      def _mon
+        @mon ||= Monitor.new
+      end
+
       # @return [Smash] argument hash
       def data
-        unless(@data)
-          @data = Smash.new
-          self.class.attributes.each do |key, value|
-            if(value.has_key?('default'))
-              @data[key] = value['default']
+        _mon.synchronize do
+          unless(@data)
+            @data = Smash.new
+            self.class.attributes.each do |key, value|
+              if(value.has_key?('default'))
+                @data[key] = value['default']
+              end
             end
           end
         end
@@ -24,15 +35,17 @@ module Bogo
 
       # @return [Smash] updated data
       def dirty
-        unless(@dirty)
-          @dirty = Smash.new
+        _mon.synchronize do
+          unless(@dirty)
+            @dirty = Smash.new
+          end
         end
         @dirty
       end
 
       # @return [Smash] current data state
       def attributes
-        data.merge(dirty)
+        _mon.synchronize { data.merge(dirty) }
       end
 
       # Create new instance
@@ -40,20 +53,22 @@ module Bogo
       # @param args [Hash]
       # @return [self]
       def load_data(args={})
-        args = args.to_smash
-        @data = Smash.new
-        self.class.attributes.each do |name, options|
-          val = args[name]
-          if(options[:required] && !args.has_key?(name) && !options.has_key?(:default))
-            raise ArgumentError.new("Missing required option: `#{name}`")
-          end
-          if(val.nil? && !args.has_key?(name) && options[:default])
-            if(options[:default])
-              val = options[:default].respond_to?(:call) ? options[:default].call : options[:default]
+        _mon.synchronize do
+          args = args.to_smash
+          @data = Smash.new
+          self.class.attributes.each do |name, options|
+            val = args[name]
+            if(options[:required] && !args.has_key?(name) && !options.has_key?(:default))
+              raise ArgumentError.new("Missing required option: `#{name}`")
+            end
+            if(val.nil? && !args.has_key?(name) && options[:default])
+              if(options[:default])
+                val = options[:default].respond_to?(:call) ? options[:default].call : options[:default]
+              end
+            end
+            if(args.has_key?(name) || val)
+              self.send("#{name}=", val)
             end
-          end
-          if(args.has_key?(name) || val)
-            self.send("#{name}=", val)
           end
         end
         self
@@ -65,9 +80,11 @@ module Bogo
       #
       # @return [self]
       def valid_state
-        data.merge!(dirty)
-        dirty.clear
-        @_checksum = Digest::SHA256.hexdigest(MultiJson.dump(data.inspect).to_s)
+        _mon.synchronize do
+          data.merge!(dirty)
+          dirty.clear
+          @_checksum = Digest::SHA256.hexdigest(MultiJson.dump(data.inspect).to_s)
+        end
         self
       end
 
@@ -76,14 +93,16 @@ module Bogo
       # @param attr [String, Symbol] name of attribute
       # @return [TrueClass, FalseClass] model or attribute is dirty
       def dirty?(attr=nil)
-        if(attr)
-          dirty.has_key?(attr)
-        else
-          if(@_checksum)
-            !dirty.empty? ||
-              @_checksum != Digest::SHA256.hexdigest(MultiJson.dump(data.inspect).to_s)
+        _mon.synchronize do
+          if(attr)
+            dirty.has_key?(attr)
           else
-            true
+            if(@_checksum)
+              !dirty.empty? ||
+                @_checksum != Digest::SHA256.hexdigest(MultiJson.dump(data.inspect).to_s)
+            else
+              true
+            end
           end
         end
       end
@@ -100,19 +119,20 @@ module Bogo
 
       # @return [Hash]
       def to_h
-        Hash[
-          attributes.map{|k,v|
-            [k, v.is_a?(Array) ?
-              v.map{|x| x.respond_to?(:to_h) ? x.to_h : x} :
-              v.respond_to?(:to_h) ? v.to_h : v]
-          }
-        ]
+        _mon.synchronize do
+          Hash[
+            attributes.map{|k,v|
+              [k, v.is_a?(Array) ?
+                v.map{|x| x.respond_to?(:to_h) ? x.to_h : x} :
+                v.respond_to?(:to_h) ? v.to_h : v]
+            }
+          ]
+        end
       end
     end
 
     # Class methods for laziness
     module ClassMethods
-
       # Disable dirty state
       def always_clean!
         self.class_eval do
@@ -264,11 +284,9 @@ module Bogo
         @attributes = attrs.to_smash
         true
       end
-
     end
 
     class << self
-
       # Injects laziness into class
       #
       # @param klass [Class]
@@ -278,16 +296,12 @@ module Bogo
           extend ClassMethods
 
           class << self
-
             def inherited(klass)
               klass.set_attributes(self.attributes.to_smash)
             end
-
           end
         end
       end
-
     end
-
   end
 end

data/lib/bogo/logger.rb

@@ -1,4 +1,3 @@
-require "concurrent"
 require "logger"
 
 module Bogo
@@ -46,9 +45,9 @@ module Bogo
         logger_args = [$stderr]
       end
       @base_args = logger_args
-      logger = ::Logger.new(*@base_args)
-      logger.level = :fatal
-      @wrapped_logger = Concurrent::MVar.new(logger)
+      @logger = ::Logger.new(*@base_args)
+      @logger.level = :fatal
+      @lock = Mutex.new
     end
 
     # Create a new logger with the sub-name provided
@@ -56,7 +55,7 @@ module Bogo
     # @param name [String] sub-name for logger
     # @return [Logger]
     def named(name)
-      new_name = self.progname.to_s
+      new_name = self.progname.to_s.dup
       new_name << "." unless new_name.empty?
       new_name << name
       new_logger = Logger.new(*@base_args)
@@ -71,15 +70,9 @@ module Bogo
       next if l_m.to_s.start_with?("_") || l_m.to_s == "object_id"
       class_eval <<-EOC
       def #{l_m}(*ma, &mb)
-      wrapped_logger.borrow { |l| l.send(:#{l_m}, *ma, &mb) }
+        @lock.synchronize { @logger.send(:#{l_m}, *ma, &mb) }
       end
       EOC
     end
-
-    protected
-
-    def wrapped_logger
-      @wrapped_logger
-    end
   end
 end

data/lib/bogo/memoization.rb

@@ -1,16 +1,12 @@
-require 'bogo'
-
 module Bogo
   # Memoization helpers
   module Memoization
-
     # Lock for providing exclusive access
     EXCLUSIVE_LOCK = Mutex.new
     # Holder for global memoization items
     GLOBAL_MEMOS = Smash.new
 
     class << self
-
       # Clean up isolated memoizations
       #
       # @param object_id [Object]
@@ -19,7 +15,7 @@ module Bogo
         proc do
           Thread.current[:bogo_memoization].delete_if do |k,v|
             k.to_s.start_with?(object_id.to_s)
-          end
+          end if Thread.current[:bogo_memoization].is_a?(Hash)
         end
       end
 
@@ -38,7 +34,6 @@ module Bogo
           GLOBAL_MEMOS.clear
         end
       end
-
     end
 
     # Memoize data
@@ -123,6 +118,5 @@ module Bogo
       end
       true
     end
-
   end
 end

data/lib/bogo/priority_queue.rb

@@ -1,10 +1,7 @@
-require 'bogo'
-
 module Bogo
   # Specialized priority based queue
   # @note does not allow duplicate objects to be queued
   class PriorityQueue
-
     # Create a new priority queue
     #
     # @return [self]
@@ -24,10 +21,12 @@ module Bogo
     def push(item, cost=nil, &block)
       lock.synchronize do
         if(queue[item])
-          raise ArgumentError.new "Item already exists in queue. Items must be unique! (#{item})"
+          raise ArgumentError,
+            "Item already exists in queue. Items must be unique! (#{item})"
         end
         unless(cost || block_given?)
-          raise ArgumentError.new 'Cost must be provided as parameter or block!'
+          raise ArgumentError,
+            'Cost must be provided as parameter or block!'
         end
         @block_costs += 1 if cost.nil?
         queue[item] = cost || block
@@ -45,10 +44,12 @@ module Bogo
         items.each do |item_pair|
           item, cost = item_pair
           if(queue[item])
-            raise ArgumentError.new "Item already exists in queue. Items must be unique! (#{item})"
+            raise ArgumentError,
+              "Item already exists in queue. Items must be unique! (#{item})"
           end
           unless(cost.is_a?(Numeric) || cost.is_a?(Proc))
-            raise ArgumentError.new "Cost must be provided as parameter or proc! (item: #{item})"
+            raise ArgumentError,
+              "Cost must be provided as parameter or proc! (item: #{item})"
           end
           @block_costs += 1 if cost.is_a?(Proc)
           queue[item] = cost
@@ -106,7 +107,5 @@ module Bogo
     protected
 
     attr_reader :queue, :lock
-
   end
-
 end

data/lib/bogo/retry.rb

@@ -1,10 +1,6 @@
-require 'bogo'
-
 module Bogo
-
   # Perform action and retry until successful or abort
   class Retry
-
     # Create a type of retry
     #
     # @param type [String, Symbol] name of retry type
@@ -38,7 +34,8 @@ module Bogo
     # @return [self]
     def initialize(args={}, &block)
       unless(block)
-        raise ArgumentError.new 'Expecting block but no block was provided!'
+        raise ArgumentError,
+          'Expecting block but no block was provided!'
       end
       args = args.to_smash
       @ui = args[:ui]
@@ -58,7 +55,8 @@ module Bogo
     # @return [Object] result of action
     def run!
       if(dead)
-        raise RuntimeError.new "Action has already reached maximum allowed attempts (#{max_attempts})!"
+        raise RuntimeError,
+          "Action has already reached maximum allowed attempts (#{max_attempts})!"
       else
         begin
           log_attempt!
@@ -110,7 +108,6 @@ module Bogo
 
     # Flat retry implementation
     class Flat < Retry
-
       # @return [Numeric]
       attr_reader :wait_interval
 
@@ -133,12 +130,10 @@ module Bogo
       def wait_on_failure(*_)
         wait_interval
       end
-
     end
 
     # Linear retry implementation
     class Linear < Retry
-
       # @return [Numeric]
       attr_reader :wait_interval
 
@@ -161,12 +156,10 @@ module Bogo
       def wait_on_failure(*_)
         wait_interval * attempts
       end
-
     end
 
     # Exponential retry implementation
     class Exponential < Retry
-
       # @return [Numeric]
       attr_reader :wait_interval
       # @return [Numeric]
@@ -196,9 +189,6 @@ module Bogo
       def wait_on_failure(*_)
         retries == 0 ? wait_interval : (wait_interval + retries) ** wait_exponent
       end
-
     end
-
   end
-
 end

data/lib/bogo/smash.rb

@@ -1,12 +1,9 @@
 require 'hashie'
 require 'digest/sha2'
-require 'bogo'
 
 module Bogo
-
   # Customized Hash
   class Smash < Hash
-
     class NoValue; end
     NO_VALUE = NoValue.new
 
@@ -25,7 +22,7 @@ module Bogo
       if(args.first.is_a?(::Hash))
         base = args.shift
       end
-      super *args
+      super(*args)
       if(base)
         self.replace(base.to_smash)
       end
@@ -89,7 +86,8 @@ module Bogo
       elsif(args.size > 1)
         default_value = args.pop
       elsif(args.size < 1)
-        raise ArgumentError.new("Default value must be provided for #fetch")
+        raise ArgumentError,
+          "Default value must be provided for #fetch"
       end
       result = retrieve(*args)
       if(result == NO_VALUE)
@@ -105,7 +103,8 @@ module Bogo
     # @return [Object] value set
     def set(*args)
       unless(args.size > 1)
-        raise ArgumentError.new 'Set requires at least one key and a value'
+        raise ArgumentError,
+          'Set requires at least one key and a value'
       end
       value = args.pop
       set_key = args.pop
@@ -132,13 +131,11 @@ module Bogo
     def checksum
       Digest::SHA256.hexdigest(self.to_smash(:sorted).to_s)
     end
-
   end
 end
 
 # Hook helper into toplevel `Hash`
 class Hash
-
   # Convert to Smash
   #
   # @return [Smash]
@@ -198,11 +195,9 @@ class Hash
       args.include?(:freeze) ? obj.freeze : obj
     end
   end
-
 end
 
 class Array
-
   # Iterates searching for Hash types to auto convert
   #
   # @return [Array]
@@ -215,7 +210,6 @@ class Array
       end
     end
   end
-
 end
 
 unless(defined?(Smash))