github-pivotal-flow 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 899947a9ef6741e50d2fcec85f2fc9bbe0b8c402
-  data.tar.gz: c085c1c245c4b4a5bdcee3ca0eaa191bf06393b5
+  metadata.gz: 4343fcc5d4d4d068f199c34fe588b89f78b34b78
+  data.tar.gz: 0279a5c747be018437bfbbe85183426c14542301
 SHA512:
-  metadata.gz: 63f8b8d5e05b61e09f4158224d8981aee3d8ce705ee8adbe2e5ede68c4158fb3aed51fc01d1f9229a481a52ec4a5cbad85de8e464a4683d796197fb18e85fe98
-  data.tar.gz: d6384a6ec33fc24e493d1c3edd5ea71d04d3c3a81300cb3a08bd7e67d82f03c956d569f5397c0f9429f99048bc93df8cba231dc01aec4f65fc2049bf273afbd8
+  metadata.gz: 210e9a9b979fdbb6c184649d480dc59ab0276de600c8a33cc9e431d9810f3abbb09c14f27d83cb667c3693330c6320f1ccd706e9b5b551ff5d79bf26a5bf0c9a
+  data.tar.gz: d16ee45c8d0b8bcdeb08ff23c9151f0c8bca876d64bd44418ee4e4877b63fd1397d2739ff869140d060465e8848cc99d5163b472a96b6554599dc53be7c57486

data/lib/github_pivotal_flow/git.rb

@@ -29,7 +29,9 @@ module GithubPivotalFlow
 
     def self.create_branch(branch_name, start_point = nil, options = {})
       return if branch_exists?(branch_name)
-      exec "git branch --quiet #{[branch_name, start_point].compact.join(' ')}"
+      command = "git branch --quiet"
+      command << " --set-upstream" if options[:set_upstream]
+      exec "#{command} #{[branch_name, start_point].compact.join(' ')}"
       puts 'OK'
     end
 
@@ -66,8 +68,12 @@ module GithubPivotalFlow
       exec command
     end
 
-    def self.tag(tag_name)
-      exec "git tag #{tag_name}"
+    def self.tag(tag_name, options = {})
+      command = "git tag"
+      command << " -a" if options[:annotated]
+      command << " -m \"#{options[:message]}\"" unless options[:message].blank?
+      command << " #{tag_name}" if tag_name
+      exec command
     end
 
     def self.delete_branch(branch_name, options = {})
@@ -180,4 +186,4 @@ module GithubPivotalFlow
       return Shell.exec(command, abort_on_failure)
     end
   end
-end
+end

data/lib/github_pivotal_flow/story.rb

@@ -86,7 +86,7 @@ module GithubPivotalFlow
       Git.checkout(root_branch_name)
       root_origin = Git.get_remote
       Git.pull_remote
-      Git.create_branch(branch_name, root_branch_name)
+      Git.create_branch(branch_name, root_branch_name, set_upstream: true)
       Git.checkout(branch_name)
       Git.set_config('root-branch', root_branch_name, :branch)
       Git.set_config('root-remote', root_origin, :branch)
@@ -129,7 +129,7 @@ module GithubPivotalFlow
         Git.merge(branch_name, commit_message: commit_message, no_ff: true)
       end
       Git.checkout(master_branch_name)
-      Git.tag(name)
+      Git.tag(name, annotated: true, message: "Release #{escape_quotes(name)}")
       Git.push(master_branch_name, development_branch_name)
       Git.push_tags
       self.delete_branch!
@@ -294,4 +294,4 @@ module GithubPivotalFlow
       string.gsub('"', '\"')
     end
   end
-end
+end

data/lib/github_pivotal_flow/version.rb

@@ -1,3 +1,3 @@
 module GithubPivotalFlow
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/github_pivotal_flow/command_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 module GithubPivotalFlow
   describe Command do
+    let(:fake_git) { double('Git').as_null_object }
+    
     before do
       $stdout = StringIO.new
       $stderr = StringIO.new

data/spec/github_pivotal_flow/configuration_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 module GithubPivotalFlow
   describe Configuration do
+    let(:fake_git) { double('Git').as_null_object }
 
     before do
       $stdout = StringIO.new

data/spec/github_pivotal_flow/finish_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 module GithubPivotalFlow
   describe Finish do
+    let(:fake_git) { double('Git').as_null_object }
 
     before do
       $stdout = StringIO.new

data/spec/github_pivotal_flow/git_spec.rb

@@ -17,6 +17,19 @@ module GithubPivotalFlow
         expect(current_branch).to eq('dev_branch')
       end
     end
+    
+    describe '.clean_working_tree?' do
+      context 'with a dirty working tree' do
+        before do
+          allow(Shell).to receive(:exec).with("git diff --no-ext-diff --ignore-submodules --quiet --exit-code", false).and_return(true)
+          allow(Shell).to receive(:exec).with("git diff-index --cached --quiet --ignore-submodules HEAD --", false).and_raise "fatal: Index contains uncommited changes. Aborting."
+        end
+        
+        it 'raises a runtime error' do
+          expect { Git.clean_working_tree? }.to raise_error(RuntimeError)  
+        end
+      end
+    end
 
     describe '.repository_root' do
       it 'returns the repository root' do

