jackal 0.3.10 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b2dc6038e53678793359a6a8df8c8a44be1142c
-  data.tar.gz: bfa8505b16fea3b018b7f7b2b87b19d421516f6b
+  metadata.gz: 02001e5b2ff6b59d1031f8121657bcb1e7ed5ee7
+  data.tar.gz: 0392d96103ada117ed0d36efb82aa8bb4c1033c2
 SHA512:
-  metadata.gz: 017e4b75a458bfc4a2da1bf64656c15fb5c0926ef374fa09964df856e0c27c1d51c8cb263d62816ee51403664d7739c1a38c5af2dd5ee90695e39dd0dc2357c3
-  data.tar.gz: fea17a6e85acca71f78889467bf7d19fa6c0b07634ec272175bac04218af9397f14e767db0166da8cab0ddbd00117d420389451bfcc37f71a4180fd29c14d99e
+  metadata.gz: 6eeb8f2de5be35b540209a3a366ffbf7c3668b5df73dd123509549ca7be26ee8b9a3577a80b65499cd23d81a25ea679b5ecd54cfd28e9e8b9757ff692be0afc7
+  data.tar.gz: 23cf4aa6b4966daa6b4329e5d88c03aeaa2ec16b25da321da68a579bb4fb59905784b10316c8f7f908dd5431fef7ba47599d21f82b3b6723c430e19d3faf2bf4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.3.12
+* Set default verbosity to :info
+* Support changing spec runner
+* Add options scrubbing on startup
+
 # v0.3.10
 * Add `:array` to allowed values for configuration type in service registration
 

data/lib/jackal/loader.rb

@@ -5,25 +5,50 @@ module Jackal
   class Loader
     class << self
 
-      # Run the jackal
+      # Configure the application
       #
       # @param opts [Hash]
-      def run!(opts)
-
+      # @return [TrueClass]
+      def configure!(opts)
+        default_verbosity = nil
         if(ENV['JACKAL_TESTING_MODE'])
           if(!opts[:config])
             Carnivore.configure!(:verify)
           else
             Carnivore.configure!(opts[:config], :force)
           end
+          default_verbosity = :fatal
         else
           Carnivore.configure!(opts[:config])
           Carnivore::Config.immutable!
+          default_verbosity = :info
         end
 
-        Celluloid.logger.level = Celluloid.logger.class.const_get(
-          (opts[:verbosity] || Carnivore::Config[:verbosity] || :debug).to_s.upcase
-        )
+        default_verbosity = :debug if ENV['DEBUG']
+        const = opts.fetch(:verbosity,
+          Carnivore::Config.fetch(:verbosity, default_verbosity)
+        ).to_s.upcase
+
+        Celluloid.logger.level = Celluloid.logger.class.const_get(const)
+        true
+      end
+
+      # Scrub and type opts
+      #
+      # @param opts [Slop,Hash]
+      # @return [Smash]
+      def process_opts(opts)
+        opts = opts.to_hash.to_smash
+        opts.delete_if{|k,v| v.nil?}
+        opts
+      end
+
+      # Run the jackal
+      #
+      # @param opts [Hash]
+      def run!(opts)
+        opts = process_opts(opts)
+        configure!(opts)
 
         Carnivore::Config.fetch(:jackal, :require, []).each do |path|
           require path

data/lib/jackal/utils/spec.rb

@@ -8,6 +8,9 @@ module Jackal
 
       class << self
 
+        # @return [Class] class used to run subsystem
+        attr_accessor :system_runner
+
         # Valid directories for test payloads
         #
         # @param args [String] list of directories to append
@@ -29,3 +32,5 @@ module Jackal
     end
   end
 end
+
+Jackal::Utils::Spec.system_runner = Jackal::Loader

data/lib/jackal/utils/spec/helpers.rb

@@ -62,7 +62,7 @@ def run_setup(config)
 
   Thread.abort_on_exception = true
   runner = Thread.new do
-    Jackal::Loader.run!(:config => path)
+    Jackal::Utils::Spec.system_runner.run!(:config => path)
   end
   source_wait(:setup)
   runner
@@ -98,7 +98,22 @@ end
 # @param wait_time [Numeric] max time to wait for message result (default 1)
 # @return [Smash] payload result
 def transmit_and_wait(actor, payload, wait_time = 1)
+  actor.callbacks.each do |c_name|
+    callback = actor.callback_supervisor[actor.callback_name(c_name)]
+    if(callback.respond_to?(:test_payload=))
+      callback.test_payload = Smash.new
+    end
+  end
   actor.transmit(payload)
   source_wait(wait_time) { !MessageStore.messages.empty? }
+  actor.callbacks.each do |c_name|
+    callback = actor.callback_supervisor[actor.callback_name(c_name)]
+    if(callback.respond_to?(:test_payload=))
+      unless(MessageStore.messages.empty?)
+        MessageStore.messages.first.deep_merge!(callback.test_payload)
+      end
+      callback.test_payload = nil
+    end
+  end
   MessageStore.messages.pop
 end

data/lib/jackal/version.rb

@@ -1,4 +1,4 @@
 module Jackal
   # Current library version
-  VERSION = Gem::Version.new('0.3.10')
+  VERSION = Gem::Version.new('0.3.12')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jackal
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.12
 platform: ruby
 authors:
 - Chris Roberts