github-pivotal-flow 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 423519e9574e2048faaaec36c2583c3ec79273eb
-  data.tar.gz: 03fb90bd37c4fb777432e1e9c6c9732ac90b25cf
+  metadata.gz: 2d3dc57a3d6971ab0f6f3cc715b8ed92ec6e09a9
+  data.tar.gz: d464f101f21dc6d6cfccc0903c73d0b7d8b2c9d5
 SHA512:
-  metadata.gz: 2aa8e365a3df85d33431476ca8c8b93bf022edce02ec2f2655f9e32e547469fc6ac36aa9978928b257c09f925505c7d0ce69f77cc24f033b28f0237f9826fa44
-  data.tar.gz: e6a57b30856b8cfffad4b65b6f34e51109a6240b666e1c4cd1026b2275e2e7b0f40a0dfc3f7102432ece7a5ca4354b86f6fc0c1ae3a6a905b1b9e75dded30bf3
+  metadata.gz: 7aa4127d145bc305ac40e50620057dc801aa0e547830939f5d7ab03470396a3b082d5e04cb034cf647a657329bfab08533549d6ce62455440d985e944c36a20d
+  data.tar.gz: 873c99a594c2d6684b744b54ae1f803f05730904be0edd15b8f2ed0f18e1557c550c922d725972469a1ffb6117d0d9fe96fe91b15ce618e6e4935ee2b677efa0

data/lib/github_pivotal_flow/finish.rb

@@ -4,7 +4,9 @@ module GithubPivotalFlow
 
     # Finishes a Pivotal Tracker story
     def run!
+      raise_error_if_development_or_master
       story = @configuration.story
+      fail("Could not find story associated with branch") unless story
       story.can_merge?
       commit_message = options[:commit_message]
       if story.release?
@@ -17,6 +19,11 @@ module GithubPivotalFlow
 
     private
 
+    def raise_error_if_development_or_master
+      fail("Cannot finish development branch") if Git.current_branch == @configuration.development_branch
+      fail("Cannot finish master branch") if Git.current_branch == @configuration.master_branch
+    end
+
     def parse_argv(*args)
       OptionParser.new do |opts|
         opts.banner = "Usage: git finish [options]"

data/lib/github_pivotal_flow/story.rb

@@ -80,7 +80,7 @@ module GithubPivotalFlow
     end
 
     def create_branch!(commit_message = nil, options = {})
-      commit_message ||= "Starting [#{story_type} ##{id}]: #{name}"
+      commit_message ||= "Starting [#{story_type} ##{id}]: #{escape_quotes(name)}"
       commit_message << " [ci skip]" unless options[:run_ci]
       print "Creating branch for story with branch name #{branch_name} from #{root_branch_name}... "
       Git.checkout(root_branch_name)
@@ -111,7 +111,7 @@ module GithubPivotalFlow
     end
 
     def merge_release!(commit_message = nil, options = {})
-      commit_message ||= "Release #{name}"
+      commit_message ||= "Release #{escape_quotes(name)}"
       commit_message << "\n\n[#{options[:no_complete] ? '' : 'Completes '}##{id}] "
       print "Merging #{branch_name} to #{master_branch_name}... "
       Git.checkout(master_branch_name)
@@ -121,9 +121,8 @@ module GithubPivotalFlow
       else
         Git.merge(branch_name, commit_message: commit_message, no_ff: true)
       end
-      Git.tag(name)
       print "Merging #{branch_name} to #{development_branch_name}... "
-      Git checkout(development_branch_name)
+      Git.checkout(development_branch_name)
       Git.pull_remote(development_branch_name)
       if trivial_merge?(development_branch_name)
         Git.merge(branch_name, commit_message: commit_message, ff: true)
@@ -131,6 +130,7 @@ module GithubPivotalFlow
         Git.merge(branch_name, commit_message: commit_message, no_ff: true)
       end
       Git.checkout(master_branch_name)
+      Git.tag(name)
       Git.push(master_branch_name, development_branch_name)
       Git.push_tags
       self.delete_branch!
@@ -288,5 +288,9 @@ module GithubPivotalFlow
       prefix = "#{prefix.strip}/" unless prefix.strip[-1,1] == '/'
       return prefix.strip
     end
+
+    def escape_quotes(string)
+      string.gsub('"', '\"')
+    end
   end
 end

data/lib/github_pivotal_flow/version.rb

@@ -1,3 +1,3 @@
 module GithubPivotalFlow
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
 end

data/spec/github_pivotal_flow/finish_spec.rb

@@ -8,7 +8,7 @@ module GithubPivotalFlow
       $stderr = StringIO.new
 
       @project = double('project')
-      @story = double('story')
+      @story = double('story', branch_name: 'feature/1234-sample_story')
       @configuration = double('configuration')
       @configuration.stub(
           development_branch: 'development',
@@ -26,7 +26,23 @@ module GithubPivotalFlow
       allow(Configuration).to receive(:new).and_return(@configuration)
       allow(Project).to receive(:find).and_return(@project)
       @finish = Finish.new
-      expect(@configuration).to receive(:story).and_return(@story)
+      allow(Git).to receive(:current_branch).and_return(@story.branch_name)
+      allow(@configuration).to receive(:story).and_return(@story)
+    end
+
+    it 'fails if you are on the development branch' do
+      allow(Git).to receive(:current_branch).and_return(@configuration.development_branch)
+      expect { @finish.run! }.to raise_error("Cannot finish development branch")
+    end
+
+    it 'fails if you are on the master branch' do
+      allow(Git).to receive(:current_branch).and_return(@configuration.master_branch)
+      expect { @finish.run! }.to raise_error("Cannot finish master branch")
+    end
+
+    it 'fails if we cannot find the story this branch relates to' do
+      allow(@configuration).to receive(:story).and_return(nil)
+      expect { @finish.run! }.to raise_error("Could not find story associated with branch")
     end
 
     it 'merges the branch back to its root by default' do

data/spec/github_pivotal_flow/story_spec.rb

@@ -163,6 +163,13 @@ module GithubPivotalFlow
 
         @story.create_branch!('Message')
       end
+
+      it 'supports stories with quotes in their name' do
+        @story.stub(name: 'Fancy story with "quotes"', branch_name: 'feature/123456-my_branch')
+        expect(Git).to receive(:commit).with(hash_including(commit_message: 'Starting [feature #123456]: Fancy story with \"quotes\" [ci skip]'))
+
+        @story.create_branch!
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-pivotal-flow
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Donald Piret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline