jackal 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21788721bbd42cb37b1a3a32431de360a07d8722
-  data.tar.gz: be2baadcafd0eb1d9dd2483b7ca2d4b1e223c869
+  metadata.gz: 87d40ed9a2151a4e456b7a80a817e81856b471b5
+  data.tar.gz: cfda4c42c5e359630c8d296c1f8be8f4fbb1956a
 SHA512:
-  metadata.gz: bd4b0bd8c69a72d965a1a2632dfdad6774bbadb42303b1bb8c86ffb5e0fa864edaed11a8e15901f512ad69e2973d309229fddfd9817df649f1901789aa429a51
-  data.tar.gz: 40ea38a0fc50d7723fbcc1ff3100d4fa66fde87340c83bd24652dbeff350cb517f0e565d11b6c11e86e8579ff1714c00271f1964efbe56e82c139a7c2bfd8600
+  metadata.gz: d3b2963e4f7f5ee5078665980843904fd17afd1edd04b1ff1865e6bbfa109826fb688f1a68645d0f11e8465c549337cd7450de81f578070ccd2e0477c021645b
+  data.tar.gz: d2dc8f35b125bdf42beb18a30786d9396adcf5e67d1b17e7a059fa50a19310c8353c51555f1c30c639e7b6455e4b3f188262ff2f3b0dd27812683b55045ebb2d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.3.0
+* Force source looping on `Callback#completed`
+* Move HTTP hook configuration within jackal namespace
+* Add support for using `spawn` on a per-process basis
+* Link owner callback into formatters
+
 # v0.2.4
 * Fix nesting for orphan callback setup
 * Add constant and memoization helpers into `Callback`

data/lib/jackal/callback.rb

@@ -1,4 +1,5 @@
 require 'jackal'
+require 'pp'
 
 module Jackal
   # Jackal customized callback
@@ -22,7 +23,7 @@ module Jackal
       super
       if(service_config[:formatters])
         @formatters = service_config[:formatters].map do |klass_name|
-          constantize(klass_name).new
+          constantize(klass_name).new(self)
         end
       end
     end
@@ -40,7 +41,7 @@ module Jackal
     # @return [Utils::Process]
     def process_manager
       memoize(:process_manager) do
-        Utils::Process.new
+        Utils::Process.new(app_config.fetch(:process_manager, Smash.new))
       end
     end
 
@@ -77,13 +78,13 @@ module Jackal
     def failed(payload, message, reason='No reason provided')
       error "Processing of #{message} failed! Reason: #{reason}"
       message.confirm!
-      destination = "#{source_prefix}_error"
-      source = Carnivore::Supervisor.supervisor[destination]
+      dest = destination(:error, payload)
+      source = Carnivore::Supervisor.supervisor[dest]
       if(source)
         error "Sending #{message} to error handler: #{source}"
         source.transmit(payload)
       else
-        error "No error source found for generated source path: #{destination}"
+        error "No error source found for generated source path: #{dest}"
         info "Processing of message #{message} has completed. Message now discarded."
       end
     end
@@ -95,21 +96,23 @@ module Jackal
     def completed(payload, message)
       message.confirm!
       info "Processing of #{message} complete on this callback"
-      forward(payload)
+      forward(payload, source.name)
     end
 
     # Forward payload to output source
     #
     # @param payload [Hash]
-    def forward(payload)
-      destination = "#{source_prefix}_output"
-      source = Carnivore::Supervisor.supervisor[destination]
+    def forward(payload, dest=nil)
+      unless(dest)
+        dest = destination(:output, payload)
+      end
+      source = Carnivore::Supervisor.supervisor[dest]
       if(source)
         info "Forwarding payload to output destination... (#{source})"
-        debug "Forwarded payload: #{payload.inspect}"
+        debug "Forwarded payload: #{payload.pretty_inspect}"
         source.transmit(payload)
       else
-        warn "No destination source found for generated source path: #{destination}"
+        warn "No destination source found for generated source path: #{dest}"
         info "Processing of message has completed. Message now discarded."
       end
     end

data/lib/jackal/loader.rb

@@ -10,8 +10,12 @@ module Jackal
       # @param opts [Hash]
       def run!(opts)
 
-        if(ENV['JACKAL_TESTING_MODE'] && !opts[:config])
-          Carnivore.configure!(:verify)
+        if(ENV['JACKAL_TESTING_MODE'])
+          if(!opts[:config])
+            Carnivore.configure!(:verify)
+          else
+            Carnivore.configure!(opts[:config], :force)
+          end
         else
           Carnivore.configure!(opts[:config])
           Carnivore::Config.immutable!

data/lib/jackal/utils.rb

@@ -4,6 +4,12 @@ module Jackal
   # Helper utilities
   module Utils
 
+    # Valid configuration paths for hook configuration
+    HTTP_HOOK_CONFIG = [
+      [:http_hook],
+      [:jackal, :http_hook]
+    ]
+
     autoload :Spec, 'jackal/utils/spec'
     autoload :Payload, 'jackal/utils/payload'
     autoload :Config, 'jackal/utils/config'
