errplane 0.5.8 → 0.5.9

data/.travis.yml

@@ -10,6 +10,7 @@ gemfile:
   - gemfiles/Gemfile.rails-3.2.x
   - gemfiles/Gemfile.rails-3.1.x
   - gemfiles/Gemfile.rails-3.0.x
+  - gemfiles/Gemfile.rails-2.3.x
 notifications:
   email:
     - mechanics@errplane.com

data/gemfiles/Gemfile.rails-2.3.x

@@ -0,0 +1,8 @@
+source :rubygems
+
+gem 'rails', '~> 2.3.14'
+gem 'rspec', '~> 1.3'
+gem 'rspec-rails', '~> 1.3'
+gem 'test-unit', "1.2.3"
+
+gemspec :path => '../'

data/generators/errplane/errplane_generator.rb

@@ -0,0 +1,43 @@
+class ErrplaneGenerator < Rails::Generator::Base
+  def add_options!(option)
+    option.on("-k", "--api-key=API_KEY", String, "API key for your Errplane organization") {|v| options[:api_key] = v}
+    option.on("-a", "--application-id=APP_ID", String, "Your Errplane application id (optional)") {|v| options[:application_id] = v}
+  end
+
+  def manifest
+    if options[:api_key].blank?
+      puts "You must provide an API key using -k or --api-key."
+      exit
+    end
+
+    begin
+      puts "Contacting Errplane API"
+      application_name = "ApplicationName"
+      api_key = options[:api_key]
+      http = Net::HTTP.new("app.errplane.com", "80")
+      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
+
+    record do |m|
+      m.template "initializer.rb", "config/initializers/errplane.rb",
+        :assigns => {
+          :application_id => options[:application_id] || secure_random.hex(4),
+          :api_key => options[:api_key]
+        }
+    end
+  end
+
+  def secure_random
+    defined?(SecureRandom) ? SecureRandom : ActiveSupport::SecureRandom
+  end
+end

data/generators/errplane/templates/initializer.rb

@@ -0,0 +1,6 @@
+require "errplane"
+
+Errplane.configure do |config|
+  config.api_key = "<%= api_key %>"
+  config.application_id = "<%= application_id %>"
+end

data/lib/errplane/rails.rb

@@ -20,6 +20,28 @@ module Errplane
         config.framework               = "Rails"
         config.framework_version       = ::Rails.version
       end
+
+      if defined?(ActiveSupport::Notifications)
+        ActiveSupport::Notifications.subscribe do |name, start, finish, id, payload|
+          if Errplane.configuration.instrumentation_enabled?
+            h = { :name => name,
+                  :start => start,
+                  :finish => finish,
+                  :nid => id,
+                  :payload => payload,
+                  :source => "active_support"}
+            Errplane.queue.push_or_discard(h)
+          end
+        end
+      end
+
+      if defined?(PhusionPassenger)
+        PhusionPassenger.on_event(:starting_worker_process) do |forked|
+          Errplane::Worker.spawn_threads() if forked
+        end
+      else
+        Errplane::Worker.spawn_threads()
+      end
     end
   end
 end

data/lib/errplane/version.rb

@@ -1,3 +1,3 @@
 module Errplane
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

data/rails/init.rb

@@ -0,0 +1 @@
+require "errplane/rails"

data/spec/spec_helper.rb

@@ -2,7 +2,23 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 ENV["RAILS_ENV"] ||= "test"
 
-require 'rails'
+require 'rails/version'
+
+if Rails::VERSION::MAJOR > 2
+  require 'rails'
+else
+  module Rails
+    class << self
+      def vendor_rails?; return false; end
+    end
+
+    class Configuration
+      def after_initialize; end
+    end
+    @@configuration = Configuration.new
+  end
+  require 'initializer'
+end
 
 require 'bundler/setup'
 Bundler.require
@@ -13,9 +29,16 @@ FakeWeb.allow_net_connect = false
 if defined? Rails
   puts "Loading Rails v#{Rails.version}..."
 
-  require "support/rails3/app"
-  require "rspec/rails"
-else
-  puts "ERROR: Rails could not be loaded."
-  exit
+  if Rails.version.to_f < 3.0
+    RAILS_ROOT = "#{File.dirname(__FILE__)}/support/rails2"
+    require "#{RAILS_ROOT}/config/environment"
+    require "spec/rails"
+  else
+    require "support/rails3/app"
+    require "rspec/rails"
+  end
+end
+
+if defined? Sinatra
+  require 'spec_helper_for_sinatra'
 end

data/spec/suite.sh

