slnky 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02cf077e415691dad1af02c3426a1e0719c2467d
-  data.tar.gz: f56f27039461b3f9c7fa7e4b4e9bbb1276c126bb
+  metadata.gz: 60ccd795293874420c8feeb8b5f8e4f088e567f1
+  data.tar.gz: 6b3b948310f95d6704244dde2558c329f600e427
 SHA512:
-  metadata.gz: 6d19c386984b66bf09aff34d24d0871271907a2f8d1fcd50c568a2deec213d108923ad9d8980b9624d96a880b5958fe5680e1c596a0c503cd772fb6060246d6b
-  data.tar.gz: 8573582553001f0a3bf5417cf55e294675d5d673161cc8b1f0c5d7e5a4c611ac4e820f36d9a22019da964c20dc1e61517ae503cb22de92d9f7b66faecdd61794
+  metadata.gz: 22fbb510b160aa8214331c479a78227663188398179e11a67c35efe4e1db133d256c12ec11224e6d2235ec1616e68d4fb857816cb9da42171658eb54ac3ad04a
+  data.tar.gz: 4f40e12b83f8853cfe6692d1c9ed3215f6536a23c6366095dfa4779d7583c40a83758bf15ada9f8259513e74335de1e93b2c14e8095d6f7c4379c3f5272fa440

data/lib/slnky/cli/command.rb

@@ -39,6 +39,7 @@ module Slnky
         tx.start!(self) do |_|
           tx.exchange('response', :direct)
           queue = tx.queue(response, 'response', durable: false, auto_delete: true, routing_key: response)
+          # queue = tx.queue(response, 'response', durable: true, routing_key: response)
           queue.subscribe do |raw|
             message = Slnky::Message.parse(raw)
             level = message.level.to_sym
@@ -47,7 +48,7 @@ module Slnky
             elsif level == :start
               # start tracking responders?
             else
-              out message.level, message.message, message.service
+              out level, message.message, message.service
             end
           end
 

data/lib/slnky/cli/service.rb

@@ -6,6 +6,7 @@ module Slnky
           n.gsub(/^slnky-/, '')
         end
         # option %w{-f --force}, :flag, "force overwrite of files"
+        option %w{-t --trace}, :flag, "print full backtrace on error"
         def execute
           lib = File.expand_path("#{Dir.pwd}/lib", __FILE__)
           $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -20,9 +21,16 @@ module Slnky
 
           Slnky::Config.reset!
           Slnky::Config.configure(name, 'environment' => environment)
-          Slnky::Chef::Service.new.start
+
+          klass = "Slnky::#{name.capitalize}::Service".constantize
+          klass.new.start
         rescue => e
           puts "failed to run service #{name}: #{e.message} at #{e.backtrace.first}"
+          if trace?
+            e.backtrace.each do |b|
+              puts "  #{b}"
+            end
+          end
         end
       end
     end

data/lib/slnky/command/response.rb

@@ -8,13 +8,14 @@ module Slnky
         @route = route
         @service = Slnky::System.pid
         @started = false
+        @exchange = nil
+        @transport = nil
         @trace = []
       end
 
-      [:info, :warn, :error].each do |l|
+      [:debug, :info, :warn, :error].each do |l|
         define_method(l) do |message|
           start! unless @started
-          log.local.send(l, "RESPONSE: #{message}")
           pub l, message
         end
       end
@@ -43,11 +44,19 @@ module Slnky
       end
 
       def pub(level, message)
-        # puts "#{level} #{message}"
+        # puts "not connected?" unless transport.connected? && exchange
         exchange.publish(msg(level, message), routing_key: @route)
         @trace << message
       end
 
+      def config
+        Slnky.config
+      end
+
+      def log
+        Slnky.log
+      end
+
       def exchange
         @exchange ||= transport.exchanges['response']
       end
@@ -55,10 +64,6 @@ module Slnky
       def transport
         @transport ||= Slnky::Transport.instance
       end
-
-      def channel
-        @channel ||= transport.channel
-      end
     end
   end
 end

data/lib/slnky/command.rb

@@ -24,10 +24,11 @@ module Slnky
           end
 
         rescue => e
+          puts "ERROR: #{e.message}"
           log.error "failed to run command: #{name}: #{data.command}: #{e.message} at #{e.backtrace.first}"
         ensure
-          res.done!
           log.response = false
+          res.done!
         end
       end
 
@@ -55,8 +56,12 @@ module Slnky
         @name ||= self.class.name.split('::')[1].downcase
       end
 
