pivo_flow 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36f283e1fb39abb5610d8613155c49afcab0869b
-  data.tar.gz: a32f069c47a63963c4ff519af31f0c9b66759797
+  metadata.gz: 3b0e99ca7d80278c1cee9005ae3c938aa10da3e8
+  data.tar.gz: 1d37fb1d48975ec2f1374c6965c63e32cfe2b79b
 SHA512:
-  metadata.gz: 8ea5361801e016ed10d3a792815d8c2da8180ee7e8f05138067c50bd520d741bbd646fe51cedcbd46779f6e2b85d67053e5f80175504b9ff9878a95ab7273be1
-  data.tar.gz: b0ce2e07bd66b60c140fb8a9e99b2436ebec8219ecfd47a7edb1ec96838e417ef5f0a71f75754e751aa02706e8de596ba0a995c77342bfbb8746a5551b384bd7
+  metadata.gz: 0fcc5cd5b21649c2ef9ae3e9157861f6f0beacf675a585c6353d7c0567ec2ac075cb5554505a7cc56519e1419cd58236d4b3d9a63c23d210348ce8dd6762e0ff
+  data.tar.gz: 28688a32e8c4af94d3ccf7d3dbc73c3782132b3a791d9816ab99e1bc9ae722f6075795650b78c0789fb3c72d04466eb7db4d9eabfe2c83b69d5e8a49d303e789

data/.rspec

