github-pivotal-flow 1.0.2 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cece2a251f6cd78582155921715f4591ef7a825b
-  data.tar.gz: e5c6ec83aef54e82c8c628382289d11545ad8664
+  metadata.gz: d28bd67dcb12ae8b5703b61c8622e682e9db5a2d
+  data.tar.gz: ad959917dd3928902a45fc8ed02d4a6b0909e105
 SHA512:
-  metadata.gz: f53421dd4465a18089d0356ea510c440684d7d952575de790d1f8f873421f0a5f0f4da9c1b3a5e11c0a639fa03476995384b49d68838d0da2a77052672227793
-  data.tar.gz: 70a2342c1e95eab672bc824a9fa0ae27256003e943ea18a3b8a4def9891cfb38d933fcd1cf3dee0d9c38175b436c01d358e49dd92dba5d82e223c6a64e5a9b4f
+  metadata.gz: 040c6e3b6be5d5111279f614ca37f07cff8eaae20023611f6c2be7c1b7ed044baf19dd264601e867b4a7ad8d3cce51f82eac88a3d4ae7b50dc04f977d1da0853
+  data.tar.gz: 5d75d84e6e0e1e1024277f07552741545996220d45054919cf87c5ec81f0106e055e0032389480122fd5bc68d9102bd1dca4b2453273ae0fa717011579b4c941

data/lib/github_pivotal_flow/git.rb

@@ -30,6 +30,7 @@ module GithubPivotalFlow
     def self.create_branch(branch_name, start_point = nil, options = {})
       return if branch_exists?(branch_name)
       command = "git branch --quiet"
+      command << " --track" if options[:track]
       command << " --set-upstream" if options[:set_upstream]
       exec "#{command} #{[branch_name, start_point].compact.join(' ')}"
       puts 'OK'
@@ -96,7 +97,7 @@ module GithubPivotalFlow
 
       print "Pushing to #{remote}... "
       command = "git push --quiet"
-      command << " -u" if options[:set_upstream]
+      command << " --set-upstream" if options[:set_upstream]
       exec "#{command} #{remote} " + refs.join(' ')
       puts 'OK'
     end

data/lib/github_pivotal_flow/story.rb

@@ -79,18 +79,16 @@ module GithubPivotalFlow
       puts 'OK'
     end
 
-    def create_branch!(commit_message = nil, options = {})
-      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}... "
+    def create_branch!(options = {})
       Git.checkout(root_branch_name)
       root_origin = Git.get_remote
+      remote_branch_name = [root_origin, root_branch_name].join('/')
+      print "Creating branch for story with branch name #{branch_name} from #{remote_branch_name}... "
       Git.pull_remote
-      Git.create_branch(branch_name, root_branch_name, set_upstream: true)
+      Git.create_branch(branch_name, remote_branch_name, track: true)
       Git.checkout(branch_name)
       Git.set_config('root-branch', root_branch_name, :branch)
       Git.set_config('root-remote', root_origin, :branch)
-      Git.commit(commit_message: commit_message, allow_empty: true)
     end
 
     def merge_to_root!(commit_message = nil, options = {})

data/lib/github_pivotal_flow/version.rb

@@ -1,3 +1,3 @@
 module GithubPivotalFlow
-  VERSION = '1.0.2'
+  VERSION = '1.1'
 end

data/spec/github_pivotal_flow/git_spec.rb

@@ -181,7 +181,7 @@ module GithubPivotalFlow
       end
 
       it 'supports passing in the set_upstream option after a ref' do
-        expect(Shell).to receive(:exec).with('git push --quiet -u origin foo', true)
+        expect(Shell).to receive(:exec).with('git push --quiet --set-upstream origin foo', true)
 
         Git.push 'foo', set_upstream: true
       end

data/spec/github_pivotal_flow/story_spec.rb

@@ -138,28 +138,20 @@ module GithubPivotalFlow
         allow(@story).to receive(:branch_prefix).and_return('feature/')
         expect(@story).to receive(:ask).with("Enter branch name (feature/<branch-name>): ").and_return('super-branch')
 
-        @story.create_branch!('Message')
+        @story.create_branch!
       end
 
-      it 'includes a tag to skip the ci build for the initial blank commit' do
+      it 'does not create an initial commit' do
         allow(@story).to receive(:branch_name).and_return('feature/123456-my_branch')
-        expect(Git).to receive(:commit).with(hash_including(commit_message: 'Message [ci skip]')).and_return(true)
+        expect(Git).to_not receive(:commit)
 
-        @story.create_branch!('Message')
+        @story.create_branch!
       end
 
       it 'does not push the local branch' do
         allow(@story).to receive(:branch_name).and_return('feature/123456-my_branch')
         expect(Git).to_not receive(:push)
 
-        @story.create_branch!('Message')
-      end
-
-      it 'supports stories with quotes in their name' do
-        allow(@story).to receive(:name).and_return('Fancy story with "quotes"')
-        allow(@story).to receive(:branch_name).and_return('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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-pivotal-flow
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: '1.1'
 platform: ruby
 authors:
 - Donald Piret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement