honeybadger 1.0.0 → 1.1.0

data/Gemfile

@@ -2,9 +2,10 @@ source "https://rubygems.org"
 
 gemspec
 
+gem 'rake'
+
 if true
   group :test do
-    gem 'turn'
     gem 'pry'
     gem 'guard'
     gem 'guard-test'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    honeybadger (0.0.1)
+    honeybadger (1.1.0)
       activesupport
       json
 
@@ -14,7 +14,6 @@ GEM
     activerecord (2.3.14)
       activesupport (= 2.3.14)
     activesupport (2.3.14)
-    ansi (1.4.2)
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (3.0.0)
@@ -65,6 +64,7 @@ GEM
       method_source (~> 0.7.1)
       slop (>= 2.4.4, < 3)
     rack (1.1.3)
+    rake (0.9.2.2)
     rb-fchange (0.0.5)
       ffi
     rb-fsevent (0.9.1)
@@ -89,8 +89,6 @@ GEM
     term-ansicolor (1.0.7)
     test-unit (2.5.0)
     thor (0.15.3)
-    turn (0.9.5)
-      ansi
 
 PLATFORMS
   ruby
@@ -107,8 +105,8 @@ DEPENDENCIES
   guard-test
   honeybadger!
   pry
+  rake
   rspec (~> 2.6.0)
   sham_rack (~> 1.3.0)
   shoulda (~> 2.11.3)
   simplecov
-  turn

data/README.md

@@ -1,6 +1,8 @@
 Honeybadger
 ===============
 
