liquid-ext 3.5.0 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1eb7c79616fa8b96ebb46d0dbff36b696b54896
-  data.tar.gz: bf5333639d97bf2c6b7842d0d3cff015cac441af
+  metadata.gz: fcf33e837810fb6d1c70d5263c0c0036b45c8c2c
+  data.tar.gz: 704fe02ff19e1c7f0374b1e45c134ef523abe6dc
 SHA512:
-  metadata.gz: 6ed90f105bc6ae3888833d2f03a3161ff639d46715a41cf4b54a71a322decdd3c5f90f369f4e3b76563051d6551f3c0c99a543108d2eedf042f6802161d1d6f8
-  data.tar.gz: a0ee19cd66b5906d89d50fb4437fd42db27084be22b8f5fa98633d6237b718ea11550f2d41360da11691309168917d910193d83b274b62596bb74bb00897ff60
+  metadata.gz: a95157e84464c6bb4e3d62db3bbcd4419ba336a969fcd876dbad9684e60a6d2bec31284b38fbb05106ea5bea00db37e9e8184b05ee153718dca5b4f385b0f5cf
+  data.tar.gz: cbbb0d4082065136c21688602c71395fff7f280a92a5ed43d356f5fd43cc19c539851c79c62492107b8cf81f203c7222da4970e219fa9399d66a5b9adb7e1681

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    liquid-ext (3.5.0)
+    liquid-ext (3.5.2)
       activesupport
       erubis
       jmx4r
@@ -12,13 +12,14 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.1.1)
+    activesupport (4.1.5)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     awesome_print (1.2.0)
+    bond (0.5.1)
     bond (0.5.1-java)
     brice (0.2.9)
       ruby-nuggets (>= 0.5.2)
@@ -33,7 +34,7 @@ GEM
       rspec (>= 2.14.0, < 3.1.0)
       ruby-progressbar (~> 1.4)
     hirb (0.7.1)
-    i18n (0.6.9)
+    i18n (0.6.11)
     jmx4r (0.1.4)
     json (1.8.1-java)
     liquid-development (0.2.1)
@@ -55,11 +56,15 @@ GEM
       yard
     log_switch (0.4.0)
     method_source (0.8.2)
-    minitest (5.3.4)
+    minitest (5.4.0)
     mixlib-cli (1.5.0)
     multi_json (1.10.1)
     nokogiri (1.6.2.1-java)
     parallel (1.0.0)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     pry (0.9.12.6-java)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -107,10 +112,10 @@ GEM
       tins (~> 1.0)
     terminal-table (1.4.5)
     text-table (1.2.3)
-    thread_safe (0.3.3-java)
+    thread_safe (0.3.4-java)
     timecop (0.7.1)
     tins (1.3.0)
-    tzinfo (1.1.0)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     yard (0.8.7.4)
 

data/lib/liquid/boot.rb

@@ -68,7 +68,7 @@ reload_mixins = ->(conf) do
     config_yml = File.join(ROOT, 'config.yml')
     conf.mixin(config_yml) if File.exist?(config_yml)
     dot_user = File.join(ROOT, '.user')
-    if File.exists?(dot_user)
+    if File.exist?(dot_user)
       File.readlines(dot_user).each do |line|
         user_yml = File.join(ROOT, 'config', 'mixins', "#{line.chomp}.yml")
         conf.mixin(user_yml)

data/lib/liquid/cli.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 
-require 'liquid/boot'
 require 'mixlib/cli'
 
 class CLI

data/lib/liquid/ext/array.rb

@@ -8,10 +8,6 @@ class Array
     self[Kernel::rand(size)-1]
   end
 
-  def to_h(&block)
-    Hash[*self.map { |v| [v, block.call(v)] }.flatten]
-  end
-
   def / parts
     inject([[]]) do |ary, x|
       ary << [] if [*ary.last].nitems == length / parts

data/lib/liquid/ext/hash.rb

@@ -3,20 +3,6 @@
 #
 class Hash
 
-  # Recursively merge +other_hash+ into +self+ and return the new hash.
-  def deep_merge(other_hash)
-    self.merge(other_hash) do |key, oldval, newval|
-      oldval = oldval.to_hash if oldval.respond_to?(:to_hash) && !oldval.is_a?(Array)
-      newval = newval.to_hash if newval.respond_to?(:to_hash) && !newval.is_a?(Array)
-      oldval.is_a?(Hash) && newval.is_a?(Hash) ? oldval.deep_merge(newval) : newval
-    end
-  end
-
-  # Recursively merge and replace +other_hash+ into +self+.
-  def deep_merge!(other_hash)
-    replace(deep_merge(other_hash))
-  end
-
   # accumulate existing keys from +other_hash+ into +self+.
   def delta_merge!(other_hash)
     other_hash.each do |k,v|

data/lib/liquid/health_checks.rb

@@ -23,6 +23,10 @@ class HealthCheck
   @@checks = {}
   @@callbacks = []
 
+  def self.register(name, &block)
+    @@checks[name.to_s] = block
+  end
+
   def self.inherited(child)
     @@checks[child.name.demodulize] = child
   end
@@ -32,9 +36,19 @@ class HealthCheck
   end
 
   def self.run
-    @@checks.inject({}) do |result, (name, handler)|
-      result[name] = handler.new.execute
-      result
+    @@checks.inject({}) do |results, (name, handler)|
+      if handler.is_a? Proc
+        result = handler.call
+      else
+        result = handler.new.execute
+      end
+
+      unless result.is_a? Result
+        result = Result.new(result , nil, nil)
+      end
+
+      results[name] = result
+      results
     end
   end
 

data/lib/liquid/metrics/tracker_reporter.rb

@@ -1,5 +1,4 @@
 require 'liquid/metrics/reporter'
-require 'liquid/tracker'
 
 module Metrics
   class TrackerReporter < Reporter

data/lib/liquid/tracker/base.rb

@@ -21,7 +21,8 @@ module Tracker
     end
 
     def event(obj)
-      @tracker.event(@topic, @serializer.dump(obj))
+      log_entry = @serializer.dump(obj)
+      @tracker.event(@topic, log_entry) if log_entry
     end
   end
 end

data/lib/liquid/tracker/logger_tracker.rb

@@ -1,4 +1,3 @@
-require 'liquid/boot'
 require 'liquid/tracker/base'
 
 module Tracker

data/liquid-ext.gemspec

@@ -1,24 +1,24 @@
 # encoding: utf-8
 
 Gem::Specification.new do |spec|
-  spec.name          = "liquid-ext"
-  spec.version       = "3.5.0"
-  spec.authors       = ["LiquidM, Inc."]
-  spec.email         = ["opensource@liquidm.com"]
-  spec.description   = %q{Ruby core extensions and helper libraries}
-  spec.summary       = %q{Ruby core extensions and helper libraries}
-  spec.homepage      = "https://github.com/liquidm/ext"
+  spec.name          = 'liquid-ext'
+  spec.version       = '3.5.2'
+  spec.authors       = ['LiquidM, Inc.']
+  spec.email         = ['opensource@liquidm.com']
+  spec.description   = %q{LiquidM ruby core extensions and helper libraries}
+  spec.summary       = %q{A collection of common utilities used in various LiquidM projects}
+  spec.homepage      = 'https://github.com/liquidm/ext'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "activesupport"
-  spec.add_dependency "erubis"
-  spec.add_dependency "jmx4r"
-  spec.add_dependency "mixlib-cli"
-  spec.add_dependency "multi_json"
-  spec.add_dependency "terminal-table"
+  spec.add_dependency 'activesupport', '~> 0'
+  spec.add_dependency 'erubis', '~> 0'
+  spec.add_dependency 'jmx4r', '~> 0'
+  spec.add_dependency 'mixlib-cli', '~> 0'
+  spec.add_dependency 'multi_json', '~> 0'
+  spec.add_dependency 'terminal-table', '~> 0'
 end

metadata

@@ -1,100 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: liquid-ext
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.2
 platform: ruby
 authors:
 - LiquidM, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+  name: activesupport
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: erubis
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+  name: erubis
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jmx4r
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+  name: jmx4r
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: mixlib-cli
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+  name: mixlib-cli
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: multi_json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+  name: multi_json
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: terminal-table
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+  name: terminal-table
   prerelease: false
   type: :runtime
-description: Ruby core extensions and helper libraries
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+description: LiquidM ruby core extensions and helper libraries
 email:
 - opensource@liquidm.com
 executables:
@@ -142,11 +142,11 @@ files:
 - lib/liquid/hash_helper.rb
 - lib/liquid/health_checks.rb
 - lib/liquid/javassist-3.15.0-GA.jar
-- lib/liquid/jeromq-0.3.3.jar
+- lib/liquid/jeromq-0.3.5-SNAPSHOT.jar
 - lib/liquid/kafka_2.10-0.8.0.jar
 - lib/liquid/log4j-1.2.17.jar
 - lib/liquid/logger.rb
-- lib/liquid/mapdb-0.9.3.jar
+- lib/liquid/mapdb-1.1.0-SNAPSHOT.jar
 - lib/liquid/metrics-annotation-2.2.0.jar
 - lib/liquid/metrics-core-2.2.0.jar
 - lib/liquid/metrics-core-3.0.1.jar
@@ -215,7 +215,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
-summary: Ruby core extensions and helper libraries
+summary: A collection of common utilities used in various LiquidM projects
 test_files:
 - spec/lib/liquid/ext/enumerable_spec.rb
 - spec/lib/liquid/weighted_selector_spec.rb