github-pivotal-flow 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 96f8e674edd44441caf0dd7f407730f55a171a3f
+  data.tar.gz: 97b78ad1be19763ce08bbedfec0b4b3794e906f6
+SHA512:
+  metadata.gz: d8036b44e6e88d57b2bfa537bdf51ebe9e83e5b5d1864f5915e246bdedc7bd9be19ee987c7a7d0a949dae5ecdf7fbf0c448c5c28e15396cf6ca449488d49e09e
+  data.tar.gz: a213f34c076c60a34debc78964cf218a9853370d437e3b7151f6dfd3b39c525ed45aff464cd44c62da559a9ae19a778a06bfc7303009b108cec8b8e46cef59a1

data/lib/github_pivotal_flow/configuration.rb

@@ -58,6 +58,15 @@ module GithubPivotalFlow
     # @return [PivotalTracker::Story] the story associated with the current development branch
     def story(project)
       story_id = Git.get_config(KEY_STORY_ID, :branch)
+      if story_id.blank? && (matchdata = /^[a-z0-9_\-]+\/(\d+)(-[a-z0-9_\-]+)?$/i.match(Git.current_branch))
+        story_id = matchdata[1]
+        Git.set_config(KEY_STORY_ID, story_id, :branch) unless story_id.blank?
+      end
+      if story_id.blank?
+        story_id = ask('What Pivotal story ID is this branch associated with?').strip
+        Git.set_config(KEY_STORY_ID, story_id, :branch) unless story_id.blank?
+      end
+      return nil if story_id.blank?
       Story.new(project.stories.find(story_id.to_i), :branch_name => Git.current_branch)
     end
 

data/lib/github_pivotal_flow/git.rb

@@ -126,7 +126,9 @@ module GithubPivotalFlow
     def self.add_hook(name, source, overwrite = false)
       hooks_directory =  File.join repository_root, '.git', 'hooks'
       hook = File.join hooks_directory, name
-
+      puts "Overwrite: #{overwrite}"
+      puts "Hook: #{hook}"
+      puts "File.exists?: #{File.exist?(hook)}"
       if overwrite || !File.exist?(hook)
         print "Creating Git hook #{name}...  "
 

data/spec/github_pivotal_flow/configuration_spec.rb

@@ -54,17 +54,49 @@ module GithubPivotalFlow
       @configuration.story = Story.new(PivotalTracker::Story.new(:id => 12345678))
     end
 
-    it 'return a story when requested' do
-      project = double('project')
-      stories = double('stories')
-      story = double('story')
-      Git.should_receive(:get_config).with('pivotal-story-id', :branch).and_return('12345678')
-      project.should_receive(:stories).and_return(stories)
-      stories.should_receive(:find).with(12345678).and_return(story)
+    describe 'story' do
+      it 'fetches the story based on the story id stored inside the git config' do
+        project = double('project')
+        stories = double('stories')
+        story = double('story')
+        Git.should_receive(:get_config).with('pivotal-story-id', :branch).and_return('12345678')
+        project.should_receive(:stories).and_return(stories)
+        stories.should_receive(:find).with(12345678).and_return(story)
+
+        result = @configuration.story project
+
+        expect(result.story).to eq(story)
+      end
+
+      it 'uses the branch name to deduce the story id if no git config is found' do
+        project = double('project')
+        stories = double('stories')
+        story = double('story')
+        Git.stub(:current_branch).and_return('feature/12345678-sample_feature')
+        Git.should_receive(:get_config).with('pivotal-story-id', :branch).and_return(' ')
+        project.should_receive(:stories).and_return(stories)
+        stories.should_receive(:find).with(12345678).and_return(story)
 
-      result = @configuration.story project
+        result = @configuration.story project
+
+        expect(result.story).to eq(story)
+      end
 
