github-pivotal-flow 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96c3e7ec554233e7990b6a64f15f0d35503d5927
-  data.tar.gz: 94ed6f85456f4b63b47fe10318d22fa7786f00dc
+  metadata.gz: 899947a9ef6741e50d2fcec85f2fc9bbe0b8c402
+  data.tar.gz: c085c1c245c4b4a5bdcee3ca0eaa191bf06393b5
 SHA512:
-  metadata.gz: 121a7ad7681ec313e1670db59a7e8c5683f926e3241326f61a9854b6d0036fb4a89984e73f7246242a46bf4e6cc895acd2db2e93734483097e9d4754a3328894
-  data.tar.gz: 183f9dc438715c9b1cc8cc22079fc5c3f3db01f8014ee6f754bd245351067db92413866772e13a8de0bcc24583c99f985e4fe9ea62071b994f5b0fd759bcee99
+  metadata.gz: 63f8b8d5e05b61e09f4158224d8981aee3d8ce705ee8adbe2e5ede68c4158fb3aed51fc01d1f9229a481a52ec4a5cbad85de8e464a4683d796197fb18e85fe98
+  data.tar.gz: d6384a6ec33fc24e493d1c3edd5ea71d04d3c3a81300cb3a08bd7e67d82f03c956d569f5397c0f9429f99048bc93df8cba231dc01aec4f65fc2049bf273afbd8

data/README.md

@@ -27,6 +27,7 @@ $ git start       # Creates branch, opens a pull request on Github and starts st
 $ git commit ...
 $ git commit ...  # Your existing development process
 $ git commit ...
+$ git publish ... # Push the branch out to origin and open a pull request on github to gather some feedback
 $ git finish      # Merges back into the main branch. Pushes to origin, destroys branch and finishes story.
 ```
 
@@ -119,6 +120,10 @@ If it doesn't exist already, a `prepare-commit-msg` commit hook is added to your
 #
 ```
 
+### `git publish`
+This command pushes your changes back to the origin, and opens a pull request on Github for your branch.
+
+
 ### `git finish [--no-complete]`
 This command finishes a story by merging and cleaning up its branch and then pushing the changes to a remote server.
 This command can be run in two ways.  First it can be run without the `--no-complete` option.

data/bin/git-publish

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby -U
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'github_pivotal_flow'
+
+exit GithubPivotalFlow::Publish.new(*ARGV).run!

data/lib/github_pivotal_flow.rb

@@ -44,4 +44,5 @@ require File.join('github_pivotal_flow', 'github_api')
 require File.join('github_pivotal_flow', 'story')
 require File.join('github_pivotal_flow', 'command')
 require File.join('github_pivotal_flow', 'start')
+require File.join('github_pivotal_flow', 'publish')
 require File.join('github_pivotal_flow', 'finish')

data/lib/github_pivotal_flow/publish.rb

@@ -0,0 +1,32 @@
+# The class that encapsulates finishing a Pivotal Tracker Story
+module GithubPivotalFlow
+  class Publish < Command
+
+    # Publishes the branch and opens the pull request
+    def run!
+      story = @configuration.story
+      fail("Could not find story associated with branch") unless story
+      Git.clean_working_tree?
+      Git.push(story.branch_name, set_upstream: true)
+      unless story.release?
+        print "Creating pull-request on Github... "
+        pull_request_params = story.params_for_pull_request.merge(project: @configuration.project)
+        @configuration.github_client.create_pullrequest(pull_request_params)
+        puts 'OK'
+      end
+      return 0
+    end
+
+    private
+
+    def parse_argv(*args)
+      OptionParser.new do |opts|
+        opts.banner = "Usage: git publish [options]"
+        opts.on("-t", "--api-token=", "Pivotal Tracker API key") { |k| options[:api_token] = k }
+        opts.on("-p", "--project-id=", "Pivotal Tracker project id") { |p| options[:project_id] = p }
+
+        opts.on_tail("-h", "--help", "This usage guide") { put opts.to_s; exit 0 }
+      end.parse!(args)
+    end
+  end
+end

data/lib/github_pivotal_flow/start.rb

@@ -10,12 +10,6 @@ module GithubPivotalFlow
       story.create_branch!
       @configuration.story = story # Tag the branch with story attributes
       Git.add_hook 'prepare-commit-msg', File.join(File.dirname(__FILE__), 'prepare-commit-msg.sh')
-      unless story.release?
-        print "Creating pull-request on Github... "
-        pull_request_params = story.params_for_pull_request.merge(project: @configuration.project)
-        @configuration.github_client.create_pullrequest(pull_request_params)
-        puts 'OK'
-      end
       story.mark_started!
       return 0
     end

data/lib/github_pivotal_flow/story.rb

@@ -91,7 +91,6 @@ module GithubPivotalFlow
       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)
-      Git.push(branch_name, set_upstream: true)
     end
 
     def merge_to_root!(commit_message = nil, options = {})
@@ -164,8 +163,8 @@ module GithubPivotalFlow
         # For release branches the format is release/5.0
         "#{Git.get_config(KEY_RELEASE_PREFIX, :inherited)}#{branch_name}"
       else
-        n = "#{branch_prefix}#{story_id}"
-        n << "-#{branch_name}" unless branch_name.blank?
+        n = "#{branch_prefix}"
+        n << "#{branch_name}" unless branch_name.blank?
         n
       end
     end

data/lib/github_pivotal_flow/version.rb

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

data/spec/github_pivotal_flow/command_spec.rb

@@ -5,15 +5,10 @@ module GithubPivotalFlow
     before do
       $stdout = StringIO.new
       $stderr = StringIO.new
-      @configuration = double('configuration')
       @project = double('project')
+      @configuration = double('configuration', validate: true, project_id: 123456, project: @project)
       allow(Configuration).to receive(:new).and_return(@configuration)
       allow(PivotalTracker::Project).to receive(:find).and_return(@project)
-      @configuration.stub(
-        validate: true,
-        project_id: 123456,
-        project: @project,
-      )
     end
 
     describe '#initialize' do

data/spec/github_pivotal_flow/configuration_spec.rb

@@ -16,7 +16,7 @@ module GithubPivotalFlow
 
     describe '#api_token' do
       it 'does not prompt the user for the API token if it is already configured' do
-        Git.should_receive(:get_config).with('pivotal.api-token', :inherited).and_return('test_api_token')
+        expect(Git).to receive(:get_config).with('pivotal.api-token', :inherited).and_return('test_api_token')
 
         api_token = @configuration.api_token
 
@@ -24,9 +24,9 @@ module GithubPivotalFlow
       end
 
       it 'prompts the user for the API token if it is not configured and stores it in the local git config' do
-        Git.should_receive(:get_config).with('pivotal.api-token', :inherited).and_return('')
-        @configuration.should_receive(:ask).and_return('test_api_token')
-        Git.should_receive(:set_config).with('pivotal.api-token', 'test_api_token', :local)
+        expect(Git).to receive(:get_config).with('pivotal.api-token', :inherited).and_return('')
+        expect(@configuration).to receive(:ask).and_return('test_api_token')
+        expect(Git).to receive(:set_config).with('pivotal.api-token', 'test_api_token', :local)
         api_token = @configuration.api_token
         expect(api_token).to eq('test_api_token')
       end
@@ -34,22 +34,22 @@ module GithubPivotalFlow
 
     describe '#project_id' do
       it 'does not prompt the user for the project id if it is already configured' do
-        Git.should_receive(:get_config).with('pivotal.project-id', :inherited).and_return('test_project_id')
+        expect(Git).to receive(:get_config).with('pivotal.project-id', :inherited).and_return('test_project_id')
         project_id = @configuration.project_id
         expect(project_id).to eq('test_project_id')
       end
 
       it 'prompts the user for the project id if it is not configured' do
