smith 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c23b69a6f4301a873fa28d72bf647d1a55f7be5
-  data.tar.gz: c95dbea268470374884fe322e12319b6d1722a77
+  metadata.gz: 79102bfef4bada48d73758f32078771d6100e759
+  data.tar.gz: 8405a9460440fdc43abc5072f0f1566848a30741
 SHA512:
-  metadata.gz: 4da08538d2ac1a625cf2d491308281591b4b76f01d88498c14bf395dab50e78966b8a26ef6b447ee341e6b6666f7d6f3a6cea3d3229af7515c34652c9589a911
-  data.tar.gz: 9484464efc2fd47fd667af75974a4ef7a18a9edc60897293465db77165af77ca18ffa75013295db3770f4c7d21f1cf5f2b1c21ab1386ef829c193bdf5b3b0530
+  metadata.gz: 201c524f5a686fe1372d264b46ee665a78143ea17335ad7eab6bf50cd6ea27c424f991a5037224f65c03521442b3911cbd121fdcabad3deb56e0629ee390ebcc
+  data.tar.gz: 087cd24ebce5fca132d8ac5b79a1e4054efeb91bb52ce2a2bdcd3106a2655b9553d141654e9ce5c95a2e86df6e21db2d4be8df2df9573d544c0695efa65a22eb

data/lib/smith/agent_cache.rb

@@ -35,7 +35,7 @@ module Smith
     def find_by_name(*names)
       inject([]) do |a, agent|
         a.tap do |acc|
-          names.flatten.each do |name|
+          names.flatten.uniq.each do |name|
             acc << agent if name == agent.name
           end
         end

data/lib/smith/command_base.rb

@@ -28,12 +28,12 @@ module Smith
       end.read
     end
 
-    def banner(banner=nil, opts={})
+    def banner(banner=nil, additional_text=nil, opts={})
       if banner.nil?
         @banner
       else
         @banner = banner
-        @parser.banner((opts[:no_template]) ? banner : banner_template(banner))
+        @parser.banner((opts[:no_template]) ? banner : banner_template(banner, additional_text))
       end
     end
 
@@ -57,16 +57,15 @@ module Smith
 
     private
 
-    def banner_template(text)
-      return <<-EOS
-
+    def banner_template(text, additional_text)
+      return %(
   #{text}
 
   Usage:
-    smithctl #{self.class.to_s.split('::').last.downcase} [Options]
+    smithctl #{self.class.to_s.split('::').last.downcase} [Options]#{(additional_text) ? " #{additional_text}" : ''}
 
 [Options] are:
-      EOS
+    )
     end
   end
 end

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

@@ -1,28 +1,30 @@
 # -*- encoding: utf-8 -*-
+require_relative '../common'
+
 module Smith
   module Commands
     class Agents < CommandBase
+      include Common
+
       def execute
         responder.succeed(_agents)
       end
 
+      # Return the fully qualified class of all avaiable agents
       def _agents
-        # FIXME make sure that if the path doesn't exist don't blow up.
         separator = (options[:one_column]) ? "\n" : " "
 
-        Smith.agent_directories.inject([]) do |path_acc, path|
-          path_acc.tap do |a|
-            if path.exist?
-              a << path.each_child.inject([]) do |agent_acc, p|
-                agent_acc.tap do |b|
-                  b << Extlib::Inflection.camelize(p.basename('.rb')) if p.file? && p.basename('.rb').to_s.end_with?("agent")
-                end
-              end.flatten
-            else
-              return "Agent path doesn't exist: #{path}"
+        if options[:group]
+          agent_group(options[:group]).sort.join(separator)
+        else
+          Smith.agent_directories.each_with_object([]) do |agent_root_path, acc|
+            Pathname.glob(agent_root_path.join("**/*")).each do |agent_path|
+              if !agent_path.symlink? && !agent_path.directory?
+                acc << Utils.class_name_from_path(agent_path, agent_root_path)
+              end
             end
-          end
-        end.flatten.sort.join(separator)
+          end.sort.join(separator)
+        end
       end
 
       private
@@ -30,7 +32,8 @@ module Smith
       def options_spec
         banner "List all available agents."
 
-        opt    :one_column, "the number of times to send the message", :short => :s
+        opt    :one_column, "List one agent per line", :short => :s
+        opt    :group,      "list only agents in this group", :type => :string, :short => :g
       end
     end
   end

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

@@ -14,15 +14,18 @@ module Smith
 
       # Returns the agents in a group.
       def group(&blk)
+        separator = (options[:one_column]) ? "\n" : " "
         begin
-          blk.call(agent_group(target.first).join(' '))
+          blk.call(agent_group(target.first).join(separator))
         rescue RuntimeError => e
           blk.call(e.message)
         end
       end
 
       def options_spec
