pps_commons 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5a18be028e38ab0bbd7cf0c6aac4123ffeb9aa6
-  data.tar.gz: 72122f33cd7aa295d5175c60c56237f5bfddef97
+  metadata.gz: d8b150097ed1971d14a82d0a3d7c3c20beef5036
+  data.tar.gz: 9b6d1acd87d24b7da1fd5851a6e8097d23b41a5f
 SHA512:
-  metadata.gz: cd91e52bea59c2c47850b7d48b6dbd0cb585fc10778dc9197f18455d23842df21ebf052dcfb82b9aeda7ca700db6dd0b361cc7b085aab4095fa4a167677462a1
-  data.tar.gz: 46ed66bae46be0c6a30c4e20f92538785c9b1f846c9964434c404b32c78842d600d57d6048effc1eea12307d84a53edf6d2ba32235b9c589aad8af659def810b
+  metadata.gz: bd3d92e340ac590e4e6cb8e034eff74b34471648dbe846327aed59ba3d56d27afec5825f826b3afd499ed174bb804218e60f0604a5483493a7c58ec93010c97c
+  data.tar.gz: 49b079eb63bf431d5f15fffe68eba9013ff83a81da7026b23dee99e1a88e7b7ba14298bc89d82146075fa791b561a237b2da018a9b8703affa695a3985f9ec27

data/lib/pps_commons/delegation_agent.rb

@@ -1,11 +1,13 @@
 require 'byebug'
 require 'dotenv'
+require 'pps_commons'
+
 module WGU
   # The DelegationAgent class allows you to pass in a message and move on with
   # life.  It does this by understanding the message and deferring the correct
   # methods for later.  This class is called from the PPS agents in the work_loop.
   class DelegationAgent
-    include ::PPSCommons
+    include WGU::PPSCommons
 
     attr_accessor :requester
     attr_reader :sentence

data/lib/pps_commons/sentence.rb

@@ -1,7 +1,9 @@
-require 'pps_commons/commons'
+require 'pps_commons'
 
 module WGU
   class Sentence
+    include WGU::PPSCommons
+
     attr_reader :recipient
     attr_reader :message
 

data/lib/pps_commons/version.rb

@@ -1,3 +1,3 @@
 module PPSCommons
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/pps_commons.rb

@@ -1,10 +1,51 @@
-require 'pps_commons/commons'
+require 'rest-client'
+require 'json'
+require 'byebug'
 
-module PPSCommons
-  include Commons
-  extend Commons::ClassMethods
+module WGU
+  module PPSCommons
+    def self.included(base)
+      base.send :include, InstanceMethods
+    end
+    # this tells EventMachine how many threads it can use.  There is a lot of Deferrals
+    # in this project so it helps to run a higher number.
+    # EM defaults to '20', PPS defaults to '40'
+    def PPSCommons.unleash_the_fury_level
+      found = ENV['PPS_THREAD_COUNT'].to_i
+      found.eql?(0) ? 40 : found.to_i
+    end
+    # search through a hash's nested keys for crap
+    def PPSCommons.deep_find(key, object=self, found=nil)
+      if object.respond_to?(:key?) && object.key?(key)
+        object[key]
+      elsif object.respond_to?(:each)
+        object.find { |k,v| found = deep_find(key, v) }
+        found
+      end
+    end
 
-  def self.included(base)
-    base.send :include, Commons
+    # Common instance methods
+    module InstanceMethods
+      def logger(file = nil)
+        if @logger.nil?
+          log = ::File.expand_path(file)
+          unless ::File.exist?(log)
+            log_dir = File.dirname(log)
+            unless ::Dir.exist?(log_dir)
+              ::Dir.mkdir_p(log_dir)
+            end
+            ::File.new(log, 'a+')
+          end
+
+          Logger.new(log)
+        else
+          @logger
+        end
+      end
+      # instance version of +self.deep_find()+
+      def deep_find(key, object=self, found=nil)
+        WGU::PPSCommons.deep_find(key, object)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pps_commons
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Adam Phillipps
@@ -126,7 +126,6 @@ files:
 - bin/setup
 - lib/pps_commons.rb
 - lib/pps_commons/chef_comms.rb
-- lib/pps_commons/commons.rb
 - lib/pps_commons/delegation_agent.rb
 - lib/pps_commons/sentence.rb
 - lib/pps_commons/thycotic_comms.rb

data/lib/pps_commons/commons.rb

@@ -1,48 +0,0 @@
-require 'rest-client'
-require 'json'
-require 'byebug'
-
-module Commons
-  module ClassMethods
-    # this tells EventMachine how many threads it can use.  There is a lot of Deferrals
-    # in this project so it helps to run a higher number.
-    # EM defaults to '20', PPS defaults to '40'
-    def unleash_the_fury_level
-      found = ENV['PPS_THREAD_COUNT'].to_i
-      found.eql?(0) ? 40 : found.to_i
-    end
-
-    # search through a hash's nested keys for crap
-    def ClassMethods.deep_find(key, object=self, found=nil)
-      if object.respond_to?(:key?) && object.key?(key)
-        object[key]
-      elsif object.respond_to?(:each)
-        object.find { |k,v| found = deep_find(key, v) }
-        found
-      end
-    end
-  end
-
-  # TODO: accept a file path instead of somewhere in the gems
-  def logger(file = nil)
-    if @logger.nil?
-      log = ::File.expand_path(file)
-      unless ::File.exist?(log)
-        log_dir = File.dirname(log)
-        unless ::Dir.exist?(log_dir)
-          ::Dir.mkdir_p(log_dir)
-        end
-        ::File.new(log, 'a+')
-      end
-
-      Logger.new(log)
-    else
-      @logger
-    end
-  end
-
-  # instance version of +self.deep_find()+
-  def deep_find(key, object=self, found=nil)
-    Commons::ClassMethods.deep_find(key, object)
-  end
-end