airbrake_tools 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6e685b460c2432e490b9a535f28aba359672c81
-  data.tar.gz: a1e69905a9b4534d24bf595cbada9ac18cc1a103
+  metadata.gz: 36fac1e64067233ec999c77a709664e713fb3d1e
+  data.tar.gz: a4ab31edbfca13e3c5bda4a7f5e4bce73662db05
 SHA512:
-  metadata.gz: 661d9e8ab2d8fcd3fa17896c31a32ea1af4e852f2551f2748fa0ca2e381569f9002dad7133f3b41bc5ddfa04aea07d5f504a8145df1b3efeb6b8d22bcb485555
-  data.tar.gz: 71a7e83db45ae534f9e034821b4ded8d3e689e458112488adca1d4c113eb7b3fcef3042ec9674d6487438323e18793e3945a67a54266e3ef6601500c81043c02
+  metadata.gz: 91ca4a6fd975468cce389a972ce4823d0e1011d6165e49abc14edbd9adcd418051e98d17df9f8fb5c44dc40528d371948a801e033a72ef3e1083ca2c9e8d4e84
+  data.tar.gz: 0ebcf50c02b4652fb2da1e4f834ff00fc7c9ec5ac0ea72f9b4238ad7ba81b15a6069af1436fe8b50adfaadb64928c73262d9a76c30fbed24d6b4c53ac6d5a7c4

data/Gemfile.lock

@@ -1,18 +1,14 @@
 PATH
   remote: .
   specs:
-    airbrake_tools (1.1.6)
-      airbrake-api (>= 4.5.1)
+    airbrake_tools (1.2.0)
+      json
+      parallel
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.6)
-    airbrake-api (4.6.0)
-      faraday_middleware
-      hashie
-      multi_xml
-      parallel
     bump (0.3.8)
     byebug (3.5.1)
       columnize (~> 0.8)
@@ -21,16 +17,10 @@ GEM
     columnize (0.8.9)
     debugger-linecache (1.2.0)
     diff-lcs (1.1.3)
-    faraday (0.9.1)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.1)
-      faraday (>= 0.7.4, < 0.10)
-    hashie (3.4.0)
+    json (1.8.2)
     launchy (2.4.2)
       addressable (~> 2.3)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    parallel (1.4.1)
+    parallel (1.6.0)
     rake (0.9.2.2)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)

data/airbrake_tools.gemspec

@@ -11,5 +11,6 @@ Gem::Specification.new name, AirbrakeTools::VERSION do |s|
   s.bindir = 'bin'
   s.license = "MIT"
   s.executables = ["airbrake-tools"]
-  s.add_runtime_dependency "airbrake-api", ">= 4.5.1"
+  s.add_runtime_dependency "json"
+  s.add_runtime_dependency "parallel"
 end

data/lib/airbrake_tools.rb

@@ -1,13 +1,19 @@
 require "airbrake_tools/version"
-require "airbrake-api"
+require "json"
+require "ostruct"
+require "net/http"
+require "net/https"
+require "time"
+require "parallel"
 
 module AirbrakeTools
   DEFAULT_HOT_PAGES = 1
   DEFAULT_NEW_PAGES = 1
-  DEFAULT_LIST_PAGES = 10
-  DEFAULT_SUMMARY_PAGES = 10
+  DEFAULT_LIST_PAGES = 1 # TODO 10 once pagination is not broken :/
+  DEFAULT_SUMMARY_PAGES = 1 # TODO 10 once pagination is not broken :/
   DEFAULT_COMPARE_DEPTH_ADDITION = 3 # first line in project is 6 -> compare at 6 + x depth
   DEFAULT_ENVIRONMENT = "production"
+  PER_PAGE = 20
   COLORS = {
     :gray => "\e[0;37m",
     :green => "\e[0;32m",
@@ -20,17 +26,15 @@ module AirbrakeTools
     def cli(argv)
       options = extract_options(argv)
 
-      AirbrakeAPI.account = ARGV[0]
-      AirbrakeAPI.auth_token = ARGV[1]
-      AirbrakeAPI.secure = true
-
-      options[:project_id] = project_id(options.delete(:project_name)) if options[:project_name]
-
-      if AirbrakeAPI.account.to_s.empty? || AirbrakeAPI.auth_token.to_s.empty?
+      # TODO get rid of argument 0
+      @token = ARGV[1]
+      if @token.to_s.empty?
         puts "Usage instructions: airbrake-tools --help"
         return 1
       end
 
+      options[:project_id] = project_id(options.delete(:project_name)) if options[:project_name]
+
       case ARGV[2]
       when "hot"
         print_errors(hot(options))
@@ -52,7 +56,7 @@ module AirbrakeTools
       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]