-        Git.should_receive(:get_config).with('pivotal.project-id', :inherited).and_return('')
+        expect(Git).to receive(:get_config).with('pivotal.project-id', :inherited).and_return('')
         menu = double('menu')
-        menu.should_receive(:prompt=)
-        PivotalTracker::Project.should_receive(:all).and_return([
+        expect(menu).to receive(:prompt=)
+        expect(PivotalTracker::Project).to receive(:all).and_return([
                                                                     PivotalTracker::Project.new(:id => 'id-2', :name => 'name-2'),
                                                                     PivotalTracker::Project.new(:id => 'id-1', :name => 'name-1')])
-        menu.should_receive(:choice).with('name-1')
-        menu.should_receive(:choice).with('name-2')
-        @configuration.should_receive(:choose) { |&arg| arg.call menu }.and_return('test_project_id')
-        Git.should_receive(:set_config).with('pivotal.project-id', 'test_project_id', :local)
+        expect(menu).to receive(:choice).with('name-1')
+        expect(menu).to receive(:choice).with('name-2')
+        expect(@configuration).to receive(:choose) { |&arg| arg.call menu }.and_return('test_project_id')
+        expect(Git).to receive(:set_config).with('pivotal.project-id', 'test_project_id', :local)
 
         project_id = @configuration.project_id
 
@@ -86,7 +86,7 @@ module GithubPivotalFlow
       end
 
       it 'uses the branch name to deduce the story id if no git config is found' do
-        Git.stub(:current_branch).and_return('feature/12345678-sample_feature')
+        allow(Git).to receive(:current_branch).and_return('feature/12345678-sample_feature')
         expect(Git).to receive(:get_config).with('pivotal-story-id', :branch).and_return(' ')
         expect(project).to receive(:stories).and_return(stories)
         expect(stories).to receive(:find).with(12345678).and_return(pivotal_story)
@@ -97,7 +97,7 @@ module GithubPivotalFlow
       end
 
       it 'prompts for the story id if the branch name does not match the known format' do
-        Git.stub(:current_branch).and_return('unknownformat')
+        allow(Git).to receive(:current_branch).and_return('unknownformat')
         expect(Git).to receive(:get_config).with('pivotal-story-id', :branch).and_return(' ')
         expect(@configuration).to receive(:ask).and_return('12345678')
         expect(Git).to receive(:set_config).with('pivotal-story-id', '12345678', :branch)
@@ -112,8 +112,8 @@ module GithubPivotalFlow
 
     describe '#project' do
       it 'supports working with git urls from the configuration' do
-        Git.should_receive(:get_remote).and_return('origin')
-        Git.should_receive(:get_config).with('remote.origin.url').and_return('git@github.com:roomorama/github-pivotal-flow.git')
+        expect(Git).to receive(:get_remote).and_return('origin')
+        expect(Git).to receive(:get_config).with('remote.origin.url').and_return('git@github.com:roomorama/github-pivotal-flow.git')
         project = @configuration.project
         expect(project.owner).to eq('roomorama')
         expect(project.name).to eq('github-pivotal-flow')

data/spec/github_pivotal_flow/finish_spec.rb

@@ -9,19 +9,18 @@ module GithubPivotalFlow
 
       @project = double('project')
       @story = double('story', branch_name: 'feature/1234-sample_story')
-      @configuration = double('configuration')
-      @configuration.stub(
-          development_branch: 'development',
-          master_branch: 'master',
-          feature_prefix: 'feature/',
-          hotfix_prefix: 'hotfix/',
-          release_prefix: 'release/',
-          api_token: 'token',
-          project_id: '123',
-          project: @project,
-          github_client: @ghclient,
-          story: @story,
-          validate: true,
+      @configuration = double('configuration',
+        development_branch: 'development',
+        master_branch: 'master',
+        feature_prefix: 'feature/',
+        hotfix_prefix: 'hotfix/',
+        release_prefix: 'release/',
+        api_token: 'token',
+        project_id: '123',
+        project: @project,
+        github_client: @ghclient,
+        story: @story,
+        validate: true
       )
       allow(Configuration).to receive(:new).and_return(@configuration)
       allow(Project).to receive(:find).and_return(@project)

data/spec/github_pivotal_flow/git_spec.rb

@@ -27,7 +27,7 @@ module GithubPivotalFlow
           git_directory = File.expand_path '.git', root
           Dir.mkdir git_directory
 
-          Dir.should_receive(:pwd).and_return(child_directory)
+          expect(Dir).to receive(:pwd).and_return(child_directory)
 
           repository_root = Git.repository_root
 
@@ -40,7 +40,7 @@ module GithubPivotalFlow
           child_directory = File.expand_path 'child', root
           Dir.mkdir child_directory
 
-          Dir.should_receive(:pwd).and_return(child_directory)
+          expect(Dir).to receive(:pwd).and_return(child_directory)
 
           expect { Git.repository_root }.to raise_error
         end
@@ -49,8 +49,8 @@ module GithubPivotalFlow
 
     describe '.get_config' do
       it 'gets configuration scoped by branch when :branch scope is specified' do
-        Git.should_receive(:current_branch).and_return('test_branch_name')
-        Shell.should_receive(:exec).with('git config branch.test_branch_name.test_key', false).and_return('test_value')
+        expect(Git).to receive(:current_branch).and_return('test_branch_name')
+        expect(Shell).to receive(:exec).with('git config branch.test_branch_name.test_key', false).and_return('test_value')
 
         value = Git.get_config 'test_key', :branch
 
@@ -58,7 +58,7 @@ module GithubPivotalFlow
       end
 
       it 'gets configuration when :inherited scope is specified' do
-        Shell.should_receive(:exec).with('git config test_key', false).and_return('test_value')
+        expect(Shell).to receive(:exec).with('git config test_key', false).and_return('test_value')
 
         value = Git.get_config 'test_key', :inherited
 
@@ -72,14 +72,14 @@ module GithubPivotalFlow
 
     describe '.set_config' do
       it 'sets configuration when :branch scope is specified' do
-        Git.should_receive(:current_branch).and_return('test_branch_name')
-        Shell.should_receive(:exec).with('git config --local branch.test_branch_name.test_key test_value', true)
+        expect(Git).to receive(:current_branch).and_return('test_branch_name')
+        expect(Shell).to receive(:exec).with('git config --local branch.test_branch_name.test_key test_value', true)
 
         Git.set_config 'test_key', 'test_value', :branch
       end
 
       it 'sets configuration when :global scope is specified' do
-        Shell.should_receive(:exec).with('git config --global test_key test_value', true)
+        expect(Shell).to receive(:exec).with('git config --global test_key test_value', true)
 
         Git.set_config 'test_key', 'test_value', :global
       end
@@ -97,55 +97,54 @@ module GithubPivotalFlow
 
     describe '.create_branch' do
       it 'creates a branch' do
-        Git.stub(:current_branch).and_return('master')
-        Shell.should_receive(:exec).with('git branch --quiet dev_branch', true)
+        allow(Git).to receive(:current_branch).and_return('master')
+        expect(Shell).to receive(:exec).with('git branch --quiet dev_branch', true)
         Git.create_branch 'dev_branch'
       end
     end
 
-    #FIXME: Can't seem to set an expectation on File for some reason...
     describe '.add_hook' do
       it 'does not add a hook if it already exists' do
         Dir.mktmpdir do |root|
-          Git.should_receive(:repository_root).and_return(root)
+          expect(Git).to receive(:repository_root).and_return(root)
           hook = "#{root}/.git/hooks/prepare-commit-msg"
           expect(File).to receive(:exist?).with(hook).and_return(true)
 
           Git.add_hook 'prepare-commit-msg', __FILE__
           allow(File).to receive(:exist?).and_call_original
-          expect(File.exist?(hook)).to be_false
+          expect(File.exist?(hook)).to be_falsy
         end
       end
 
       it 'adds a hook if it does not exist' do
         Dir.mktmpdir do |root|
-          Git.should_receive(:repository_root).and_return(root)
+          expect(Git).to receive(:repository_root).and_return(root)
           hook = "#{root}/.git/hooks/prepare-commit-msg"
           #File.should_receive(:exist?).with(hook).and_return(false)
           expect(File).to receive(:exist?).with(hook).and_return(false)
 
           Git.add_hook 'prepare-commit-msg', __FILE__
           expect(File).to receive(:exist?).with(hook).and_call_original
-          expect(File.exist?(hook)).to be_true
+          expect(File.exist?(hook)).to be_truthy
         end
       end
 
       it 'adds a hook if it already exists and overwrite is true' do
         Dir.mktmpdir do |root|
-          Git.should_receive(:repository_root).and_return(root)
+          expect(Git).to receive(:repository_root).and_return(root)
           hook = "#{root}/.git/hooks/prepare-commit-msg"
 
           Git.add_hook 'prepare-commit-msg', __FILE__, true
 
-          File.should_receive(:exist?).and_call_original
-          expect(File.exist?(hook)).to be_true
+          expect(File).to receive(:exist?).and_call_original
+          expect(File.exist?(hook)).to be_truthy
         end
       end
     end
 
     describe '.merge' do
       it 'merges branches' do
-        Shell.should_receive(:exec).with("git merge --quiet --no-ff -m \"Merge development_branch to master\" development_branch", true)
+        expect(Shell).to receive(:exec).with("git merge --quiet --no-ff -m \"Merge development_branch to master\" development_branch", true)
 
         Git.merge 'development_branch', commit_message: 'Merge development_branch to master', no_ff: true
       end
@@ -153,23 +152,23 @@ module GithubPivotalFlow
 
     describe '.push' do
       before do
-        Git.should_receive(:get_config).with('remote', :branch).and_return('origin')
+        expect(Git).to receive(:get_config).with('remote', :branch).and_return('origin')
       end
 
       it 'pushes changes back to the origin without refs' do
-        Shell.should_receive(:exec).with('git push --quiet origin ', true)
+        expect(Shell).to receive(:exec).with('git push --quiet origin ', true)
 
         Git.push
       end
 
       it 'pushes changes back to the origin with refs' do
-        Shell.should_receive(:exec).with('git push --quiet origin foo bar', true)
+        expect(Shell).to receive(:exec).with('git push --quiet origin foo bar', true)
 
         Git.push 'foo', 'bar'
       end
 
       it 'supports passing in the set_upstream option after a ref' do
-        Shell.should_receive(:exec).with('git push --quiet -u origin foo', true)
+        expect(Shell).to receive(:exec).with('git push --quiet -u origin foo', true)
 
         Git.push 'foo', set_upstream: true
       end
@@ -177,7 +176,7 @@ module GithubPivotalFlow
 
     describe '.commit' do
       it 'creates a commit' do
-        Shell.should_receive(:exec).with("git commit --quiet --allow-empty -m \"test_message\"", true)
+        expect(Shell).to receive(:exec).with("git commit --quiet --allow-empty -m \"test_message\"", true)
 
         Git.commit commit_message: 'test_message', allow_empty: true
       end
@@ -191,7 +190,7 @@ module GithubPivotalFlow
 
     describe '.tag' do
       it 'creates a tag' do
-        Shell.should_receive(:exec).with('git tag 1.0.0.RELEASE', true)
+        expect(Shell).to receive(:exec).with('git tag 1.0.0.RELEASE', true)
 
         Git.tag '1.0.0.RELEASE'
       end

data/spec/github_pivotal_flow/publish_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+module GithubPivotalFlow
+  describe Publish do
+    before do
+      $stdout = StringIO.new
+      $stderr = StringIO.new
+
+      @project = double('project')
+      @story = double('story',
+        branch_name: 'feature/1234-sample_story',
+        release?: false,
+        params_for_pull_request: {})
+      @ghclient = double('ghclient')
+      @ghproject = double('ghproject')
+      @configuration = double('configuration',
+        development_branch: 'development',
+        master_branch: 'master',
+        feature_prefix: 'feature/',
+        hotfix_prefix: 'hotfix/',
+        release_prefix: 'release/',
+        api_token: 'token',
+        project_id: '123',
+        project: @project,
+        github_client: @ghclient,
+        story: @story,
+        validate: true
+      )
+      allow(Configuration).to receive(:new).and_return(@configuration)
+      allow(Project).to receive(:find).and_return(@project)
+      allow(@ghclient).to receive(:create_pullrequest).and_return(true)
+      allow(Git).to receive(:push).and_return(true)
+      @publish = Publish.new
+    end
+
+    it 'fails if we cannot find the story this branch relates to' do
+      allow(@configuration).to receive(:story).and_return(nil)
+      expect { @publish.run! }.to raise_error("Could not find story associated with branch")
+    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 { @publish.run! }.to raise_error(RuntimeError)
+    end
+
+    context 'with a clean working tree' do
+      before do
+        allow(Git).to receive(:clean_working_tree?).and_return(true)
+
+      end
+
+      it 'pushes the branch back to the origin and sets the upstream' do
+        expect(Git).to receive(:push).with(instance_of(String), hash_including(set_upstream: true)).and_return(true)
+
+        @publish.run!
+      end
+
+      it 'opens a pull request' do
+        expect(@ghclient).to receive(:create_pullrequest).and_return(true)
+
+        @publish.run!
+      end
+    end
+  end
+end

data/spec/github_pivotal_flow/shell_spec.rb

@@ -9,8 +9,8 @@ module GithubPivotalFlow
     end
 
     it 'should return result when exit code is 0' do
-      Shell.should_receive(:`).with('test_command').and_return('test_result')
-      $?.should_receive(:exitstatus).and_return(0)
+      expect(Shell).to receive(:`).with('test_command').and_return('test_result')
+      expect($?).to receive(:exitstatus).and_return(0)
 
       result = Shell.exec 'test_command'
 
@@ -18,17 +18,17 @@ module GithubPivotalFlow
     end
 
     it "should abort with 'FAIL' when the exit code is not 0" do
-      Shell.should_receive(:`).with('test_command')
-      $?.should_receive(:exitstatus).and_return(-1)
+      expect(Shell).to receive(:`).with('test_command')
+      expect($?).to receive(:exitstatus).and_return(-1)
 
-      lambda { Shell.exec 'test_command' }.should raise_error(SystemExit)
+      expect { Shell.exec 'test_command' }.to raise_error
 
       expect($stderr.string).to match(/FAIL/)
     end
 
     it 'should return result when the exit code is not 0 and told not to abort on failure' do
-      Shell.should_receive(:`).with('test_command')
-      $?.should_receive(:exitstatus).and_return(-1)
+      expect(Shell).to receive(:`).with('test_command')
+      expect($?).to receive(:exitstatus).and_return(-1)
 
       Shell.exec 'test_command', false
     end

data/spec/github_pivotal_flow/start_spec.rb

@@ -5,46 +5,79 @@ module GithubPivotalFlow
     before do
       $stdout = StringIO.new
       $stderr = StringIO.new
-      @story = double('story')
-      @project = double('project')
-      @project.stub(
-          stories: [@story]
+      @story = double('story',
+        unestimated?: false,
+        release?: false
+      )
+      @project = double('project',
+        stories: [@story]
       )
       @ghclient = double('ghclient')
       @ghproject = double('ghproject')
-      @configuration = double('configuration')
-      @configuration.stub(
-          development_branch: 'development',
-          master_branch: 'master',
-          feature_prefix: 'feature/',
-          hotfix_prefix: 'hotfix/',
-          release_prefix: 'release/',
-          api_token: 'token',
-          project_id: '123',
-          project: @project,
-          github_client: @ghclient,
-          story: @story,
-          validate: true,
+      @configuration = double('configuration',
+        development_branch: 'development',
+        master_branch: 'master',
+        feature_prefix: 'feature/',
+        hotfix_prefix: 'hotfix/',
+        release_prefix: 'release/',
+        api_token: 'token',
+        project_id: '123',
+        project: @project,
+        github_client: @ghclient,
+        story: @story,
+        validate: true
       )
       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()
     end
 
-    it 'should runs correctly' do
+    it 'selects the story and pretty prints out the options' do
       @start.options[:args] = 'test_filter'
-      @story.stub(:unestimated? => false, :release? => false, params_for_pull_request: {})
-
       expect(Story).to receive(:select_story).with(@project, 'test_filter').and_return(@story)
       expect(Story).to receive(:pretty_print)
-      expect(@story).to receive(:create_branch!)
-      expect(Git).to receive(:add_hook)
-      expect(@configuration).to receive(:story=).with(@story).and_return(true)
-      #@story.should_receive(:params_for_pull_request).and_return({})
-      expect(@ghclient).to receive(:create_pullrequest)
-      expect(@story).to receive(:mark_started!)
 
       @start.run!
     end
+
+    context 'with a story selected' do
+      before do
+        @start.options[:args] = 'test_filter'
+        allow(Story).to receive(:select_story).with(@project, 'test_filter').and_return(@story)
+        allow(Story).to receive(:pretty_print)
+      end
+
+      it 'should runs correctly' do
+        @start.run!
+      end
+
+      it 'creates the branch for the story' do
+        expect(@story).to receive(:create_branch!)
+
+        @start.run!
+      end
+
+      it 'adds the Git hook' do
+        expect(Git).to receive(:add_hook)
+
+        @start.run!
+      end
+
+      it 'stores the current story in the configuration' do
+        expect(@configuration).to receive(:story=).with(@story).and_return(true)
+
+        @start.run!
+      end
+
+      it 'marks the story as started in tracker' do
+        expect(@story).to receive(:mark_started!)
+
+        @start.run!
+      end
+    end
   end
 end

data/spec/github_pivotal_flow/story_spec.rb

@@ -19,9 +19,9 @@ module GithubPivotalFlow
     describe '.pretty_print' do
       it 'pretty-prints story information' do
         story = double('story')
-        story.should_receive(:name)
-        story.should_receive(:description).and_return("description-1\ndescription-2")
-        PivotalTracker::Note.should_receive(:all).and_return([PivotalTracker::Note.new(:noted_at => Date.new, :text => 'note-1')])
+        expect(story).to receive(:name)
+        expect(story).to receive(:description).and_return("description-1\ndescription-2")
+        expect(PivotalTracker::Note).to receive(:all).and_return([PivotalTracker::Note.new(:noted_at => Date.new, :text => 'note-1')])
 
         Story.pretty_print story
 
@@ -35,9 +35,9 @@ module GithubPivotalFlow
 
       it 'does not pretty print description or notes if there are none (empty)' do
         story = double('story')
-        story.should_receive(:name)
-        story.should_receive(:description)
-        PivotalTracker::Note.should_receive(:all).and_return([])
+        expect(story).to receive(:name)
+        expect(story).to receive(:description)
+        expect(PivotalTracker::Note).to receive(:all).and_return([])
 
         Story.pretty_print story
 
@@ -48,9 +48,9 @@ module GithubPivotalFlow
 
       it 'does not pretty print description or notes if there are none (nil)' do
         story = double('story')
-        story.should_receive(:name)
-        story.should_receive(:description).and_return('')
-        PivotalTracker::Note.should_receive(:all).and_return([])
+        expect(story).to receive(:name)
+        expect(story).to receive(:description).and_return('')
+        expect(PivotalTracker::Note).to receive(:all).and_return([])
 
         Story.pretty_print story
 
@@ -125,48 +125,46 @@ module GithubPivotalFlow
 
     describe '#create_branch!' do
       before do
-        Git.stub(
-          checkout: nil,
-          pull_remote: nil,
-          create_branch: nil,
-          set_config: nil,
-          get_config: nil,
-          push: nil,
-          commit: nil,
-          get_remote: 'origin',
-        )
-        @pivotal_story.stub(
-            story_type: 'feature',
-            id: '123456',
-            name: 'test',
-            description: 'description')
+        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')
+        allow(@pivotal_story).to receive(:description).and_return('description')
         @story = GithubPivotalFlow::Story.new(@project, @pivotal_story)
         allow(@story).to receive(:ask).and_return('test')
       end
 
       it 'prompts the user for a branch extension name' do
         allow(@story).to receive(:branch_prefix).and_return('feature/')
-        expect(@story).to receive(:ask).with("Enter branch name (feature/123456-<branch-name>): ").and_return('super-branch')
+        expect(@story).to receive(:ask).with("Enter branch name (feature/<branch-name>): ").and_return('super-branch')
 
         @story.create_branch!('Message')
       end
 
       it 'includes a tag to skip the ci build for the initial blank commit' do
-        @story.stub(branch_name: 'feature/123456-my_branch')
+        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)
 
         @story.create_branch!('Message')
       end
 
-      it 'pushes the local branch and sets the upstream using the -u flag' do
-        @story.stub(branch_name: 'feature/123456-my_branch')
-        expect(Git).to receive(:push).with(instance_of(String), hash_including(set_upstream: true))
+      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
-        @story.stub(name: 'Fancy story with "quotes"', branch_name: 'feature/123456-my_branch')
+        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!

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: github-pivotal-flow
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Donald Piret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 description: Provides a set of additional Git commands to help developers when working
@@ -141,6 +141,7 @@ description: Provides a set of additional Git commands to help developers when w
 email: donald@donaldpiret.com
 executables:
 - git-finish
+- git-publish
 - git-start
 extensions: []
 extra_rdoc_files: []
@@ -148,6 +149,7 @@ files:
 - LICENSE
 - README.md
 - bin/git-finish
+- bin/git-publish
 - bin/git-start
 - lib/core_ext/object/blank.rb
 - lib/github_pivotal_flow.rb
@@ -158,6 +160,7 @@ files:
 - lib/github_pivotal_flow/github_api.rb
 - lib/github_pivotal_flow/prepare-commit-msg.sh
 - lib/github_pivotal_flow/project.rb
+- lib/github_pivotal_flow/publish.rb
 - lib/github_pivotal_flow/shell.rb
 - lib/github_pivotal_flow/start.rb
 - lib/github_pivotal_flow/story.rb
@@ -166,6 +169,7 @@ files:
 - spec/github_pivotal_flow/configuration_spec.rb
 - spec/github_pivotal_flow/finish_spec.rb
 - spec/github_pivotal_flow/git_spec.rb
+- spec/github_pivotal_flow/publish_spec.rb
 - spec/github_pivotal_flow/shell_spec.rb
 - spec/github_pivotal_flow/start_spec.rb
 - spec/github_pivotal_flow/story_spec.rb
@@ -179,17 +183,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Git commands for integration with Pivotal Tracker and Github pull requests
@@ -198,6 +202,7 @@ test_files:
 - spec/github_pivotal_flow/configuration_spec.rb
 - spec/github_pivotal_flow/finish_spec.rb
 - spec/github_pivotal_flow/git_spec.rb
+- spec/github_pivotal_flow/publish_spec.rb
 - spec/github_pivotal_flow/shell_spec.rb
 - spec/github_pivotal_flow/start_spec.rb
 - spec/github_pivotal_flow/story_spec.rb