bullet 4.1.6 → 4.2.0

data/.gitignore

@@ -8,4 +8,5 @@ tags
 .bundle
 *.gem
 benchmark_profile*
-/nbproject/private/
+/nbproject/private/
+Gemfile*.lock

data/Gemfile.rails-4-beta

@@ -0,0 +1,19 @@
+# Use `bundle install` in order to install these gems
+# Use `bundle exec rake` in order to run the specs using the bundle
+source "http://rubygems.org"
+
+gemspec
+
+gem 'rails', github: 'rails/rails'
+gem 'journey', github: 'rails/journey'
+gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders'
+gem 'sqlite3'
+gem 'mysql'
+gem 'activerecord-import'
+gem 'mongoid', github: 'slbug/mongoid'
+
+gem "rspec"
+gem "guard"
+gem "guard-rspec"
+
+gem "perftools.rb"

data/README.textile

@@ -50,17 +50,19 @@ config.after_initialize do
                   :receiver => 'your_account@jabber.org',
                   :show_online_status => true }
   Bullet.rails_logger = true
+  Bullet.airbrake = true
   Bullet.disable_browser_cache = true
 end
 </code></pre>
 
 The notifier of bullet is a wrap of "uniform_notifier":https://github.com/flyerhzm/uniform_notifier
 
-The code above will enable all six of the Bullet notification systems:
+The code above will enable all seven of the Bullet notification systems:
 * <code>Bullet.enable</code>: enable Bullet gem, otherwise do nothing
 * <code>Bullet.alert</code>: pop up a JavaScript alert in the browser
 * <code>Bullet.bullet_logger</code>: log to the Bullet log file (Rails.root/log/bullet.log)
 * <code>Bullet.rails_logger</code>: add warnings directly to the Rails log
+* <code>Bullet.airbrake</code>: add notifications to airbrake
 * <code>Bullet.console</code>: log warnings to your browser's console.log (Safari/Webkit browsers or Firefox w/Firebug installed)
 * <code>Bullet.growl</code>: pop up Growl warnings if your system has Growl installed. Requires a little bit of configuration
 * <code>Bullet.xmpp</code>: send XMPP/Jabber notifications to the receiver indicated. Note that the code will currently not handle the adding of contacts, so you will need to make both accounts indicated know each other manually before you will receive any notifications. If you restart the development server frequently, the 'coming online' sound for the bullet account may start to annoy - in this case set :show_online_status to false; you will still get notifications, but the bullet account won't announce it's online status anymore.
@@ -101,7 +103,7 @@ These two lines are notifications that unused eager loadings have been encounter
 
 ****************************************************************************
 
-h2. Growl and XMPP/Jabber Support
+h2. Growl, XMPP/Jabber and Airbrake Support
 
 see "https://github.com/flyerhzm/uniform_notifier":https://github.com/flyerhzm/uniform_notifier
 

data/bullet.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency "uniform_notifier", "~> 1.0.0"
+  s.add_dependency "uniform_notifier"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/bullet.rb

@@ -33,7 +33,7 @@ module Bullet
     attr_accessor :enable, :disable_browser_cache
     attr_reader :notification_collector
 
-    delegate :alert=, :console=, :growl=, :rails_logger=, :xmpp=, :to => UniformNotifier
+    delegate :alert=, :console=, :growl=, :rails_logger=, :xmpp=, :airbrake=, :to => UniformNotifier
 
     DETECTORS = [ Bullet::Detector::NPlusOneQuery,
                   Bullet::Detector::UnusedEagerAssociation,

data/lib/bullet/dependency.rb

@@ -24,7 +24,7 @@ module Bullet
                                      'active_record2'
                                    elsif active_record30?
                                      'active_record3'
-                                   elsif active_record31? || active_record32?
+                                   elsif active_record31? || active_record32? || active_record4?
                                      'active_record31'
                                    end
                                  end
@@ -60,6 +60,10 @@ module Bullet
       ::ActiveRecord::VERSION::MAJOR == 3
     end
 
+    def active_record4?
+      ::ActiveRecord::VERSION::MAJOR == 4
+    end
+
     def active_record30?
       active_record3? && ::ActiveRecord::VERSION::MINOR == 0
     end

data/lib/bullet/notification/base.rb

@@ -19,7 +19,12 @@ module Bullet
       end
 
       def whoami
-        "user: " << `whoami`.chomp
+        user = `whoami`
+        if user
+          "user: #{user.chomp}"
+        else
+          ""
+        end
       end
 
       def body_with_caller

data/lib/bullet/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Bullet
-  VERSION = "4.1.6"
+  VERSION = "4.2.0"
 end

data/test.sh

@@ -2,3 +2,4 @@ bundle && bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-3.1.5 bundle && bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-3.0.13 bundle && bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-2.3.14 bundle && bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-4-beta bundle && bundle exec rspec spec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.1.6
+  version: 4.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uniform_notifier
-  requirement: &70273215166900 !ruby/object:Gem::Requirement
+  requirement: &70294547787940 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273215166900
+  version_requirements: *70294547787940
 description: A rails plugin to kill N+1 queries and unused eager loading.
 email:
 - flyerhzm@gmail.com
@@ -35,13 +35,10 @@ files:
 - .rvmrc.example
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - Gemfile.rails-2.3.14
-- Gemfile.rails-2.3.14.lock
 - Gemfile.rails-3.0.13
-- Gemfile.rails-3.0.13.lock
 - Gemfile.rails-3.1.5
-- Gemfile.rails-3.1.5.lock
+- Gemfile.rails-4-beta
 - Guardfile
 - Hacking.textile
 - MIT-LICENSE
@@ -152,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1116007460163165065
+      hash: -1372591245763188534
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/Gemfile.lock

@@ -1,129 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bullet (4.1.6)
-      uniform_notifier (~> 1.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.5)
-      actionpack (= 3.2.5)
-      mail (~> 2.4.4)
-    actionpack (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.5)
-      activesupport (= 3.2.5)
-      builder (~> 3.0.0)
-    activerecord (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activerecord-import (0.2.9)
-      activerecord (~> 3.0)
-      activerecord (~> 3.0)
-    activeresource (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
-    activesupport (3.2.5)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    ffi (1.0.11)
-    guard (1.0.1)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-rspec (0.6.0)
-      guard (>= 0.10.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.7.3)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.18)
-    mongoid (3.0.0.rc)
-      activemodel (~> 3.1)
-      moped (~> 1.0.0.rc)
-      origin (~> 1.0.0.rc)
-      tzinfo (~> 0.3.22)
-    moped (1.0.0.rc)
-    multi_json (1.3.6)
-    mysql (2.8.1)
-    origin (1.0.0.rc)
-    perftools.rb (2.0.0)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.5)
-      actionmailer (= 3.2.5)
-      actionpack (= 3.2.5)
-      activerecord (= 3.2.5)
-      activeresource (= 3.2.5)
-      activesupport (= 3.2.5)
-      bundler (~> 1.0)
-      railties (= 3.2.5)
-    railties (3.2.5)
-      actionpack (= 3.2.5)
-      activesupport (= 3.2.5)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    uniform_notifier (1.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-import
-  bullet!
-  guard
-  guard-rspec
-  mongoid (= 3.0.0.rc)
-  mysql
-  perftools.rb
-  rails (= 3.2.5)
-  rspec
-  sqlite3

data/Gemfile.rails-2.3.14.lock

@@ -1,65 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bullet (4.1.6)
-      uniform_notifier (~> 1.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (2.3.14)
-      actionpack (= 2.3.14)
-    actionpack (2.3.14)
-      activesupport (= 2.3.14)
-      rack (~> 1.1.0)
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activeresource (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
-    bson (1.6.2)
-    bson_ext (1.6.2)
-      bson (~> 1.6.2)
-    diff-lcs (1.1.3)
-    ffi (1.0.11)
-    guard (1.0.2)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-rspec (0.7.0)
-      guard (>= 0.10.0)
-    mysql (2.8.1)
-    perftools.rb (2.0.0)
-    rack (1.1.3)
-    rails (2.3.14)
-      actionmailer (= 2.3.14)
-      actionpack (= 2.3.14)
-      activerecord (= 2.3.14)
-      activeresource (= 2.3.14)
-      activesupport (= 2.3.14)
-      rake (>= 0.8.3)
-    rake (0.9.2.2)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.0)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    sqlite3 (1.3.6)
-    thor (0.14.6)
-    uniform_notifier (1.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bson_ext
-  bullet!
-  guard
-  guard-rspec
-  mysql
-  perftools.rb
-  rails (= 2.3.14)
-  rspec
-  sqlite3

data/Gemfile.rails-3.0.13.lock

@@ -1,116 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bullet (4.1.6)
-      uniform_notifier (~> 1.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.13)
-      actionpack (= 3.0.13)
-      mail (~> 2.2.19)
-    actionpack (3.0.13)
-      activemodel (= 3.0.13)
-      activesupport (= 3.0.13)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.5)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.13)
-      activesupport (= 3.0.13)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.13)
-      activemodel (= 3.0.13)
-      activesupport (= 3.0.13)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activerecord-import (0.2.9)
-      activerecord (~> 3.0)
-      activerecord (~> 3.0)
-    activeresource (3.0.13)
-      activemodel (= 3.0.13)
-      activesupport (= 3.0.13)
-    activesupport (3.0.13)
-    arel (2.0.10)
-    bson (1.6.2)
-    bson_ext (1.6.2)
-      bson (~> 1.6.2)
-    builder (2.1.2)
-    diff-lcs (1.1.3)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    ffi (1.0.11)
-    guard (1.0.2)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-rspec (0.7.0)
-      guard (>= 0.10.0)
-    i18n (0.5.0)
-    json (1.7.3)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.18)
-    mysql (2.8.1)
-    perftools.rb (2.0.0)
-    polyglot (0.3.3)
-    rack (1.2.5)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.13)
-      actionmailer (= 3.0.13)
-      actionpack (= 3.0.13)
-      activerecord (= 3.0.13)
-      activeresource (= 3.0.13)
-      activesupport (= 3.0.13)
-      bundler (~> 1.0)
-      railties (= 3.0.13)
-    railties (3.0.13)
-      actionpack (= 3.0.13)
-      activesupport (= 3.0.13)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.0)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    sqlite3 (1.3.6)
-    thor (0.14.6)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    uniform_notifier (1.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-import
-  bson_ext
-  bullet!
-  guard
-  guard-rspec
-  mysql
-  perftools.rb
-  rails (= 3.0.13)
-  rspec
-  sqlite3

data/Gemfile.rails-3.1.5.lock

@@ -1,134 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bullet (4.1.6)
-      uniform_notifier (~> 1.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.1.5)
-      actionpack (= 3.1.5)
-      mail (~> 2.3.3)
-    actionpack (3.1.5)
-      activemodel (= 3.1.5)
-      activesupport (= 3.1.5)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
-    activemodel (3.1.5)
-      activesupport (= 3.1.5)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.5)
-      activemodel (= 3.1.5)
-      activesupport (= 3.1.5)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activerecord-import (0.2.9)
-      activerecord (~> 3.0)
-      activerecord (~> 3.0)
-    activeresource (3.1.5)
-      activemodel (= 3.1.5)
-      activesupport (= 3.1.5)
-    activesupport (3.1.5)
-      multi_json (>= 1.0, < 1.3)
-    arel (2.2.3)
-    bson (1.6.2)
-    bson_ext (1.6.2)
-      bson (~> 1.6.2)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    ffi (1.0.11)
-    guard (1.0.2)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-rspec (0.7.0)
-      guard (>= 0.10.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    json (1.7.3)
-    mail (2.3.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.18)
-    mongo (1.6.2)
-      bson (~> 1.6.2)
-    mongoid (2.4.10)
-      activemodel (~> 3.1)
-      mongo (~> 1.3)
-      tzinfo (~> 0.3.22)
-    multi_json (1.2.0)
-    mysql (2.8.1)
-    perftools.rb (2.0.0)
-    polyglot (0.3.3)
-    rack (1.3.6)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.1.5)
-      actionmailer (= 3.1.5)
-      actionpack (= 3.1.5)
-      activerecord (= 3.1.5)
-      activeresource (= 3.1.5)
-      activesupport (= 3.1.5)
-      bundler (~> 1.0)
-      railties (= 3.1.5)
-    railties (3.1.5)
-      actionpack (= 3.1.5)
-      activesupport (= 3.1.5)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.0)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    sprockets (2.0.4)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    uniform_notifier (1.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-import
-  bson_ext
-  bullet!
-  guard
-  guard-rspec
-  mongoid (= 2.4.10)
-  mysql
-  perftools.rb
-  rails (= 3.1.5)
-  rspec
-  sqlite3