-      expect(result).to be_a(Story)
+      it 'prompts for the story id if the branch name does not match the known format' do
+        project = double('project')
+        stories = double('stories')
+        story = double('story')
+        Git.stub(:current_branch).and_return('unknownformat')
+        Git.should_receive(:get_config).with('pivotal-story-id', :branch).and_return(' ')
+        @configuration.should_receive(:ask).and_return('12345678')
+        Git.should_receive(:set_config).with('pivotal-story-id', '12345678', :branch)
+        project.should_receive(:stories).and_return(stories)
+        stories.should_receive(:find).with(12345678).and_return(story)
+
+        result = @configuration.story project
+
+        expect(result.story).to eq(story)
+      end
     end
 
     describe 'github_project' do

data/spec/github_pivotal_flow/git_spec.rb

@@ -4,164 +4,183 @@ module GithubPivotalFlow
   describe Git do
 
     before do
-      $stdout = StringIO.new
-      $stderr = StringIO.new
+      #$stdout = StringIO.new
+      #$stderr = StringIO.new
     end
 
-    it 'should return the current branch name' do
-      Shell.should_receive(:exec).with('git branch', true).and_return("   master\n * dev_branch")
+    describe '.current_branch' do
+      it 'returns the current branch name' do
+        Shell.should_receive(:exec).with('git branch', true).and_return("   master\n * dev_branch")
 
-      current_branch = Git.current_branch
+        current_branch = Git.current_branch
 
-      expect(current_branch).to eq('dev_branch')
+        expect(current_branch).to eq('dev_branch')
+      end
     end
 
-    it 'should return the repository root' do
-      Dir.mktmpdir do |root|
-        child_directory = File.expand_path 'child', root
-        Dir.mkdir child_directory
+    describe '.repository_root' do
+      it 'returns the repository root' do
+        Dir.mktmpdir do |root|
+          child_directory = File.expand_path 'child', root
+          Dir.mkdir child_directory
 
-        git_directory = File.expand_path '.git', root
-        Dir.mkdir git_directory
+          git_directory = File.expand_path '.git', root
+          Dir.mkdir git_directory
 
-        Dir.should_receive(:pwd).and_return(child_directory)
+          Dir.should_receive(:pwd).and_return(child_directory)
 
-        repository_root = Git.repository_root
+          repository_root = Git.repository_root
 
-        expect(repository_root).to eq(root)
+          expect(repository_root).to eq(root)
+        end
       end
-    end
 
-    it 'should raise an error there is no repository root' do
-      Dir.mktmpdir do |root|
-        child_directory = File.expand_path 'child', root
-        Dir.mkdir child_directory
+      it 'raises an error if there is no repository root' do
+        Dir.mktmpdir do |root|
+          child_directory = File.expand_path 'child', root
+          Dir.mkdir child_directory
 
-        Dir.should_receive(:pwd).and_return(child_directory)
+          Dir.should_receive(:pwd).and_return(child_directory)
 
-        expect { Git.repository_root }.to raise_error
+          expect { Git.repository_root }.to raise_error
+        end
       end
     end
 
-    it 'should get configuration 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')
+    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')
 
-      value = Git.get_config 'test_key', :branch
+        value = Git.get_config 'test_key', :branch
 
-      expect(value).to eq('test_value')
-    end
+        expect(value).to eq('test_value')
+      end
 
-    it 'should get configuration when :inherited scope is specified' do
-      Shell.should_receive(:exec).with('git config test_key', false).and_return('test_value')
+      it 'gets configuration when :inherited scope is specified' do
+        Shell.should_receive(:exec).with('git config test_key', false).and_return('test_value')
 
-      value = Git.get_config 'test_key', :inherited
+        value = Git.get_config 'test_key', :inherited
 
-      expect(value).to eq('test_value')
-    end
+        expect(value).to eq('test_value')
+      end
 
-    it 'should raise an error when an unknown scope is specified (get)' do
-      expect { Git.get_config 'test_key', :unknown }.to raise_error
+      it 'raises an error when an unknown scope is specified (get)' do
+        expect { Git.get_config 'test_key', :unknown }.to raise_error
+      end
     end
 
-    it 'should set 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)
+    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)
 
-      Git.set_config 'test_key', 'test_value', :branch
-    end
+        Git.set_config 'test_key', 'test_value', :branch
+      end
 
-    it 'should set configuration when :global scope is specified' do
-      Shell.should_receive(:exec).with('git config --global test_key test_value', true)
+      it 'sets configuration when :global scope is specified' do
+        Shell.should_receive(:exec).with('git config --global test_key test_value', true)
 
-      Git.set_config 'test_key', 'test_value', :global
-    end
+        Git.set_config 'test_key', 'test_value', :global
+      end
 
-    it 'should set configuration when :local scope is specified' do
-      Shell.should_receive(:exec).with('git config --local test_key test_value', true)
+      it 'sets configuration when :local scope is specified' do
+        Shell.should_receive(:exec).with('git config --local test_key test_value', true)
 
-      Git.set_config 'test_key', 'test_value', :local
-    end
+        Git.set_config 'test_key', 'test_value', :local
+      end
 
-    it 'should raise an error when an unknown scope is specified (set)' do
-      expect { Git.set_config 'test_key', 'test_value', :unknown }.to raise_error
+      it 'raises an error when an unknown scope is specified (set)' do
+        expect { Git.set_config 'test_key', 'test_value', :unknown }.to raise_error
+      end
     end
 
-    it 'should create a branch and set the root_branch and root_remote properties on it' do
-      Git.stub(:current_branch).and_return('master')
-      Shell.should_receive(:exec).with('git branch --quiet dev_branch', true)
-
-      Git.create_branch 'dev_branch'
+    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)
+        Git.create_branch 'dev_branch'
+      end
     end
 
-    it 'should not add a hook if it already exists' do
-      Dir.mktmpdir do |root|
-        Git.should_receive(:repository_root).and_return(root)
-        hook = "#{root}/.git/hooks/prepare-commit-msg"
-        File.should_receive(:exist?).with(hook).and_return(true)
+    #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)
+          hook = "#{root}/.git/hooks/prepare-commit-msg"
+          File.should_receive(:exists?).with(hook).and_return(true)
 
-        Git.add_hook 'prepare-commit-msg', __FILE__
-
-        File.should_receive(:exist?).and_call_original
-        expect(File.exist?(hook)).to be_false
+          Git.add_hook 'prepare-commit-msg', __FILE__
+          File.should_receive(:exist?).and_call_original
+          expect(File.exist?(hook)).to be_false
+        end
       end
-    end
 
-    it 'should add a hook if it does not exist' do
-      Dir.mktmpdir do |root|
-        Git.should_receive(:repository_root).and_return(root)
-        hook = "#{root}/.git/hooks/prepare-commit-msg"
-        File.should_receive(:exist?).with(hook).and_return(false)
+      it 'adds a hook if it does not exist' do
+        Dir.mktmpdir do |root|
+          Git.should_receive(:repository_root).and_return(root)
+          hook = "#{root}/.git/hooks/prepare-commit-msg"
+          File.should_receive(:exist?).with(hook).and_return(false)
 
-        Git.add_hook 'prepare-commit-msg', __FILE__
+          Git.add_hook 'prepare-commit-msg', __FILE__
 
-        File.should_receive(:exist?).and_call_original
-        expect(File.exist?(hook)).to be_true
+          File.should_receive(:exist?).and_call_original
+          expect(File.exist?(hook)).to be_true
+        end
       end
-    end
 
-    it 'should add a hook if it already exists and overwrite is true' do
-      Dir.mktmpdir do |root|
-        Git.should_receive(:repository_root).and_return(root)
-        hook = "#{root}/.git/hooks/prepare-commit-msg"
+      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)
+          hook = "#{root}/.git/hooks/prepare-commit-msg"
 
-        Git.add_hook 'prepare-commit-msg', __FILE__, true
+          Git.add_hook 'prepare-commit-msg', __FILE__, true
 
-        File.should_receive(:exist?).and_call_original
-        expect(File.exist?(hook)).to be_true
+          File.should_receive(:exist?).and_call_original
+          expect(File.exist?(hook)).to be_true
+        end
       end
     end
 
-    it 'should merge and delete branches' do
-      Shell.should_receive(:exec).with("git merge --quiet --no-ff -m \"Merge development_branch to master\" development_branch", true)
+    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)
 
-      Git.merge 'development_branch', commit_message: 'Merge development_branch to master', no_ff: true
+        Git.merge 'development_branch', commit_message: 'Merge development_branch to master', no_ff: true
+      end
     end
 
-    it 'should push changes without refs' do
-      Git.should_receive(:get_config).with('remote', :branch).and_return('origin')
-      Shell.should_receive(:exec).with('git push --quiet origin ', true)
+    describe '.push' do
+      it 'pushes changes back to the origin without refs' do
+        Git.should_receive(:get_config).with('remote', :branch).and_return('origin')
+        Shell.should_receive(:exec).with('git push --quiet origin ', true)
 
-      Git.push
-    end
+        Git.push
+      end
 
-    it 'should push changes with refs' do
-      Git.should_receive(:get_config).with('remote', :branch).and_return('origin')
-      Shell.should_receive(:exec).with('git push --quiet origin foo bar', true)
+      it 'pushes changes back to the origin with refs' do
+        Git.should_receive(:get_config).with('remote', :branch).and_return('origin')
+        Shell.should_receive(:exec).with('git push --quiet origin foo bar', true)
 
-      Git.push 'foo', 'bar'
+        Git.push 'foo', 'bar'
+      end
     end
 
-    it 'should create a commit' do
-      Shell.should_receive(:exec).with("git commit --quiet --allow-empty -m \"test_message\"", true)
+    describe '.commit' do
+      it 'creates a commit' do
+        Shell.should_receive(:exec).with("git commit --quiet --allow-empty -m \"test_message\"", true)
 
-      Git.commit commit_message: 'test_message', allow_empty: true
+        Git.commit commit_message: 'test_message', allow_empty: true
+      end
     end
 
-    it 'should create a tag' do
-      Shell.should_receive(:exec).with('git tag 1.0.0.RELEASE', true)
+    describe '.tag' do
+      it 'creates a tag' do
+        Shell.should_receive(:exec).with('git tag 1.0.0.RELEASE', true)
 
-      Git.tag '1.0.0.RELEASE'
+        Git.tag '1.0.0.RELEASE'
+      end
     end
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: github-pivotal-flow
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Donald Piret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,20 +133,20 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- bin/git-finish
+- bin/git-start
 - lib/core_ext/object/blank.rb
+- lib/github_pivotal_flow.rb
 - lib/github_pivotal_flow/command.rb
 - lib/github_pivotal_flow/configuration.rb
 - lib/github_pivotal_flow/finish.rb
 - lib/github_pivotal_flow/git.rb
 - 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/shell.rb
 - lib/github_pivotal_flow/start.rb
 - lib/github_pivotal_flow/story.rb
-- lib/github_pivotal_flow.rb
-- lib/github_pivotal_flow/prepare-commit-msg.sh
-- bin/git-finish
-- bin/git-start
 - spec/github_pivotal_flow/configuration_spec.rb
 - spec/github_pivotal_flow/finish_spec.rb
 - spec/github_pivotal_flow/git_spec.rb
@@ -173,27 +156,26 @@ files:
 homepage: https://github.com/roomorama/github-pivotal-flow
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Git commands for integration with Pivotal Tracker and Github pull requests
 test_files:
 - spec/github_pivotal_flow/configuration_spec.rb