+      errors.sort_by{|_,_,f| f }.reverse[0...PER_PAGE]
     end
 
     def new(options = {})
@@ -62,15 +66,15 @@ module AirbrakeTools
     end
 
     def errors_with_notices(options)
-      add_notices_to_pages(errors_from_pages(options))
+      add_notices_to_pages(options.fetch(:project_id), errors_from_pages(options))
     end
 
     def list(options)
       need_project_id!(options)
       list_pages = (options[:pages] ? options[:pages] : DEFAULT_LIST_PAGES)
       page = 1
-      while page <= list_pages && errors = AirbrakeAPI.errors(page: page, project_id: options.fetch(:project_id))
-        select_env(errors, options).each do |error|
+      while page <= list_pages && errors = airbrake_errors(options.fetch(:project_id), page, options)
+        errors.each do |error|
           puts "#{error.id} -- #{error.error_class} -- #{error.error_message} -- #{error.created_at}"
         end
         $stderr.puts "Page #{page} ----------\n"
@@ -79,7 +83,7 @@ module AirbrakeTools
     end
 
     def summary(error_id, options)
-      notices = AirbrakeAPI.notices(error_id, :pages => options[:pages] || DEFAULT_SUMMARY_PAGES)
+      notices = notices_from_pages(options.fetch(:project_id), error_id, options[:pages] || DEFAULT_SUMMARY_PAGES)
 
       puts "last retrieved notice: #{((Time.now - notices.last.created_at) / (60 * 60)).round} hours ago at #{notices.last.created_at}"
       puts "last 2 hours:  #{sparkline(notices, :slots => 60, :interval => 120)}"
@@ -143,25 +147,20 @@ module AirbrakeTools
     end
 
     def grouped_backtraces(notices, options)
-      notices = notices.compact.select { |n| backtrace(n) }
+      notices = notices.compact.select { |n| n.backtrace.any? }
 
       compare_depth = if options[:compare_depth]
         options[:compare_depth]
       else
-        average_first_project_line(notices.map { |n| backtrace(n) }) +
+        average_first_project_line(notices.map { |n| n.backtrace }) +
           DEFAULT_COMPARE_DEPTH_ADDITION
       end
 
       notices.group_by do |notice|
-        backtrace(notice)[0..compare_depth]
+        notice.backtrace[0..compare_depth]
       end
     end
 
-    def backtrace(notice)
-      return if notice.backtrace.is_a?(String)
-      [*notice.backtrace.first[1]] # can be string or array
-    end
-
     def average_first_project_line(backtraces)
       depths = backtraces.map do |backtrace|
         backtrace.index { |line| custom_file?(line) }
@@ -174,15 +173,13 @@ module AirbrakeTools
       line.start_with?("[PROJECT_ROOT]") && !line.start_with?("[PROJECT_ROOT]/vendor/")
     end
 
-    def add_notices_to_pages(errors)
+    def add_notices_to_pages(project_id, errors)
       Parallel.map(errors, :in_threads => 10) do |error|
         begin
           pages = 1
-          notices = AirbrakeAPI.notices(error.id, pages: pages, raw: true).compact
+          notices = notices_from_pages(project_id, error.id, pages).compact
           print "."
-          [error, notices, frequency(notices, pages * AirbrakeAPI::Client::PER_PAGE)]
-        rescue Faraday::Error::ParsingError
-          $stderr.puts "Ignoring #{hot_summary(error)}, got 500 from http://#{AirbrakeAPI.account}.airbrake.io/errors/#{error.id}"
+          [error, notices, frequency(notices, pages * PER_PAGE)]
         rescue Exception => e
           puts "Ignoring exception <<#{e}>>, most likely bad data from airbrake"
         end