-        banner "Lists the agents in a group."
+        banner "Lists the agents in a group.", "<group>"
+
+        opt    :one_column, "Lists one agent per line", :short => :s
       end
     end
   end

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

@@ -1,7 +1,12 @@
 # -*- encoding: utf-8 -*-
+require_relative '../common'
+
 module Smith
   module Commands
     class Kill < CommandBase
+
+      include Common
+
       def execute
         work = ->(acc, uuid, iter) do
           if agents.exist?(uuid)
@@ -15,11 +20,19 @@ module Smith
 
         done = ->(errors) { responder.succeed(format_error_message(errors)) }
 
-        EM::Iterator.new(target).inject([], work, done)
+        EM::Iterator.new(agents_to_kill).inject([], work, done)
       end
 
       private
 
+      def agents_to_kill
+        if options[:group]
+          agents.find_by_name(agent_group(options[:group])).map(&:uuid)
+        else
+          target
+        end
+      end
+
       def format_error_message(errors)
         errors = errors.compact
         case errors.size
@@ -33,7 +46,9 @@ module Smith
       end
 
       def options_spec
-        banner "Kill an agent/agents."
+        banner "Kill an agent/agents.", "<uuid[s]>"
+
+        opt    :group,  "kill agents in this group", :type => :string, :short => :g
       end
     end
   end

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

@@ -64,7 +64,7 @@ module Smith
       end
 
       def options_spec
-        banner "List the running agents."
+        banner "List the running agents.", "<agent name[s]>"
 
         opt         :long,       "shows full details of running agents", :short => :l
         opt         :group,      "list only agents in this group", :type => :string, :short => :g

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

@@ -57,7 +57,7 @@ module Smith
       end
 
       def options_spec
-        banner "Change the log and trace level of the agents or the agency."
+        banner "Change the log and trace level of the agents or the agency.", "<uuid[s]>"
 
         opt    :level, "the log level you want to set", :type => :string, :short => :l
         opt    :trace, "turn trace on or off", :type => :boolean, :short => :t

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

@@ -9,7 +9,7 @@ module Smith
       private
 
       def options_spec
-        banner "Display an agent/agents metadata."
+        banner "Display an agent/agents metadata.", "<uuid>"
       end
     end
   end

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

@@ -25,7 +25,7 @@ module Smith
           begin
             agents_to_start = agent_group(options[:group])
             if agents_to_start.empty?
-              blk.call("Agent group is empty. No agents started: #{options[:group]}")
+              blk.call("Empty group: #{options[:group]}. No agents started")
             else
               start_agents(agents_to_start, &blk)
             end
@@ -63,7 +63,7 @@ module Smith
       end
 
       def options_spec
-        banner "Start an agent/agents or group of agents."
+        banner "Start an agent/agents or group of agents.", "<agent[s]>"
 
         opt    :group, "Start everything in the specified group", :type => :string, :short => :g
       end

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

@@ -55,7 +55,7 @@ module Smith
           begin
             agents_to_stop = agents.find_by_name(agent_group(options[:group])).map(&:uuid)
             if agents_to_stop.empty?
-              blk.call("There are no agents in group: #{options[:group]}")
+              blk.call("Empty group: #{options[:group]}. No agents stopped")
             end
           rescue RuntimeError => e
             return blk.call(e.message)
@@ -98,7 +98,7 @@ module Smith
       end
 
       def options_spec
-        banner "Stop an agent/agents."
+        banner "Stop an agent/agents.", "<uuid[s]>"
 
         opt    :group, "Stop everything in the specified group", :type => :string, :short => :g
         opt    :name,  "Stop an agent(s) by name", :type => :string, :short => :n

data/lib/smith/commands/common.rb

@@ -18,7 +18,7 @@ module Smith
           if group_directory.exist? && group_directory.directory?
             agents = Pathname.glob(group_directory.join("*.rb")).map(&:expand_path)
 
-            agents.each_with_object([]) do |agent, acc|
+            agents.inject([]) do |acc, agent|
               if agent.symlink?
                 expanded_agent_path = resolve_agent_path(group_directory, agent)
                 acc << Utils.class_name_from_path(expanded_agent_path, agent_directory)

data/lib/smith/commands/smithctl/acl.rb

@@ -68,7 +68,7 @@ module Smith
       end
 
       def options_spec
-        banner "List and display acl files."
+        banner "List and display acl files.", "[acl]"
 
         opt    :long,     "format the listing", :short => :l
         opt    :show,     "show the contents of the acl file", :short => :s

data/lib/smith/commands/smithctl/dump.rb

@@ -5,7 +5,11 @@ module Smith
   module Commands
     class Dump < CommandBase
       def execute
-        dump
+        if options[:'yes-i-want-to-remove-all-acls-from-the-queue']
+          dump
+        else
+          responder.succeed("Missing option. You need to supply the ridiculously long anti-fuckup option.")
+        end
       end
 
       def dump
@@ -67,10 +71,10 @@ module Smith
       private
 
       def options_spec
-        banner "Dump a queue to STDOUT.\n\n  This is a very DANGEROUS command in that it removes all messages from a queue."
+        banner "Dump a queue to STDOUT.\n\n  This is a very DANGEROUS command in that it removes all messages from a queue.", "<queue>"
 
-        opt    :'yes-i-want-to-remove-all-messaeges-from-the-queue',  "Remove all messages from the queue and print to stdout", :type => :boolean,  :short => :none
-        opt    :verbose,                                              "print the number of messages backed up.", :type => :boolean,  :short => :v
+        opt    :'yes-i-want-to-remove-all-acls-from-the-queue',  "Remove all acls from the queue and print to stdout", :type => :boolean,  :short => :none
+        opt    :verbose,                                         "Print the number of acls dumped.", :type => :boolean,  :short => :v
       end
     end
   end

data/lib/smith/commands/smithctl/firehose.rb

@@ -26,10 +26,11 @@ module Smith
       end
 
       def options_spec
-        b = ["Listens to the rabbitmq firehose for the named queue and prints decoded message to stdout.",
-             "  Be warned it can produce vast amounts of outpu.\n",
-             "  You _must_ run 'rabbitmqctl trace_on' for this to work."]
-        banner b.join("\n")
+        banner %(Listens on the rabbitmq firehose for the named queue and prints decoded
+  message to stdout.
+
+  Be warned it can produce vast amounts of outpu. You _must_ run 'rabbitmqctl
+  trace_on' for this to work.), "<queue>"
 
         opt    :json,       "return the JSON representation of the message", :short => :j
         opt    :direction,  "Show messages that are leaving the broker [deliver|publish]", :short => :d, :type => :string, :default => 'deliver'

data/lib/smith/commands/smithctl/pop.rb

@@ -74,7 +74,7 @@ module Smith
       end
 
       def options_spec
-        banner "Pop messages off the named queue."
+        banner "Pop messages off the named queue.", "<queue>"
 
         opt    :print,  "print the message", :short => :p
         opt    :json ,  "return the JSON representation of the message", :short => :j

data/lib/smith/commands/smithctl/push.rb

@@ -88,9 +88,9 @@ module Smith
       end
 
       def options_spec
-        banner "Send a message to a queue. The ACL can also be specified."
+        banner "Pushs an ACL on to a queue.", "<queue>"
 
-        opt :type,          "message type", :type => :string, :default => 'default', :short => :t
+        opt :type,          "message type", :type => :string, :required => true, :short => :t
         opt :message,       "the message, as json", :type => :string, :short => :m
         opt :file,          "read messages from the named file", :type => :string, :short => :f
         opt :number,        "the number of times to send the message", :type => :integer, :default => 1, :short => :n

data/lib/smith/commands/smithctl/rm.rb

@@ -23,7 +23,7 @@ module Smith
       private
 
       def options_spec
-        banner "Display or remove a message from the named queue."
+        banner "Display or remove a message from the named queue.", "<queue>"
 
         opt :force,         "force the removal even if there are messages on the queue", :short => :f
         opt :ignore_errors, "ignore any errors.", :default => false

data/lib/smith/commands/smithctl/subscribe.rb

@@ -25,7 +25,7 @@ module Smith
       end
 
       def options_spec
-        banner "Subcribe to the named queue and print and received messages to stdout."
+        banner "Subcribe to the named queue and print and received messages to stdout.", "<queue>"
 
         opt    :durable,     "amqp durable option", :default => false
         opt    :auto_delete, "amqp auto-delete option", :default => false

data/lib/smith/messaging/sender.rb

@@ -97,7 +97,9 @@ module Smith
 
         @timeout ||= Timeout.new(Smith.config.smith.timeout, :queue_name => @queue_def.denormalise)
 
-        queue_def = QueueDefinition.new(opts.delete(:reply_queue_name) || "#{@queue_def.denormalise}.reply", opts.merge(:auto_delete => true, :durable => false))
+        reply_queue = opts.delete(:reply_queue_name) { random("#{@queue_def.denormalise}.") }
+
+        queue_def = QueueDefinition.new(reply_queue, opts.merge(:auto_delete => true, :durable => false))
         logger.debug { "reply queue: #{queue_def.denormalise}" }
 
         @reply_queue_completion ||= EM::Completion.new.tap do |completion|

data/lib/smith/version.rb

@@ -1,3 +1,3 @@
 module Smith
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -190,6 +190,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.4
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: curses
   requirement: !ruby/object:Gem::Requirement