@@ -18,6 +18,7 @@ function build_versions() {
   build_version "3.2.x"
   build_version "3.1.x"
   build_version "3.0.x"
+  build_version "2.3.x"
 }
 
 function build_with_ruby() {

data/spec/support/rails2/app/controllers/application_controller.rb

@@ -0,0 +1,4 @@
+class ApplicationController < ActionController::Base
+  helper :all
+  protect_from_forgery
+end

data/spec/support/rails2/app/controllers/widgets_controller.rb

@@ -0,0 +1,4 @@
+class WidgetsController < ApplicationController
+  def index; render :nothing => true; end
+  def new; return 1/0; end
+end

data/spec/support/rails2/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/spec/support/rails2/app/helpers/widgets_helper.rb

@@ -0,0 +1,2 @@
+module WidgetsHelper
+end

data/spec/support/rails2/config/environment.rb

@@ -0,0 +1,4 @@
+Rails::Initializer.run do |config|
+  config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
+  config.time_zone = 'UTC'
+end

data/spec/support/rails2/config/initializers/cookie_verification_secret.rb

@@ -0,0 +1 @@
+ActionController::Base.cookie_verifier_secret = '171a91942320ec70c77a53d50cf62835b06a9e9e3ee8e9f045d4fe195965b9d5b30ceed7570ac6d77c20ca561229625be0cf987e8342b14f499033a271480970';

data/spec/support/rails2/config/initializers/errplane.rb

@@ -0,0 +1,6 @@
+Errplane.configure do |config|
+  config.api_key = "f123-e456-d789c012"
+  config.application_id = "b12r8c72"
+end
+
+MissingSourceFile::REGEXPS << [/^cannot load such file -- (.+)$/i, 1]

data/spec/support/rails2/config/initializers/new_rails_defaults.rb

@@ -0,0 +1,8 @@
+if defined?(ActiveRecord)
+  ActiveRecord::Base.include_root_in_json = true
+  ActiveRecord::Base.store_full_sti_class = true
+end
+
+ActionController::Routing.generate_best_match = false
+ActiveSupport.use_standard_json_time_format = true
+ActiveSupport.escape_html_entities_in_json = false

data/spec/support/rails2/config/initializers/session_store.rb

@@ -0,0 +1,4 @@
+ActionController::Base.session = {
+  :key         => '_rails-2.3_session',
+  :secret      => '76cc9f32d38e9b6227bd663076edcf28cc915dc3021da204763a73dbd0d2741f6f7074af21400d4f8f9ef6c4db72487c467edf4a1dfec732835c5674a9846dd7'
+}

data/spec/support/rails2/config/routes.rb

@@ -0,0 +1,3 @@
+ActionController::Routing::Routes.draw do |map|
+  map.resources :widgets
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errplane
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-17 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70177908401580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70177908401580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70177908396000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70177908396000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.14
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70177908395120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70177908395120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.14
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70177908394640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70177908394640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70177908394020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177908394020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70177908393320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177908393320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70177908392600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177908392600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70177908392120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177908392120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70177908391640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177908391640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70177908391160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177908391160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70177908390660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +181,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177908390660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem provides exception reporting with Errplane for Rails 3.x applications.
 email:
 - todd@errplane.com
@@ -147,9 +202,12 @@ files:
 - Rakefile
 - config.ru
 - errplane.gemspec
+- gemfiles/Gemfile.rails-2.3.x
 - gemfiles/Gemfile.rails-3.0.x
 - gemfiles/Gemfile.rails-3.1.x
 - gemfiles/Gemfile.rails-3.2.x
+- generators/errplane/errplane_generator.rb
+- generators/errplane/templates/initializer.rb
 - lib/errplane.rb
 - lib/errplane/backtrace.rb
 - lib/errplane/black_box.rb
@@ -171,11 +229,23 @@ files:
 - lib/errplane/worker.rb
 - lib/rails/generators/errplane/errplane_generator.rb
 - lib/rails/generators/errplane/templates/initializer.rb
+- rails/init.rb
 - spec/controllers/widgets_controller_spec.rb
 - spec/integration/exceptions_spec.rb
 - spec/integration/integration_helper.rb
 - spec/spec_helper.rb
 - spec/suite.sh
+- spec/support/rails2/app/controllers/application_controller.rb
+- spec/support/rails2/app/controllers/widgets_controller.rb
+- spec/support/rails2/app/helpers/application_helper.rb
+- spec/support/rails2/app/helpers/widgets_helper.rb
+- spec/support/rails2/config/environment.rb
+- spec/support/rails2/config/environments/test.rb
+- spec/support/rails2/config/initializers/cookie_verification_secret.rb
+- spec/support/rails2/config/initializers/errplane.rb
+- spec/support/rails2/config/initializers/new_rails_defaults.rb
+- spec/support/rails2/config/initializers/session_store.rb
+- spec/support/rails2/config/routes.rb
 - spec/support/rails3/app.rb
 - spec/unit/backtrace_spec.rb
 - spec/unit/black_box_spec.rb
@@ -205,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: errplane
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails exception reporting for Errplane.
@@ -215,6 +285,17 @@ test_files:
 - spec/integration/integration_helper.rb
 - spec/spec_helper.rb
 - spec/suite.sh
+- spec/support/rails2/app/controllers/application_controller.rb
+- spec/support/rails2/app/controllers/widgets_controller.rb
+- spec/support/rails2/app/helpers/application_helper.rb
+- spec/support/rails2/app/helpers/widgets_helper.rb
+- spec/support/rails2/config/environment.rb
+- spec/support/rails2/config/environments/test.rb
+- spec/support/rails2/config/initializers/cookie_verification_secret.rb
+- spec/support/rails2/config/initializers/errplane.rb
+- spec/support/rails2/config/initializers/new_rails_defaults.rb
+- spec/support/rails2/config/initializers/session_store.rb
+- spec/support/rails2/config/routes.rb
 - spec/support/rails3/app.rb
 - spec/unit/backtrace_spec.rb
 - spec/unit/black_box_spec.rb