@@ -192,13 +189,17 @@ module AirbrakeTools
     def errors_from_pages(options)
       errors = []
       options[:pages].times do |i|
-        errors.concat(AirbrakeAPI.errors(:page => i+1, :project_id => options[:project_id]) || [])
+        errors.concat(airbrake_errors(options[:project_id], i+1, options))
       end
-      select_env(errors, options)
+      errors
     end
 
-    def select_env(errors, options)
-      errors.select{|e| e.rails_env == (options[:env] || DEFAULT_ENVIRONMENT) }
+    def notices_from_pages(project_id, error_id, pages)
+      notices = []
+      pages.times do |i|
+        notices.concat(airbrake_notices(project_id, error_id, i+1))
+      end
+      notices
     end
 
     def print_errors(hot)
@@ -273,15 +274,77 @@ module AirbrakeTools
       `#{File.expand_path('../../spark.sh',__FILE__)} #{sparkline_data(notices, options).join(" ")}`.strip
     end
 
-    def projects
-      @projects ||= AirbrakeAPI.projects
-    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
+
+    def projects
+      @projects ||= begin
+        response = make_request("https://airbrake.io/api/v3/projects?key=#{@token}")
+        case response.code.to_i
+        when 200..299
+          JSON.parse(response.body)["projects"].compact.map do |raw|
+            OpenStruct.new(
+              :id   => raw["id"].to_s,
+              :name => raw["name"]
+            )
+          end.sort_by{|p| p[:name].to_s.downcase }
+        else
+          raise "ERROR - Bad response for http://airbrake.io/api/v3/projects - #{response.code} - #{response.message}"
+        end
+      end
+    end
+
+    def airbrake_errors(project_id, page, options)
+      response = make_request("https://airbrake.io/api/v3/projects/#{project_id}/groups?key=#{@token}&page=#{page}&environment=#{options[:env] || DEFAULT_ENVIRONMENT}&resolved=false")
+      case response.code.to_i
+      when 200..299
+        JSON.parse(response.body)["groups"].compact.map do |raw|
+          OpenStruct.new(
+            :id            => raw["id"].to_s,
+            :project_id    => raw["projectId"].to_s,
+            :env           => raw["environment"],
+            :count         => raw["noticeCount"],
+            :created_at    => Time.parse(raw["createdAt"]),
+            :most_recent   => Time.parse(raw["lastNoticeAt"]),
+            :error_message => raw["errors"][0]["message"].to_s,
+            :error_class   => raw["errors"][0]["type"].to_s
+          )
+        end
+      else
+        puts "ERROR - Bad response for http://airbrake.io/api/v3/projects/#{project_id}/groups - #{response.code} - #{response.message}"
+      end
+    end
+
+    def airbrake_notices(project_id, error_id, page=1)
+      response = make_request("https://airbrake.io/api/v3/projects/#{project_id}/groups/#{error_id}/notices?key=#{@token}&page=#{page}")
+      case response.code.to_i
+      when 200..299
+        JSON.parse(response.body)["notices"].compact.map do |raw|
+          OpenStruct.new(
+            :id            => raw["id"].to_s,
+            :created_at    => Time.parse(raw["createdAt"]),
+            :message       => raw["errors"][0]["message"].to_s,
+            :backtrace     => (raw["errors"].first['backtrace'] || []).map { |l| "#{l["file"]}:#{l["line"]}" }
+          )
+        end
+      else
+        raise "ERROR - Bad response for http://airbrake.io/api/v3/projects/#{project_id}/groups/#{error_id}/notices - #{response.code} - #{response.message}"
+      end
+    end
+
+    def make_request(url)
+      # stolen from https://github.com/bf4/airbrake_client/blob/master/airbrake_client.rb
+      uri = URI(url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      if http.use_ssl = (uri.scheme == 'https')
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+      request = Net::HTTP::Get.new(uri.request_uri)
+      http.request(request)
+    end
   end
 end

data/lib/airbrake_tools/version.rb

@@ -1,3 +1,3 @@
 module AirbrakeTools
-  VERSION = "1.1.6"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: airbrake_tools
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - Jonathan Cheatham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: airbrake-api
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.5.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.5.1
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: coaxis@gmail.com
 executables: