honeybadger 1.3.1 → 1.4.0

data/features/step_definitions/rake_steps.rb

@@ -1,6 +1,6 @@
 When /I run rake with (.+)/ do |command|
   @rake_command = "rake #{command.gsub(' ','_')}"
-  @rake_result = `cd features/support/rake && GEM_HOME=#{BUILT_GEM_ROOT} #{@rake_command} 2>&1`
+  @rake_result = `cd features/support/rake && #{@rake_command} 2>&1`
 end
 
 Then /Honeybadger should (|not) ?catch the exception/ do |condition|

data/features/support/env.rb

@@ -1,17 +1,17 @@
-require 'active_support'
 require 'rspec'
+require 'aruba/cucumber'
 
 PROJECT_ROOT     = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
 TEMP_DIR         = File.join(PROJECT_ROOT, 'tmp').freeze
 LOCAL_RAILS_ROOT = File.join(TEMP_DIR, 'rails_root').freeze
-BUILT_GEM_ROOT   = File.join(TEMP_DIR, 'built_gems').freeze
-LOCAL_GEM_ROOT   = File.join(TEMP_DIR, 'local_gems').freeze
 RACK_FILE        = File.join(TEMP_DIR, 'rack_app.rb').freeze
 
 Before do
-  FileUtils.mkdir_p(TEMP_DIR)
-  FileUtils.rm_rf(BUILT_GEM_ROOT)
   FileUtils.rm_rf(LOCAL_RAILS_ROOT)
-  FileUtils.rm_f(RACK_FILE)
-  FileUtils.mkdir_p(BUILT_GEM_ROOT)
+end
+
+Before do
+  @dirs = ["tmp"]
+  @aruba_timeout_seconds = 45
+  @aruba_io_wait_seconds = 5
 end

data/features/support/rails.rb

@@ -1,8 +1,4 @@
 module RailsHelpers
-  def rails_root_exists?
-    File.exists?(environment_path)
-  end
-
   def application_controller_filename
     controller_filename = File.join(rails_root, 'app', 'controllers', "application_controller.rb")
   end
@@ -20,24 +16,7 @@ module RailsHelpers
   end
 
   def rails_version
-    @rails_version ||= begin
-      if ENV["RAILS_VERSION"]
-        ENV["RAILS_VERSION"]
-      elsif bundler_manages_gems?
-        rails_version = open(gemfile_path).read.match(/gem.*rails["'].*["'](.+)["']/)[1]
-      else
-        environment_file = File.join(rails_root, 'config', 'environment.rb')
-        rails_version = `grep RAILS_GEM_VERSION #{environment_file}`.match(/[\d.]+/)[0]
-      end
-    end
-  end
-
-  def bundler_manages_gems?
-    File.exists?(gemfile_path)
-  end
-
-  def gemfile_path
-    gemfile = File.join(rails_root, 'Gemfile')
+    @rails_version ||= `bundle exec rails -v`[/\d.+/]
   end
 
   def rails_manages_gems?
@@ -52,10 +31,6 @@ module RailsHelpers
     rails3? || rails_version =~ /^2\./
   end
 
-  def version_string
-    ENV['RAILS_VERSION'] || `tail -n 1 SUPPORTED_RAILS_VERSIONS` # use latest version if ENV["RAILS_VERSION"] is undefined
-  end
-
   def environment_path
     File.join(rails_root, 'config', 'environment.rb')
   end
@@ -64,12 +39,12 @@ module RailsHelpers
     File.join(rails_root, 'Rakefile')
   end
 
-  def bundle_gem(gem_name, version = nil)
-    File.open(gemfile_path, 'a') do |file|
-      gem = "gem '#{gem_name}'"
-      gem += ", '#{version}'" if version
-      file.puts(gem)
-    end
+  def rails_initializer_file
+    File.join(rails_root, 'config', 'initializers', 'honeybadger.rb')
+  end
+
+  def rails_non_initializer_honeybadger_config_file
+    File.join(rails_root, 'config', 'honeybadger.rb')
   end
 
   def config_gem(gem_name, version = nil)
@@ -85,34 +60,17 @@ module RailsHelpers
     end
   end
 
-  def config_gem_dependencies
-    insert = <<-END
-    if Gem::VERSION >= "1.3.6"
-      module Rails
-        class GemDependency
-          def requirement
-            r = super
-            (r == Gem::Requirement.default) ? nil : r
-          end
-        end
-      end
-    end
-    END
+  def disable_activerecord
     run     = "Rails::Initializer.run do |config|"
+    insert  = "  config.frameworks -= [ :active_record ]"
     content = File.read(environment_path)
-    if content.sub!(run, "#{insert}\n#{run}")
+    if content.sub!(run, "#{run}\n#{insert}")
       File.open(environment_path, 'wb') { |file| file.write(content) }
     else
       raise "Couldn't find #{run.inspect} in #{environment_path}"
     end
   end
 
-  def require_thread
-    content = File.read(rakefile_path)
-    content = "require 'thread'\n#{content}"
-    File.open(rakefile_path, 'wb') { |file| file.write(content) }
-  end
-
   def perform_request(uri, environment = 'production')
     if rails3?
       request_script = <<-SCRIPT
@@ -132,8 +90,7 @@ module RailsHelpers
         end
       SCRIPT
       File.open(File.join(rails_root, 'request.rb'), 'w') { |file| file.write(request_script) }
-      @terminal.cd(rails_root)
-      @terminal.run("ruby -rthread ./script/rails runner -e #{environment} request.rb")
+      step %(I run `ruby -rthread ./script/rails runner -e #{environment} request.rb`)
     elsif rails_uses_rack?
       request_script = <<-SCRIPT
         require File.expand_path('../config/environment', __FILE__)
@@ -153,8 +110,7 @@ module RailsHelpers
         puts response
       SCRIPT
       File.open(File.join(rails_root, 'request.rb'), 'w') { |file| file.write(request_script) }
-      @terminal.cd(rails_root)
-      @terminal.run("ruby -rthread ./script/runner -e #{environment} request.rb")
+      step %(I run `ruby -rthread ./script/runner -e #{environment} request.rb`)
     else
       uri = URI.parse(uri)
       request_script = <<-SCRIPT
@@ -182,8 +138,7 @@ module RailsHelpers
         Dispatcher.dispatch(cgi)
       SCRIPT
       File.open(File.join(rails_root, 'request.rb'), 'w') { |file| file.write(request_script) }
-      @terminal.cd(rails_root)
-      @terminal.run("ruby -rthread ./script/runner -e #{environment} request.rb")
+      step %(I run `ruby -rthread ./script/runner -e #{environment} request.rb`)
     end
   end
 
@@ -196,6 +151,34 @@ module RailsHelpers
 
     File.open(File.join(rails_root,"config","initializers", 'monkeypatchin.rb'), 'w') { |file| file.write(monkeypatchin) }
   end
+
+  def config_gem_dependencies
+    insert = <<-END
+    if Gem::VERSION >= "1.3.6"
+      module Rails
+        class GemDependency
+          def requirement
+            r = super
+            (r == Gem::Requirement.default) ? nil : r
+          end
+        end
+      end
+    end
+    END
+    run     = "Rails::Initializer.run do |config|"
+    content = File.read(environment_path)
+    if content.sub!(run, "#{insert}\n#{run}")
+      File.open(environment_path, 'wb') { |file| file.write(content) }
+    else
+      raise "Couldn't find #{run.inspect} in #{environment_path}"
+    end
+  end
+
+  def require_thread
+    content = File.read(rakefile_path)
+    content = "require 'thread'\n#{content}"
+    File.open(rakefile_path, 'wb') { |file| file.write(content) }
+  end
 end
 
 World(RailsHelpers)

data/gemfiles/rails2.3.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "rails", "2.3.14"
+gem "rake", "0.9.5"
+gem "honeybadger", :path=>"../"
+
+gemspec :path=>"../"

data/gemfiles/rails2.3.gemfile.lock

@@ -0,0 +1,102 @@
+PATH
+  remote: /Users/josh/code/honeybadger-ruby
+  specs:
+    honeybadger (1.3.1)
+      activesupport
+      json
+
+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)
+    appraisal (0.5.1)
+      bundler
+      rake
+    aruba (0.5.1)
+      childprocess (~> 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    bourne (1.1.2)
+      mocha (= 0.10.5)
+    builder (3.1.4)
+    capistrano (2.13.5)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    cucumber (1.2.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    fakeweb (1.3.0)
+    ffi (1.2.0)
+    gherkin (2.11.5)
+      json (>= 1.4.6)
+    highline (1.6.15)
+    json (1.7.5)
+    metaclass (0.0.1)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-sftp (2.0.5)
+      net-ssh (>= 2.0.9)
+    net-ssh (2.6.2)
+    net-ssh-gateway (1.1.0)
+      net-ssh (>= 1.99.1)
+    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.5)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.0)
+    rspec-expectations (2.12.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
+    sham_rack (1.3.4)
+      rack
+    shoulda (2.11.3)
+    sinatra (1.2.8)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+    tilt (1.3.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  aruba
+  bourne (>= 1.0)
+  capistrano
+  cucumber (~> 1.2.1)
+  fakeweb (~> 1.3.0)
+  honeybadger!
+  rails (= 2.3.14)
+  rake (= 0.9.5)
+  rspec (~> 2.12.0)
+  sham_rack (~> 1.3.0)
+  shoulda (~> 2.11.3)
+  sinatra

data/gemfiles/rails3.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "rails", "3.0.17"
+gem "honeybadger", :path=>"../"
+
+gemspec :path=>"../"

data/gemfiles/rails3.0.gemfile.lock

@@ -0,0 +1,146 @@
+PATH
+  remote: /Users/josh/code/honeybadger-ruby
+  specs:
+    honeybadger (1.3.1)
+      activesupport
+      json
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.17)
+      actionpack (= 3.0.17)
+      mail (~> 2.2.19)
+    actionpack (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
+      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.17)
+      activesupport (= 3.0.17)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
+    activesupport (3.0.17)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (2.0.10)
+    aruba (0.5.1)
+      childprocess (~> 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    bourne (1.1.2)
+      mocha (= 0.10.5)
+    builder (2.1.2)
+    capistrano (2.13.5)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    cucumber (1.2.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    fakeweb (1.3.0)
+    ffi (1.2.0)
+    gherkin (2.11.5)
+      json (>= 1.4.6)
+    highline (1.6.15)
+    i18n (0.5.0)
+    json (1.7.5)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metaclass (0.0.1)
+    mime-types (1.19)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-sftp (2.0.5)
+      net-ssh (>= 2.0.9)
+    net-ssh (2.6.2)
+    net-ssh-gateway (1.1.0)
+      net-ssh (>= 1.99.1)
+    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.17)
+      actionmailer (= 3.0.17)
+      actionpack (= 3.0.17)
+      activerecord (= 3.0.17)
+      activeresource (= 3.0.17)
+      activesupport (= 3.0.17)
+      bundler (~> 1.0)
+      railties (= 3.0.17)
+    railties (3.0.17)
+      actionpack (= 3.0.17)
+      activesupport (= 3.0.17)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (10.0.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.0)
+    rspec-expectations (2.12.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
+    sham_rack (1.3.4)
+      rack
+    shoulda (2.11.3)
+    sinatra (1.0)
+      rack (>= 1.0)
+    thor (0.14.6)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  aruba
+  bourne (>= 1.0)
+  capistrano
+  cucumber (~> 1.2.1)
+  fakeweb (~> 1.3.0)
+  honeybadger!
+  rails (= 3.0.17)
+  rake
+  rspec (~> 2.12.0)
+  sham_rack (~> 1.3.0)
+  shoulda (~> 2.11.3)
+  sinatra