papertrail 0.9.1 → 0.9.2.pre1

data/lib/papertrail/cli.rb

@@ -6,6 +6,11 @@ require 'papertrail/connection'
 module Papertrail
   class Cli
     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,
         :delay  => 2,
@@ -57,10 +62,16 @@ module Papertrail
 
       if options[:system]
         query_options[:system_id] = connection.find_id_for_source(options[:system])
+        unless query_options[:system_id]
+          abort "System \"#{options[:system]}\" not found"
+        end
       end
 
       if options[:group]
         query_options[:group_id] = connection.find_id_for_group(options[:group])
+        unless query_options[:group_id]
+          abort "Group \"#{options[:group]}\" not found"
+        end
       end
 
       search_query = connection.query(ARGV[0], query_options)

data/lib/papertrail/connection.rb

@@ -42,21 +42,23 @@ module Papertrail
     def find_id_for_source(name)
       response = @connection.get('/api/v1/systems.json')
 
-      response.body.each do |source|
-        return source['id'] if source['name'] =~ /#{Regexp.escape(name)}/i
-      end
-
-      return nil
+      find_id_for_item(response.body, name)
     end
 
     def find_id_for_group(name)
       response = @connection.get('/api/v1/groups.json')
 
-      response.body.each do |group|
-        return group['id'] if group['name'] =~ /#{Regexp.escape(name)}/i
+      find_id_for_item(response.body, name)
+    end
+
+    def find_id_for_item(items, name_wanted)
+      items.each do |item|
+        return item['id'] if item['name'] == name_wanted
       end
 
-      return nil
+      items.each do |item|
+        return item['id'] if item['name'] =~ /#{Regexp.escape(name_wanted)}/i
+      end
     end
 
     def query(query = nil, options = {})

data/lib/papertrail.rb

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

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.1'
-  s.date              = '2012-03-12'
+  s.version           = '0.9.2.pre1'
+  s.date              = '2012-05-02'
   s.rubyforge_project = 'papertrail'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: papertrail
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
   - 9
+  - 2
+  - pre
   - 1
-  version: 0.9.1
+  version: 0.9.2.pre1
 platform: ruby
 authors: 
 - Papertrail
@@ -14,25 +16,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 -07:00
+date: 2012-05-02 00:00:00 -07:00
 default_executable: papertrail
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
+  requirement: *id001
+  name: yajl-ruby
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: faraday
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -46,12 +46,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
+  requirement: *id002
+  name: faraday
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: faraday_middleware
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -60,8 +60,10 @@ dependencies:
         - 8
         - 4
         version: 0.8.4
+  requirement: *id003
+  name: faraday_middleware
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
 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: 
@@ -102,11 +104,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: papertrail