liquid-ext 2.0.3 → 3.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5b4739125c0f045cc43cf1d3dc7658d0d06f0b64
+  data.tar.gz: e3bd9b7031b166c16c799c7064149bb2c2cc4499
+SHA512:
+  metadata.gz: 02a4e55a0fc87c47b2e2f994c2d6ae8fe056847b5bc60968e3d0751d1cc852770bd93fd36f9d13eb6f6f870d33c10d21bca067441ea3e4ee1a568c67f434a4db
+  data.tar.gz: f732a993fc2509cbe4e89c73021d49170ec8776bd9a348a8d4fce366918c471a6577d52b3ce49e91bcabdcc0cda6175a410a5d0dd9a7e8f10e2e043e012b5990

data/Gemfile

@@ -2,5 +2,4 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'lock_jar'
 gem 'liquid-development'

data/Gemfile.lock

@@ -1,17 +1,16 @@
 PATH
   remote: .
   specs:
-    liquid-ext (2.0.2)
+    liquid-ext (3.0.0)
       activesupport
       erubis
-      liquid-logging (>= 2.0.0)
       mixlib-cli
       terminal-table
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.0.2)
+    activesupport (4.0.3)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -19,7 +18,7 @@ GEM
       tzinfo (~> 0.3.37)
     atomic (1.1.14-java)
     awesome_print (1.2.0)
-    bond (0.4.3-java)
+    bond (0.5.1-java)
     brice (0.2.9)
       ruby-nuggets (>= 0.5.2)
     cane (2.6.1)
@@ -27,21 +26,25 @@ GEM
     coderay (1.1.0)
     columnize (0.3.6)
     diff-lcs (1.2.5)
-    docile (1.1.2)
+    docile (1.1.3)
     erubis (2.7.0)
     ffi (1.9.3-java)
     fuubar (1.3.2)
       rspec (>= 2.14.0, < 3.1.0)
       ruby-progressbar (~> 1.3)
+    hirb (0.7.1)
     i18n (0.6.9)
-    liquid-development (0.1.2)
+    liquid-development (0.2.0)
       awesome_print
+      bond
       brice
       cane
       fuubar
+      hirb
       pry
       rake
       reek
+      rib
       ripl
       rspec
       ruby-debug
@@ -49,20 +52,12 @@ GEM
       tailor
       timecop
       yard
-    liquid-logging (2.0.1-java)
-      log4jruby (~> 1.0.0.rc1)
-      slyphon-log4j (~> 1.2.15)
-    lock_jar (0.7.5)
-      naether (~> 0.10.1)
-      thor (~> 0.18.1)
-    log4jruby (1.0.0.rc1-java)
     log_switch (0.4.0)
     method_source (0.8.2)
     mini_portile (0.5.2)
     minitest (4.7.5)
     mixlib-cli (1.4.0)
     multi_json (1.8.4)
-    naether (0.10.1-java)
     nokogiri (1.6.1-java)
       mini_portile (~> 0.5.0)
     parallel (0.9.2)
@@ -76,16 +71,16 @@ GEM
       ruby2ruby (~> 2.0.7)
       ruby_parser (~> 3.2)
       sexp_processor
-    ripl (0.7.0)
-      bond (~> 0.4.2)
+    rib (1.2.3)
+    ripl (0.1.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec-mocks (2.14.6)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -95,7 +90,7 @@ GEM
     ruby2ruby (2.0.7)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.3.0)
+    ruby_parser (3.4.1)
       sexp_processor (~> 4.1)
     sexp_processor (4.4.1)
     simplecov (0.8.2)
@@ -104,7 +99,6 @@ GEM
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.4.7)
-    slyphon-log4j (1.2.15)
     spoon (0.0.4)
       ffi
     tailor (1.4.0)
@@ -112,15 +106,14 @@ GEM
       nokogiri (>= 1.6.0)
       term-ansicolor (>= 1.0.5)
       text-table (>= 1.2.2)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
     terminal-table (1.4.5)
     text-table (1.2.3)
-    thor (0.18.1)
     thread_safe (0.1.3-java)
       atomic
     timecop (0.7.1)
-    tins (0.13.1)
+    tins (1.0.0)
     tzinfo (0.3.38)
     yard (0.8.7.3)
 
@@ -130,4 +123,3 @@ PLATFORMS
 DEPENDENCIES
   liquid-development
   liquid-ext!
-  lock_jar

data/bin/liquid

@@ -5,9 +5,9 @@ ROOT = File.expand_path('../..', __FILE__)
 require 'bundler/setup'
 require 'liquid/boot'
 
-require 'liquid/generator'
+require 'liquid/console'
 
-CLI.for(Liquid::Generator) do
+CLI.for(Liquid::Console) do
   option :author,
     :short => '-a',
     :long => '--author',

data/lib/liquid/benchmark.rb

@@ -4,6 +4,6 @@ module Benchmark
   def realtime(&block)
     timing = Timing.start
     yield
-    timing.stop
+    timing.stop.to_f / 1_000_000_000
   end
 end

data/lib/liquid/boot.rb

@@ -20,6 +20,11 @@ if RUBY_PLATFORM == 'java'
     # do nothing
   end
 
+  # load bundled jars
+  Dir[File.join(File.dirname(__FILE__), '*.jar')].each do |f|
+    require f
+  end
+
   # some java libraries cannot be found on maven central, so we load all bundled
   # jar files here for convenience
   if defined?(ROOT)
@@ -29,33 +34,41 @@ if RUBY_PLATFORM == 'java'
   end
 end
 
-# load default configuration
-require 'liquid-logging'
-require 'liquid/configuration'
-
-$conf = Configuration.new
+# load a bunch of common classes here, so we don't have to track and repeat it
+# everywhere
+require 'active_support/all'
+require 'cgi'
+require 'date'
+require 'json'
+require 'socket'
+require 'time'
 
-# configuration-reloading callbacks
-reload_logger = ->(conf) do
-  ImprovedLogger::Formatter.format = conf.log_format
-  ImprovedLogger::Formatter.log4j_format = conf.log4j_format
+# load all extensions
+Dir[File.join(File.dirname(__FILE__), 'ext', '*.rb')].each do |f|
+  require f
+end
 
-  $log = MultiLogger.new
-  $log.attach(ImprovedLogger.new(conf.log_backend.to_sym, File.basename($0)))
-  $log.level = conf.log_level.downcase.to_sym
-  $log.log_caller = conf.log_caller
+require 'liquid/benchmark'
+require 'liquid/cli'
+require 'liquid/environment'
+require 'liquid/from_file'
+require 'liquid/hash_helper'
+require 'liquid/metrics'
+require 'liquid/timing'
+require 'liquid/transaction_id'
+require 'liquid/zmq'
 
-  # sneak this in automatically
-  ZK.logger = $log if ::Module.const_defined?(:ZK)
+# configuration callbacks
+require 'liquid/logger'
+reload_logger = ->(conf) do
+  $log = Liquid::Logger.new("root")
 end
 
 reload_mixins = ->(conf) do
   if defined?(ROOT)
     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)
       File.readlines(dot_user).each do |line|
         user_yml = File.join(ROOT, 'config', 'mixins', "#{line.chomp}.yml")
@@ -65,30 +78,29 @@ reload_mixins = ->(conf) do
   end
 end
 
-# reload configuration, trigger callbacks
+require 'liquid/configuration'
+$conf = Liquid::Configuration.new
+
+$conf.mixin({
+  generic: {
+    log: {
+      caller: false,
+      level: :info,
+      format: "%d{ISO8601} %-5p #{File.basename($0)}(#{Process.pid})[%t]: %m%n",
+    },
+  },
+  production: {
+    log: {
+      format: "[%t]: %m%n",
+    },
+  },
+  staging: {
+    log: {
+      format: "[%t]: %m%n",
+    },
+  },
+})
+
 $conf.callback(&reload_mixins)
 $conf.callback(&reload_logger)
-
 $conf.reload!
-
-# load a bunch of common classes here, so we don't have to track and repeat it
-# everywhere
-require 'active_support/all'
-require 'cgi'
-require 'date'
-require 'json'
-require 'socket'
-require 'time'
-
-# load all extensions
-Dir[File.join(File.dirname(__FILE__), 'ext', '*.rb')].each do |f|
-  require f
-end
-
-require 'liquid/benchmark'
-require 'liquid/cli'
-require 'liquid/environment'
-require 'liquid/from_file'
-require 'liquid/hash_helper'
-require 'liquid/timing'
-require 'liquid/transaction_id'

data/lib/liquid/cli.rb

@@ -6,11 +6,6 @@ require 'mixlib/cli'
 class CLI
   include Mixlib::CLI
 
-  option :configfile,
-    short: '-c FILE',
-    long: '--config FILE',
-    description: 'Configuration File to load'
-
   option :name,
     :short => '-n NAME',
     :long => '--name NAME',
@@ -31,7 +26,7 @@ class CLI
     :description => "Enable debug output",
     :boolean => true,
     :default => false,
-    :proc => ->(value) { $conf.mixin(log_level: value ? :debug : :info); value }
+    :proc => ->(value) { $conf.mixin(debug: value, log: { level: value ? :debug : :info }); value }
 
   option :help,
     :short => '-h',

data/lib/liquid/configuration.rb

@@ -7,152 +7,135 @@ require 'liquid/ext/hash'
 require 'liquid/ext/ordered_set'
 require 'liquid/environment'
 
-##
-# A {Configuration} consists of one or more Sections. A section is a hash-like
-# object that responds to all keys in the hash as if they were methods:
-#
-#   > s = Section.from_hash({:v1 => 2, :nested => {:v2 => 1}})
-#   > s.v1
-#   => 2
-#   > s.nested.v2
-#   => 1
-#
-class Section < Hash
-
-  class << self
-
-    # How to handle nil values in the configuration?
-    #
-    # Possible values are:
-    #  - :nil, nil  (return nil)
-    #  - :raise  (raise an exception)
-    #  - :section  (return a NilSection which can be chained)
-    #
-    attr_accessor :nil_action
+module Liquid
+  ##
+  # Am {Configuration} consists of one or more Sections. A section is a hash-like
+  # object that responds to all keys in the hash as if they were methods:
+  #
+  #   > s = Section.from_hash({:v1 => 2, :nested => {:v2 => 1}})
+  #   > s.v1
+  #   => 2
+  #   > s.nested.v2
+  #   => 1
+  #
+  class Section < Hash
+
+    class << self
+
+      # How to handle nil values in the configuration?
+      #
+      # Possible values are:
+      #  - :nil, nil  (return nil)
+      #  - :raise  (raise an exception)
+      #  - :section  (return a NilSection which can be chained)
+      #
+      attr_accessor :nil_action
+
+      # Create a new section from the given hash-like object.
+      #
+      # @param [Hash] hsh  The hash to convert into a section.
+      # @return [Section]  The new {Section} object.
+      def from_hash(hsh)
+        new.tap do |result|
+          hsh.each do |key, value|
+            result[key.to_sym] = from_value(value)
+          end
+        end
+      end
 
-    # Create a new section from the given hash-like object.
-    #
-    # @param [Hash] hsh  The hash to convert into a section.
-    # @return [Section]  The new {Section} object.
-    def from_hash(hsh)
-      new.tap do |result|
-        hsh.each do |key, value|
-          result[key.to_sym] = from_value(value)
+      # Convert the given value into a Section, list of Sections or the pure
+      # value. Used to recursively build the Section hash.
+      #
+      # @private
+      def from_value(value)
+        case value
+        when Hash
+          from_hash(value)
+        when Array
+          value.map do |item|
+            from_value(item)
+          end
+        else
+          value
         end
       end
+
     end
 
-    # Convert the given value into a Section, list of Sections or the pure
-    # value. Used to recursively build the Section hash.
-    #
     # @private
-    def from_value(value)
-      case value
-      when Hash
-        from_hash(value)
-      when Array
-        value.map do |item|
-          from_value(item)
-        end
+    def method_missing(name, *args)
+      if name.to_s =~ /(.*)=$/
+        self[$1.to_sym] = Section.from_value(args.first)
       else
-        value
+        value = self[name]
+        self[name] = value.call if value.is_a?(Proc)
+        self[name]
       end
     end
-
-  end
-
-  # @private
-  def method_missing(name, *args)
-    if name.to_s =~ /(.*)=$/
-      self[$1.to_sym] = Section.from_value(args.first)
-    else
-      value = self[name]
-      self[name] = value.call if value.is_a?(Proc)
-      self[name]
-    end
   end
-end
 
-##
-# The Configuration class provides a simple interface to configuration stored
-# inside of YAML files.
-#
-class Configuration < Section
-
-  DEFAULTS = {
-    generic: {
-      log_backend: :stdout,
-      log_caller: false,
-      log_level: :info,
-      log_format: "%{time} %{progname}(%{pid}) [%{severity}] %{msg}\n",
-      log4j_format: "%d %c(%t) [%p] %m%n",
-    },
-    production: {
-      log_format: "%{msg}\n",
-      log4j_format: "%m%n",
-    },
-    staging: {
-      log_format: "%{msg}\n",
-      log4j_format: "%m%n",
-    },
-  }
-
-  # Create a new {Configuration} object.
+  ##
+  # The Configuration class provides a simple interface to configuration stored
+  # inside of YAML files.
   #
-  # @yield [config]  The new configuration object.
-  def initialize
-    @mixins = OrderedSet.new
-    @callbacks = []
-    mixin(DEFAULTS)
-  end
+  class Configuration < Section
 
-  # Mixin a configuration snippet into the current section.
-  #
-  # @param [Hash, String] value  A hash to merge into the current
-  #                              configuration. If a string is given a filename
-  #                              is assumed and the given file is expected to
-  #                              contain a YAML hash.
-  # @return [void]
-  def mixin(value)
-    @mixins << value
-
-    if value.is_a?(String)
-      value = YAML.load(File.read(value))
+    # Create a new {Configuration} object.
+    #
+    # @yield [config]  The new configuration object.
+    def initialize
+      @mixins = OrderedSet.new
+      @callbacks = []
     end
 
-    return unless value
+    # Mixin a configuration snippet into the current section.
+    #
+    # @param [Hash, String] value  A hash to merge into the current
+    #                              configuration. If a string is given a filename
+    #                              is assumed and the given file is expected to
+    #                              contain a YAML hash.
+    # @return [void]
+    def mixin(value)
+      @mixins << value
+
+      if value.is_a?(String)
+        value = YAML.load(File.read(value))
+      end
+
+      return unless value
 
-    value = Section.from_hash(value)
+      value = Section.from_hash(value)
 
-    deep_merge!(value[:generic]) if value.has_key?(:generic)
+      deep_merge!(value[:generic]) if value.has_key?(:generic)
 
-    if value.has_key?(Env.to_sym)
-      deep_merge!(value[Env.to_sym])
-    else
-      deep_merge!(value)
+      if value.has_key?(Env.to_sym)
+        deep_merge!(value[Env.to_sym])
+      else
+        deep_merge!(value)
+      end
     end
-  end
 
-  # Reload all mixins.
-  #
-  # @return [void]
-  def reload!
-    clear
+    # Reload all mixins.
+    #
+    # @return [void]
+    def reload!
+      clear
+
+      @mixins.each do |file|
+        mixin(file)
+      end
 
-    @mixins.each do |file|
-      mixin(file)
+      @callbacks.each do |callback|
+        callback.call(self)
+      end
     end
 
-    @callbacks.each do |callback|
-      callback.call(self)
+    # Register a callback for config mixins.
+    #
+    # @return [void]
+    def callback(&block)
+      @callbacks << block
     end
-  end
 
-  # Register a callback for config mixins.
-  #
-  # @return [void]
-  def callback(&block)
-    @callbacks << block
   end
-
 end

data/lib/liquid/{generator.rb → console.rb}

@@ -1,13 +1,20 @@
 require 'erubis'
 require 'mixlib/cli'
+require 'rib/runner'
+require 'rib/all'
 
 module Liquid
-  class Generator
+  class Console
 
     def run
       self.__send__(ARGV.shift, *ARGV)
     end
 
+    def console(*args)
+      require 'liquid/boot'
+      Rib::Runner.run(args)
+    end
+
     def project(name)
       if File.exist?(name)
         puts "!!! #{name} already exists"

data/lib/liquid/ext/string.rb

@@ -1,3 +1,11 @@
 class String
   alias each each_line
+
+  def clean_quote
+    if index(/["\s]/)
+      %{"#{tr('"', "'")}"}
+    else
+      self
+    end
+  end
 end

data/lib/liquid/ext/thread.rb

@@ -14,4 +14,10 @@ class Thread
     end
   end
 
+  def self.join
+    Thread.list.reject do |thread|
+      thread == Thread.current
+    end.each(&:join)
+  end
+
 end

data/lib/liquid/health_checks.rb

@@ -1,18 +1,13 @@
-require 'singleton'
+require 'liquid/logger'
 
+require_relative './metrics-healthchecks-3.0.1.jar'
 java_import 'com.codahale.metrics.health.HealthCheckRegistry'
 
 class HealthChecks
-  include Singleton
-
-  attr_reader :registry
-
-  def initialize
-    @registry = HealthCheckRegistry.new
-  end
+  @registry = HealthCheckRegistry.new
 
   def self.registry
-    instance.registry
+    @registry
   end
 
   def self.register(name, handler)
@@ -22,5 +17,4 @@ class HealthChecks
   def self.run
     registry.run_health_checks
   end
-
 end