carnivore 0.2.4 → 0.2.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ac834556d9171f25bda0fe15e7806a2f4f9dc9a7
+  data.tar.gz: 32e70f3f0d5ef57add22d7bf7f09f2a5cdb634f4
+SHA512:
+  metadata.gz: bab0685d6d936f9daa7f37814c2bbccb2760028ed4a347a4f855af4d1efe23ae9ba10f137024ea812444a053856e4f31a457839c6092448be387791aab5883b0
+  data.tar.gz: 7b822a61b2eb8370c8626c242e55713eb2946a365bdd2b0e46090171ce4d324f2b433a951f51f1379a4e95ad0694889383595df5a0bec950e086ab619e6ef4d7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.6
+* Provide arguments method alias for sources (#args)
+* Allow configuration via directory and file merge
+
 # v0.2.4
 * Move receive starts out of processing loop
 * Extract source name from arguments on setup

data/lib/carnivore/config.rb

@@ -40,7 +40,23 @@ module Carnivore
         if(path_or_hash.is_a?(Hash))
           conf = path_or_hash
         else
-          if(File.exists?(path_or_hash.to_s))
+          if(File.directory?(path_or_hash.to_s))
+            files = Dir.new(path_or_hash.to_s).find_all do |f|
+              File.extname(f) == '.json'
+            end.sort
+            conf = files.inject(Smash.new) do |memo, path|
+              memo.deep_merge!(
+                MultiJson.load(
+                  File.read(
+                    File.join(
+                      path_or_hash.to_s, path
+                    )
+                  )
+                ).to_smash
+              )
+            end
+            self.config_path = path_or_hash
+          elsif(File.exists?(path_or_hash.to_s))
             conf = JSON.load(File.read(path_or_hash))
             self.config_path = path_or_hash
           else

data/lib/carnivore/source.rb

@@ -127,6 +127,9 @@ module Carnivore
     # @return [Hash] original options hash
     attr_reader :arguments
 
+    # @note this is just a compat method for older sources
+    alias_method :args, :arguments
+
     # Create new Source
     #
     # @param args [Hash]

data/lib/carnivore/spec_helper.rb

@@ -23,7 +23,11 @@ end
 # @param name [String, Symbol] fetch wait time from environment variable
 # @return [Numeric] seconds sleeping
 def source_wait(name='wait')
-  total = ENV.fetch("CARNIVORE_SOURCE_#{name.to_s.upcase}", 1.0).to_f
+  if(name.is_a?(String) || name.is_a?(Symbol))
+    total = ENV.fetch("CARNIVORE_SOURCE_#{name.to_s.upcase}", 1.0).to_f
+  else
+    total = name.to_f
+  end
   if(block_given?)
     elapsed = 0.0
     until(yield || elapsed >= total)

data/lib/carnivore/version.rb

@@ -1,7 +1,4 @@
 module Carnivore
-  # Versioning class for library
-  class Version < Gem::Version
-  end
   # Current version of library
-  VERSION = Version.new('0.2.4')
+  VERSION = Gem::Version.new('0.2.6')
 end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: carnivore
 version: !ruby/object:Gem::Version
-  version: 0.2.4
-  prerelease: 
+  version: 0.2.6
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Message processing helper
@@ -81,51 +72,50 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- README.md
+- carnivore.gemspec
+- lib/carnivore.rb
 - lib/carnivore/callback.rb
+- lib/carnivore/config.rb
+- lib/carnivore/container.rb
 - lib/carnivore/errors.rb
-- lib/carnivore/supervisor.rb
-- lib/carnivore/source/test.rb
-- lib/carnivore/source.rb
-- lib/carnivore/version.rb
+- lib/carnivore/message.rb
 - lib/carnivore/runner.rb
+- lib/carnivore/source.rb
+- lib/carnivore/source/test.rb
+- lib/carnivore/source_container.rb
 - lib/carnivore/spec_helper.rb
-- lib/carnivore/utils/message_registry.rb
-- lib/carnivore/utils/smash.rb
+- lib/carnivore/supervisor.rb
+- lib/carnivore/utils.rb
 - lib/carnivore/utils/logging.rb
+- lib/carnivore/utils/message_registry.rb
 - lib/carnivore/utils/params.rb
-- lib/carnivore/config.rb
-- lib/carnivore/message.rb
-- lib/carnivore/source_container.rb
-- lib/carnivore/utils.rb
-- lib/carnivore/container.rb
-- lib/carnivore.rb
-- carnivore.gemspec
-- README.md
-- CHANGELOG.md
+- lib/carnivore/utils/smash.rb
+- lib/carnivore/version.rb
 homepage: https://github.com/carnivore-rb/carnivore
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Message processing helper
 test_files: []
 has_rdoc: