txgh-server 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ed650a35c78fd2a4a616a5e106aceea35eae654
-  data.tar.gz: a8df5a3a0ab04c9e30c86444dd06c49bf5127768
+  metadata.gz: 359b3bb8990904063bb4b3f9bbdc8602311ff53f
+  data.tar.gz: d4b6f7e1429cadac6cdf8aada177b54de89fc69c
 SHA512:
-  metadata.gz: ece1db6aa35c8d561d6e8c1f8335190e23e0dc97d32ed90d4f1a83e38fdeaceef90bf86ceb46aab83c6ab13d760b999e726362df45a6a4568f619b4f5a59b403
-  data.tar.gz: f9bdf5680ac0306ffa52564e7b8d31733d7e60e7bac5ae250086520ab3266e4e22325bb230bf0c42b7bd063d451fd6c9806dd1f824b30b5e66175a1a691e2b61
+  metadata.gz: 8c793ad9b43034ce152d910bbb6dff0f160d6e30c8df666c4cd93d66461efb4490421832b2799d392288a16566e57af77f201634048a58047465946618dc8989
+  data.tar.gz: 25dc3a1ae9b51abb31d0603948c4b8d1ef2a676f545cee664faf84f97f8936877210319c58a6fcffdd677604c39c2979c46d5af81486050f9458652d8f37a411

data/lib/txgh-server/transifex_request_auth.rb

@@ -1,4 +1,5 @@
 require 'openssl'
+require 'base64'
 
 module TxghServer
   class TransifexRequestAuth

data/lib/txgh-server/version.rb

@@ -1,3 +1,3 @@
 module TxghServer
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/lib/txgh-server/webhooks/github.rb

@@ -9,6 +9,7 @@ module TxghServer
       autoload :PushHandler,      'txgh-server/webhooks/github/push_handler'
       autoload :PushAttributes,   'txgh-server/webhooks/github/push_attributes'
       autoload :RequestHandler,   'txgh-server/webhooks/github/request_handler'
+      autoload :StatusUpdater,    'txgh-server/webhooks/github/status_updater'
     end
   end
 end

data/lib/txgh-server/webhooks/github/push_handler.rb

@@ -30,26 +30,25 @@ module TxghServer
               { 'author' => attributes.author }
             end
 
-            update_github_status
+            status_updater.update_status
           end
 
           respond_with(200, true)
+        rescue => e
+          status_updater.report_error_and_update_status(e)
+          respond_with_error(500, "Internal server error: #{e.message}", e)
         end
 
         private
 
-        def update_github_status
-          Txgh::GithubStatus.update(project, repo, branch)
-        rescue Octokit::UnprocessableEntity
-          # raised because we've tried to create too many statuses for the commit
-        rescue Txgh::TransifexNotFoundError
-          # raised if transifex resource can't be found
-        end
-
         def pusher
           @pusher ||= Txgh::Pusher.new(project, repo, branch)
         end
 
+        def status_updater
+          @status_updater = StatusUpdater.new(project, repo, branch)
+        end
+
         # finds the resources that were updated in each commit
         def added_and_modified_resources
           @amr ||= attributes.files.each_with_object(Set.new) do |file, ret|

data/lib/txgh-server/webhooks/github/status_updater.rb

@@ -0,0 +1,45 @@
+require 'octokit'
+
+module TxghServer
+  module Webhooks
+    module Github
+      class StatusUpdater
+        attr_reader :project, :repo, :branch
+
+        def initialize(project, repo, branch)
+          @project = project
+          @repo = repo
+          @branch = branch
+        end
+
+        def report_error_and_update_status(error)
+          error_params = Txgh.events.publish_error!(error)
+
+          Txgh.events.publish_each('github.status.error', error_params) do |status_params|
+            if status_params
+              update_status_safely do
+                Txgh::GithubStatus.error(project, repo, branch, status_params)
+              end
+            end
+          end
+        end
+
+        def update_status
+          update_status_safely do
+            Txgh::GithubStatus.update(project, repo, branch)
+          end
+        end
+
+        private
+
+        def update_status_safely
+          yield
+        rescue Octokit::UnprocessableEntity
+          # raised because we've tried to create too many statuses for the commit
+        rescue Txgh::TransifexNotFoundError
+          # raised if transifex resource can't be found
+        end
+      end
+    end
+  end
+end

data/spec/webhooks/github/push_handler_spec.rb

@@ -57,6 +57,31 @@ describe PushHandler do
     expect(response.body).to eq(true)
   end
 
+  context 'with an error' do
+    let(:description) { 'An error done occurred, fool' }
+    let(:target_url) { 'http://you-goofed.com' }
+
+    let(:status_params) do
+      { description: description, target_url: target_url }
+    end
+
+    let(:error_params) { { foo: 'bar' } }
+
+    before(:each) do
+      Txgh.events.subscribe(Txgh::Events::ERROR_CHANNEL) { error_params }
+      Txgh.events.subscribe('github.status.error') { status_params }
+    end
+
+    it 'reports errors and updates the github status' do
+      expect(Txgh::GithubStatus).to(
+        receive(:error).with(transifex_project, github_repo, ref, status_params)
+      )
+
+      expect(handler).to receive(:should_process?).and_raise(StandardError)
+      handler.execute
+    end
+  end
+
   context 'with a deleted branch' do
     let(:before) { nil }
     let(:after) { '0' * 40 }

data/spec/webhooks/github/status_updater_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+require 'helpers/standard_txgh_setup'
+
+include TxghServer::Webhooks::Github
+
+describe StatusUpdater do
+  include StandardTxghSetup
+
+  let(:updater) { StatusUpdater.new(transifex_project, github_repo, ref) }
+
+  describe '#report_error_and_update_status' do
+    let(:description) { 'An error done occurred, fool' }
+    let(:target_url) { 'http://you-goofed.com' }
+
+    let(:status_params) do
+      { description: description, target_url: target_url }
+    end
+
+    let(:error_params) { { foo: 'bar' } }
+
+    before(:each) do
+      Txgh.events.subscribe(Txgh::Events::ERROR_CHANNEL) { error_params }
+      Txgh.events.subscribe('github.status.error') { status_params }
+    end
+
+    it 'reports the error and updates the status' do
+      expect(Txgh::GithubStatus).to(
+        receive(:error).with(transifex_project, github_repo, ref, status_params)
+      )
+
+      expect(Txgh.events).to receive(:publish_error!)
+      updater.report_error_and_update_status(StandardError.new)
+    end
+
+    it 'avoids blowing up on octokit error' do
+      expect(Txgh::GithubStatus).to(
+        receive(:error).and_raise(Octokit::UnprocessableEntity)
+      )
+
+      expect { updater.report_error_and_update_status(StandardError.new) }.to_not raise_error
+    end
+  end
+
+  describe '#update_status' do
+    it 'updates the github status' do
+      expect(Txgh::GithubStatus).to receive(:update)
+      updater.update_status
+    end
+
+    it 'avoids blowing up on octokit error' do
+      expect(Txgh::GithubStatus).to(
+        receive(:update).and_raise(Octokit::UnprocessableEntity)
+      )
+
+      expect { updater.update_status }.to_not raise_error
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh-server
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -119,6 +119,7 @@ files:
 - lib/txgh-server/webhooks/github/push_attributes.rb
 - lib/txgh-server/webhooks/github/push_handler.rb
 - lib/txgh-server/webhooks/github/request_handler.rb
+- lib/txgh-server/webhooks/github/status_updater.rb
 - lib/txgh-server/webhooks/transifex.rb
 - lib/txgh-server/webhooks/transifex/hook_handler.rb
 - lib/txgh-server/webhooks/transifex/request_handler.rb
@@ -147,6 +148,7 @@ files:
 - spec/webhooks/github/push_attributes_spec.rb
 - spec/webhooks/github/push_handler_spec.rb
 - spec/webhooks/github/request_handler_spec.rb
+- spec/webhooks/github/status_updater_spec.rb
 - spec/webhooks/transifex/hook_handler_spec.rb
 - spec/webhooks/transifex/request_handler_spec.rb
 - spec/zip_stream_response_spec.rb