papertrail 0.9.5 → 0.9.6

data/lib/papertrail.rb

@@ -1,5 +1,5 @@
 module Papertrail
- VERSION = "0.9.5"
+ VERSION = "0.9.6"
 end
 
 require 'papertrail/search_client'

data/lib/papertrail/cli_add_system.rb

@@ -8,6 +8,8 @@ module Papertrail
   class CliAddSystem
     include Papertrail::CliHelpers
 
+    attr_reader :program_name
+
     def run
       # Let it slide if we have invalid JSON
       if JSON.respond_to?(:default_options)
@@ -24,26 +26,53 @@ module Papertrail
       end
 
       OptionParser.new do |opts|
-        opts.banner = "papertrail-add-system"
+        @program_name = opts.program_name
+
+        opts.banner = "Usage: #{opts.program_name} [OPTION]..."
+
+        opts.separator ''
+
+        opts.separator "Options:"
 
-        opts.on("-h", "--help", "Show usage") do |v|
-          puts opts
-          exit
-        end
         opts.on("-c", "--configfile PATH", "Path to config (~/.papertrail.yml)") do |v|
           options[:configfile] = File.expand_path(v)
         end
         opts.on("-s", "--system SYSTEM", "Name of system to add") do |v|
           options[:system] = v
         end
-        opts.on("-n", "--hostname HOSTNAME", "Optional hostname which can be used to filter events from the same IP by syslog hostname") do |v|
+        opts.on("-n", "--hostname HOSTNAME", "Hostname which can be used to filter",
+            "events from the same IP by syslog hostname") do |v|
           options[:hostname] = v
         end
+
+        opts.separator ''
+        opts.separator 'Host Settings:'
+
         opts.on("-i", "--ip-address IP_ADDRESS", "IP address of system") do |v|
-          options[:ip] = v
+          options[:ip_address] = v
+        end
+
+        opts.on("--destination-port PORT", "Destination port") do |v|
+          options[:destination_port] = v
+        end
+
+        opts.separator ''
+        opts.separator "  Note: only one of --ip-address or --destination-port must be specified"
+
+
+        opts.separator ''
+        opts.separator "Common options:"
+
+        opts.on("-h", "--help", "Show usage") do |v|
+          puts opts
+          exit
         end
 
-        opts.separator usage
+        opts.separator ''
+        opts.separator 'Example:'
+        opts.separator "    $ #{opts.program_name} --system mysystemname --destination-port 39273"
+        opts.separator "    $ #{opts.program_name} --system mysystemname --ip-address 1.2.3.4"
+
       end.parse!
 
       if options[:configfile]
@@ -51,8 +80,13 @@ module Papertrail
         options.merge!(configfile_options)
       end
 
-      raise OptionParser::MissingArgument, 'system' if options[:system].nil?
-      raise OptionParser::MissingArgument, 'ip' if options[:ip].nil?
+      unless options[:system]
+        error "The --system argument must be specified"
+      end
+
+      unless options[:ip_address] || options[:destination_port]
+        error 'Either --ip-address or --destination-port most be provided'
+      end
 
       connection = Papertrail::Connection.new(options)
 
@@ -61,27 +95,26 @@ module Papertrail
         exit 0
       end
 
-      if connection.register_source(options[:system], options[:ip], options[:hostname])
+      if options[:destination_port] && !options[:hostname]
+        options[:hostname] = options[:system]
+      end
+
+      if connection.register_source(options[:system], options)
         exit 0
       end
 
       exit 1
     rescue OptionParser::ParseError => e
-      puts "Error: #{e}"
-      puts usage
+      error(e, true)
       exit 1
     end
 
-    def usage
-      <<-EOF
-
-  Usage:
-    papertrail-add-system [-s system] [-i ip-address] [-n hostname] [-c papertrail.yml]
-
-  Example:
-    papertrail-add-system -s mysystemname -i 1.2.3.4
-
-  EOF
+    def error(message, try_help = false)
+      puts "#{program_name}: #{message}"
+      if try_help
+        puts "Try `#{program_name} --help' for more information."
+      end
+      exit(1)
     end
   end
 end

data/lib/papertrail/connection.rb

@@ -96,10 +96,37 @@ module Papertrail
       end
     end
 
-    def register_source(name, ip_address, hostname = nil)
-      opts = { :name => name, :ip_address => ip_address }
-      opts.merge! :hostname => hostname unless hostname.nil?
-      @connection.post("systems.json", :system => opts)
+    def register_source(name, *args)
+      options = args.last.is_a?(Hash) ? args.pop.dup : {}
+
+      if ip_address = args.shift
+        options[:ip_address] = ip_address
+      end
+
+      if hostname = args.shift
+        options[:hostname] = hostname
+      end
+
+      request = {
+        :system => {
+          :name => name
+        }
+      }
+
+      if options[:ip_address]
+        request[:system][:ip_address] = options[:ip_address]
+      end
+
+      if options[:hostname]
+        request[:system][:hostname] = options[:hostname]
+      end
+
+      if options[:destination_port]
+        request[:destination_port] = options[:destination_port]
+      end
+
+      response = @connection.post("systems.json", request)
+      raise response.body.inspect unless response.success?
     end
 
     def unregister_source(name)

data/papertrail.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'papertrail'
-  s.version           = '0.9.5'
-  s.date              = '2012-09-27'
+  s.version           = '0.9.6'
+  s.date              = '2012-10-05'
   s.rubyforge_project = 'papertrail'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Papertrail
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-27 00:00:00 -07:00
+date: 2012-10-05 00:00:00 -07:00
 default_executable: papertrail
 dependencies: 
 - !ruby/object:Gem::Dependency