errplane 0.5.0 → 0.5.1

data/lib/errplane/configuration.rb

@@ -29,7 +29,7 @@ module Errplane
       :app_host => "app.errplane.com",
       :ignored_exceptions => %w{ActiveRecord::RecordNotFound
                                 ActionController::RoutingError},
-      :ignored_environments => %w{development test cucumber selenium},
+      :ignored_environments => %w{test cucumber selenium},
       :ignored_user_agents => %w{GoogleBot},
       :backtrace_filters => [
         lambda { |line| line.gsub(/^\.\//, "") },

data/lib/errplane/rails.rb

@@ -8,6 +8,7 @@ module Errplane
     def self.initialize
       ActionController::Base.send(:include, Errplane::Rails::AirTrafficController)
       ActionController::Base.send(:include, Errplane::Rails::Middleware::HijackRescueActionEverywhere)
+      ActionController::Base.send(:include, Errplane::Rails::Instrumentation)
 
       ::Rails.configuration.middleware.insert_after 'ActionController::Failsafe', Errplane::Rack
 

data/lib/errplane/railtie.rb

@@ -90,6 +90,9 @@ module Errplane
       ActiveSupport.on_load(:action_controller) do
         require 'errplane/rails/air_traffic_controller'
         include Errplane::Rails::AirTrafficController
+
+        require 'errplane/rails/instrumentation'
+        include Errplane::Rails::Instrumentation
       end
 
       if defined?(::ActionDispatch::DebugExceptions)

data/lib/errplane/version.rb

@@ -1,3 +1,3 @@
 module Errplane
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/rails/generators/errplane/errplane_generator.rb

@@ -3,6 +3,24 @@ require 'rails/generators'
 class ErrplaneGenerator < Rails::Generators::Base
   desc "Description:\n  This creates a Rails initializer for Errplane."
 
+  begin
+    puts "Contacting Errplane API"
+    application_name = Rails.application.class.parent_name
+    api_key = ARGV.last
+    http = Net::HTTP.new("localhost", "3000")
+    url = "/api/v1/applications?api_key=#{api_key}&name=#{application_name}"
+    response = http.post(url, nil)
+    @application = JSON.parse(response.body)
+
+    unless response.is_a?(Net::HTTPSuccess)
+      raise "The Errplane API returned an error: #{response.inspect}"
+    end
+  rescue => e
+    puts "We ran into a problem creating your application via the API!"
+    puts "If this issue persists, contact us at support@errplane.com with the following details:"
+    puts "#{e.class}: #{e.message}"
+  end
+
   source_root File.expand_path('../templates', __FILE__)
   argument :api_key,
     :required => true,
@@ -10,7 +28,7 @@ class ErrplaneGenerator < Rails::Generators::Base
     :description => "API key for your Errplane organization"
   argument :application_id,
     :required => false,
-    :default => SecureRandom.hex(4),
+    :default => @application["key"],
     :type => :string,
     :description => "Identifier for this application (Leave blank and a new one will be generated for you)"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errplane
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70165371262220 !ruby/object:Gem::Requirement
+  requirement: &70329913694340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165371262220
+  version_requirements: *70329913694340
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70165371261120 !ruby/object:Gem::Requirement
+  requirement: &70329913693580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70165371261120
+  version_requirements: *70329913693580
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70165371260600 !ruby/object:Gem::Requirement
+  requirement: &70329913692540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70165371260600
+  version_requirements: *70329913692540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70165371259960 !ruby/object:Gem::Requirement
+  requirement: &70329913692040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70165371259960
+  version_requirements: *70329913692040
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70165371259200 !ruby/object:Gem::Requirement
+  requirement: &70329901187280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165371259200
+  version_requirements: *70329901187280
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70165371258360 !ruby/object:Gem::Requirement
+  requirement: &70329901186200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165371258360
+  version_requirements: *70329901186200
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70165371257800 !ruby/object:Gem::Requirement
+  requirement: &70329901185400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165371257800
+  version_requirements: *70329901185400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70165371257320 !ruby/object:Gem::Requirement
+  requirement: &70329901184360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165371257320
+  version_requirements: *70329901184360
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70165371256800 !ruby/object:Gem::Requirement
+  requirement: &70329901183000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165371256800
+  version_requirements: *70329901183000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70165371256240 !ruby/object:Gem::Requirement
+  requirement: &70329901182400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165371256240
+  version_requirements: *70329901182400
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70165371255740 !ruby/object:Gem::Requirement
+  requirement: &70329901181840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165371255740
+  version_requirements: *70329901181840
 description: This gem provides exception reporting with Errplane for Rails 3.x applications.
 email:
 - todd@errplane.com
@@ -158,7 +158,6 @@ files:
 - lib/errplane/black_box.rb
 - lib/errplane/capistrano.rb
 - lib/errplane/configuration.rb
-- lib/errplane/errplane_chef_handler.rb
 - lib/errplane/instrumentation.rb
 - lib/errplane/logger.rb
 - lib/errplane/rack.rb

data/lib/errplane/errplane_chef_handler.rb

@@ -1,63 +0,0 @@
-#Forked from https://github.com/morgoth/airbrake_handler/blob/master/lib/airbrake_handler.rb
-#Apache license please see above url for more details
-
-require "chef/handler"
-require "errplane"
-require 'logger'
-
-class ErrplaneChefHandler < Chef::Handler
-
-  attr_accessor :options, :api_key, :ignore, :notify_host, :environment
-
-  def initialize(options = {})
-    @api_key     = options.delete(:api_key)
-    @ignore      = options.delete(:ignore) || []
-    @options     = options
-    @environment = options.delete(:env) || "production"
-  end
-
-  def report
-    if run_status.failed? && !ignore_exception?(run_status.exception)
-      Chef::Log.error("Creating Errplane exception report")
-
-      excep = run_status.exception
-      setup_errplane
-      Errplane.transmit(excep, errplane_params)
-    end
-  end
-
-  def ignore_exception?(exception)
-    ignore.any? do |ignore_case|
-      ignore_case[:class] == exception.class.name && (!ignore_case.key?(:message) || !!ignore_case[:message].match(exception.message))
-    end
-  end
-
-  def errplane_params
-    {
-      :notifier_name    => "Chef Errplane Notifier",
-      :notifier_version => Errplane::VERSION,
-      :notifier_url     => "https://github.com/errplane/gem",
-      :component        => run_status.node.name,
-      :url              => nil,
-      :environment      => @environment,
-      :params           => {
-        :start_time   => run_status.start_time,
-        :end_time     => run_status.end_time,
-        :elapsed_time => run_status.elapsed_time,
-        :run_list     => run_status.node.run_list.to_s
-      }
-    }.merge(options)
-  end
-
-  def setup_errplane
-    raise ArgumentError.new("You must provide an Errplane API key") unless api_key
-    Errplane.configure do |config|
-      config.api_key = api_key
-      config.application_id = "chef"
-      config.application_name = "chef"
-      config.logger = Chef::Log
-      config.debug = false
-      config.rails_environment = @environment
-    end
-  end
-end