crashbreak 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1f7b323bc59848e1bfacea41f7a51473da45add
-  data.tar.gz: d2ea8950c5f1e0aca334002262a37b8f6e1aa137
+  metadata.gz: 2c212f45cf4606d87ba6a1e6b51717cfce678b8d
+  data.tar.gz: 99f162f5a918d72b446e29fe4818e17587f01a90
 SHA512:
-  metadata.gz: 6665aca68f5f3671cac26e529c786a393da1dd28d7a3d6cc2e1fcc6a265a46353b670c64075d0e39c1237bad0639a9dd221dee14d235a6ef69089720b37e2e1e
-  data.tar.gz: fbd36e78a41cefaa9635f1962493adae01e03162f8f4b04069bf9f12f3639c51955c9fb18eabe3a5f247ecb21b6591ff98a5f80002aabb2deb6177776bc9dca0
+  metadata.gz: 922ed25a212e112ba96d9eac46c4f57c3e95a8c61d6ed25abbf4f265d2d6fbb11f37b352f6c3b995e4af472fd277f82fc112442dc350060de5db3423233d98be
+  data.tar.gz: e85e395e00b7a1bab9935c7ee79f652baddfcdb9ff6c800da910567d4f49a75fee6014a6cb7c7bf7d40f6969c66e7b8632338a738a4e84e7ed5c491bdbefb83f

data/lib/crashbreak.rb

@@ -26,6 +26,7 @@ require 'crashbreak/AWS'
 require 'crashbreak/async_exception_notifier'
 require 'crashbreak/tiny_exception_notifier'
 require 'crashbreak/fork_exception_notifier'
+require 'crashbreak/predefined_settings'
 
 require 'dumpers/database_dumper'
 require 'dumpers/request_dumper'

data/lib/crashbreak/config/configurator.rb

@@ -15,35 +15,35 @@ module Crashbreak
     attr_accessor :github_development_branch
 
     def exception_notifier
-      @exception_notifier || ExceptionNotifier.new
+      @exception_notifier ||= ExceptionNotifier.new
     end
 
     def ignored_environments
-      @ignored_environments || ['development', 'test']
+      @ignored_environments ||= ['development', 'test']
     end
 
     def error_serializers
-      @error_serializers || []
+      @error_serializers ||= []
     end
 
     def github_spec_file_path
-      @github_spec_file_path || 'spec/crashbreak_error_spec.rb'
+      @github_spec_file_path ||= 'spec/crashbreak_error_spec.rb'
     end
 
     def github_development_branch
-      @github_development_branch || 'master'
+      @github_development_branch ||= 'master'
     end
 
     def dumpers
-      @dumpers || []
+      @dumpers ||= []
     end
 
     def dumper_options
-      @dumper_options || {}
+      @dumper_options ||= {}
     end
 
     def restorer_options
-      @restorer_options || {}
+      @restorer_options ||= {}
     end
   end
 end

data/lib/crashbreak/exception_catcher_middleware.rb

@@ -8,10 +8,12 @@ module Crashbreak
       begin
         @app.call(env)
       rescue ::Exception => exception
-        RequestStore.store[:exception] = exception
-        store_variables_from_env env
+        unless skip_exception?
+          RequestStore.store[:exception] = exception
+          store_variables_from_env env
+          notify_about_exception
+        end
 
-        notify_about_exception
         raise
       end
     end
@@ -57,5 +59,9 @@ module Crashbreak
     def request(env)
       Rack::Request.new(env)
     end
+
+    def skip_exception?
+      Crashbreak.configure.ignored_environments.include?(ENV['RACK_ENV'] || ENV['RAILS_ENV'])
+    end
   end
 end

data/lib/crashbreak/exception_notifier.rb

@@ -1,7 +1,6 @@
 module Crashbreak
   class ExceptionNotifier
     def notify
-      return if skip_exception?
       response = exceptions_repository.create serialize_exception
       GithubIntegrationService.new(response).push_test if Crashbreak.configure.github_repo_name.present? && response['similar'] == false
     end
@@ -23,10 +22,6 @@ module Crashbreak
       end
     end
 
-    def skip_exception?
-      Crashbreak.configure.ignored_environments.include? ENV['RACK_ENV']
-    end
-
     def dumpers
       Crashbreak.configure.dumpers
     end

data/lib/crashbreak/predefined_settings.rb

@@ -0,0 +1,36 @@
+module Crashbreak
+  class PredefinedSettings
+    def postgresql(db_name)
+      restorer_for_postgresql
+
+      config.dumper_options.reverse_merge!(
+          dump_location: "#{Rails.root}/tmp/db.dump",
+          dump_command: "pg_dump -Fc #{db_name} > #{Rails.root}/tmp/db.dump"
+      )
+    end
+
+    def heroku_postgresql(db_name, app_name)
+      restorer_for_postgresql
+
+      config.dumper_options.reverse_merge!(
+          dump_location: "#{Rails.root}/tmp/db.dump",
+          dump_command: "/app/vendor/heroku-toolbelt/bin/heroku pg:backups capture #{db_name} -a #{app_name} &&" +
+              "curl -o #{Rails.root}/tmp/db.dump `/app/vendor/heroku-toolbelt/bin/heroku pg:backups public-url --app #{app_name}`"
+      )
+    end
+
+    private
+
+    def config
+      Crashbreak.configurator
+    end
+
+    def restorer_for_postgresql
+      config.restorer_options.reverse_merge!(
+          drop_test_database_command: 'dropdb crashbreak-test',
+          create_test_database_command: 'createdb -T template0 crashbreak-test',
+          restore_command: "pg_restore -O #{Rails.root}/tmp/db.dump -d crashbreak-test",
+      )
+    end
+  end
+end

