magnum-payload 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a93c18d82f5039aabc7a14c75291693117f92b6d
-  data.tar.gz: 9f6d4a32fe5b2b047e4f178bf172ff7c056f0c86
+  metadata.gz: d392f76be98d4ea79c1d0d37f39bcfac1cb0766d
+  data.tar.gz: 921b9928570d5ad2f41a51d3ea3649663a1dd000
 SHA512:
-  metadata.gz: b8f22f02913bb97c4f030ad0da10d95476c01d595aa952c2426ec873fe5aaab786232fa3e48c7fe786b951b0e393a773bd4ef8b6cca028e447f2b956b204c436
-  data.tar.gz: 5ff86b1468c19eae47943c59b52d56f464443e4254237affa3fbd2cb5e13f44bf3ade649b629631b6aac203043e3ba666e74692e504df0be3894cd6c5ab622f9
+  metadata.gz: f5add8ecc03c30922eb0e954e4161248cf2e7ad5f3b01b0a66f30db8fe1581dc27fb9d679687b6654b98245e6fe510ee28098bfac5c36b7a50dd20cbeb542ae6
+  data.tar.gz: 222df38da21cd23ee037ed1116de654b6f9813be103ab854b91686ec09f38d6d0803d52eee9db7ccb44ce6187791270b59e42f8478b5bbd718bc426ac4f36e76

data/lib/magnum/payload/github.rb

@@ -13,7 +13,7 @@ module Magnum
       @committer       = last_commit.committer.name
       @committer_email = last_commit.committer.email
       @message         = last_commit.message
-      @branch          = data.ref.split('/').last
+      @branch          = data.ref.gsub("refs/heads/", "")
       @commit_url      = last_commit.url
       @compare_url     = data.compare
     end

data/lib/magnum/payload/gitlab.rb

@@ -14,7 +14,7 @@ module Magnum
 
     def assign_payload
       @commit = data.after
-      @branch = data.ref.split('/').last
+      @branch = data.ref.gsub("refs/heads/", "")
 
       if data.commits.any?
         @author          = last_commit.author.name

data/lib/magnum/payload/version.rb

@@ -1,5 +1,5 @@
 module Magnum
   module Payload
-    VERSION = '0.3.2'
+    VERSION = "0.3.3"
   end
 end

data/spec/fixtures/gitlab/branch_with_slash.json

@@ -0,0 +1,34 @@
+{
+  "after": "a96a0df33262e2d2fd1b20162553aae6750f8c00",
+  "before": "0188ef243dd8083a4d4761766342b523d521247d",
+  "commits": [{
+      "author": {
+        "email": "dan.sosedoff@gmail.com",
+        "name": "Dan Sosedoff"
+      },
+      "id": "bce85c7015af8ff5e50bab160f8bd1aa9b2738e1",
+      "message": "Commit 1",
+      "timestamp": "2013-03-22T19:44:53+00:00",
+      "url": "https://gitlab.com/sosedoff/bar/commit/bce85c7015af8ff5e50bab160f8bd1aa9b2738e1"
+    }, {
+      "author": {
+        "email": "dan.sosedoff@gmail.com",
+        "name": "Dan Sosedoff"
+      },
+      "id": "a96a0df33262e2d2fd1b20162553aae6750f8c00",
+      "message": "Commit 2",
+      "timestamp": "2013-03-22T19:44:56+00:00",
+      "url": "https://gitlab.com/sosedoff/bar/commit/a96a0df33262e2d2fd1b20162553aae6750f8c00"
+    }
+  ],
+  "ref": "refs/heads/issue/broken-feature",
+  "repository": {
+    "description": null,
+    "homepage": "https://gitlab.com/sosedoff/bar",
+    "name": "bar",
+    "url": "git@gitlab.com:sosedoff/bar.git"
+  },
+  "total_commits_count": 2,
+  "user_id": 3686,
+  "user_name": "Dan Sosedoff"
+}

data/spec/payload/gitlab_spec.rb

@@ -1,52 +1,64 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Magnum::Payload::Gitlab do
-  let(:data)    { fixture('gitlab/commits.json') }
+  let(:data)    { fixture("gitlab/commits.json") }
   let(:payload) { Magnum::Payload::Gitlab.new(data) }
 
-  describe '#parse!' do
-    it 'sets commit SHA' do
-      payload.commit.should eq 'a96a0df33262e2d2fd1b20162553aae6750f8c00'
+  describe "#parse!" do
+    it "sets commit SHA" do
+      expect(payload.commit).to eq "a96a0df33262e2d2fd1b20162553aae6750f8c00"
     end
 
-    it 'sets commit branch' do
-      payload.branch.should eq 'master'
+    it "sets commit branch" do
+      expect(payload.branch).to eq "master"
     end
 
-    it 'sets commit message' do
-      payload.message.should eq 'Commit 2'
+    it "sets commit message" do
+      expect(payload.message).to eq "Commit 2"
     end
 
-    it 'sets author and committer' do
-      payload.committer.should eq 'Dan Sosedoff'
-      payload.author.should eq 'Dan Sosedoff'
+    it "sets commit author" do
+      expect(payload.author).to eq "Dan Sosedoff"
     end
 
-    it 'sets commit view url' do
-      payload.commit_url.should eq 'https://gitlab.com/sosedoff/bar/commit/a96a0df33262e2d2fd1b20162553aae6750f8c00'
+    it "sets commit committer" do
+      expect(payload.committer).to eq "Dan Sosedoff"
     end
 
-    it 'does not set compare url' do
-      payload.compare_url.should eq nil
+    it "sets commit view url" do
+      expect(payload.commit_url).
+        to eq "https://gitlab.com/sosedoff/bar/commit/a96a0df33262e2d2fd1b20162553aae6750f8c00"
     end
 
-    context 'on new branch' do
-      let(:data) { fixture('gitlab/create_branch.json') }
+    it "does not set compare url" do
+      expect(payload.compare_url).to eq nil
+    end
+
+    context "on new branch" do
+      let(:data) { fixture("gitlab/create_branch.json") }
+
+      it "sets commit SHA" do
+        expect(payload.commit).to eq "0188ef243dd8083a4d4761766342b523d521247d"
+      end
 
-      it 'sets commit SHA' do
-        payload.commit.should eq '0188ef243dd8083a4d4761766342b523d521247d'
+      it "sets branch to foobar" do
+        expect(payload.branch).to eq "foobar"
       end
+    end
+
+    context "on deleted branch" do
+      let(:data) { fixture("gitlab/delete_branch.json") }
 
-      it 'sets branch to foobar' do
-        payload.branch.should eq 'foobar'
+      it "sets skip to true " do
+        expect(payload.skip).to eq true
       end
     end
 
-    context 'on deleted branch' do
-      let(:data) { fixture('gitlab/delete_branch.json') }
+    context "on head with slash" do
+      let(:data) { fixture("gitlab/branch_with_slash.json") }
 
-      it 'sets skip to true ' do
-        payload.skip.should eq true
+      it "returns correct branch name" do
+        expect(payload.branch).to eq "issue/broken-feature"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magnum-payload
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -116,6 +116,7 @@ files:
 - spec/fixtures/github/forced.json
 - spec/fixtures/github/new_branch.json
 - spec/fixtures/github/new_tag.json
+- spec/fixtures/gitlab/branch_with_slash.json
 - spec/fixtures/gitlab/commits.json
 - spec/fixtures/gitlab/create_branch.json
 - spec/fixtures/gitlab/delete_branch.json
@@ -149,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Code payload parser
@@ -165,6 +166,7 @@ test_files:
 - spec/fixtures/github/forced.json
 - spec/fixtures/github/new_branch.json
 - spec/fixtures/github/new_tag.json
+- spec/fixtures/gitlab/branch_with_slash.json
 - spec/fixtures/gitlab/commits.json
 - spec/fixtures/gitlab/create_branch.json
 - spec/fixtures/gitlab/delete_branch.json