smith 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96cb51ec7c1b312e9579ed53e172fb9007dade01
-  data.tar.gz: 9a18b232612707ff1bb428e1885e3ec34826cdaf
+  metadata.gz: 2cc8959d34747160c59a7a05ec820ec2e27c5682
+  data.tar.gz: aac86c9b5eeb61288c2bc9d6233df3d48a364e5d
 SHA512:
-  metadata.gz: 63f78bfab75adfe3399b6f5f7dbb6e6e902c3e38e0ef365740c31259eabb1e934be252cd2152816d14bd390dfb596946ca3c80a4c60a56a0098a892b6af68bbf
-  data.tar.gz: cfd8e95af6b81ed3f2e0fbf0a456e2f31f718e0d0dc7a67386716abb294d647d5348fc478e794e8c372455e09b66917d89289054067daf8b6a493c6d50e518df
+  metadata.gz: 6a917e6fb2e800c94ddf20db84425c780beac39f1dcd9bd445ff15cbc24cff767625fbef4094154ea53fca11a0a252b2b32d8b3b2ed5be4f0eda4cece7525e1b
+  data.tar.gz: 707db2b0981c8ce05f284c337634fb5abf5ee540352bcfc80b51ba941e3e74867c7ecfcb210f91d154531dadd645fda9604efae94617741bca80c45ae406a8d9

data/lib/smith/commands/agency/list.rb

@@ -9,17 +9,20 @@ module Smith
       include Common
 
       def execute
-        if target.size > 0
+        case
+        when target.size > 0
           selected_agents = agents.find_by_name(target)
+        when options[:group] && options[:all]
+          selected_agents = agent_group(options[:group]).map do |agent_name|
+            a = agents.find_by_name(agent_name)
+            (a.empty?) ? AgentProcess.new(nil, :name => agent_name, :uuid => nil_uuid) : a.first
+          end
+        when options[:group]
+          selected_agents = agents.find_by_name(agent_group(options[:group]))
         else
           selected_agents = (options[:all]) ? agents.to_a : agents.state(:running)
         end
 
-        if options[:group]
-          group_names = agent_group(options[:group])
-          selected_agents = selected_agents.select { |a| group_names.include?(a.name) }
-        end
-
         responder.succeed((selected_agents.empty?) ? '' : format(selected_agents, options[:long]))
       end
 
@@ -63,6 +66,11 @@ module Smith
         end
       end
 
+      # Produces a null version 4 UUID.
+      def nil_uuid
+        '00000000-0000-4000-0000-000000000000'
+      end
+
       def options_spec
         banner "List the running agents.", "<agent name[s]>"
 

data/lib/smith/messaging/receiver.rb

@@ -207,26 +207,11 @@ module Smith
 
       attr_accessor :metadata
 
-      def m(o)
-        (o.methods -  Object.methods).sort
-      end
-
       def initialize(metadata, data, opts={}, requeue_opts, &blk)
         @metadata = metadata
         @reply_queue = opts[:reply_queue]
-        # @queue_name = (metadata.methods -  Object.methods).sort
         @requeue_opts = requeue_opts
 
-        pp m(metadata)
-        puts '====================='
-        pp m(metadata.channel)
-        puts '====================='
-        pp metadata.channel.class
-        puts '====================='
-        pp m(metadata.channel.queue)
-        puts '====================='
-        pp metadata.channel.queue.status
-
         @acl_type_cache = AclTypeCache.instance
 
         @time = Time.now

data/lib/smith/version.rb

@@ -1,3 +1,3 @@
 module Smith
-  VERSION = "0.7.6"
+  VERSION = "0.7.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Richard Heycock