airbrake_tools 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdd1c1131520b79c11f048ba998705943ab95bc2
-  data.tar.gz: 29a5a90cc97973dbb2bed66ac01d66cd9a7a56f6
+  metadata.gz: fc3d7af0e6a7b6fc87ca968b446c774e970acd57
+  data.tar.gz: 69733ce8c83cc4a147ec7c3c9655e4a9cb00a737
 SHA512:
-  metadata.gz: 15526a3a2541bbee47b30bb81235bc585eb80ccba968226c3c0d40cf44bf39e9cf51e6f023a81a0866490dc51a38b67f61431778e65d70b4a7bb634589d94973
-  data.tar.gz: 2f0a069e6fcf7e78a934d2d630c13af0b53530bbfd78a36b95cb6aaa76f93189776a3f33b0005aa0badf1cbe995a4271f1f78263a869403027ced6a7cb960906
+  metadata.gz: c2988f6f938cee2117380a1f52c8307440899e8e4f389aefd3227719b9a85b0f2c00af4408ab86041bdfe8763b85e47d59bf358904b62291ff11d7003b30eca4
+  data.tar.gz: 9e899108980cdbff2044dd0d30d686f38ed8a5583a03ee85b7d131b4f7da4ffd5f89920dbfafb66bae036bde61ea04999b16ab04dc3985ba36eb38cbee1b9c24

data/Gemfile

@@ -5,3 +5,4 @@ gem "bump", "0.3.8"
 gem "rake"
 gem "rspec", "~>2"
 gem "launchy"
+gem "byebug"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    airbrake_tools (1.1.3)
+    airbrake_tools (1.1.4)
       airbrake-api (>= 4.5.1)
 
 GEM
@@ -14,12 +14,18 @@ GEM
       multi_xml
       parallel
     bump (0.3.8)
+    byebug (3.5.1)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+      slop (~> 3.6)
+    columnize (0.8.9)
+    debugger-linecache (1.2.0)
     diff-lcs (1.1.3)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.9.1)
       faraday (>= 0.7.4, < 0.10)
-    hashie (2.1.1)
+    hashie (3.3.1)
     launchy (2.4.2)
       addressable (~> 2.3)
     multi_xml (0.5.5)
@@ -34,6 +40,7 @@ GEM
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
+    slop (3.6.0)
 
 PLATFORMS
   ruby
@@ -41,6 +48,7 @@ PLATFORMS
 DEPENDENCIES
   airbrake_tools!
   bump (= 0.3.8)
+  byebug
   launchy
   rake
   rspec (~> 2)

data/Readme.md

