magnum-payload 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21782a6d2a38628f608ef49f52e416e50b4c1473
-  data.tar.gz: 0442f0409b8795ad1e41296b77d1b6689f2d94b0
+  metadata.gz: b8f355e4af0da303d451c791184ef2db4ea963cf
+  data.tar.gz: ba6b8d1a4d1af1d9148fbf9ae99b95d4c1b7466d
 SHA512:
-  metadata.gz: 986c4c308614292ea17242ba2287be2228600811879473116d11f6a0ebd27055fbeb2cfac12763ceea96729836000abccaba0d5de07ae00330282ffed1084b78
-  data.tar.gz: 6a25dae5724ab131d193046cf275e2f571a01c01567e915cb7ceafc75f490c91deec60235a53615b459b74e5453300198460d5b1e939b96299653f62871f8ac6
+  metadata.gz: 44f535e0fb242a222eb22eb11bf876c1a71acee4bebcf8fd39346da76879beda8ea443a8847c88bceabb76f43f3560b02462c0f0dd09f790587dee74c586266d
+  data.tar.gz: d95b1dab33bf627bbf07c27d137bf50da1485baf99c9d849cf517a5a22541d61c5c1743fc36aafdbc4e0cafe2c196bbb9eb049fb2abb1f10bfdd017b48303d9a

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2014 Dan Sosedoff, dan.sosedoff@gmail.com
+Copyright (c) 2013-2014 Magnum CI
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -91,17 +91,8 @@ To execute test suite run:
 rake test
 ```
 
-## Contact
-
-Magnum CI
-
-- [https://magnum-ci.com](https://magnum-ci.com)
-- [https://github.com/magnumci](https://github.com/magnumci)
-- [https://twitter.com/ci_magnum](https://twitter.com/ci_magnum)
-- [support@magnum-ci.com](mailto:support@magnum-ci.com)
-
 ## License
 
 The MIT License (MIT)
 
-Copyright (c) 2013-2014 Dan Sosedoff, <dan.sosedoff@gmail.com>
+Copyright (c) 2013-2014 Magnum CI

data/Rakefile

@@ -1,10 +1,19 @@
-require 'bundler'
-require 'bundler/gem_tasks'
+require "bundler"
+require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:test) do |t|
-  t.pattern = 'spec/**/*_spec.rb'
+  t.pattern = "spec/**/*_spec.rb"
   t.verbose = false
 end
 
+task :console do
+  require "irb"
+  require "irb/completion"
+  require "magnum/payload"
+  
+  ARGV.clear
+  IRB.start
+end
+
 task :default => :test

data/lib/magnum/payload/base.rb

@@ -4,6 +4,8 @@ require "hashr"
 module Magnum
   module Payload
     class Base
+      GIT_ZERO_SHA = /\A[0]{40}\z/
+
       include Magnum::Payload::MessageParser
 
       attr_reader :raw_data, :data

data/lib/magnum/payload/beanstalk.rb

@@ -12,6 +12,11 @@ module Magnum
     private
 
     def parse_git!
+      if data.after =~ GIT_ZERO_SHA
+        @skip = true
+        return
+      end
+
       @commit       = last_commit.id
       @branch       = data.branch
       @message      = last_commit.message

data/lib/magnum/payload/gitlab.rb

@@ -1,7 +1,5 @@
 module Magnum
   class Payload::Gitlab < Payload::Base
-    ZERO_SHA = /\A[0]{40}\z/
-
     def parse!
       assign_payload unless skip_payload?
     end
@@ -32,7 +30,7 @@ module Magnum
     end
 
     def deleted?
-      data.before !~ ZERO_SHA && data.after =~ ZERO_SHA
+      data.before !~ GIT_ZERO_SHA && data.after =~ GIT_ZERO_SHA
     end
   end
 end

data/lib/magnum/payload/version.rb

@@ -1,5 +1,5 @@
 module Magnum
   module Payload
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/spec/fixtures/beanstalk/git_branch_delete.json

@@ -0,0 +1,20 @@
+{
+  "branch": "feature-13914-activation-via-password-reset",
+  "ref": "refs/heads/feature-13914-activation-via-password-reset",
+  "before": "ad027019cdfd4a78e622feb87fb2c56627911d36",
+  "after": "0000000000000000000000000000000000000000",
+  "uri": "git@company.git.beanstalkapp.com:/repo.git",
+  "pusher_id": 12345,
+  "pusher_name": "John Doe",
+  "repository": {
+    "name": "repo",
+    "url": "http://company.beanstalkapp.com/repo",
+    "private": true,
+    "owner": {
+      "name": "John Doe",
+      "email": "owner@email.com"
+    }
+  },
+  "push_is_too_large": false,
+  "commits": []
+}

data/spec/payload/base_spec.rb

@@ -1,59 +1,63 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Magnum::Payload::Base do
   let(:base) { described_class }
 
-  before do
-    Magnum::Payload::Base.any_instance.stub(:parse!)
-  end
+  describe "#new" do
+    before do
+      Magnum::Payload::Base.any_instance.stub(:parse!)
+    end
 
-  describe '#new' do
-    it 'assigns raw data attribute' do
+    it "assigns raw data attribute" do
       Magnum::Payload::Base.any_instance.stub(:parse_payload)
 
       payload = base.new("raw data")
-      payload.raw_data.should eq 'raw data'
+      expect(payload.raw_data).to eq "raw data"
     end
 
-    it 'assigns data attribute' do
-      payload = base.new({'foo' => 'bar'})
-      payload.data.should be_a Hashr
+    it "assigns data attribute" do
+      payload = base.new({"foo" => "bar"})
+      expect(payload.data).to be_a Hashr
     end
 
-    it 'accepts a String' do
+    it "accepts a string" do
       payload = base.new('{"foo":"bar"}')
-      payload.data.should be_a Hashr
-      payload.data.foo.should eq 'bar'
+
+      expect(payload.data).to be_a Hashr
+      expect(payload.data.foo).to eq "bar"
     end
 
-    it 'accepts a Hash' do
-      payload = base.new({'foo' => 'bar'})
-      payload.data.should be_a Hashr
-      payload.data.foo.should eq('bar')
+    it "accepts a hash" do
+      payload = base.new({"foo" => "bar"})
+
+      expect(payload.data).to be_a Hashr
+      expect(payload.data.foo).to  eq "bar"
     end
 
-    it 'raises error on invalid input type' do
+    it "raises error on invalid input type" do
       expect { base.new(nil) }.to raise_error "String or Hash required"
     end
 
-    it 'raises error on invalid json' do
+    it "raises error on invalid json" do
       expect { base.new("invalid json") }.
         to raise_error Magnum::Payload::ParseError, "Valid JSON required"
     end
   end
 
-  describe '#skip' do
+  describe "#skip" do
     before do
+      Magnum::Payload::Base.any_instance.stub(:parse!)
       Magnum::Payload::Base.any_instance.stub(:parse_payload)
     end
 
-    it 'should be false' do
-      base.new('data').skip.should eq false
+    it "returns false" do
+      expect(base.new("data").skip).to be_false
     end
   end
 
   describe "#skip?" do
     before do
+      Magnum::Payload::Base.any_instance.stub(:parse!)
       Magnum::Payload::Base.any_instance.stub(:parse_payload)
       Magnum::Payload::Base.any_instance.stub(:skip) { true }
     end
@@ -62,4 +66,35 @@ describe Magnum::Payload::Base do
       expect(base.new("data").skip?).to be_true
     end
   end
+
+  describe "#parse!" do
+    it "raises error" do
+      expect { described_class.new("foo" => "bar").parse! }.
+        to raise_error "Not implemented in base class"
+    end
+  end
+
+  describe "#attributes_hash" do
+    let(:hash) { described_class.new("foo" => "bar").attributes_hash }
+
+    before do
+      Magnum::Payload::Base.any_instance.stub(:parse!)
+    end
+
+    it "returns payload hash" do
+      expect(hash).to be_a Hash
+    end
+
+    it "it includes attributes" do
+      expect(hash.keys).to eq [
+        "commit",
+        "branch",
+        "author",
+        "committer",
+        "message",
+        "commit_url",
+        "compare_url"
+      ]
+    end
+  end
 end

data/spec/payload/beanstalk_spec.rb

@@ -46,6 +46,14 @@ describe Magnum::Payload::Beanstalk do
           expect(payload.test).to be_true
         end
       end
+
+      context "when deleted branch" do
+        let(:data) { fixture "beanstalk/git_branch_delete.json" }
+
+        it "sets skip to true" do
+          expect(payload.skip).to be_true
+        end
+      end
     end
 
     context "with svn payload" do

data/spec/payload/bitbucket_spec.rb

@@ -1,103 +1,111 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Magnum::Payload::Bitbucket do
-  let(:data) { fixture('bitbucket/git.json') }
-  let(:payload) { Magnum::Payload::Bitbucket.new(data) }
+  let(:data)    { fixture("bitbucket/git.json") }
+  let(:payload) { described_class.new(data) }
 
-  describe '#parse!' do
-    context 'with git payload' do
-      let(:data) { fixture('bitbucket/git.json') }
+  describe "#parse!" do
+    context "with git payload" do
+      let(:data) { fixture("bitbucket/git.json") }
 
-      it 'sets commit SHA' do
-        payload.commit.should eq 'f15566c42759198fd32a70963d2509f3f8309586'
+      it "sets commit SHA" do
+        expect(payload.commit).to eq "f15566c42759198fd32a70963d2509f3f8309586"
       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 Sat Jan 19 18:42:40 CST 2013'
+      it "sets commit message" do
+        expect(payload.message).to eq "Commit Sat Jan 19 18:42:40 CST 2013"
       end
 
-      it 'sets author and committer' do
-        payload.committer.should be_nil
-        payload.committer_email.should be_nil
+      it "sets committer name" do
+        expect(payload.committer).to eq nil
+      end
+
+      it "sets committer email" do
+        expect(payload.committer_email).to eq nil
+      end
 
-        payload.author.should eq 'Dan Sosedoff'
-        payload.author_email.should eq 'dan.sosedoff@gmail.com'
+      it "sets author name" do
+        expect(payload.author).to eq "Dan Sosedoff"
       end
 
-      it 'sets commit view url' do
-        payload.commit_url.should eq 'https://bitbucket.org/sosedoff/test1/commits/f15566c42759198fd32a70963d2509f3f8309586'
+      it "sets author email" do
+        expect(payload.author_email).to eq "dan.sosedoff@gmail.com"
       end
 
-      it 'sets compare url' do
-        payload.compare_url.should eq 'https://bitbucket.org/sosedoff/test1/compare/e15c6013c0f6232153e53b003b97da51d338da3a..f15566c42759198fd32a70963d2509f3f8309586'
+      it "sets commit view url" do
+        expect(payload.commit_url).to eq "https://bitbucket.org/sosedoff/test1/commits/f15566c42759198fd32a70963d2509f3f8309586"
+      end
+
+      it "sets compare url" do
+        expect(payload.compare_url).to eq "https://bitbucket.org/sosedoff/test1/compare/e15c6013c0f6232153e53b003b97da51d338da3a..f15566c42759198fd32a70963d2509f3f8309586"
       end
 
       context "that does not have commits" do
         let(:data) { fixture("bitbucket/git_no_commits.json") }
 
         it "raises PayloadError exception" do
-          expect { Magnum::Payload::Bitbucket.new(data) }.
+          expect { described_class.new(data) }.
             to raise_error Magnum::Payload::PayloadError, "Payload has no commits"
         end
       end
     end
 
-    context 'with mercurial payload' do
-      let(:data) { fixture('bitbucket/hg.json') }
+    context "with mercurial payload" do
+      let(:data) { fixture("bitbucket/hg.json") }
 
-      it 'sets commit SHA' do
-        payload.commit.should eq 4
+      it "sets commit SHA" do
+        expect(payload.commit).to eq 4
       end
 
-      it 'sets commit branch' do
-        payload.branch.should eq 'default'
+      it "sets commit branch" do
+        expect(payload.branch).to eq "default"
       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 be_nil
-        payload.committer_email.should be_nil
+      it "sets author name" do
+        payload.author.should eq "Dan Sosedoff"
+      end
 
-        payload.author.should eq 'Dan Sosedoff'
-        payload.author_email.should eq 'dan.sosedoff@gmail.com'
+      it "sets author email" do
+        expect(payload.author_email).to eq "dan.sosedoff@gmail.com"
       end
 
-      it 'sets commit view url' do
-        payload.commit_url.should eq 'https://bitbucket.org/sosedoff/mercurial-test/commits/4'
+      it "sets commit view url" do
+        expect(payload.commit_url).to eq "https://bitbucket.org/sosedoff/mercurial-test/commits/4"
       end
 
-      it 'sets compare url' do
-        payload.compare_url.should eq 'https://bitbucket.org/sosedoff/mercurial-test/compare/3..4'
+      it "sets compare url" do
+        expect(payload.compare_url).to eq "https://bitbucket.org/sosedoff/mercurial-test/compare/3..4"
       end
     end
   end
 
-  describe '#site_url' do
-    it 'returns website url without a path' do
-      payload.site_url.should eq 'https://bitbucket.org'
+  describe "#site_url" do
+    it "returns website url without a path" do
+      expect(payload.site_url).to eq "https://bitbucket.org"
     end
   end
 
-  describe '#repo_url' do
-    it 'return relative repository path' do
-      payload.repo_url.should eq '/sosedoff/test1/'
+  describe "#repo_url" do
+    it "return relative repository path" do
+      expect(payload.repo_url).to eq "/sosedoff/test1/"
     end
   end
 
-  describe '#make_url' do
-    it 'returns a full url to the repository' do
-      payload.make_url.should eq 'https://bitbucket.org/sosedoff/test1/'
+  describe "#make_url" do
+    it "returns a full url to the repository" do
+      expect(payload.make_url).to eq "https://bitbucket.org/sosedoff/test1/"
     end 
 
-    it 'returns a full url to the repository action' do
-      payload.make_url('commits/1234').should eq 'https://bitbucket.org/sosedoff/test1/commits/1234'
+    it "returns a full url to the repository action" do
+      expect(payload.make_url("commits/1234")).to eq "https://bitbucket.org/sosedoff/test1/commits/1234"
     end
   end
 end

data/spec/payload/github_spec.rb

@@ -17,13 +17,19 @@ describe Magnum::Payload::Github do
       expect(payload.message).to eq "Remove jruby from test matrix"
     end
 
-    it "sets author" do
+    it "sets author name" do
       expect(payload.committer).to eq "Dan Sosedoff"
+    end
+
+    it "sets author email" do
       expect(payload.committer_email).to eq "dan.sosedoff@gmail.com"
     end
 
-    it "sets committer" do
+    it "sets committer name" do
       expect(payload.author).to eq "Dan Sosedoff"
+    end
+
+    it "sets committer email" do
       expect(payload.author_email).to eq "dan.sosedoff@gmail.com"
     end
 

data/spec/payload/message_parser_spec.rb

@@ -3,41 +3,44 @@ require "spec_helper"
 describe Magnum::Payload::MessageParser do
   let(:subject) { TestMessageParser.new }
 
-  describe "#skip_message?" do
-    it "returns true when message contains 'ci-skip'" do
-      subject.stub(:message).and_return("Commit message [ci-skip]")
-      expect(subject.skip_message?).to be_true
-    end
-
-    it "returns true when message contains 'ci skip'" do
-      subject.stub(:message).and_return("Commit message [ci skip]")
-      expect(subject.skip_message?).to be_true
-    end
+  before do
+    subject.stub(:message) { message }
+  end
 
-    it "returns true when message contains 'skip ci'" do
-      subject.stub(:message).and_return("Commit message [skip ci]")
-      expect(subject.skip_message?).to be_true
-    end
+  describe "#skip_message?" do
+    context "when no skip points" do
+      let(:message) { "Commit message" }
 
-    it "returns true when message contains 'skip-ci'" do
-      subject.stub(:message).and_return("Commit message [skip-ci]")
-      expect(subject.skip_message?).to be_true
+      it "returns false" do
+        expect(subject.skip_message?).to be_false
+      end
     end
-
-    it "returns false if no skip points found" do
-      subject.stub(:message).and_return("Commit message")
-      expect(subject.skip_message?).to be_false
+    
+    ["[ci-skip]", "[ci skip]", "[skip ci]", "[skip-ci]"].each do |val|
+      context "when message contains #{val}" do
+        let(:message) { val }
+
+        it "returns true" do
+          expect(subject.skip_message?).to be_true
+        end
+      end
     end
 
     context "with multi-line message" do
-      it "returns true" do
-        subject.stub(:message).and_return("Commit message [skip-ci]\nCommit comments")
-        expect(subject.skip_message?).to be_true
+      context "when first line is a skip" do
+        let(:message) { "Commit message [skip-ci]\nCommit comments" }
+
+        it "returns true" do
+          expect(subject.skip_message?).to be_true
+        end
       end
 
-      it "returns false" do
-        subject.stub(:message).and_return("Commit message\nLets skip [ci-skip]")
-        expect(subject.skip_message?).to be_false
+      context "when first lie is not a skip" do
+        let(:message) { "Commit message\nLets skip [ci-skip]" }
+
+        it "returns false" do
+          expect(subject.skip_message?).to be_false
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magnum-payload
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -106,6 +106,7 @@ files:
 - lib/magnum/payload/version.rb
 - magnum-payload.gemspec
 - spec/fixtures/beanstalk/git.json
+- spec/fixtures/beanstalk/git_branch_delete.json
 - spec/fixtures/beanstalk/hg.json
 - spec/fixtures/beanstalk/svn.json
 - spec/fixtures/bitbucket/git.json
@@ -156,6 +157,7 @@ specification_version: 4
 summary: Code payload parser
 test_files:
 - spec/fixtures/beanstalk/git.json
+- spec/fixtures/beanstalk/git_branch_delete.json
 - spec/fixtures/beanstalk/hg.json
 - spec/fixtures/beanstalk/svn.json
 - spec/fixtures/bitbucket/git.json