+      def config
+        Slnky.config
+      end
+
       def log
-        @log ||= Slnky.log
+        Slnky.log
       end
 
       class << self
@@ -85,7 +90,7 @@ module Slnky
       end
 
       def process(args)
-        opts = Docopt::docopt(@doc, argv: args)
+        opts = Docopt::docopt(@doc, argv: args||[])
         data = Slnky::Data.new
         opts.each do |key, value|
           k = key.gsub(/^--/, '').downcase

data/lib/slnky/generator.rb

@@ -26,8 +26,6 @@ module Slnky
         # puts "  from: #{@template}"
         # puts "  to:   #{@dir}"
         process_files
-        # make service executable
-        `chmod 755 #{@dir}/service-slnky-#{@name}`
         # git init
         if File.directory?("#{@dir}/.git")
           puts "git already initialized"

data/lib/slnky/log.rb

@@ -29,7 +29,7 @@ module Slnky
           @service = false
         else # development or unset
           @local   = Slnky::Log::Local.new
-          @service = false
+          @service = Slnky::Log::Service.new
       end
     end
 
@@ -72,7 +72,7 @@ module Slnky
     class Local < Base
       def initialize
         super
-        @logger = Logger.new(STDOUT)
+        @logger = ::Logger.new(STDOUT)
         @logger.formatter = proc do |severity, datetime, progname, msg|
           "%-5s %s: %s: %s\n" % [severity, datetime, Slnky::System.pid, msg]
         end

data/lib/slnky/template/service/spec/slnky/NAME/service_spec.rb.erb

@@ -6,7 +6,7 @@ describe Slnky::<%= cap %>::Service do
     s.client = Slnky::<%= cap %>::Mock.new
     s
   end
-  let(:test_event) { event_load('test')}
+  let(:test_event) { slnky_event('test')}
 
   it 'handles event' do
     # test that the handler method receives and responds correctly

data/lib/slnky/template/service/spec/spec_helper.rb.erb

@@ -1,3 +1,3 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'slnky/spec/helper'
-require 'slnky/chef'
+require 'slnky/<%= name %>'

data/lib/slnky/transport.rb

@@ -13,8 +13,7 @@ module Slnky
     class Rabbit
       attr_reader :channel
       attr_reader :exchanges
-      attr_reader :queues
-      attr_reader :stopper
+      # attr_reader :queues
 
       def initialize
         @config = Slnky.config
@@ -48,12 +47,10 @@ module Slnky
           yield self if block_given?
 
           if service.is_a?(Slnky::Service::Base)
-            queues.each do |name, queue|
-              queue.subscribe do |raw|
-                event = Slnky::Message.parse(raw)
-                service.subscriber.for(event.name) do |name, method|
-                  service.send(method.to_sym, event.name, event.payload)
-                end
+            queue(service.name, 'events').subscribe do |raw|
+              event = Slnky::Message.parse(raw)
+              service.subscriber.for(event.name) do |name, method|
+                service.send(method.to_sym, event.name, event.payload)
               end
             end
 
@@ -72,10 +69,14 @@ module Slnky
         @connection.close { EventMachine.stop { exit } }
       end
 
+      def connected?
+        @channel != nil
+      end
+
       def exchange(desc, type)
         raise 'attempting to create exchange without channel' unless @channel
         name = "slnky.#{desc}"
-        @exchanges[desc] ||=
+        @exchanges[desc] =
             case type
               when :fanout
                 @channel.fanout(name)
@@ -86,15 +87,17 @@ module Slnky
             end
       end
 
-      def queue(desc, exchange, options={})
+      def queue(desc, exchange='events', options={})
         raise 'attempting to create queue without channel' unless @channel
         name = "service.#{desc}.#{exchange}"
-        options = {
-            durable: true
-        }.merge(options)
-        routing = options.delete(:routing_key)
-        bindoptions = routing ? {routing_key: routing} : {}
-        @queues[desc] ||= @channel.queue(name, options).bind(@exchanges[exchange], bindoptions)
+        @queues[name] ||= begin
+          options = {
+              durable: true
+          }.merge(options)
+          routing = options.delete(:routing_key)
+          bindoptions = routing ? {routing_key: routing} : {}
+          @channel.queue(name, options).bind(@exchanges[exchange], bindoptions)
+        end
       end
     end
 

data/lib/slnky/version.rb

@@ -1,3 +1,3 @@
 module Slnky
-  VERSION = "0.10.2"
+  VERSION = "0.11.0"
 end

metadata

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