data/spec/github_pivotal_flow/publish_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 module GithubPivotalFlow
   describe Publish do
+    let(:fake_git) { double('Git').as_null_object }
+    
     before do
       $stdout = StringIO.new
       $stderr = StringIO.new
@@ -39,8 +41,7 @@ module GithubPivotalFlow
     end
 
     it 'fails with a dirty working tree' do
-      allow(Shell).to receive(:exec).with("git diff --no-ext-diff --ignore-submodules --quiet --exit-code", false).and_return(true)
-      allow(Shell).to receive(:exec).with("git diff-index --cached --quiet --ignore-submodules HEAD --", false).and_raise "fatal: Index contains uncommited changes. Aborting."
+      expect(Git).to receive(:clean_working_tree?).and_raise(RuntimeError)
       expect { @publish.run! }.to raise_error(RuntimeError)
     end
 

data/spec/github_pivotal_flow/shell_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 module GithubPivotalFlow
   describe Shell do
+    let(:fake_git) { double('Git').as_null_object }
 
     before do
       $stdout = StringIO.new

data/spec/github_pivotal_flow/start_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 module GithubPivotalFlow
   describe Start do
+    let(:fake_git) { double('Git').as_null_object }
+    
     before do
       $stdout = StringIO.new
       $stderr = StringIO.new
@@ -30,7 +32,6 @@ module GithubPivotalFlow
       allow(Configuration).to receive(:new).and_return(@configuration)
       allow(PivotalTracker::Project).to receive(:find).and_return(@project)
       allow(@story).to receive(:create_branch!).and_return(true)
-      allow(Git).to receive(:add_hook)
       allow(@configuration).to receive(:story=).with(@story).and_return(true)
       allow(@story).to receive(:mark_started!)
       @start = Start.new()

data/spec/github_pivotal_flow/story_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 module GithubPivotalFlow
   describe Story do
+    let(:fake_git) { double('Git').as_null_object }
 
     before do
       $stdout = StringIO.new
@@ -125,14 +126,6 @@ module GithubPivotalFlow
 
     describe '#create_branch!' do
       before do
-        allow(Git).to receive(:checkout).and_return(nil)
-        allow(Git).to receive(:pull_remote).and_return(nil)
-        allow(Git).to receive(:create_branch).and_return(nil)
-        allow(Git).to receive(:set_config).and_return(nil)
-        allow(Git).to receive(:get_config).and_return(nil)
-        allow(Git).to receive(:push).and_return(nil)
-        allow(Git).to receive(:commit).and_return(nil)
-        allow(Git).to receive(:get_remote).and_return(nil)
         allow(@pivotal_story).to receive(:story_type).and_return('feature')
         allow(@pivotal_story).to receive(:id).and_return('123456')
         allow(@pivotal_story).to receive(:name).and_return('test')
@@ -170,5 +163,53 @@ module GithubPivotalFlow
         @story.create_branch!
       end
     end
+    
+    describe '#merge_release!' do
+      before do
+        allow(@pivotal_story).to receive(:story_type).and_return('release')
+        allow(@pivotal_story).to receive(:id).and_return('123456')
+        allow(@pivotal_story).to receive(:name).and_return('v1.5.1')
+        @story = GithubPivotalFlow::Story.new(@project, @pivotal_story)
+        allow(@story).to receive(:branch_prefix).and_return('release/')
+        allow(@story).to receive(:branch_name).and_return('release/v1.5.1')
+      end
+      
+      context 'if the merge is trivial' do
+        before do
+          allow(@story).to receive(:trivial_merge?).and_return(true)
+        end
+        
+        it 'merges using fast-forward' do
+          expect(Git).to receive(:merge).with('release/v1.5.1', hash_including(ff: true))
+          
+          @story.merge_release!
+        end
+      end
+      
+      context 'with a non-trivial merge' do
+        before do
+          allow(@story).to receive(:trivial_merge?).and_return(false)
+        end
+        
+        it 'merges using no-ff' do
+          expect(Git).to receive(:merge).with('release/v1.5.1', hash_including(no_ff: true))
+          
+          @story.merge_release!
+        end
+      end
+      
+      context 'when the branch is successfully merged' do
+        before do
+          allow(@story).to receive(:trivial_merge?).and_return(true)
+          allow(Git).to receive(:merge).and_return(true)
+        end
+        
+        it 'creates an annotated tag with the release name and short description' do
+          expect(Git).to receive(:tag).with('v1.5.1', hash_including(annotated: true, message: 'Release v1.5.1'))
+      
+          @story.merge_release!
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-pivotal-flow
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Donald Piret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: Provides a set of additional Git commands to help developers when working
   with Pivotal Tracker and Github pull requests
 email: donald@donaldpiret.com