kungfuig 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c46ca10e03faa3bb4f6d9eeb8216011c5dbb10f8
-  data.tar.gz: b6c314ca7222809ffdc2693c6d497f81c93a0948
+  metadata.gz: bc4658d114e15ae6587f426fd6484f73ac507d49
+  data.tar.gz: fd0ba43d7d5f10f1d148c32fccb8b22d15bf1269
 SHA512:
-  metadata.gz: c57384f359cf7f73a3acf92a5aa2914619e0d126c2fcbd62049e4bb5f26da953ade875cdc1a801b91df012a9f25dd6ba9b8c40e779888a28b3ab4416f61cfbe4
-  data.tar.gz: 8ffb336572f9d1a222c4e416046b14d9a505f61ce14f7f1509cb4e7dcbc2fc8246355261b4a4ea687ad40750e1446ff6e8ca01f0ef5f6f30a81b23243564e95e
+  metadata.gz: 088b8cc7fa2c5dde35d5133eb24eedeac49667c072246492e6924dd84b2995ee3e07ea9ea601122fc918f35a5fbfb68129b7f74b1da2c6956a4a30de3bf724c0
+  data.tar.gz: 5425c1425ed7ed78e3aecfadebe29410049798f14129b1797a9961cc4d4c38d1d34d4699c3ca9eef723ad7d3d650ebd77460271a272569d9324080d43b4e4331

data/lib/kungfuig.rb

@@ -2,7 +2,6 @@ require 'yaml'
 require 'hashie'
 
 require 'kungfuig/version'
-require 'kungfuig/color'
 require 'kungfuig/aspector'
 require 'kungfuig/prepender'
 
@@ -12,11 +11,7 @@ module Kungfuig
   # rubocop:disable Style/MethodName
   def ✍(receiver: nil, method: nil, result: nil, args: nil, **params)
     require 'logger'
-    @✍ ||= Kernel.const_defined?('Rails') && Rails.logger || Logger.new($stdout)
-    message = receiver.is_a?(String) ? "#{receiver} | #{method}" : "#{receiver.class}##{method}"
-    "#{Color.to_xterm256(message, :info)} called with «#{Color.to_xterm256(args.inspect, :success)}» and returned «#{result || 'nothing (was it before aspect?)'}»".tap do |m|
-      @✍.debug m
-    end
+    Logger.new($stdout).debug({receiver: receiver, method: method, result: result, args: args, **params}.inspect)
   end
   module_function :✍
   # rubocop:enable Style/MethodName
@@ -35,6 +30,7 @@ module Kungfuig
       rescue
         raise ArgumentError, "#{__callee__} expects valid YAML configuration string (misspelled file name?). Got:\n#{hos.inspect}"
       end
+    when ->(h) { h.respond_to?(:to_h) } then Hashie::Mash.new(h.to_h)
     when ->(h) { h.respond_to?(:to_hash) } then Hashie::Mash.new(h.to_hash)
     else
       fail ArgumentError.new "#{__callee__} accepts either String or Hash as parameter."

data/lib/kungfuig/jobber.rb

@@ -32,10 +32,23 @@ module Kungfuig
   class Jobber
     RESPOND_TO = ->(m, r) { r.respond_to? m.to_sym }
 
+    # this is an ugly hack unless I understand why digest gets corrupted sometimes
+    class UglyHack
+      def self.cleanup_digest(digest)
+        case digest
+        when String then digest
+        when Symbol then digest.to_s
+        when Hash then digest[:digest] || digest['digest'] || digest.inspect
+        else digest.inspect
+        end
+      end
+    end
+
     class Dummy
       prepend Kungfuig::Worker
 
       def perform digest: nil, delay: nil, worker: nil, worker_params: nil
+        digest = UglyHack.cleanup_digest(digest)
         Sidekiq.redis { |redis| redis.set(digest, worker_params.to_json) }
         DummyExecutor.perform_in(delay, digest: digest, worker: worker)
       end
@@ -45,13 +58,14 @@ module Kungfuig
       prepend Kungfuig::Worker
 
       def perform digest: nil, worker: nil
+        digest = UglyHack.cleanup_digest(digest)
         params = Sidekiq.redis do |redis|
           redis.multi do
             redis.get(digest)
             redis.del(digest)
           end
         end
-        Kernel.const_get(worker).perform_async(atomize_keys(params.first)) if params.last > 0
+        Kernel.const_get(worker).perform_async(**atomize_keys(params.first)) if params.last > 0
       end
 
       private

data/lib/kungfuig/version.rb

@@ -1,3 +1,3 @@
 module Kungfuig
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.11.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kungfuig
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Kantox LTD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -209,7 +209,6 @@ files:
 - kungfuig.png
 - lib/kungfuig.rb
 - lib/kungfuig/aspector.rb
-- lib/kungfuig/color.rb
 - lib/kungfuig/jobber.rb
 - lib/kungfuig/prepender.rb
 - lib/kungfuig/version.rb

data/lib/kungfuig/color.rb

@@ -1,286 +0,0 @@
-module Kungfuig
-  # rubocop:disable Metrics/ClassLength
-  # Dealing with colors
-  class Color
-    # Copyright (c) 2007 McClain Looney
-    #
-    # Permission is hereby granted, free of charge, to any person obtaining a copy
-    # of this software and associated documentation files (the "Software"), to deal
-    # in the Software without restriction, including without limitation the rights
-    # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    # copies of the Software, and to permit persons to whom the Software is
-    # furnished to do so, subject to the following conditions:
-    #
-    # The above copyright notice and this permission notice shall be included in
-    # all copies or substantial portions of the Software.
-    #
-    # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    # THE SOFTWARE.
-
-    # Implements a color (r,g,b + a) with conversion to/from web format (eg #aabbcc), and
-    # with a number of utilities to lighten, darken and blend values.
-
-    attr_reader :r, :g, :b, :a
-
-    # Table for conversion to hex
-    HEXVAL = ('0'..'9').to_a.concat(('A'..'F').to_a).freeze
-    # Default value for #darken, #lighten etc.
-    BRIGHTNESS_DEFAULT = 0.2
-
-    # Constructor.  Inits to white (#FFFFFF) by default, or accepts any params
-    # supported by #parse.
-    def initialize(*args)
-      @r = 255
-      @g = 255
-      @b = 255
-      @a = 255
-
-      if args.size.between?(3, 4)
-        self.r = args[0]
-        self.g = args[1]
-        self.b = args[2]
-        self.a = args[3] if args[3]
-      else
-        set(*args)
-      end
-    end
-
-    # All-purpose setter - pass in another Color, '#000000', rgb vals... whatever
-    def set(*args)
-      val = Color.parse(*args)
-      unless val.nil?
-        self.r = val.r
-        self.g = val.g
-        self.b = val.b
-        self.a = val.a
-      end
-      self
-    end
-
-    # Test for equality, accepts string vals as well, eg Color.new('aaa') == '#AAAAAA' => true
-    def ==(other)
-      val = Color.parse(other)
-      return false if val.nil?
-      r == val.r && g == val.g && b == val.b && a == val.a
-    end
-
-    # Setters for individual channels - take 0-255 or '00'-'FF' values
-    %i(r g b a).each do |m|
-      define_method "#{m}=" do |val|
-        instance_variable_set("@#{m}", from_hex(val))
-      end
-    end
-
-    # rubocop:disable Metrics/CyclomaticComplexity
-    # rubocop:disable Metrics/MethodLength
-    # Attempt to read in a string and parse it into values
-    def self.parse(*args)
-      case args.size
-      when 0 then return nil
-      when 1
-        case val = args.first
-        when Color then val
-        when Fixnum then Color.new(val, val, val) # Single value, assume grayscale
-        when String
-          str = val.to_s.upcase[/[0-9A-F]{3,8}/] || ''
-          Color.new(*case str.length
-                     when 3, 4 then str.scan(/[0-9A-F]/)
-                     when 6, 8 then str.scan(/[0-9A-F]{2}/)
-                     else 'FF'
-                     end.map { |c| Integer("0x#{c}") })
-        end
-      when 2 # assume gray + alpha
-        val, alpha = args
-        Color.new(val, val, val, alpha)
-      when 3, 4 then Color.new(*args)
-      end
-    end
-    # rubocop:enable Metrics/MethodLength
-    # rubocop:enable Metrics/CyclomaticComplexity
-
-    def inspect
-      id = format('%x', object_id << 1)
-      "#<#{self.class.name}:0x#{id.rjust(14, '0')} 💻=“\\e[#{to_esc(true)}#{to_esc(false)}\e[0mm” 🗔=“#{self}”>"
-    end
-
-    def to_s(add_hash = true)
-      trans? ? to_rgba(add_hash) : to_rgb(add_hash)
-    end
-
-    # rubocop:disable Metrics/CyclomaticComplexity
-    # rubocop:disable Metrics/PerceivedComplexity
-    # rubocop:disable Metrics/ParameterLists
-    # Color as used in 256-color terminal escape sequences
-    def to_esc(surround = true, bold: true, italic: false, underline: false, reverse: false, foreground: true)
-      result = if grayscale?
-                 (r > 239) ? 15 : (r / 10).floor + 232
-               else
-                 16 + 36 * (r / 51).floor + 6 * (g / 51).floor + (b / 51).floor
-               end
-
-      esc = [
-        bold ? '01' : nil,
-        italic ? '03' : nil,
-        underline ? '04' : nil,
-        reverse ? '07' : nil,
-        foreground ? '38' : '48',
-        '05',
-        result
-      ].compact.join(';')
-
-      surround ? "\e[#{esc}m" : esc
-    end
-    # rubocop:enable Metrics/ParameterLists
-    # rubocop:enable Metrics/PerceivedComplexity
-    # rubocop:enable Metrics/CyclomaticComplexity
-
-    def to_rgb(add_hash = true)
-      (add_hash ? '#' : '') + to_hex(r) + to_hex(g) + to_hex(b)
-    end
-
-    def to_rgba(add_hash = true)
-      to_rgb(add_hash) + to_hex(a)
-    end
-
-    def opaque?
-      @a == 255
-    end
-
-    def trans?
-      !opaque?
-    end
-
-    def grayscale?
-      @r == @g && @g == @b
-    end
-
-    # Lighten color towards white.  0.0 is a no-op, 1.0 will return #FFFFFF
-    def lighten(amt = BRIGHTNESS_DEFAULT)
-      return self if amt <= 0
-      return WHITE if amt >= 1.0
-      Color.new(self).tap do |val|
-        val.r += ((255 - val.r) * amt).to_i
-        val.g += ((255 - val.g) * amt).to_i
-        val.b += ((255 - val.b) * amt).to_i
-      end
-    end
-
-    # In place version of #lighten
-    def lighten!(amt = BRIGHTNESS_DEFAULT)
-      set(lighten(amt))
-    end
-
-    # Darken a color towards full black.  0.0 is a no-op, 1.0 will return #000000
-    def darken(amt = BRIGHTNESS_DEFAULT)
-      return self if amt <= 0
-      return BLACK if amt >= 1.0
-      Color.new(self).tap do |val|
-        val.r -= (val.r * amt).to_i
-        val.g -= (val.g * amt).to_i
-        val.b -= (val.b * amt).to_i
-      end
-    end
-
-    # In place version of #darken
-    def darken!(amt = BRIGHTNESS_DEFAULT)
-      set(darken(amt))
-    end
-
-    # Convert to grayscale, using perception-based weighting
-    def grayscale
-      Color.new(self).tap do |val|
-        val.r = val.g = val.b = (0.2126 * val.r + 0.7152 * val.g + 0.0722 * val.b)
-      end
-    end
-
-    # In place version of #grayscale
-    def grayscale!
-      set(grayscale)
-    end
-
-    # rubocop:disable Metrics/AbcSize
-    # Blend to a color amt % towards another color value, eg
-    # red.blend(blue, 0.5) will be purple, white.blend(black, 0.5) will be gray, etc.
-    def blend(other, amt)
-      other = Color.parse(other)
-      return Color.new(self) if amt <= 0 || other.nil?
-      return Color.new(other) if amt >= 1.0
-      Color.new(self).tap do |val|
-        val.r += ((other.r - val.r) * amt).to_i
-        val.g += ((other.g - val.g) * amt).to_i
-        val.b += ((other.b - val.b) * amt).to_i
-      end
-    end
-    # rubocop:enable Metrics/AbcSize
-
-    # In place version of #blend
-    def blend!(other, amt)
-      set(blend(other, amt))
-      self
-    end
-
-    # Class-level version for explicit blends of two values, useful with constants
-    def self.blend(col1, col2, amt)
-      col1, col2 = [col1, col2].map { |c| Color.parse c }
-      col1.blend(col2, amt)
-    end
-
-    # rubocop:disable Metrics/ParameterLists
-    def self.to_xterm256(text, color, bold: true, italic: false, underline: false, reverse: false, foreground: true)
-      color = Color.preset(color) unless color.is_a?(Color)
-      [
-        color.to_esc(true, bold: bold, italic: italic, underline: underline, reverse: reverse, foreground: foreground),
-        text,
-        "\e[0m"
-      ].join
-    end
-    # rubocop:enable Metrics/ParameterLists
-
-    # rubocop:disable Metrics/CyclomaticComplexity
-    def self.preset type
-      Color.parse case type
-                  when :label then '#999999'
-                  when :success then '#468847'
-                  when :warning then '#F89406'
-                  when :important then '#B94A48'
-                  when :fatal then '#B94A48'
-                  when :error then '#FF0000'
-                  when :info then '#3A87AD'
-                  when :inverse then '#333333'
-                  else type
-                  end
-    end
-    # rubocop:enable Metrics/CyclomaticComplexity
-
-    protected
-
-    # Convert int to string hex, eg 255 => 'FF'
-    def to_hex(val)
-      HEXVAL[val / 16] + HEXVAL[val % 16]
-    end
-
-    # Convert int or string to int, eg 80 => 80, 'FF' => 255, '7' => 119
-    def from_hex(val)
-      if val.is_a?(String)
-        # Double up if single char form
-        val *= 2 if val.size == 1
-        # Convert to integer
-        val = val.hex
-      end
-      # Clamp
-      val = 0 if val < 0
-      val = 255 if val > 255
-      val
-    end
-
-    # Some constants for general use
-    WHITE = Color.new(255, 255, 255).freeze
-    BLACK = Color.new(0, 0, 0).freeze
-  end
-  # rubocop:enable Metrics/ClassLength
-end