crashbreak 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4df45d34d6e9036c52b70b7c7719925cd7204228
-  data.tar.gz: fd14f19299eb5dab7082000818db713f714d1e76
+  metadata.gz: 049fadb7ad06d34a0cee543f5c51cb12f88b91eb
+  data.tar.gz: b5b854e144727e47300921c6f88a7bd5947cfe31
 SHA512:
-  metadata.gz: 3b59aa2de3910274e2c670487634f4f0dbed9ce987b3f3a55fda5c698c741b86a81dc508e31066eeefb7ef0349ca9db3c31eaef115dce9351e3a542827f1cdfa
-  data.tar.gz: 5d7fdc4a29c2e1407815148d094b76ef86885cf7900acaedecc4f0e4966d86c7304ef8fd2ce5516b2fd5be610c05ac9dff4bc1a44afb6b643c8e301ef1d050e3
+  metadata.gz: bf6074ee2b2b7db7ff8d29efa35a1329f77109ddfb2e8a9c985a56bef54753b24c081260624d2eed240a3a8f17ce92d242de252ade5047ae5e2c53c3cf98e63d
+  data.tar.gz: dd5dd8039dac2068fee5e20dd31ec4504668e8f8e99f63ea30f7c50cf52a56ad3cdbf64ea6e136b564d50ea6bb9f8850e336c8f663c785ce27e7cc6f345d048c

data/lib/crashbreak/exception_notifier.rb

@@ -1,8 +1,8 @@
 module Crashbreak
   class ExceptionNotifier
     def notify
-      error_id = exceptions_repository.create serialize_exception
-      GithubIntegrationService.new(error_id).push_test if Crashbreak.configure.github_repo_name.present?
+      response = exceptions_repository.create serialize_exception
+      GithubIntegrationService.new(response).push_test if Crashbreak.configure.github_repo_name.present?
     end
 
     private

data/lib/crashbreak/exceptions_repository.rb

@@ -3,7 +3,7 @@ module Crashbreak
     BASE_URL = 'http://crashbreak.herokuapp.com/api'
 
     def create(error_report_hash)
-      JSON.parse(post_request(error_report_hash).body)['id']
+      JSON.parse(post_request(error_report_hash).body)
     end
 
     def resolve(error_id)

data/lib/crashbreak/github_integration_service.rb

@@ -1,7 +1,8 @@
 module Crashbreak
   class GithubIntegrationService
-    def initialize(error_id)
-      @error_id = error_id
+    def initialize(error_hash)
+      @error_id = error_hash['id']
+      @error_deploy_revision = error_hash['deploy_revision']
     end
 
     def push_test
@@ -21,7 +22,13 @@ module Crashbreak
     private
 
     def branch_sha
-      @branch_sha ||= client.ref(repo_name, 'heads/master').object.sha
+      @branch_sha ||= begin
+        if @error_deploy_revision
+          client.commit(repo_name, @error_deploy_revision).sha
+        else
+          client.ref(repo_name, 'heads/master').object.sha
+        end
+      end
     end
 
     def test_file_sha

data/lib/crashbreak/version.rb

@@ -1,3 +1,3 @@
 module Crashbreak
-  VERSION = '0.9.9'
+  VERSION = '0.9.10'
 end

data/spec/lib/exception_notifier_spec.rb

@@ -41,37 +41,37 @@ describe Crashbreak::ExceptionNotifier do
       end
     end
 
-    context 'github integration' do
-      let(:error_id) { 1 }
+    context 'with additional serializers' do
+      let(:expected_hash) { exception_basic_hash.merge(serializer_hash) }
 
-      it 'passes error id from request to github integration service' do
-        Crashbreak.configure.github_repo_name = 'user/repo'
+      let(:serializer_hash) do
+        { additional_key: :example, additional_data: { looks_good: :yes } }
+      end
+
+      let(:serializer) { double(:serializer) }
 
-        allow_any_instance_of(Crashbreak::ExceptionsRepository).to receive(:create).and_return(error_id)
-        expect_any_instance_of(Crashbreak::GithubIntegrationService).to receive(:initialize).with(error_id)
+      before(:each) do
+        allow(serializer).to receive(:serialize).and_return(serializer_hash)
+        allow_any_instance_of(Crashbreak::Configurator).to receive(:error_serializers).and_return([serializer])
+      end
 
+      it 'sends formatted error' do
+        expect_any_instance_of(Crashbreak::ExceptionsRepository).to receive(:create).with(expected_hash)
         subject.notify
       end
     end
-  end
 
-  context 'with additional serializers' do
-    let(:expected_hash) { exception_basic_hash.merge(serializer_hash) }
-
-    let(:serializer_hash) do
-      { additional_key: :example, additional_data: { looks_good: :yes } }
-    end
+    context 'github integration' do
+      let(:error_hash) { Hash[id: 1, deploy_revision: 'test'] }
 
-    let(:serializer) { double(:serializer) }
+      it 'passes error hash from request to github integration service' do
+        Crashbreak.configure.github_repo_name = 'user/repo'
 
-    before(:each) do
-      allow(serializer).to receive(:serialize).and_return(serializer_hash)
-      allow_any_instance_of(Crashbreak::Configurator).to receive(:error_serializers).and_return([serializer])
-    end
+        allow_any_instance_of(Crashbreak::ExceptionsRepository).to receive(:create).and_return(error_hash)
+        expect_any_instance_of(Crashbreak::GithubIntegrationService).to receive(:initialize).with(error_hash)
 
-    it 'sends formatted error' do
-      expect_any_instance_of(Crashbreak::ExceptionsRepository).to receive(:create).with(expected_hash)
-      subject.notify
+        subject.notify
+      end
     end
   end
 end

data/spec/lib/exceptions_repository_spec.rb

@@ -3,6 +3,7 @@ describe Crashbreak::ExceptionsRepository do
 
   let(:project_token) { 'example_project_token' }
   let(:exception_id) { 1 }
+  let(:current_deploy_revision) { 'current_deploy_revision' }
 
   before(:each) do
     Crashbreak.configure.api_key = project_token
@@ -17,7 +18,7 @@ describe Crashbreak::ExceptionsRepository do
 
   let!(:create_exception_request) do
     stub_request(:post, "#{described_class::BASE_URL}/projects/#{project_token}/errors").
-        with(body: error_report_hash.to_json).to_return(status: 200, body: { id: exception_id }.to_json)
+        with(body: error_report_hash.to_json).to_return(status: 200, body: { id: exception_id, deploy_revision: current_deploy_revision }.to_json)
   end
 
   let!(:resolve_exception_request) do
@@ -26,7 +27,7 @@ describe Crashbreak::ExceptionsRepository do
   end
 
   it 'sends request to create exception report' do
-    expect(subject.create error_report_hash).to eq exception_id
+    expect(subject.create error_report_hash).to eq('id' => exception_id, 'deploy_revision' => current_deploy_revision)
     expect(create_exception_request).to have_been_made
   end
 

data/spec/lib/github_integration_service_spec.rb

@@ -1,7 +1,7 @@
 describe Crashbreak::GithubIntegrationService do
-  subject { described_class.new error_id }
+  subject { described_class.new error_hash }
 
-  let(:error_id) { 1 }
+  let(:error_hash) { Hash['id' => 1, 'deploy_revision' => 'example_deploy_revision'] }
   let(:branch_name) { 'refs/heads/crashbreak-error-1' }
   let(:git_sha) { 'example_sha' }
   let(:file_content) { 'example_file_content' }
@@ -11,6 +11,7 @@ describe Crashbreak::GithubIntegrationService do
   let(:github_create_content_url) { 'https://api.github.com/repos/user/repo/contents' }
   let(:github_test_file_url) { 'https://api.github.com/repos/user/repo/contents/spec/crashbreak_error_spec.rb' }
   let(:github_pull_requests_url) { 'https://api.github.com/repos/user/repo/pulls' }
+  let(:github_deploy_commit_url) { 'https://api.github.com/repos/user/repo/commits/example_deploy_revision' }
 
   before(:each) do
     Crashbreak.configure.github_spec_file_path = 'spec/crashbreak_error_spec.rb'
@@ -19,7 +20,9 @@ describe Crashbreak::GithubIntegrationService do
   it 'pushes test to github' do
     stub_request(:get, github_master_ref_url).to_return(body: DeepStruct.wrap(object: { sha: git_sha } ))
 
-    stub_request(:post, github_refs_url).with(body: { ref: 'refs/heads/crashbreak-error-1', sha: git_sha}.to_json)
+    stub_request(:get, github_deploy_commit_url).to_return(body: DeepStruct.wrap(sha: 'example_deploy_revision'))
+
+    stub_request(:post, github_refs_url).with(body: { ref: 'refs/heads/crashbreak-error-1', sha: 'example_deploy_revision'}.to_json)
 
     stub_request(:put, "#{github_create_content_url}/#{Crashbreak.configure.github_spec_file_path}").
         with(body: { branch: branch_name, content: Base64.strict_encode64(file_content), message: 'Add test file for error 1' }.to_json)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crashbreak
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Michal Janeczek