+[![Build Status](https://secure.travis-ci.org/honeybadger-io/honeybadger-ruby.png?branch=master)](http://travis-ci.org/honeybadger-io/honeybadger-ruby)
+
 This is the notifier gem for integrating apps with [Honeybadger](http://honeybadger.io).
 
 When an uncaught exception occurs, Honeybadger will POST the relevant data
@@ -256,7 +258,7 @@ added the following information to your Honeybadger configuration block.
 
 ## Supported Rails versions
 
-Honeybadger supports Rails 2.3.14 through rails 3.2.6.
+Honeybadger supports Rails 3.0.0 through rails 3.2.6.
 
 ## Credits
 

data/Rakefile

@@ -86,7 +86,7 @@ end
 FEATURES = ['sinatra', 'rack', 'metal']
 
 desc 'Default: run unit & acceptance tests.'
-task :default => [:test, "cucumber:rails:all"] + FEATURES
+task :default => [:test, :vendor_test_gems , "cucumber:rails:all"] + FEATURES
 
 GEM_ROOT = File.dirname(__FILE__).freeze
 
@@ -94,15 +94,16 @@ LOCAL_GEM_ROOT = File.join(GEM_ROOT, 'tmp', 'local_gems').freeze
 RAILS_VERSIONS = IO.read('SUPPORTED_RAILS_VERSIONS').strip.split("\n")
 LOCAL_GEMS =
   [
-    ["rack","1.3.2"],
+    ['rake', nil],
+    ['rack','1.3.2']
   ] +
   RAILS_VERSIONS.collect { |version| ['rails', version] } +
   [
     ['sham_rack', nil],
     ['capistrano', nil],
     ['sqlite3-ruby', nil],
-    ["therubyracer",nil],
-    ["sinatra",nil]
+    ['therubyracer',nil],
+    ['sinatra',nil]
   ]
 
 desc "Vendor test gems: Run this once to prepare your test environment"

data/SUPPORTED_RAILS_VERSIONS

@@ -1,4 +1,3 @@
-2.3.14
 3.0.0
 3.0.1
 3.0.2

data/features/support/honeybadger_shim.rb.template

@@ -1,6 +1,6 @@
 require 'sham_rack'
 
-ShamRack.at("api.honeybadger.io") do |env|
+ShamRack.at("api.honeybadger.io", 443) do |env|
   response = <<-end_json
 {"id":"123456789"}
   end_json

data/honeybadger.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'honeybadger'
-  s.version           = '1.0.0'
-  s.date              = '2012-06-27'
+  s.version           = '1.1.0'
+  s.date              = '2012-07-26'
 
   s.summary     = "Error reports you can be happy about."
   s.description = "Make managing application errors a more pleasant experience."

data/lib/honeybadger.rb

@@ -19,7 +19,7 @@ require 'honeybadger/sender'
 require 'honeybadger/railtie' if defined?(Rails::Railtie)
 
 module Honeybadger
-  VERSION = '0.0.1'
+  VERSION = '1.1.0'
   LOG_PREFIX = "** [Honeybadger] "
 
   HEADERS = {

data/lib/honeybadger/configuration.rb

@@ -121,23 +121,23 @@ module Honeybadger
     alias_method :use_system_ssl_cert_chain?, :use_system_ssl_cert_chain
 
     def initialize
-      @secure                   = false
-      @use_system_ssl_cert_chain= false
-      @host                     = 'api.honeybadger.io'
-      @http_open_timeout        = 2
-      @http_read_timeout        = 5
-      @params_filters           = DEFAULT_PARAMS_FILTERS.dup
-      @backtrace_filters        = DEFAULT_BACKTRACE_FILTERS.dup
-      @ignore_by_filters        = []
-      @ignore                   = IGNORE_DEFAULT.dup
-      @ignore_user_agent        = []
-      @development_environments = %w(development test cucumber)
-      @notifier_name            = 'Honeybadger Notifier'
-      @notifier_version         = VERSION
-      @notifier_url             = 'https://github.com/honeybadger/honeybadger'
-      @framework                = 'Standalone'
-      @user_information         = 'Honeybadger Error {{error_id}}'
-      @rescue_rake_exceptions   = nil
+      @secure                    = true
+      @use_system_ssl_cert_chain = false
+      @host                      = 'api.honeybadger.io'
+      @http_open_timeout         = 2
+      @http_read_timeout         = 5
+      @params_filters            = DEFAULT_PARAMS_FILTERS.dup
+      @backtrace_filters         = DEFAULT_BACKTRACE_FILTERS.dup
+      @ignore_by_filters         = []
+      @ignore                    = IGNORE_DEFAULT.dup
+      @ignore_user_agent         = []
+      @development_environments  = %w(development test cucumber)
+      @notifier_name             = 'Honeybadger Notifier'
+      @notifier_version          = VERSION
+      @notifier_url              = 'https://github.com/honeybadger/honeybadger'
+      @framework                 = 'Standalone'
+      @user_information          = 'Honeybadger Error {{error_id}}'
+      @rescue_rake_exceptions    = nil
     end
 
     # Public: Takes a block and adds it to the list of backtrace filters. When

data/lib/honeybadger/shared_tasks.rb

@@ -2,12 +2,12 @@ namespace :honeybadger do
   desc "Notify Honeybadger of a new deploy."
   task :deploy => :environment do
     require 'honeybadger_tasks'
-    HoneybadgerTasks.deploy(:rails_env      => ENV['TO'],
-                         :scm_revision   => ENV['REVISION'],
-                         :scm_repository => ENV['REPO'],
-                         :local_username => ENV['USER'],
-                         :api_key        => ENV['API_KEY'],
-                         :dry_run        => ENV['DRY_RUN'])
+    HoneybadgerTasks.deploy(:environment    => ENV['TO'],
+                            :revision       => ENV['REVISION'],
+                            :repository     => ENV['REPO'],
+                            :local_username => ENV['USER'],
+                            :api_key        => ENV['API_KEY'],
+                            :dry_run        => ENV['DRY_RUN'])
   end
 
   task :log_stdout do
@@ -24,10 +24,10 @@ namespace :honeybadger do
       end
 
       heroku_rails_env = heroku_var("rails_env")
-      heroku_api_key = heroku_var("(hoptoad|honeybadger)_api_key").split.find {|x| x unless x.blank?} ||
+      heroku_api_key = heroku_var("(honeybadger)_api_key").split.find {|x| x unless x.blank?} ||
         Honeybadger.configuration.api_key
 
-      command = %Q(heroku addons:add deployhooks:http --url="http://honeybadger.io/deploys.txt?deploy[rails_env]=#{heroku_rails_env}&api_key=#{heroku_api_key}")
+      command = %Q(heroku addons:add deployhooks:http --url="https://api.honeybadger.io/v1/deploys?deploy[environment]=#{heroku_rails_env}&api_key=#{heroku_api_key}")
 
       puts "\nRunning:\n#{command}\n"
       puts `#{command}`

data/lib/honeybadger_tasks.rb

@@ -9,9 +9,9 @@ module HoneybadgerTasks
   #
   # opts - Data about the deploy that is set to Honeybadger
   #        :api_key        - Api key of you Honeybadger application
-  #        :rails_env      - Environment of the deploy (production, staging)
-  #        :scm_revision   - The given revision/sha that is being deployed
-  #        :scm_repository - Address of your repository to help with code lookups
+  #        :environment    - Environment of the deploy (production, staging)
+  #        :revision       - The given revision/sha that is being deployed
+  #        :repository     - Address of your repository to help with code lookups
   #        :local_username - Who is deploying
   #
   # Returns true or false
@@ -22,8 +22,8 @@ module HoneybadgerTasks
       return false
     end
 
-    if opts[:rails_env].blank?
-      puts "I don't know to which Rails environment you are deploying (use the TO=production option)."
+    if opts[:environment].blank?
+      puts "I don't know to which environment you are deploying (use the TO=production option)."
       return false
     end
 
@@ -47,7 +47,7 @@ module HoneybadgerTasks
       http.verify_mode  = OpenSSL::SSL::VERIFY_PEER
     end
 
-    post = Net::HTTP::Post.new("/deploys.txt")
+    post = Net::HTTP::Post.new("/v1/deploys")
     post.set_form_data(params)
     post['X-API-Key'] = api_key
 

data/test/unit/configuration_test.rb

@@ -14,7 +14,7 @@ class ConfigurationTest < Honeybadger::UnitTest
     assert_config_default :notifier_version,    Honeybadger::VERSION
     assert_config_default :notifier_name,       'Honeybadger Notifier'
     assert_config_default :notifier_url,        'https://github.com/honeybadger/honeybadger'
-    assert_config_default :secure,              false
+    assert_config_default :secure,              true
     assert_config_default :host,                'api.honeybadger.io'
     assert_config_default :http_open_timeout,   2
     assert_config_default :http_read_timeout,   5

data/test/unit/honeybadger_tasks_test.rb

@@ -29,7 +29,7 @@ class HoneybadgerTasksTest < Honeybadger::UnitTest
         setup { @output = HoneybadgerTasks.deploy({}) }
 
         before_should "complain about missing rails env" do
-          HoneybadgerTasks.expects(:puts).with(regexp_matches(/rails environment/i))
+          HoneybadgerTasks.expects(:puts).with(regexp_matches(/which environment/i))
         end
 
         should "return false" do
@@ -40,7 +40,10 @@ class HoneybadgerTasksTest < Honeybadger::UnitTest
       context "given an optional HTTP proxy and valid options" do
         setup do
           @response         = stub("response",    :body => "stub body")
-          @http_proxy       = stub("proxy",       :request => @response)
+          @http_proxy       = stub("proxy",       :request => @response,
+                                                  :use_ssl= => nil,
+                                                  :ca_file= => nil,
+                                                  :verify_mode= => nil)
           @http_proxy_class = stub("proxy_class", :new => @http_proxy)
           @post             = stub("post",        :set_form_data => nil)
 
@@ -52,9 +55,9 @@ class HoneybadgerTasksTest < Honeybadger::UnitTest
                  Honeybadger.configuration.proxy_user,
                  Honeybadger.configuration.proxy_pass).
                  returns(@http_proxy_class)
-          Net::HTTP::Post.expects(:new).with("/deploys.txt").returns(@post)
+          Net::HTTP::Post.expects(:new).with("/v1/deploys").returns(@post)
 
-          @options    = { :rails_env => "staging", :dry_run => false }
+          @options    = { :environment => "staging", :dry_run => false }
         end
 
         context "performing a dry run" do
@@ -73,18 +76,18 @@ class HoneybadgerTasksTest < Honeybadger::UnitTest
             @output = HoneybadgerTasks.deploy(@options)
           end
 
-          before_should "post to http://api.honeybadger.io:80/deploys.txt" do
-            @http_proxy_class.expects(:new).with("api.honeybadger.io", 80).returns(@http_proxy)
+          before_should "post to https://api.honeybadger.io:443/v1/deploys" do
+            @http_proxy_class.expects(:new).with("api.honeybadger.io", 443).returns(@http_proxy)
             @post.expects(:set_form_data).with(kind_of(Hash))
             @http_proxy.expects(:request).with(any_parameters).returns(successful_response)
           end
 
-          before_should "use send the rails_env param" do
+          before_should "use send the environment param" do
             @post.expects(:set_form_data).
-              with(has_entries("deploy[rails_env]" => "staging"))
+              with(has_entries("deploy[environment]" => "staging"))
           end
 
-          [:local_username, :scm_repository, :scm_revision].each do |key|
+          [:local_username, :repository, :revision].each do |key|
             before_should "use send the #{key} param if it's passed in." do
               @options[key] = "value"
               @post.expects(:set_form_data).
@@ -122,11 +125,12 @@ class HoneybadgerTasksTest < Honeybadger::UnitTest
         Honeybadger.configure do |config| 
           config.api_key = "1234123412341234"
           config.host = "custom.host"
+          config.secure = false
         end
       end
 
-      context "on deploy(:rails_env => 'staging')" do
-        setup { @output = HoneybadgerTasks.deploy(:rails_env => "staging") }
+      context "on deploy(:environment => 'staging')" do
+        setup { @output = HoneybadgerTasks.deploy(:environment => "staging") }
 
         before_should "post to the custom host" do
           @post             = stub("post",     :set_form_data => nil)
@@ -137,7 +141,7 @@ class HoneybadgerTasksTest < Honeybadger::UnitTest
           @http_proxy_class = stub("proxy_class", :new => @http_proxy)
           @http_proxy_class.expects(:new).with("custom.host", 80).returns(@http_proxy)
           Net::HTTP.expects(:Proxy).with(any_parameters).returns(@http_proxy_class)
-          Net::HTTP::Post.expects(:new).with("/deploys.txt").returns(@post)
+          Net::HTTP::Post.expects(:new).with("/v1/deploys").returns(@post)
           @post.expects(:set_form_data).with(kind_of(Hash))
           @http_proxy.expects(:request).with(any_parameters).returns(successful_response)
         end
@@ -147,8 +151,8 @@ class HoneybadgerTasksTest < Honeybadger::UnitTest
     context "when not configured" do
       setup { Honeybadger.configure { |config| config.api_key = "" } }
 
-      context "on deploy(:rails_env => 'staging')" do
-        setup { @output = HoneybadgerTasks.deploy(:rails_env => "staging") }
+      context "on deploy(:environment => 'staging')" do
+        setup { @output = HoneybadgerTasks.deploy(:environment => "staging") }
 
         before_should "complain about missing api key" do
           HoneybadgerTasks.expects(:puts).with(regexp_matches(/api key/i))

data/test/unit/logger_test.rb

@@ -6,7 +6,9 @@ class LoggerTest < Honeybadger::UnitTest
     @http = stub(:post => response,
                  :read_timeout= => nil,
                  :open_timeout= => nil,
-                 :use_ssl= => nil)
+                 :use_ssl= => nil,
+                 :ca_file= => nil,
+                 :verify_mode= => nil)
     Net::HTTP.stubs(:new).returns(@http)
   end
 

data/test/unit/notifier_test.rb

@@ -188,7 +188,7 @@ class NotifierTest < Honeybadger::UnitTest
       assert_match /honeybadger\/rack_test\.rb$/, @hash[:file]
     end
 
-    should "set rails_env to production" do
+    should "set environment_name to production" do
       assert_equal 'production', @hash[:environment_name]
     end
 

data/test/unit/sender_test.rb

@@ -34,7 +34,9 @@ class SenderTest < Honeybadger::UnitTest
     http     = stub(:post          => response,
                     :read_timeout= => nil,
                     :open_timeout= => nil,
-                    :use_ssl=      => nil)
+                    :use_ssl=      => nil,
+                    :ca_file=      => nil,
+                    :verify_mode=  => nil)
     proxy    = stub(:new => http)
     Net::HTTP.stubs(:Proxy => proxy)
 
@@ -174,14 +176,19 @@ class SenderTest < Honeybadger::UnitTest
     end
 
     should "use the default DEFAULT_CERT_FILE if asked to" do
-      config = Honeybadger::Configuration.new
-      config.use_system_ssl_cert_chain = true
-      sender = Honeybadger::Sender.new(config)
+      File.expects(:exist?).with(OpenSSL::X509::DEFAULT_CERT_FILE).returns(true)
+
+      Honeybadger.configure do |config|
+        config.secure = true
+        config.use_system_ssl_cert_chain = true
+      end
+
+      sender = Honeybadger::Sender.new(Honeybadger.configuration)
 
       assert(sender.use_system_ssl_cert_chain?)
 
       http    = sender.send(:setup_http_connection)
-      assert_not_equal http.ca_file, config.local_cert_path
+      assert_not_equal http.ca_file, Honeybadger.configuration.local_cert_path
     end
 
     should "verify the connection when the use_ssl option is set (VERIFY_PEER)" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json