@@ -39,7 +39,7 @@ Shows all errors divided by pages
  - "fix all errors on page x"
 
 ```
- airbrake-tools your-account your-auth-token list | grep 'is suspended'
+ airbrake-tools your-account your-auth-token list --project 12345 | grep 'is suspended'
  Page 1 ----------
  54054554 -- ActiveRecord::RecordInvalid -- ActiveRecord::RecordInvalid: Validation failed: Requester is suspended.
  Page 2 ----------

data/lib/airbrake_tools.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
 require "airbrake_tools/version"
 require "airbrake-api"
-require "launchy"
 
 module AirbrakeTools
   DEFAULT_HOT_PAGES = 1
@@ -51,13 +49,16 @@ module AirbrakeTools
     end
 
     def hot(options = {})
-      errors = errors_with_notices({:pages => DEFAULT_HOT_PAGES}.merge(options))
-      errors.sort_by{|e,n,f| f }.reverse
+      errors = Array(options[:project_id] || projects.map(&:id)).flat_map do |project_id|
+        errors_with_notices({pages: DEFAULT_HOT_PAGES, project_id: project_id}.merge(options))
+      end
+      errors.sort_by{|_,_,f| f }.reverse[0...AirbrakeAPI::Client::PER_PAGE]
     end
 
     def new(options = {})
+      need_project_id!(options)
       errors = errors_with_notices({:pages => DEFAULT_NEW_PAGES}.merge(options))
-      errors.sort_by{|e,n,f| e.created_at }.reverse
+      errors.sort_by{|e,_,_| e.created_at }.reverse
     end
 
     def errors_with_notices(options)
@@ -65,9 +66,10 @@ module AirbrakeTools
     end
 
     def list(options)
-      list_pages = options[:pages] ? options[:pages] : DEFAULT_LIST_PAGES
+      need_project_id!(options)
+      list_pages = (options[:pages] ? options[:pages] : DEFAULT_LIST_PAGES)
       page = 1
-      while errors = AirbrakeAPI.errors(page: page) and page <= list_pages
+      while page <= list_pages && errors = AirbrakeAPI.errors(page: page, project_id: options.fetch(:project_id))
         select_env(errors, options).each do |error|
           puts "#{error.id} -- #{error.error_class} -- #{error.error_message} -- #{error.created_at}"
         end
@@ -92,20 +94,23 @@ module AirbrakeTools
     end
 
     def open(error_id, notice_id=nil)
+      require "launchy"
       error = AirbrakeAPI.error(error_id)
       raise URI::InvalidURIError if error.nil?
 
-      if notice_id.nil?
-        Launchy.open "https://#{AirbrakeAPI.account}.airbrake.io/projects/#{error.project_id}/groups/#{error_id}"
-      else
-        Launchy.open "https://#{AirbrakeAPI.account}.airbrake.io/projects/#{error.project_id}/groups/#{error_id}/notices/#{notice_id}"
-      end
+      url = "https://#{AirbrakeAPI.account}.airbrake.io/projects/#{error.project_id}/groups/#{error_id}"
+      url += "/notices/#{notice_id}" if notice_id
+      Launchy.open url
     rescue URI::InvalidURIError
       puts "Error id does not map to any error on Airbrake"
     end
 
     private
 
+    def need_project_id!(options)
+      raise "Need a project_id" unless options[:project_id]
+    end
+
     def present_line(line)
       color = :gray if $stdout.tty? && !custom_file?(line)
       line = line.sub("[PROJECT_ROOT]/", "")
@@ -187,7 +192,7 @@ module AirbrakeTools
     end
 
     def print_errors(hot)
-      hot.each_with_index do |(error, notices, rate, deviance), index|
+      hot.each_with_index do |(error, notices, rate), index|
         spark = sparkline(notices, :slots => 60, :interval => 60)
         puts "\n##{(index+1).to_s.ljust(2)} #{rate.round(2).to_s.rjust(6)}/hour total:#{error.notices_count.to_s.ljust(8)} #{color_text(spark.ljust(61), :green)}"
         puts hot_summary(error)
@@ -234,7 +239,7 @@ module AirbrakeTools
         opts.on("-c NUM", "--compare-depth NUM", Integer, "How deep to compare backtraces in summary (default: first line in project + #{DEFAULT_COMPARE_DEPTH_ADDITION})") {|s| options[:compare_depth] = s }
         opts.on("-p NUM", "--pages NUM", Integer, "How maybe pages to iterate over (default: hot:#{DEFAULT_HOT_PAGES} new:#{DEFAULT_NEW_PAGES} summary:#{DEFAULT_SUMMARY_PAGES})") {|s| options[:pages] = s }
         opts.on("-e ENV", "--environment ENV", String, "Only show errors from this environment (default: #{DEFAULT_ENVIRONMENT})") {|s| options[:env] = s }
-        opts.on("--project NAME", String, "Name of project to fetch errors for") {|p| options[:project_name] = p }
+        opts.on("--project NAME_OR_ID", String, "Name of project to fetch errors for") {|p| options[:project_name] = p }
         opts.on("-h", "--help", "Show this.") { puts opts; exit }
         opts.on("-v", "--version", "Show Version"){ puts "airbrake-tools #{VERSION}"; exit }
       end.parse!(argv)
@@ -257,10 +262,14 @@ module AirbrakeTools
       `#{File.expand_path('../../spark.sh',__FILE__)} #{sparkline_data(notices, options).join(" ")}`.strip
     end
 
-    def project_id(project_name)
+    def projects
       @projects ||= AirbrakeAPI.projects
-      project = @projects.detect { |p| p.name == project_name }
-      raise "project with name #{name} not found try #{@projects.map(&:name).join(", ")}" unless project
+    end
+
+    def project_id(project_name)
+      return project_name.to_i if project_name =~ /^\d+$/
+      project = projects.detect { |p| p.name == project_name }
+      raise "project with name #{project_name} not found try #{projects.map(&:name).join(", ")}" unless project
       project.id
     end
   end

data/lib/airbrake_tools/version.rb

@@ -1,3 +1,3 @@
 module AirbrakeTools
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/spec/airbrake_tools_spec.rb

@@ -45,14 +45,14 @@ describe "airbrake-tools" do
 
     describe "hot" do
       it "kinda works" do
-        output = airbrake_tools("#{config["subdomain"]} #{config["auth_token"]} hot")
+        output = airbrake_tools("#{config["subdomain"]} #{config["auth_token"]} hot --project #{config["project_id"]}")
         output.should =~ /#\d+\s+\d+\.\d+\/hour\s+total:\d+/
       end
     end
 
     describe "list" do
       it "kinda works" do
-        output = airbrake_tools("#{config["subdomain"]} #{config["auth_token"]} list")
+        output = airbrake_tools("#{config["subdomain"]} #{config["auth_token"]} list --project #{config["project_id"]}")
         output.should include("Page 1 ")
         output.should =~ /^\d+/
       end
@@ -68,7 +68,7 @@ describe "airbrake-tools" do
 
     describe "new" do
       it "kinda works" do
-        output = airbrake_tools("#{config["subdomain"]} #{config["auth_token"]} new")
+        output = airbrake_tools("#{config["subdomain"]} #{config["auth_token"]} new --project #{config["project_id"]}")
         output.should =~ /#\d+\s+\d+\.\d+\/hour\s+total:\d+/
       end
     end

data/spec/fixtures.example.yml

@@ -1,3 +1,4 @@
 subdomain: xxx
 auth_token: yyy # NOT THE API KEY <-> got to airbrake, click on settings, copy auth_token
 summary_error_id: zzz # some valid error ID from airbrake to test summary functionality
+project_id: aaa # some valid project ID from airbrake to test new/list functionality

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake_tools
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Jonathan Cheatham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake-api