slnky 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6005a5b408631aca853cd7e65baaaeb4ac3fe801
-  data.tar.gz: 301732f0f7efbd6948e81e200eb14568ba204b11
+  metadata.gz: cef5780da8199f4831f87d9726a554fbc777407a
+  data.tar.gz: db1105f8c13ae487284241408bba3a7c49be7d41
 SHA512:
-  metadata.gz: 79d05973370fa351c292adbd3077a311eeda6ea77a3940ece207645cfc46572ed2ab742ff7d9312294c2b8024ffaa27068ff03bc4847fc5adc1a4dd4db68fd78
-  data.tar.gz: efb6b2ac7c3013e90cd91e9ff7d75f94c7f7ad5770e35f3918610c0b2c728a076f2f16f0aafd396f70dfdad322ad79eee8869c5b65ee542170399f4003b95255
+  metadata.gz: b49dd59dea125c59bf02bea0a2f1309cf89d699ed6b885279bb91c62c997e7f5d2705fb7b4952c89d2054405a835ca61b5cf2db9feae786a2ce6267b22e13f90
+  data.tar.gz: 2d8280232b177edc6812aa68402a1548490922e5b6c99d50571741e08d02954e2d5546fc5af8fcb757d68314f726e59530ce57d17314134940849c782fb49876

data/lib/slnky/cli/notify.rb

@@ -9,9 +9,14 @@ module Slnky
         end
         f
       end
+      option %w{-n --dry-run}, :flag, "just output the event, don't send"
       parameter 'NAME', 'the name of the event to send'
-      parameter '[ATTRIBUTES] ...', 'key=value pairs to add to the event, merged with optional file', attribute_name: :kvs
-
+      parameter '[ATTRIBUTES] ...', <<-DESC.strip_heredoc, attribute_name: :kvs
+        key=value pairs to add to the event, merged with optional file
+        supports dotted notation keys, and will merge them into nested hash
+        chat.* keys are specially handled, they are not encoded as part of the
+        attributes, they will be moved to their own keyspace
+      DESC
       def execute
         attributes = {}
         if file
@@ -23,19 +28,46 @@ module Slnky
             exit(1)
           end
         end
-        kvs.each do |kv|
-          (k, v) = kv.split('=')
-          attributes[k] = v
-        end
-        msg = Slnky::Message.new({name: name, attributes: attributes})
+        attributes.merge!(dothash(kvs)) if kvs
+        chat = attributes.delete(:chat)
+        msg = Slnky::Message.new({name: name, attributes: attributes, chat: chat})
         cfg = Slnky.config
         srv = server || cfg['slnky']['url']
 
         puts 'sending message:'
         puts JSON.pretty_generate(msg.to_h)
-        Slnky.notify(msg)
+        Slnky.notify(msg, srv) unless dry_run?
+      end
+
+      # convert list of dot notation key.name=value into nested hash
+      def dothash(list)
+        input_hash = list.inject({}) {|h, e| (k,v)=e.split('='); h[k]=v; h}
+        input_hash.map do |main_key, main_value|
+          main_key.to_s.split(".").reverse.inject(main_value) do |value, key|
+            {key.to_sym => value(value)}
+          end
+        end.inject(&:deep_merge)
+      end
+
+      # convert value from string to internal types
+      def value(value)
+        return value unless value.is_a?(String)
+        case value
+          when 'true'
+            true
+          when 'false'
+            false
+          when /^\d+\.\d+\.\d+/ # ip addr
+            value
+          when /^\d+$/ # number
+            value.to_i
+          when /^[\d\.]+$/ # float
+            value.to_f
+          else
+            value
+        end
       end
     end
   end
 end
-Slnky::CLI::Main.subcommand 'notify', 'send notification to the slnky server', Slnky::CLI::Notify
+Slnky::CLI::Main.subcommand('notify', 'send notification to the slnky server', Slnky::CLI::Notify)

data/lib/slnky/version.rb

@@ -1,3 +1,3 @@
 module Slnky
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/lib/slnky.rb

@@ -5,6 +5,7 @@ require 'slnky/service'
 require 'slnky/generator'
 
 require 'rest_client'
+require 'active_support/all'
 
 module Slnky
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slnky
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Shawn Catanzarite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler