txgh-server 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e75d11d351052dcae4752db36b41f3bfe213b7c
-  data.tar.gz: 26d3a5ace61faa39884854fc336e70490fbb1bd6
+  metadata.gz: 08999181efe8b160394afe81270055aea22ba8df
+  data.tar.gz: 80f4a180a3a7d20f97adb2c587bcf884f3ba85c1
 SHA512:
-  metadata.gz: 9a230bc3d628166f714d41a4705c85b1331c44f267b9c593e5049903149f91ca379d050a5f8e7ed31b09ac52eebaa01ae0bc903c235044ed10c6a322e9df1b9a
-  data.tar.gz: 2c594d254994d92586b44653448387e450e52931719f6819e0657a7dc7e472a375c72a55bac7abdf00652f837e268d5d9824b2cb310c1e0a8e0e96b45e8e9bdc
+  metadata.gz: 11edfef929681456b7e0977a34a67b99e658341e82e6f6a71f18034fada792614eaf4d3547f14ee9205c6d4fc0a14fe944676c6e0cf1c8e1ca8df1bf6b4716e4
+  data.tar.gz: ee273984933596d9363ecf632e2f85a895fc06559c6458f7244946459dac03f9b7350a603f6069fc5c825980bfb444720e08837886f4b607bc20c109945fe96c

data/lib/txgh-server/version.rb

@@ -1,3 +1,3 @@
 module TxghServer
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

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

@@ -45,7 +45,12 @@ module TxghServer
           end
 
           def author(payload)
-            payload.fetch('head_commit').fetch('committer').fetch('name')
+            if head_commit = payload.fetch('head_commit')
+              head_commit.fetch('committer').fetch('name')
+            else
+              # fall back to pusher if no head commit
+              payload.fetch('pusher').fetch('name')
+            end
           end
 
           def extract_files(payload, state)

data/spec/helpers/github_payload_builder.rb

@@ -22,7 +22,11 @@ class GithubPayload
     @result.to_json
   end
 
-  protected
+  def merge!(hash)
+    @result.merge!(hash)
+  end
+
+  private
 
   def digits
     @@digits ||= ('a'..'f').to_a + ('0'..'9').to_a
@@ -92,6 +96,7 @@ class GithubPushPayload < GithubPayload
       deleted: false,
       forced: true,
       base_ref: nil,
+      head_commit: nil,
       compare: "https://github.com/#{@repo}/commit/#{@after[0..12]}",
       commits: [],
       repository: {

data/spec/webhooks/github/push_attributes_spec.rb

@@ -11,44 +11,57 @@ describe PushAttributes do
   let(:modified) { ['modified_file.txt'] }
 
   let(:payload) do
-    GithubPayloadBuilder.push_payload(repo_name, ref).tap do |payload|
-      payload.add_commit(added: added, modified: modified)
-    end
+    GithubPayloadBuilder.push_payload(repo_name, ref)
   end
 
   describe '#from_webhook_payload' do
     let(:attributes) { PushAttributes.from_webhook_payload(payload.to_h) }
 
-    it 'pulls out repo name' do
-      expect(attributes.repo_name).to eq(repo_name)
+    it "when no head commit, uses the pusher's name instead" do
+      payload.merge!(pusher: { name: 'Fu Barro', email: 'fu@barro.com' })
+      expect(attributes.author).to eq('Fu Barro')
     end
+  end
 
-    it 'pulls out ref' do
-      expect(attributes.ref).to eq("refs/#{ref}")
+  context 'with a commit added to the payload' do
+    before(:each) do
+      payload.add_commit(added: added, modified: modified)
     end
 
-    it 'pulls out before sha' do
-      expect(attributes.before).to eq(payload.to_h['before'])
-    end
+    describe '#from_webhook_payload' do
+      let(:attributes) { PushAttributes.from_webhook_payload(payload.to_h) }
 
-    it 'pulls out after sha' do
-      expect(attributes.after).to eq(payload.to_h['after'])
-    end
+      it 'pulls out repo name' do
+        expect(attributes.repo_name).to eq(repo_name)
+      end
 
-    it 'pulls out added files' do
-      expect(attributes.added_files.to_a).to eq(added)
-    end
+      it 'pulls out ref' do
+        expect(attributes.ref).to eq("refs/#{ref}")
+      end
 
-    it 'pulls out modified files' do
-      expect(attributes.modified_files.to_a).to eq(modified)
-    end
+      it 'pulls out before sha' do
+        expect(attributes.before).to eq(payload.to_h['before'])
+      end
 
-    it 'combines all files into one handy array' do
-      expect(attributes.files.sort).to eq((added + modified).sort)
-    end
+      it 'pulls out after sha' do
+        expect(attributes.after).to eq(payload.to_h['after'])
+      end
+
+      it 'pulls out added files' do
+        expect(attributes.added_files.to_a).to eq(added)
+      end
+
+      it 'pulls out modified files' do
+        expect(attributes.modified_files.to_a).to eq(modified)
+      end
+
+      it 'combines all files into one handy array' do
+        expect(attributes.files.sort).to eq((added + modified).sort)
+      end
 
-    it 'pulls out the author' do
-      expect(attributes.author).to eq('Test User')
+      it 'pulls out the author' do
+        expect(attributes.author).to eq('Test User')
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh-server
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An HTTP server for interacting with txgh.