papertrail 0.9.2 → 0.9.3

data/bin/papertrail-add-group

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require 'papertrail/cli_add_group'
+
+begin
+  Papertrail::CliAddGroup.new.run
+rescue Interrupt
+  exit(0)
+end

data/bin/papertrail-add-system

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require 'papertrail/cli_add_system'
+
+begin
+  Papertrail::CliAddSystem.new.run
+rescue Interrupt
+  exit(0)
+end

data/bin/papertrail-join-group

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require 'papertrail/cli_join_group'
+
+begin
+  Papertrail::CliJoinGroup.new.run
+rescue Interrupt
+  exit(0)
+end

data/bin/papertrail-remove-system

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require 'papertrail/cli_remove_system'
+
+begin
+  Papertrail::CliRemoveSystem.new.run
+rescue Interrupt
+  exit(0)
+end

data/lib/papertrail.rb

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

data/lib/papertrail/cli.rb

@@ -2,9 +2,12 @@ require 'optparse'
 require 'yaml'
 
 require 'papertrail/connection'
+require 'papertrail/cli_helpers'
 
 module Papertrail
   class Cli
+    include Papertrail::CliHelpers
+
     def run
       # Let it slide if we have invalid JSON
       if JSON.respond_to?(:default_options)
@@ -99,28 +102,6 @@ module Papertrail
       end
     end
 
-    def find_configfile
-      if File.exists?(path = File.expand_path('.papertrail.yml'))
-        return path
-      end
-      if File.exists?(path = File.expand_path('~/.papertrail.yml'))
-        return path
-      end
-    end
-
-    def load_configfile(file_path)
-      symbolize_keys(YAML.load_file(file_path))
-    end
-
-    def symbolize_keys(hash)
-      new_hash = {}
-      hash.each do |(key, value)|
-        new_hash[(key.to_sym rescue key) || key] = value
-      end
-
-      new_hash
-    end
-
     def usage
       <<-EOF
 
@@ -140,4 +121,4 @@ module Papertrail
   EOF
     end
   end
-end
+end

data/lib/papertrail/cli_add_group.rb

@@ -0,0 +1,83 @@
+require 'optparse'
+require 'yaml'
+
+require 'papertrail/cli_helpers'
+require 'papertrail/connection'
+
+module Papertrail
+  class CliAddGroup
+    include Papertrail::CliHelpers
+
+    def run
+      # Let it slide if we have invalid JSON
+      if JSON.respond_to?(:default_options)
+        JSON.default_options[:check_utf8] = false
+      end
+
+      options = {
+        :configfile => nil,
+      }
+
+      if configfile = find_configfile
+        configfile_options = load_configfile(configfile)
+        options.merge!(configfile_options)
+      end
+
+      OptionParser.new do |opts|
+        opts.banner = "papertrail-add-group"
+
+        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("-g", "--group SYSTEM", "Name of group to add") do |v|
+          options[:group] = v
+        end
+        opts.on("-w", "--system-wildcard WILDCARD", "Wildcard for system match") do |v|
+          options[:wildcard] = v
+        end
+
+        opts.separator usage
+      end.parse!
+
+      if options[:configfile]
+        configfile_options = load_configfile(options[:configfile])
+        options.merge!(configfile_options)
+      end
+
+      raise OptionParser::MissingArgument, 'group' if options[:group].nil?
+
+      connection = Papertrail::Connection.new(options)
+
+      # Bail if group already exists
+      if connection.show_group(options[:group])
+        exit 0
+      end
+
+      if connection.create_group(options[:group], options[:wildcard])
+        exit 0
+      end
+
+      exit 1
+    rescue OptionParser::ParseError => e
+      puts "Error: #{e}"
+      puts usage
+      exit 1
+    end
+
+    def usage
+      <<-EOF
+
+  Usage: 
+    papertrail-add-group [-g group] [-w system-wildcard] [-c papertrail.yml] 
+
+  Example:
+    papertrail-add-group -g mygroup -w mygroup-systems*
+
+  EOF
+    end
+  end
+end

data/lib/papertrail/cli_add_system.rb

@@ -0,0 +1,84 @@
+require 'optparse'
+require 'yaml'
+
+require 'papertrail/cli_helpers'
+require 'papertrail/connection'
+
+module Papertrail
+  class CliAddSystem
+    include Papertrail::CliHelpers
+
+    def run
+      # Let it slide if we have invalid JSON
+      if JSON.respond_to?(:default_options)
+        JSON.default_options[:check_utf8] = false
+      end
+
+      options = {
+        :configfile => nil,
+      }
+
+      if configfile = find_configfile
+        configfile_options = load_configfile(configfile)
+        options.merge!(configfile_options)
+      end
+
+      OptionParser.new do |opts|
+        opts.banner = "papertrail-add-system"
+
+        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("-i", "--ip-address IP_ADDRESS", "IP address of system") do |v|
+          options[:ip] = v
+        end
+
+        opts.separator usage
+      end.parse!
+
+      if options[:configfile]
+        configfile_options = load_configfile(options[:configfile])
+        options.merge!(configfile_options)
+      end
+
+      raise OptionParser::MissingArgument, 'system' if options[:system].nil?
+      raise OptionParser::MissingArgument, 'ip' if options[:ip].nil?
+
+      connection = Papertrail::Connection.new(options)
+      
+      # Bail if system already exists
+      if connection.show_source(options[:system])
+        exit 0
+      end
+
+      if connection.register_source(options[:system], options[:ip])
+        exit 0
+      end
+
+      exit 1
+    rescue OptionParser::ParseError => e
+      puts "Error: #{e}"
+      puts usage
+      exit 1
+    end
+
+    def usage
+      <<-EOF
+
+  Usage: 
+    papertrail-add-system [-s system] [-i ip-address] [-c papertrail.yml] 
+
+  Example:
+    papertrail-add-system -s mysystemname -i 1.2.3.4
+
+  EOF
+    end
+  end
+end

data/lib/papertrail/cli_helpers.rb

@@ -0,0 +1,25 @@
+module Papertrail
+  module CliHelpers
+    def find_configfile
+      if File.exists?(path = File.expand_path('.papertrail.yml'))
+        return path
+      end
+      if File.exists?(path = File.expand_path('~/.papertrail.yml'))
+        return path
+      end
+    end
+
+    def load_configfile(file_path)
+      symbolize_keys(YAML.load_file(file_path))
+    end
+
+    def symbolize_keys(hash)
+      new_hash = {}
+      hash.each do |(key, value)|
+        new_hash[(key.to_sym rescue key) || key] = value
+      end
+
+      new_hash
+    end
+  end
+end

data/lib/papertrail/cli_join_group.rb

@@ -0,0 +1,79 @@
+require 'optparse'
+require 'yaml'
+
+require 'papertrail/cli_helpers'
+require 'papertrail/connection'
+
+module Papertrail
+  class CliJoinGroup
+    include Papertrail::CliHelpers
+
+    def run
+      # Let it slide if we have invalid JSON
+      if JSON.respond_to?(:default_options)
+        JSON.default_options[:check_utf8] = false
+      end
+
+      options = {
+        :configfile => nil,
+      }
+
+      if configfile = find_configfile
+        configfile_options = load_configfile(configfile)
+        options.merge!(configfile_options)
+      end
+
+      OptionParser.new do |opts|
+        opts.banner = "papertrail-join-group"
+
+        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 to group") do |v|
+          options[:system] = v
+        end
+        opts.on("-g", "--group GROUP", "Name of group to join") do |v|
+          options[:group] = v
+        end
+
+        opts.separator usage
+      end.parse!
+
+      if options[:configfile]
+        configfile_options = load_configfile(options[:configfile])
+        options.merge!(configfile_options)
+      end
+
+      raise OptionParser::MissingArgument, 'system' if options[:system].nil?
+      raise OptionParser::MissingArgument, 'group' if options[:group].nil?
+
+      connection = Papertrail::Connection.new(options)
+
+      if connection.join_group(options[:system], options[:group])
+        exit 0
+      end
+
+      exit 1
+    rescue OptionParser::ParseError => e
+      puts "Error: #{e}"
+      puts usage
+      exit 1
+    end
+
+    def usage
+      <<-EOF
+
+  Usage: 
+    papertrail-join-group [-s system] [-g group] [-c papertrail.yml] 
+
+  Example:
+    papertrail-join-group -s mymachine -g mygroup
+
+  EOF
+    end
+  end
+end

data/lib/papertrail/cli_remove_system.rb

@@ -0,0 +1,75 @@
+require 'optparse'
+require 'yaml'
+
+require 'papertrail/cli_helpers'
+require 'papertrail/connection'
+
+module Papertrail
+  class CliRemoveSystem
+    include Papertrail::CliHelpers
+
+    def run
+      # Let it slide if we have invalid JSON
+      if JSON.respond_to?(:default_options)
+        JSON.default_options[:check_utf8] = false
+      end
+
+      options = {
+        :configfile => nil,
+      }
+
+      if configfile = find_configfile
+        configfile_options = load_configfile(configfile)
+        options.merge!(configfile_options)
+      end
+
+      OptionParser.new do |opts|
+        opts.banner = "papertrail-remove-system"
+
+        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 remove") do |v|
+          options[:system] = v
+        end
+
+        opts.separator usage
+      end.parse!
+
+      if options[:configfile]
+        configfile_options = load_configfile(options[:configfile])
+        options.merge!(configfile_options)
+      end
+
+      raise OptionParser::MissingArgument, 'system' if options[:system].nil?
+
+      connection = Papertrail::Connection.new(options)
+
+      if connection.unregister_source(options[:system])
+        exit 0
+      end
+
+      exit 1
+    rescue OptionParser::ParseError => e
+      puts "Error: #{e}"
+      puts usage
+      exit 1
+    end
+
+    def usage
+      <<-EOF
+
+  Usage: 
+    papertrail-remove-system [-s system] [-c papertrail.yml] 
+
+  Example:
+    papertrail-remove-system -s mysystemname
+
+  EOF
+    end
+  end
+end

data/lib/papertrail/connection.rb

@@ -1,3 +1,4 @@
+require 'addressable/uri'
 require 'faraday'
 require 'openssl'
 require 'faraday_middleware'
@@ -11,7 +12,7 @@ module Papertrail
 
     attr_reader :connection
 
-    def_delegators :@connection, :get, :put, :post
+    def_delegators :@connection, :get, :put, :post, :delete
 
     def initialize(options)
       ssl_options = {
@@ -26,7 +27,8 @@ module Papertrail
         ssl_options[:ca_file] = '/etc/ssl/certs/ca-certificates.crt'
       end
 
-      @connection = Faraday::Connection.new(:url => 'https://papertrailapp.com', :ssl => ssl_options) do |builder|
+      @connection = Faraday::Connection.new(:url => 'https://papertrailapp.com/api/v1', :ssl => ssl_options) do |builder|
+        builder.use Faraday::Request::UrlEncoded
         builder.adapter Faraday.default_adapter
         builder.use Faraday::Response::RaiseError
         builder.use FaradayMiddleware::ParseJson, :content_type => /\bjson$/
@@ -40,14 +42,13 @@ module Papertrail
     end
 
     def find_id_for_source(name)
-      response = @connection.get('/api/v1/systems.json')
+      response = @connection.get('systems.json')
 
       find_id_for_item(response.body, name)
     end
 
     def find_id_for_group(name)
-      response = @connection.get('/api/v1/groups.json')
-
+      response = @connection.get('groups.json')
       find_id_for_item(response.body, name)
     end
 
@@ -59,10 +60,49 @@ module Papertrail
       items.each do |item|
         return item['id'] if item['name'] =~ /#{Regexp.escape(name_wanted)}/i
       end
+      return nil
+    end
+
+    def create_group(name, system_wildcard = nil)
+      group = { :group => { :name => name } }
+      if system_wildcard
+        group[:group][:system_wildcard] = system_wildcard
+      end
+      @connection.post("groups.json", group)
+    end
+
+    def show_group(name)
+      if id = find_id_for_group(name)
+        @connection.get("groups/#{id}.json").body
+      end
+    end
+
+    def show_source(name)
+      if id = find_id_for_source(name)
+        @connection.get("systems/#{id}.json").body
+      end
+    end
+
+    def join_group(source_name, group_name)
+      source_id = find_id_for_source(source_name)
+      group_id = find_id_for_group(group_name)
+      if source_id && group_id
+        @connection.post("systems/#{source_id}/join.json", :group_id => group_id)
+      end
+    end
+
+    def register_source(name, ip_address)
+      @connection.post("systems.json", :system => { :name => name, :ip_address => ip_address })
+    end
+
+    def unregister_source(name)
+      if source_id = find_id_for_source(name)
+        @connection.delete("systems/#{source_id}.json")
+      end
     end
 
     def query(query = nil, options = {})
       Papertrail::SearchQuery.new(self, query, options)
     end
   end
-end
+end

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.2'
-  s.date              = '2012-05-02'
+  s.version           = '0.9.3'
+  s.date              = '2012-07-12'
   s.rubyforge_project = 'papertrail'
 
   ## Make sure your summary is short. The description may be as long
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
 #  s.extensions = %w[ext/extconf.rb]
 
   ## If your gem includes any executables, list them here.
-  s.executables = ["papertrail"]
+  s.executables = ["papertrail", "papertrail-add-system", "papertrail-remove-system", "papertrail-add-group", "papertrail-join-group"]
   s.default_executable = 'papertrail'
 
   ## Specify any RDoc options here. You'll want to add your README and
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
+  s.add_dependency('addressable')
   s.add_dependency('yajl-ruby')
   s.add_dependency('faraday', [ '>= 0.6', '< 0.9' ])
   s.add_dependency('faraday_middleware', [ '~> 0.8.4' ])
@@ -67,9 +68,18 @@ Gem::Specification.new do |s|
     README.md
     Rakefile
     bin/papertrail
+    bin/papertrail-add-group
+    bin/papertrail-add-system
+    bin/papertrail-join-group
+    bin/papertrail-remove-system
     examples/papertrail.yml.example
     lib/papertrail.rb
     lib/papertrail/cli.rb
+    lib/papertrail/cli_add_group.rb
+    lib/papertrail/cli_add_system.rb
+    lib/papertrail/cli_helpers.rb
+    lib/papertrail/cli_join_group.rb
+    lib/papertrail/cli_remove_system.rb
     lib/papertrail/connection.rb
     lib/papertrail/event.rb
     lib/papertrail/search_query.rb

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Papertrail
@@ -14,10 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-02 00:00:00 -07:00
+date: 2012-07-12 00:00:00 -07:00
 default_executable: papertrail
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
@@ -25,12 +26,24 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: addressable
   requirement: *id001
-  name: yajl-ruby
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  name: yajl-ruby
+  requirement: *id002
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,12 +57,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
-  requirement: *id002
   name: faraday
+  requirement: *id003
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -58,14 +71,17 @@ dependencies:
         - 8
         - 4
         version: 0.8.4
-  requirement: *id003
   name: faraday_middleware
+  requirement: *id004
   prerelease: false
-  type: :runtime
 description: Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).
 email: troy@sevenscale.com
 executables: 
 - papertrail
+- papertrail-add-system
+- papertrail-remove-system
+- papertrail-add-group
+- papertrail-join-group
 extensions: []
 
 extra_rdoc_files: []
@@ -76,9 +92,18 @@ files:
 - README.md
 - Rakefile
 - bin/papertrail
+- bin/papertrail-add-group
+- bin/papertrail-add-system
+- bin/papertrail-join-group
+- bin/papertrail-remove-system
 - examples/papertrail.yml.example
 - lib/papertrail.rb
 - lib/papertrail/cli.rb
+- lib/papertrail/cli_add_group.rb
+- lib/papertrail/cli_add_system.rb
+- lib/papertrail/cli_helpers.rb
+- lib/papertrail/cli_join_group.rb
+- lib/papertrail/cli_remove_system.rb
 - lib/papertrail/connection.rb
 - lib/papertrail/event.rb
 - lib/papertrail/search_query.rb