data/lib/crashbreak/version.rb

@@ -1,3 +1,3 @@
 module Crashbreak
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

data/lib/restorers/database_restorer.rb

@@ -7,8 +7,8 @@ module Crashbreak
     end
 
     def restore
-      system('dropdb crashbreak-test')
-      system('createdb -T template0 crashbreak-test')
+      system(drop_test_database_command)
+      system(create_test_database_command)
       prepare_aws
       download_dump
       restore_database
@@ -31,10 +31,6 @@ module Crashbreak
       end
     end
 
-    def restore_command
-      Crashbreak.configure.restorer_options[:restore_command]
-    end
-
     def setup_connection_to_restored_database
       if Crashbreak.configure.restorer_options[:setup_database_connection].present?
         Crashbreak.configure.restorer_options[:setup_database_connection].call
@@ -46,5 +42,17 @@ module Crashbreak
     def database_config
       @database_config ||= YAML.load(File.read('config/database.yml')).try(:[], 'test')
     end
+
+    def restore_command
+      Crashbreak.configure.restorer_options[:restore_command]
+    end
+
+    def drop_test_database_command
+      Crashbreak.configure.restorer_options[:drop_test_database_command]
+    end
+
+    def create_test_database_command
+      Crashbreak.configure.restorer_options[:create_test_database_command]
+    end
   end
 end

data/spec/lib/exception_catcher_middleware_spec.rb

@@ -4,7 +4,7 @@ describe Crashbreak::ExceptionCatcherMiddleware do
 
   let(:env) { Hash['action_controller.instance' => example_controller ]}
   let(:example_controller) { double(:controller) }
-  let(:error) { StandardError.new }
+  let(:error) { RegexpError.new }
 
   before(:each) do
     allow(app_with_crashes).to receive(:call).with(env).and_raise(error)
@@ -16,7 +16,7 @@ describe Crashbreak::ExceptionCatcherMiddleware do
 
     before(:each) do
       expect_any_instance_of(Crashbreak::ExceptionNotifier).to receive(:notify).and_return(true)
-      expect{ subject.call(env) }.to raise_error(StandardError)
+      expect{ subject.call(env) }.to raise_error(error.class)
     end
 
     it 'sets exception in store' do
@@ -32,11 +32,31 @@ describe Crashbreak::ExceptionCatcherMiddleware do
     end
   end
 
+  context 'app that raises exception but current env is ignored' do
+    subject { described_class.new app_with_crashes }
+
+    before(:each) do
+      expect_any_instance_of(Crashbreak::ExceptionNotifier).to_not receive(:notify)
+    end
+
+      it 'skips development environment by default' do
+        expect(ENV).to receive(:[]).with('RACK_ENV').and_return('development')
+        expect{ subject.call(env) }.to raise_error(error.class)
+      end
+
+      it 'skips all environments in config' do
+        Crashbreak.configure.ignored_environments = ['staging']
+
+        expect(ENV).to receive(:[]).with('RACK_ENV').and_return('staging')
+        expect{ subject.call(env) }.to raise_error(error.class)
+      end
+  end
+
   context 'app that works without exceptions' do
     subject { described_class.new app_without_crashes }
 
     it 'does nothing' do
-      expect_any_instance_of(Crashbreak::ExceptionNotifier).to_not receive(:notify).and_return(true)
+      expect_any_instance_of(Crashbreak::ExceptionNotifier).to_not receive(:notify)
       expect(subject.call(env)).to eq(:ok)
     end
   end

data/spec/lib/exception_notifier_spec.rb

@@ -61,24 +61,6 @@ describe Crashbreak::ExceptionNotifier do
       end
     end
 
-    context 'skipping environment' do
-      before(:each) do
-        expect_any_instance_of(Crashbreak::ExceptionsRepository).to_not receive(:create)
-      end
-
-      it 'skips development environment by default' do
-        expect(ENV).to receive(:[]).with('RACK_ENV').and_return('development')
-        subject.notify
-      end
-
-      it 'skips all environments in config' do
-        Crashbreak.configure.ignored_environments = ['staging']
-
-        expect(ENV).to receive(:[]).with('RACK_ENV').and_return('staging')
-        subject.notify
-      end
-    end
-
     context 'github integration' do
       let(:error_hash) { Hash['id' => 1, 'deploy_revision' => 'test', 'similar' => false] }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crashbreak
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Michal Janeczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -240,6 +240,7 @@ files:
 - lib/crashbreak/formatters/hash_formatter.rb
 - lib/crashbreak/formatters/summary_formatter.rb
 - lib/crashbreak/github_integration_service.rb
+- lib/crashbreak/predefined_settings.rb
 - lib/crashbreak/request_parser.rb
 - lib/crashbreak/tiny_exception_notifier.rb
 - lib/crashbreak/version.rb