@@ -16,18 +22,21 @@ module Jackal
 
     class << self
 
-      # Load thee HTTP Hook if configured
+      # Load the HTTP Hook if configured
       #
       # @return [TrueClass, FalseClass]
       def load_http_hook
-        if(Carnivore::Config.get(:http_hook))
+        hook_config = HTTP_HOOK_CONFIG.map do |path|
+          Carnivore::Config.get(*path)
+        end.compact.first
+        if(hook_config)
           Carnivore.configure do
             Carnivore::Source.build(
               :type => :http_endpoints,
               :args => {
-                :name => :http_hook,
-                :bind => Carnivore::Config.get(:http_hook, :bind) || "0.0.0.0",
-                :port => Carnivore::Config.get(:http_hook, :port) || 8989
+                :name => :jackal_http_hook,
+                :bind => hook_config.fetch(:bind, "0.0.0.0"),
+                :port => hook_config.fetch(:port, 8989)
               }
             )
           end

data/lib/jackal/utils/config.rb

@@ -4,6 +4,20 @@ module Jackal
   module Utils
     module Config
 
+      # Load extra modules automatically
+      def self.included(klass)
+        klass.class_eval do
+          include Bogo::AnimalStrings
+        end
+      end
+
+      # Load extra modules automatically
+      def self.extended(klass)
+        klass.class_eval do
+          extend Bogo::AnimalStrings
+        end
+      end
+
       # @return [Symbol] name of service
       def service_name(class_name = self.class.name)
         config_path(class_name).last.to_sym
@@ -12,7 +26,7 @@ module Jackal
       # @return [Array] key path in configuration
       def config_path(class_name = self.class.name)
         class_name.split('::')[0,2].map do |string|
-          string.gsub(/(?<![A-Z])([A-Z])/, '_\1').sub(/^_/, '').downcase
+          snake(string)
         end
       end
 
@@ -21,6 +35,16 @@ module Jackal
         config_path.join('_')
       end
 
+      # @return [Smash] application configuration
+      def app_config
+        Carnivore::Config.fetch(
+          snake(
+            self.class.name.split('::').first
+          ),
+          Smash.new
+        )
+      end
+
       # @return [Smash] service configuration
       def service_config
         Carnivore::Config.get(*config_path) || Smash.new
@@ -31,11 +55,12 @@ module Jackal
         service_config[:config] || Smash.new
       end
 
-      # Generation destination key based on direction
+      # Generate destination key based on direction
       #
       # @param direction [Symbol, String]
+      # @param payload [Smash]
       # @return [Symbol]
-      def destination(direction = :output)
+      def destination(direction, payload)
         [source_prefix, direction].map(&:to_s).join('_').to_sym
       end
 

data/lib/jackal/utils/process.rb

@@ -8,15 +8,24 @@ module Jackal
   module Utils
     class Process
 
+      # Default path for IO tmp files
+      DEFAULT_STORAGE_DIRECTORY = '/tmp/jackal-process-manager'
+
+      # @return [Smash] manager configuration
+      attr_reader :configuration
+      # @return [String] storage directory path
+      attr_reader :storage_directory
+
       # Create new instance
       #
+      # @param config [Smash] process manager configuration
       # @return [self]
-      def initialize
-        @storage_directory = Carnivore::Config.fetch(
-          :fission, :utils, :process_manager, :storage,
-          '/tmp/fission/process_manager'
+      def initialize(config={})
+        @configuration = config.to_smash
+        @storage_directory = configuration.fetch(
+          :storage_directory, DEFAULT_STORAGE_DIRECTORY
         )
-        FileUtils.mkdir_p(@storage_directory)
+        FileUtils.mkdir_p(storage_directory)
       end
 
       # Create new process
@@ -30,7 +39,13 @@ module Jackal
           command = Shellwords.shellsplit(command.first)
         end
         if(block_given?)
-          yield ChildProcess.build(*command)
+          if(configuration[:spawn])
+            yield ChildProcess::Unix::PosixSpawnProcess.new(command)
+          else
+            yield ChildProcess.build(*command)
+          end
+        else
+          raise ArgumentError.new('Expecting block but no block provided!')
         end
         true
       end
@@ -40,7 +55,7 @@ module Jackal
       # @param args [String] argument list joined for filename
       # @return [IO]
       def create_io_tmp(*args)
-        path = File.join(@storage_directory, args.join('-'))
+        path = File.join(storage_directory, args.join('-'))
         FileUtils.mkdir_p(File.dirname(path))
         t_file = File.open(path, 'w+')
         t_file.sync

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

@@ -40,7 +40,7 @@ def payload_for(style, args={})
       if(args[:nest])
         Jackal::Utils.new_payload(:test, args[:nest] => MultiJson.load(File.read(path)))
       else
-        Jackal::Utils.new_payload(:test, File.read(path))
+        Jackal::Utils.new_payload(:test, MultiJson.load(File.read(path)))
       end
     end
   else

data/lib/jackal/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jackal
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore