slnky 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d50626f322bbe6a03f8f5f9ad0d47333a0cf2828
-  data.tar.gz: b9fea18e95609538fe62d7f8f3d6cb47eeeb0287
+  metadata.gz: 3daa94cfe02db241bff3ca0337980904fb6f976d
+  data.tar.gz: 26cf996e25971b79db83fd2914c85b178547963d
 SHA512:
-  metadata.gz: 6db64c5ca17c0ce07125b2ece35a588cdeb6fadff72a8461ed8a03fb46f339bffe01e2c8ecba1c2ac49d83a6ca796d95e613c4a6a4a4ce60b0885bb5f67c4c03
-  data.tar.gz: 111cebddcd0655854933c233fed75f360b896315ff28986f6223711014448e9203a608fe99bc205f003a6ae945040ca07684a18bf975b0fa87a3756ff371a6d1
+  metadata.gz: 5d450b6a1482cb46711f4991d3192d64ba38459dc2b9d9a3cb618d270a0142d034763b37a023a580b401aa7687892a91e4440d2c9ff7f8df80003b5214d52217
+  data.tar.gz: f4abfa76c5f7461f07cf3f4588a770b97d2f908ffea1ae7400108bd82e5471c85a9e06a0849f03c2725ac450041e3378ebb97d8d5b83be4fd31f409191cf4cdb

data/lib/slnky/cli/command.rb

@@ -65,7 +65,7 @@ module Slnky
           end
 
           EventMachine.add_timer(1) do
-            puts "sendinng request:".colorize(:light_white)
+            puts "sending request:".colorize(:light_white)
             Slnky.notify(msg)
           end
         end
@@ -74,13 +74,8 @@ module Slnky
         # Slnky.notify(msg)
       end
 
-      def out(level, message, service=:local)
-        # unless @remote[service]
-        #   say "<%= color('response from service: #{data.service}', BOLD) %>"
-        #   @first = true
-        # end
-        # color = level.to_s == 'info' ? 'GREEN' : 'RED'
-        # say "<%= color(\"#{service}\", GRAY) %> <%= color(\"#{message}\", #{color}) %>"
+      def out(level, message, service=nil)
+        service ||= Slnky::System.pid('local')
         lines = message.split("\n")
         lines.each do |line|
           str = service.colorize(:light_black)

data/lib/slnky/command.rb

@@ -28,7 +28,7 @@ module Slnky
           log.error "failed to run command: #{name}: #{data.command}: #{e.message} at #{e.backtrace.first}"
         ensure
           log.response = false
-          res.done!
+          res.done! if res
         end
       end
 

data/lib/slnky/command/response.rb

@@ -5,7 +5,12 @@ module Slnky
 
       def initialize(route, service)
         Slnky.config.service = service
+        if route =~ /\:/
+          (route, reply) = route.split(':', 2)
+        end
+        puts "ROUTE: #{route} #{reply}"
         @route = route
+        @reply = reply
         @service = Slnky::System.pid
         @started = false
         @exchange = nil
@@ -40,12 +45,15 @@ module Slnky
       private
 
       def msg(level, message)
-        Slnky::Message.new({level: level, message: message, service: @service})
+        Slnky::Message.new({level: level, message: message, service: @service, reply: @reply})
       end
 
       def pub(level, message)
-        # puts "not connected?" unless transport.connected? && exchange
-        exchange.publish(msg(level, message), routing_key: @route)
+        # if @route.to_s =~ /^hipchat/
+        #   chat(level, message)
+        # else
+          exchange.publish(msg(level, message), routing_key: @route)
+        # end
         @trace << message
       end
 

data/lib/slnky/system.rb

@@ -3,8 +3,8 @@ require 'socket'
 module Slnky
   class System
     class << self
-      def pid
-        service = Slnky.config.service || 'unknown'
+      def pid(name=nil)
+        service = name || Slnky.config.service || 'unknown'
         "#{ipaddress}/#{service}-#{$$}"
       end
 

data/lib/slnky/version.rb

@@ -1,3 +1,3 @@
 module Slnky
-  VERSION = "0.12.1"
+  VERSION = "0.12.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slnky
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Shawn Catanzarite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler