fuci 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6ac65a1e15ae2e4186b03e0988dc5fae93b789d
-  data.tar.gz: 19a5f43ed5018e7dc30491539b15e6948c35eef9
+  metadata.gz: b5ba244bcdcab4ce2878400e677ac26b989f7900
+  data.tar.gz: 1b12e99347df18f93d5cee35a8440e17c59d4586
 SHA512:
-  metadata.gz: ec5f4d3c0008ab34b53769bc3e0fcb3e8548927e26a113d9ad7266b4c240f027ef0aa9582356f417b31975024c9988dccf3aa2bb629d13454353820741812c16
-  data.tar.gz: 2a5b14f07f033c41f3701260c344096efdf78d37db351c788936541e9da5737a07a7669b4cc47eee530218a3ce883d7e63859a10be51a3ebf0275cc7c61f088a
+  metadata.gz: bf6727e01bf54307aea86683af8faaf1ad9ca6d454f441c859777c56e18839e7659dd627d68ec9ce52ccce84ae40dc43a59964f52840bfeb9ba056d9c7ed3a76
+  data.tar.gz: e3e318715eca38d250c7c98d4f86efb5b459cf730ec03bf4dc282965d18f5dad8d9c4b4c54eef3f4b6f855b2489012f220a068266160ebf475d25bfcd0f6668b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### version 0.3.0 *August 5, 2013*
+* Adds three methods to Git helper:
+1. `#remote_sha_from(branch_name)`
+2. `#pull_merge_sha_from(branch_name)`
+3. `#pull_number_from(branch_name`
+
 ### version 0.2.0 *July 31, 2013*
 * Offers command-line option (`--last`, `-l`) which runs failed tests
 from last call to `fuci`

data/lib/fuci/git.rb

@@ -1,9 +1,15 @@
 module Fuci
   module Git
-    CURRENT_BRANCH_COMMAND    = "git branch | sed -n '/\* /s///p'"
-    REMOTE_MASTER_SHA_COMMAND = "git rev-parse origin/master"
-    REMOTE_REPO_COMMAND       =
+    MASTER                 = 'master'
+    CURRENT_BRANCH_COMMAND = "git branch | sed -n '/\* /s///p'"
+    REMOTE_REPO_COMMAND    =
       "git remote -v | grep origin | grep push | awk 'match($0, /:\(.*)\.git/) { print substr($0, RSTART+1, RLENGTH-5) }'"
+    REMOTE_SHA_FROM_BRANCH_COMMAND =
+      lambda { |branch_name| "git rev-parse origin/#{branch_name}" }
+    PULL_MERGE_SHA_FROM_NUMBER_COMMAND =
+      lambda { |pull_number| "git ls-remote origin | grep refs\\/pull\\/#{pull_number}\\/merge | awk '{ print $1 };'" }
+    PULL_NUMBER_FROM_SHA_COMMAND =
+      lambda { |sha| "git ls-remote origin | grep #{sha} | grep pull | perl -n -e '/pull\\/(.*)\\/head/ && print $1'" }
 
     def current_branch_name
       with_popen current_branch_command
@@ -14,14 +20,37 @@ module Fuci
     end
 
     def remote_master_sha
-      with_popen remote_master_sha_command
+      with_popen remote_sha_from_branch_command(MASTER)
+    end
+
+    def remote_sha_from branch_name
+      with_popen remote_sha_from_branch_command(branch_name)
+    end
+
+    def pull_merge_sha_from branch_name
+      pull_number = pull_number_from branch_name
+      with_popen pull_merge_sha_command(pull_number)
+    end
+
+    def pull_number_from branch_name
+      remote_sha  = remote_sha_from branch_name
+
+      begin
+        with_popen pull_number_from_sha_command(remote_sha)
+      rescue NoResponseError
+        raise NoPullError
+      end
     end
 
     private
 
     def with_popen command
       IO.popen command do |io|
-        io.first.chomp
+        if first_line = io.first
+          first_line.chomp
+        else
+          raise NoResponseError
+        end
       end
     end
 
@@ -33,8 +62,19 @@ module Fuci
       REMOTE_REPO_COMMAND
     end
 
-    def remote_master_sha_command
-      REMOTE_MASTER_SHA_COMMAND
+    def remote_sha_from_branch_command branch_name
+      REMOTE_SHA_FROM_BRANCH_COMMAND.(branch_name)
+    end
+
+    def pull_merge_sha_command pull_number
+      PULL_MERGE_SHA_FROM_NUMBER_COMMAND.(pull_number)
     end
+
+    def pull_number_from_sha_command sha
+      PULL_NUMBER_FROM_SHA_COMMAND.(sha)
+    end
+
+    class NoResponseError < StandardError; end;
+    class NoPullError < StandardError; end;
   end
 end

data/lib/fuci/version.rb

@@ -1,3 +1,3 @@
 module Fuci
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/lib/fuci/git_spec.rb

@@ -30,20 +30,91 @@ describe Fuci::Git do
 
   describe '#remote_master_sha' do
     it 'returns the remote master sha' do
-      @test_class.stubs(:remote_master_sha_command).
-        returns remote_master_sha_command = mock
-      @test_class.expects(:with_popen).with remote_master_sha_command
+      @test_class.stubs(:remote_sha_from_branch_command).
+        with('master').
+        returns command = mock
+      @test_class.expects(:with_popen).with command
 
       @test_class.remote_master_sha
     end
   end
 
+  describe '#remote_sha_from' do
+    it 'returns the remote sha from the branch name passed in' do
+      @test_class.stubs(:remote_sha_from_branch_command).
+        with(branch_name = 'branch_name').
+        returns command = mock
+      @test_class.expects(:with_popen).with command
+
+      @test_class.remote_sha_from branch_name
+    end
+  end
+
+  describe '#pull_merge_sha_from' do
+    it 'gets the merge sha from the pull number' do
+      @test_class.stubs(:pull_number_from).
+        with(branch_name = 'branch_name').
+        returns pull_number = 1
+      @test_class.stubs(:pull_merge_sha_command).
+        with(pull_number).
+        returns command = mock
+      @test_class.stubs(:with_popen).
+        with(command).
+        returns sha = 'didizxndfjii223994w'
+
+      expect(@test_class.pull_merge_sha_from(branch_name)).to_equal sha
+    end
+  end
+
+  describe '#pull_number_from' do
+    before do
+      @branch_name = 'branch_name'
+      command     = mock
+      remote_sha  = '12k3asdifi23ia92'
+      @test_class.stubs(:remote_sha_from).
+        with(@branch_name).
+        returns remote_sha
+      @test_class.stubs(:pull_number_from_sha_command).
+        with(remote_sha).
+        returns command
+      @with_popen = @test_class.stubs(:with_popen).with command
+    end
+
+    describe 'when there is a pull number' do
+      before { @with_popen.returns @pull_number = '1' }
+
+      it 'returns the pull number with the remote sha' do
+        expect(@test_class.pull_number_from(@branch_name)).
+          to_equal @pull_number
+      end
+    end
+
+    describe 'when there is no pull number' do
+      before { @with_popen.raises Fuci::Git::NoResponseError }
+
+      it 'raises a NoPullError' do
+        expect { @test_class.pull_number_from(@branch_name) }.
+          to_raise Fuci::Git::NoPullError
+      end
+    end
+  end
+
   describe '#with_popen' do
-    it 'runs the command with popen' do
-      current_branch = 'current_branch'
-      result         = @test_class.send :with_popen, "echo #{current_branch}"
+    describe 'when there is a string response' do
+      it 'runs the command with popen' do
+        current_branch = 'current_branch'
+        result         = @test_class.send :with_popen, "echo #{current_branch}"
+
+        expect(result).to_equal current_branch
+      end
+    end
+
+    describe 'when the response is nil' do
+      it 'raises a no response error' do
+        IO.stubs(:popen).with(command = '').yields []
 
-      expect(result).to_equal current_branch
+        expect { @test_class.send :with_popen, command }.to_raise Fuci::Git::NoResponseError
+      end
     end
   end
 
@@ -61,10 +132,27 @@ describe Fuci::Git do
     end
   end
 
-  describe '#remote_master_sha_command' do
-    it 'returns the git/unix command to return the remote master sha' do
-      current_branch_command = @test_class.send :remote_master_sha_command
-      expect(current_branch_command).to_equal "git rev-parse origin/master"
+  describe '#remote_sha_from_branch_command' do
+    it 'returns the git/unix command to return the remote sha from the branch' do
+      branch_name = 'branch_name'
+      command = @test_class.send :remote_sha_from_branch_command, branch_name
+      expect(command).to_equal "git rev-parse origin/#{branch_name}"
+    end
+  end
+
+  describe '#pull_merge_sha_command' do
+    it 'is the pull merge sha command with the pull number' do
+      pull_number = 1
+      command     = @test_class.send :pull_merge_sha_command, pull_number
+      expect(command).to_equal "git ls-remote origin | grep refs\\/pull\\/#{pull_number}\\/merge | awk '{ print $1 };'"
+    end
+  end
+
+  describe '#pull_number_from_sha_command' do
+    it 'gets the pull number with the sha' do
+      sha     = '234asdf'
+      command = @test_class.send :pull_number_from_sha_command, sha
+      expect(command).to_equal "git ls-remote origin | grep #{sha} | grep pull | perl -n -e '/pull\\/(.*)\\/head/ && print $1'"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuci
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Dave Jachimiak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest-spec-expect