@@ -1,2 +1,3 @@
+--require spec_helper
 --format documentation
 --color

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+# 0.7 - 2017-10-06
+
+Thanks [David Balatero](https://github.com/dbalatero) for your help with this
+release!
+
+## Added
+
+* [Ability to track story ID by branch](https://github.com/lubieniebieski/pivo_flow/pull/20)
+
+## Fixed
+
+* [Readme badges](https://github.com/lubieniebieski/pivo_flow/pull/21)
+* [Commit message fixes](https://github.com/lubieniebieski/pivo_flow/pull/23)
+* [Make branch names start with the name, downcased](https://github.com/lubieniebieski/pivo_flow/pull/22)

data/README.md

@@ -1,7 +1,7 @@
 # PivoFlow
 
-[![Code Climate](https://codeclimate.com/github/lubieniebieski/pivo_flow.png)](https://codeclimate.com/github/lubieniebieski/pivo_flow)
-[![Build Status](https://secure.travis-ci.org/lubieniebieski/pivo_flow.png?branch=master)](http://travis-ci.org/lubieniebieski/pivo_flow)
+[![](http://img.shields.io/codeclimate/github/lubieniebieski/pivo_flow.svg?style=flat-square)](https://codeclimate.com/github/lubieniebieski/pivo_flow)
+[![](https://img.shields.io/circleci/project/github/lubieniebieski/pivo_flow.svg?style=flat-square)](https://circleci.com/gh/lubieniebieski/pivo_flow)
 
 PivoFlow lets you choose the story you are currently working on from Pivotal Tracker. Intended for all the people, who doesn't like feature-branch approach or are "merdżuj - nie pier*ol"-theory enthusiasts.
 
@@ -61,42 +61,9 @@ Show current STORY_ID from temp file
 
 This gem installs a `pepare-commit-msg` hook by adding a reference to `pf-prepare-commit-msg` file. In short: you shouldn't be worried about your own `prepare-commit-msg` hook, the one added by `pivo_flow` will be added in the last line of original hook file.
 
-## Roadmap
-### 0.6 Current release
+## Changelog
 
-* create local branch of the current ticket using its id and name with 'pf branch'
-
-### 0.5
-
-* set ticket id without connecting to pivotal with 'pf set NUMBER'
-
-### 0.4
-
-* colorized output
-* **TODO** story statistics
-* **TODO** git statistics (number of commits in some peroid, average, etc.)
-
-### 0.3
-
-* single-story view with comments and tasks
-* flow:
-  * select story
-  * read the story description
-  * accept or back to story selection
-* `pf info` displaying info about current task
-* `pf deliver` ability to deliver finished stories [#6]
-* options via `OptionParser`
-
-### 0.2
-
-* git hook
-* formatted output
-* bugfixes
-
-### before 0.2
-
-* gem basic structure
-* git config read/write
+See [CHANGELOG.md](https://github.com/lubieniebieski/pivo_flow/blob/master/CHANGELOG.md) file
 
 ## Contributing
 

data/bin/pf-prepare-commit-msg

@@ -1,13 +1,19 @@
 #!/usr/bin/env ruby
-story_path = 'tmp/.pivotal_story_id'
-if File.exists?(story_path)
+
+branch_name = `git symbolic-ref HEAD 2>/dev/null | cut -d '/' -f3`.strip
+story_path = "tmp/.pivo_flow/stories/#{branch_name}"
+
+if !branch_name.empty? && File.exists?(story_path)
   story_id = File.read(story_path).strip
+
   if story_id =~ /(\d{7,})/
     puts IO.read(ARGV[0])
     commit_msg = IO.read(ARGV[0])
-    unless commit_msg.include?($1) or commit_msg =~ /Merge branch/
+
+    unless commit_msg.include?("##{$1}") or commit_msg =~ /Merge branch/
       File.open(ARGV[0], 'w') do |file|
-        file.print commit_msg
+        file.print commit_msg.strip
+        file.print "\n\n"
         file.print "[##{story_id}]"
       end
     end

data/lib/pivo_flow/cli.rb

@@ -1,8 +1,8 @@
 module PivoFlow
   class Cli
+    include PivoFlow::State
 
     def initialize *args
-      @file_story_path = File.join(Dir.pwd, "/tmp/.pivotal_story_id")
       @args = args
     end
 
@@ -58,7 +58,7 @@ module PivoFlow
 
     def clear
       unless current_story_id.nil?
-        FileUtils.remove_file(@file_story_path)
+        FileUtils.remove_file(current_story_id_file_path)
         puts "Current pivotal story id cleared."
       else
         puts no_story_found_message
@@ -98,7 +98,7 @@ module PivoFlow
     end
 
     def no_story_found_message
-      "No story found in #{@file_story_path}"
+      "No story found in #{current_story_id_file_path}"
     end
 
     def no_method_error
@@ -109,11 +109,6 @@ module PivoFlow
       puts "Ups, no such method..."
     end
 
-    def current_story_id
-      return nil unless File.exists?(@file_story_path)
-      File.open(@file_story_path).read.strip
-    end
-
     def parse_argv(args)
       @options = {}
 

data/lib/pivo_flow/pivotal.rb

@@ -1,11 +1,9 @@
 # -*- encoding : utf-8 -*-
 module PivoFlow
   class Pivotal < Base
-    def run
-      @story_id_file_name = ".pivotal_story_id"
-      @story_id_tmp_path = File.join(@current_dir, "/tmp")
-      @story_id_file_path = File.join(@story_id_tmp_path, @story_id_file_name)
+    include PivoFlow::State
 
+    def run
       PivotalTracker::Client.token = @options["api-token"]
       PivotalTracker::Client.use_ssl = true
     end
@@ -228,15 +226,21 @@ module PivoFlow
 
     def create_branch story_id
       story = find_story(story_id)
+
       if story.nil?
-        puts "Sorry, this story is not found (#{story_id})"
+        puts "Sorry, this story could not be found (#{story_id})"
         return
       end
 
-      ticket_name = story.name.tr('^A-Za-z0-9 ', '').tr(' ', '-')
-      branch_name = [story.id, ticket_name].join("-")
+      ticket_name = story.name
+        .tr('^A-Za-z0-9 ', '')
+        .tr(' ', '-')
+        .downcase
+
+      branch_name = [ticket_name, story.id].join("-")
 
       git_create_branch(branch_name)
+      save_story_id_to_file(story_id)
     end
 
     def start_story story_id
@@ -252,12 +256,12 @@ module PivoFlow
     end
 
     def remove_story_id_file
-      FileUtils.remove_file(@story_id_file_path)
+      FileUtils.remove_file(current_story_id_file_path)
     end
 
     def save_story_id_to_file story_id
-      FileUtils.mkdir_p(@story_id_tmp_path)
-      File.open(@story_id_file_path, 'w') { |f| f.write(story_id) }
+      FileUtils.mkdir_p(story_id_tmp_path)
+      File.open(current_story_id_file_path, 'w') { |f| f.write(story_id) }
     end
 
     def show_stories count=9

data/lib/pivo_flow/state.rb

@@ -0,0 +1,23 @@
+module PivoFlow
+  module State
+    extend self
+
+    def current_branch_name
+      Grit::Repo.new(Dir.pwd).head.name
+    end
+
+    def story_id_tmp_path
+      "#{Dir.pwd}/tmp/.pivo_flow/stories"
+    end
+
+    def current_story_id_file_path
+      File.join(story_id_tmp_path, current_branch_name)
+    end
+
+    def current_story_id
+      return nil unless File.exist?(current_story_id_file_path)
+
+      File.read(current_story_id_file_path)
+    end
+  end
+end

data/lib/pivo_flow/version.rb

@@ -1,3 +1,3 @@
 module PivoFlow
-  VERSION = '0.6'
+  VERSION = '0.7'
 end

data/lib/pivo_flow.rb

@@ -5,6 +5,7 @@ require 'highline'
 require 'fileutils'
 require 'pivotal-tracker'
 
+require 'pivo_flow/state'
 require 'pivo_flow/core_extensions'
 require 'pivo_flow/errors'
 require 'pivo_flow/version'

data/pivo_flow.gemspec

@@ -25,5 +25,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "vcr"
   gem.add_development_dependency "fakeweb"
-
 end

data/spec/pivo_flow/base_spec.rb

@@ -1,23 +1,27 @@
 require "spec_helper"
 require_relative './../../lib/pivo_flow/errors'
-describe PivoFlow::Base do
 
+describe PivoFlow::Base do
   let(:base) { PivoFlow::Base.new }
 
   before do
-    PivoFlow::Base.any_instance.stub(:puts)
+    allow_any_instance_of(PivoFlow::Base).to receive(:puts)
+
     stub_git_config
     stub_base_methods(PivoFlow::Base)
   end
 
   it "raises exception if it's outside of git repo" do
-    PivoFlow::Base.any_instance.stub(:git_directory_present?).and_return(false)
-    expect{base}.to raise_error(PivoFlow::Errors::NoGitRepoFound)
+    allow_any_instance_of(PivoFlow::Base).to receive(:git_directory_present?)
+      .and_return(false)
+
+    expect{ base }.to raise_error(PivoFlow::Errors::NoGitRepoFound)
   end
 
   it "calls hook installation if it's needed" do
-    PivoFlow::Base.any_instance.stub(:git_hook_needed?).and_return(true)
-    PivoFlow::Base.any_instance.should_receive(:install_git_hook)
+    allow_any_instance_of(PivoFlow::Base).to receive(:git_hook_needed?).and_return(true)
+    allow_any_instance_of(PivoFlow::Base).to receive(:install_git_hook)
+
     base
   end
 
@@ -33,13 +37,13 @@ describe PivoFlow::Base do
 
     it "creates an executable prepare-commit-msg file" do
       base.install_git_hook
-      File.executable?(file_name).should be_true
+      expect(File.executable?(file_name)).to be_truthy
     end
 
     it "creates an executable pf-prepare-commit-msg file" do
       File.delete pf_file_name if File.exists? pf_file_name
       base.install_git_hook
-      File.executable?(pf_file_name).should be_true
+      expect(File.executable?(pf_file_name)).to be_truthy
     end
 
   end
@@ -47,15 +51,15 @@ describe PivoFlow::Base do
   describe "parses git config" do
 
     it "and returns project id" do
-      base.options["project-id"].should eq "123456"
+      expect(base.options["project-id"]).to eq "123456"
     end
 
     it "and returns api token" do
-      base.options["api-token"].should eq "testtesttesttesttesttesttesttest"
+      expect(base.options["api-token"]).to eq "testtesttesttesttesttesttesttest"
     end
 
     it "returns user name" do
-      base.user_name.should eq "Adam Newman"
+      expect(base.user_name).to eq "Adam Newman"
     end
 
   end
@@ -67,18 +71,16 @@ describe PivoFlow::Base do
         'pivo-flow.api-token' => nil,
         'pivo-flow.project-id' => nil}
         )
-      PivoFlow::Base.any_instance.stub(:git_config_ok?).and_return(false)
 
+      allow_any_instance_of(PivoFlow::Base).to receive(:git_config_ok?).and_return(false)
     end
 
     PivoFlow::Base::KEYS_AND_QUESTIONS.each do |key, value|
       it "changes #{key} value" do
-        PivoFlow::Base.any_instance.stub(:ask_question).and_return(key)
+        allow_any_instance_of(PivoFlow::Base).to receive(:ask_question).and_return(key)
         new_key = key.split(".").last
-        base.options[new_key].should eq key
+        expect(base.options[new_key]).to eq key
       end
     end
-
   end
-
 end

data/spec/pivo_flow/cli_spec.rb

@@ -4,7 +4,7 @@ describe PivoFlow::Cli do
 
   before(:each) do
     # we don't need cli output all over the specs
-    PivoFlow::Cli.any_instance.stub(:puts)
+    allow_any_instance_of(PivoFlow::Cli).to receive(:puts)
   end
 
   describe "with no args provided" do
@@ -12,7 +12,7 @@ describe PivoFlow::Cli do
     let(:command) { PivoFlow::Cli.new.go! }
 
     before(:each) do
-      PivoFlow::Cli.any_instance.should_receive(:no_method_error).and_return(true)
+      expect_any_instance_of(PivoFlow::Cli).to receive(:no_method_error).and_return(true)
     end
 
     it "calls no_method_error message " do
@@ -30,7 +30,7 @@ describe PivoFlow::Cli do
     let(:command) { PivoFlow::Cli.new("invalid_method_name").go! }
 
     before(:each) do
-      PivoFlow::Cli.any_instance.should_receive(:invalid_method_error)
+      expect_any_instance_of(PivoFlow::Cli).to receive(:invalid_method_error)
     end
 
     it "calls invalid_method_error message" do
@@ -44,11 +44,11 @@ describe PivoFlow::Cli do
   end
 
   describe "with valid command" do
-    cmd = "stories"
+    let(:cmd) { "stories" }
     let(:command) { PivoFlow::Cli.new(cmd).go! }
 
     before do
-      PivoFlow::Cli.any_instance.should_receive(cmd.to_sym)
+      expect_any_instance_of(PivoFlow::Cli).to receive(cmd.to_sym)
     end
 
     it "runs this command if it is public" do
@@ -58,44 +58,27 @@ describe PivoFlow::Cli do
     it "returns 0" do
       expect(command).to eq 0
     end
-
-  end
-
-  describe "reads story id from file" do
-
-    it "and returns nil if there is no such file" do
-      File.stub(:exists?).and_return(false)
-      PivoFlow::Cli.new.send(:current_story_id).should be_nil
-    end
-
-    it "and returns story id if file exists" do
-      File.stub(:exists?).and_return(true)
-      f = mock('File', :read => "123")
-      File.stub(:open).and_return(f)
-      PivoFlow::Cli.new.send(:current_story_id).should eq "123"
-    end
   end
 
   describe "finish method" do
-
     it "calls finish_story on pivotal object on finish method" do
-      pivo = mock("PivoFlow::Pivotal")
-      PivoFlow::Cli.any_instance.should_receive(:pivotal_object).and_return(pivo)
-      pivo.should_receive(:finish_story).with("123")
-      PivoFlow::Cli.any_instance.should_receive(:current_story_id).twice.and_return("123")
+      pivo = instance_double("PivoFlow::Pivotal")
+      expect_any_instance_of(PivoFlow::Cli).to receive(:pivotal_object).and_return(pivo)
+      expect(pivo).to receive(:finish_story).with("123")
+      expect_any_instance_of(PivoFlow::Cli).to receive(:current_story_id).twice.and_return("123")
       PivoFlow::Cli.new("finish").go!
     end
 
     it "returns 1 if there is no current_story_id" do
-      PivoFlow::Cli.any_instance.should_receive(:current_story_id).and_return(nil)
-      PivoFlow::Cli.new.send(:finish).should eq 1
+      expect_any_instance_of(PivoFlow::Cli).to receive(:current_story_id).and_return(nil)
+      expect(PivoFlow::Cli.new.send(:finish)).to eq 1
     end
   end
 
   describe "start method" do
 
     it "returns 1 if no story given" do
-      PivoFlow::Cli.new.send(:start).should eq 1
+      expect(PivoFlow::Cli.new.send(:start)).to eq 1
     end
 
   end
@@ -103,14 +86,14 @@ describe PivoFlow::Cli do
   describe "clear method" do
 
     it "returns 1 if current story is nil" do
-      PivoFlow::Cli.any_instance.should_receive(:current_story_id).and_return(nil)
-      PivoFlow::Cli.new.send(:clear).should eq 1
+      expect_any_instance_of(PivoFlow::Cli).to receive(:current_story_id).and_return(nil)
+      expect(PivoFlow::Cli.new.send(:clear)).to eq 1
     end
 
 
     it "removes file if current story is present" do
-      PivoFlow::Cli.any_instance.should_receive(:current_story_id).and_return(1)
-      FileUtils.should_receive(:remove_file).and_return(true)
+      expect_any_instance_of(PivoFlow::Cli).to receive(:current_story_id).and_return(1)
+      expect(FileUtils).to receive(:remove_file).and_return(true)
       PivoFlow::Cli.new.send(:clear)
     end
 
@@ -121,8 +104,8 @@ describe PivoFlow::Cli do
     methods = [:stories, :start, :info, :finish, :clear, :help, :reconfig, :current, :deliver]
     methods.each do |method|
       it "#{method.to_s}" do
-        PivoFlow::Cli.any_instance.stub(method)
-        PivoFlow::Cli.new(method.to_s).go!.should eq 0
+        allow_any_instance_of(PivoFlow::Cli).to receive(method)
+        expect(PivoFlow::Cli.new(method.to_s).go!).to eq 0
       end
     end
   end

data/spec/pivo_flow/pivotal_spec.rb

@@ -6,66 +6,68 @@ describe PivoFlow::Pivotal do
 
   before do
     stub_git_config
-    PivoFlow::Pivotal.any_instance.stub(:puts)
+
+    allow_any_instance_of(PivoFlow::Pivotal).to receive(:puts)
+
     stub_base_methods(PivoFlow::Pivotal)
   end
 
   describe "raises exception" do
     it "when project id is incorrect" do
       VCR.use_cassette(:pivotal_fetch_project_not_found) do
-        expect{pivotal.fetch_stories}.to raise_error(PivoFlow::Errors::UnsuccessfulPivotalConnection)
+        expect { pivotal.fetch_stories }
+          .to raise_error(PivoFlow::Errors::UnsuccessfulPivotalConnection)
       end
     end
 
     it "when api-token is incorrect (unauthorized)" do
       VCR.use_cassette(:pivotal_fetch_project_unauthorized) do
-        expect{pivotal.fetch_stories}.to raise_error(PivoFlow::Errors::UnsuccessfulPivotalConnection)
+        expect { pivotal.fetch_stories }
+          .to raise_error(PivoFlow::Errors::UnsuccessfulPivotalConnection)
       end
     end
-
   end
 
   describe "methods" do
-
     before(:each) do
       stub_pivotal_project
       pivotal.run
     end
 
     it "does not call pivotal upon run" do
-      pivotal.options[:project].should be_nil
+      expect(pivotal.options[:project]).to be_nil
     end
 
     it "calls pivotal when necessary" do
-      pivotal.should_receive(:ensure_project).once
+      expect(pivotal).to receive(:ensure_project).once
       pivotal.fetch_stories
     end
 
     it "does not call pivotal twice" do
-      PivotalTracker::Project.should_receive(:find).once
+      expect(PivotalTracker::Project).to receive(:find).once
       2.times { pivotal.fetch_stories }
     end
 
     it "user_stories takes only stories owned by current user" do
-      pivotal.user_stories.should eq [@story_feature]
+      expect(pivotal.user_stories).to eq [@story_feature]
     end
 
     it "unasigned_stories takes only stories with no user" do
-      pivotal.unasigned_stories.should eq [@story_unassigned]
+      expect(pivotal.unasigned_stories).to eq [@story_unassigned]
     end
 
     it "show_stories should display stories on output" do
-      pivotal.should_receive(:list_stories_to_output)
+      expect(pivotal).to receive(:list_stories_to_output)
       pivotal.show_stories
     end
 
     describe "story_string" do
 
       it "includes story id" do
-        pivotal.story_string(@story_feature).should match(/[##{@story_feature.id}]/)      end
+        expect(pivotal.story_string(@story_feature)).to match(/[##{@story_feature.id}]/)      end
 
       it "includes story name" do
-        pivotal.story_string(@story_feature).should match(/#{@story_feature.name}/)
+        expect(pivotal.story_string(@story_feature)).to match(/#{@story_feature.name}/)
       end
 
     end
@@ -73,9 +75,9 @@ describe PivoFlow::Pivotal do
     describe "deliver" do
 
       it "list only the stories with 'finished' status" do
-        pivotal.should_receive(:user_name).and_return(@story_finished.owned_by)
-        @project.stub_chain(:stories, :all).and_return([@story_finished])
-        pivotal.should_receive(:list_stories_to_output).with([@story_finished], "deliver")
+        expect(pivotal).to receive(:user_name).and_return(@story_finished.owned_by)
+        allow(@project).to receive_message_chain(:stories, :all).and_return([@story_finished])
+        expect(pivotal).to receive(:list_stories_to_output).with([@story_finished], "deliver")
         pivotal.deliver
       end
 
@@ -84,11 +86,11 @@ describe PivoFlow::Pivotal do
     describe "list_stories_to_output" do
 
       it "returns 1 if stories are nil" do
-        pivotal.list_stories_to_output(nil).should eq 1
+        expect(pivotal.list_stories_to_output(nil)).to eq 1
       end
 
       it "returns 1 if stories are []" do
-        pivotal.list_stories_to_output([]).should eq 1
+        expect(pivotal.list_stories_to_output([])).to eq 1
       end
 
     end
@@ -96,9 +98,9 @@ describe PivoFlow::Pivotal do
     describe "show_story" do
 
       after(:each) do
-        pivotal.stub(:show_stories)
+        allow(pivotal).to receive(:show_stories)
         # pivotal.stub(:update_story)
-        pivotal.stub(:show_info)
+        allow(pivotal).to receive(:show_info)
 
         pivotal.show_story 1
       end
@@ -106,41 +108,41 @@ describe PivoFlow::Pivotal do
       describe "if story's state is 'finished'" do
 
         before(:each) do
-          @story_feature.stub(:current_state).and_return("finished")
-          pivotal.stub(:ask_question).and_return("y")
+          allow(@story_feature).to receive(:current_state).and_return("finished")
+          allow(pivotal).to receive(:ask_question).and_return("y")
         end
 
         it "ask for deliver the story" do
-          pivotal.should_receive(:ask_question).with(/deliver/)
+          expect(pivotal).to receive(:ask_question).with(/deliver/)
         end
 
         it "updates story on pivotal with 'delivered' status" do
-          @story_feature.should_receive(:update).with({ owned_by: @story_feature.owned_by, current_state: :delivered })
+          expect(@story_feature).to receive(:update).with({ owned_by: @story_feature.owned_by, current_state: :delivered })
         end
 
       end
 
 
       it "shows info about the story" do
-        pivotal.stub(:ask_question).and_return("no")
-        pivotal.should_receive(:show_info)
+        allow(pivotal).to receive(:ask_question).and_return("no")
+        expect(pivotal).to receive(:show_info)
       end
 
       it "updates the story if user response is 'yes'" do
-        pivotal.stub(:ask_question).and_return("yes")
-        pivotal.should_receive(:update_story)
+        allow(pivotal).to receive(:ask_question).and_return("yes")
+        expect(pivotal).to receive(:update_story)
       end
 
       it "show stories if user response is 'no'" do
-        pivotal.stub(:ask_question).and_return("no")
-        pivotal.should_receive(:show_stories)
+        allow(pivotal).to receive(:ask_question).and_return("no")
+        expect(pivotal).to receive(:show_stories)
       end
     end
 
     describe "start_story" do
 
       before(:each) do
-        @story_feature.should_receive(:update).with({ current_state: :started, owned_by: pivotal.user_name })
+        expect(@story_feature).to receive(:update).with({ current_state: :started, owned_by: pivotal.user_name })
       end
 
       it "updates pivotal tracker" do
@@ -148,13 +150,12 @@ describe PivoFlow::Pivotal do
       end
 
       it "returns true on success" do
-        pivotal.start_story(@story_feature.id).should be_true
+        expect(pivotal.start_story(@story_feature.id)).to be_truthy
       end
-
     end
 
     it "show_info returns 1 if there is no story" do
-      @project.stub_chain(:stories, :all).and_return([])
+      allow(@project).to receive_message_chain(:stories, :all).and_return([])
       expect(pivotal.show_info).to eq 1
     end
 
@@ -168,47 +169,50 @@ describe PivoFlow::Pivotal do
 
 
       it "is the first of user's started stories" do
-        @project.stub_chain(:stories, :all).and_return([@users_story1, @users_story2])
+        allow(@project).to receive_message_chain(:stories, :all).and_return([@users_story1, @users_story2])
 
-        pivotal.current_story.should eq @users_story1
+        expect(pivotal.current_story).to eq @users_story1
       end
 
       it "is the first of user's stories if he has no started stories" do
-        @project.stub_chain(:stories, :all).and_return([@users_story3, @users_story4])
+        allow(@project).to receive_message_chain(:stories, :all).and_return([@users_story3, @users_story4])
 
-        pivotal.current_story.should eq @users_story3
+        expect(pivotal.current_story).to eq @users_story3
       end
 
       it "is nil if there is no stories assigned to user" do
-        @project.stub_chain(:stories, :all).and_return([])
-        pivotal.current_story.should be_nil
+        allow(@project).to receive_message_chain(:stories, :all).and_return([])
+        expect(pivotal.current_story).to be_nil
       end
 
     end
 
   end
 
-end
-
-def stub_pivotal_project
-  @project = PivotalTracker::Project.new(id: 123456, name: "testproject")
-  @story_feature = PivotalTracker::Story.new(
-    id: 1,
-    url: "http://www.pivotaltracker.com/story/show/1",
-    created_at: DateTime.now,
-    project_id: 123456,
-    name: "story no 1",
-    description: "story description",
-    story_type: "feature",
-    estimate: 3,
-    current_state: "started",
-    requested_by: "Paul Newman",
-    owned_by: "Adam Newman",
-    labels: "first,second")
-  @story_feature.stub_chain(:update).and_return(mock(errors: []))
-  @story_unassigned = PivotalTracker::Story.new(owned_by: nil, name: "test", current_state: "started")
-  @story_rejected = PivotalTracker::Story.new(current_state: "rejected", owned_by: "Mark Marco", name: "test_rejected")
-  @story_finished = PivotalTracker::Story.new(current_state: "finished", owned_by: "Mark Marco", name: "finished")
-  @project.stub_chain(:stories, :all).and_return([@story_feature, @story_unassigned, @story_rejected, @story_finished])
-  PivotalTracker::Project.stub(:find).and_return(@project)
+  def stub_pivotal_project
+    @project = PivotalTracker::Project.new(id: 123456, name: "testproject")
+
+    @story_feature = PivotalTracker::Story.new(
+      id: 1,
+      url: "http://www.pivotaltracker.com/story/show/1",
+      created_at: DateTime.now,
+      project_id: 123456,
+      name: "story no 1",
+      description: "story description",
+      story_type: "feature",
+      estimate: 3,
+      current_state: "started",
+      requested_by: "Paul Newman",
+      owned_by: "Adam Newman",
+      labels: "first,second"
+    )
+
+    allow(@story_feature).to receive_message_chain(:update).and_return(double(errors: []))
+    @story_unassigned = PivotalTracker::Story.new(owned_by: nil, name: "test", current_state: "started")
+    @story_rejected = PivotalTracker::Story.new(current_state: "rejected", owned_by: "Mark Marco", name: "test_rejected")
+    @story_finished = PivotalTracker::Story.new(current_state: "finished", owned_by: "Mark Marco", name: "finished")
+
+    allow(@project).to receive_message_chain(:stories, :all).and_return([@story_feature, @story_unassigned, @story_rejected, @story_finished])
+    allow(PivotalTracker::Project).to receive(:find).and_return(@project)
+  end
 end

data/spec/pivo_flow/state_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe PivoFlow::State do
+  describe "#current_story_id_file_path" do
+    before do
+      allow(PivoFlow::State).to receive(:current_branch_name) { "cool-branch" }
+    end
+
+    it "should return a path to a branch-based file name" do
+      expect(PivoFlow::State.current_story_id_file_path).to eq(
+        "#{Dir.pwd}/tmp/.pivo_flow/stories/cool-branch"
+      )
+    end
+  end
+
+  describe "#current_story_id" do
+    let(:tmp_file) { "#{Dir.pwd}/tmp/.pivo_flow/stories/cool-branch" }
+
+    before do
+      allow(PivoFlow::State).to receive(:current_branch_name) { "cool-branch" }
+
+      FileUtils.mkdir_p(PivoFlow::State.story_id_tmp_path)
+      File.write(tmp_file, "123456")
+    end
+
+    after { FileUtils.remove_file(tmp_file) }
+
+    it "should read it from the tmp file" do
+      expect(PivoFlow::State.current_story_id).to eq("123456")
+    end
+
+    it "should return nil if there's no file for it yet" do
+      allow(PivoFlow::State).to receive(:current_branch_name) { "different" }
+
+      expect(PivoFlow::State.current_story_id).to be_nil
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -12,18 +12,26 @@ VCR.configure do |c|
   c.cassette_library_dir = 'spec/pivo_flow/vcr_cassettes'
 end
 
-def stub_git_config(options = {})
-  git_options = {
-    "pivo-flow.api-token" => "testtesttesttesttesttesttesttest",
-    "pivo-flow.project-id" => "123456",
-    "user.name" => "Adam Newman"
-  }.merge options
-  Grit::Repo.stub!(:new).and_return mock('Grit::Repo', :config => git_options)
+module StubHelpers
+  def stub_git_config(options = {})
+    git_options = {
+      "pivo-flow.api-token" => "testtesttesttesttesttesttesttest",
+      "pivo-flow.project-id" => "123456",
+      "user.name" => "Adam Newman"
+    }.merge(options)
 
+    allow(Grit::Repo).to receive(:new) do
+      instance_double('Grit::Repo', config: git_options)
+    end
+  end
+
+  def stub_base_methods(klass)
+    allow_any_instance_of(klass).to receive(:git_hook_needed?) { false }
+    allow_any_instance_of(klass).to receive(:git_directory_present?) { true }
+    allow_any_instance_of(klass).to receive(:git_config_ok?) { true }
+  end
 end
 
-def stub_base_methods(klass)
- klass.any_instance.stub(:git_hook_needed?).and_return(false)
- klass.any_instance.stub(:git_directory_present?).and_return(true)
- klass.any_instance.stub(:git_config_ok?).and_return(true)
+RSpec.configure do |config|
+  config.include StubHelpers
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pivo_flow
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Adam Nowak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker
@@ -148,7 +148,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -161,11 +161,13 @@ files:
 - lib/pivo_flow/core_extensions.rb
 - lib/pivo_flow/errors.rb
 - lib/pivo_flow/pivotal.rb
+- lib/pivo_flow/state.rb
 - lib/pivo_flow/version.rb
 - pivo_flow.gemspec
 - spec/pivo_flow/base_spec.rb
 - spec/pivo_flow/cli_spec.rb
 - spec/pivo_flow/pivotal_spec.rb
+- spec/pivo_flow/state_spec.rb
 - spec/pivo_flow/vcr_cassettes/pivotal_fetch_project_not_found.yml
 - spec/pivo_flow/vcr_cassettes/pivotal_fetch_project_unauthorized.yml
 - spec/spec_helper.rb
@@ -188,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Simple pivotal tracker integration for day to day work with git
@@ -196,7 +198,7 @@ test_files:
 - spec/pivo_flow/base_spec.rb
 - spec/pivo_flow/cli_spec.rb
 - spec/pivo_flow/pivotal_spec.rb
+- spec/pivo_flow/state_spec.rb
 - spec/pivo_flow/vcr_cassettes/pivotal_fetch_project_not_found.yml
 - spec/pivo_flow/vcr_cassettes/pivotal_fetch_project_unauthorized.yml
 - spec/spec_helper.rb
-has_rdoc: 

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.2
-  - 1.9.3
-notifications:
-  email:
-    recipients:
-      - lubieniebieski@gmail.com