github-pivotal-flow 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9b610ee742c48034c61dea914dda07d41e01ad3
-  data.tar.gz: 036cd8c69558626b705bc11fbf8eca6112a31862
+  metadata.gz: 1f48c6c6681d452bc95ae8070df768f9eb197630
+  data.tar.gz: 3477460091811610ce0bb27b5f37586955be40d6
 SHA512:
-  metadata.gz: 32a04dadb71f5408229e4fba7067283d7181438ca298c2e6fe070669db7d45c0b1f5eb2588af45f7f59c07f754001f37a48ed6744acfe027e11e31e8f4e276fd
-  data.tar.gz: 98b3862a4c10d87e2dac080b62eff22e52df789ff5e70fd18640db09d86b39f5225ebeea03b848c053935b7c6ae71bb9097e7b804e5952eae69d075caee22b2e
+  metadata.gz: b575b85c76b662a4c5507ea1f6a6c161bc6c0e441c53c7d8b413ee8720329208df7a5022a99a28f6af6ff70db8be80831f78f82c87764fb52ae07dfb6ef18efb
+  data.tar.gz: 495535b82f4a6d85989a07e8b80594f5cce8fde4c41e54ec0243c5ab7b718309071d868dd8f85ccc14ee078a69b47727c4467519af72a6dbd34f3f89a6b0113a

data/README.md

@@ -24,7 +24,7 @@ $ gem install github-pivotal-flow
 The typical workflow looks something like the following:
 
 ```plain
-$ git start       # Creates branch, opens a pull request on Github and starts story
+$ git start       # Creates branch from your [development] branch and starts story
 $ git commit ...
 $ git commit ...  # Your existing development process
 $ git commit ...
@@ -46,7 +46,6 @@ In order to use `github-pivotal-flow`, a few Git client configuration properties
 | `gitflow.branch.development` | The Git-flow development branch name. The branch that is commonly used for your development.
 | `gitflow.prefix.feature` | Git-flow feature branch name prefix.
 | `gitflow.prefix.hotfix` | Git-flow hotfix branch name prefix.
-| `gitflow.prefix.feature` | Git-flow feature branch name prefix.
 | `gitflow.prefix.release` | Git-flow release branch name prefix.
 
 [profile]: https://www.pivotaltracker.com/profile

data/lib/github_pivotal_flow/git.rb

@@ -171,9 +171,9 @@ module GithubPivotalFlow
     end
 
     def self.clean_working_tree?
-      exec("git diff --no-ext-diff --ignore-submodules --quiet --exit-code", false)
+      system("git diff --no-ext-diff --ignore-submodules --quiet --exit-code")
       fail("fatal: Working tree contains unstaged changes. Aborting.") if $?.exitstatus != 0
-      exec("git diff-index --cached --quiet --ignore-submodules HEAD --", false)
+      system("git diff-index --cached --quiet --ignore-submodules HEAD --")
       fail("fatal: Index contains uncommited changes. Aborting.") if $?.exitstatus != 0
       return true
     end

data/lib/github_pivotal_flow/project.rb

@@ -12,7 +12,7 @@ module GithubPivotalFlow
         instance_variable_set("@#{k}", v) unless v.nil?
       end
       url = Git.get_config("remote.#{Git.get_remote}.url")
-      if (matchdata = /^git@([a-z0-9\._-]+):([a-z0-9_-]+)\/([a-z0-9_-]+)(\.git)?$/.match(url.strip))
+      if (matchdata = /^git@([a-z0-9\._-]+):([a-z0-9_-]+)\/([a-z0-9_-]+)(\.git)?$/i.match(url.strip))
         self.host ||= matchdata[1]
         self.owner ||= matchdata[2]
         self.name ||= matchdata[3]
@@ -45,4 +45,4 @@ module GithubPivotalFlow
       return pivotal_project.send(m, *args, &block)
     end
   end
-end
+end

data/lib/github_pivotal_flow/story.rb

@@ -9,6 +9,8 @@ module GithubPivotalFlow
     # @param [PivotalTracker::Story] story the story to pretty print
     # @return [void]
     def self.pretty_print(story)
+      print_label LABEL_ID
+      print_value story.id
       print_label LABEL_TITLE
       print_value story.name
 
@@ -217,6 +219,7 @@ module GithubPivotalFlow
     private
     CANDIDATE_STATES = %w(rejected unstarted unscheduled).freeze
     LABEL_DESCRIPTION = 'Description'.freeze
+    LABEL_ID = 'ID'.freeze
     LABEL_TITLE = 'Title'.freeze
     LABEL_WIDTH = (LABEL_DESCRIPTION.length + 2).freeze
     CONTENT_WIDTH = (HighLine.new.output_cols - LABEL_WIDTH).freeze
@@ -226,10 +229,10 @@ module GithubPivotalFlow
     end
 
     def self.print_value(value)
-      if value.nil? || value.empty?
+      if value.blank?
         puts ''
       else
-        value.scan(/\S.{0,#{CONTENT_WIDTH - 2}}\S(?=\s|$)|\S+/).each_with_index do |line, index|
+        value.to_s.scan(/\S.{0,#{CONTENT_WIDTH - 2}}\S(?=\s|$)|\S+/).each_with_index do |line, index|
           if index == 0
             puts line
           else

data/lib/github_pivotal_flow/version.rb

@@ -1,3 +1,3 @@
 module GithubPivotalFlow
-  VERSION = '1.2'
+  VERSION = '1.3'
 end

data/spec/github_pivotal_flow/configuration_spec.rb

@@ -119,6 +119,14 @@ module GithubPivotalFlow
         expect(project.owner).to eq('roomorama')
         expect(project.name).to eq('github-pivotal-flow')
       end
+
+      it 'supports working with git urls with uppercase letters from the configuration' do
+        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')
+      end
     end
   end
 end

data/spec/github_pivotal_flow/story_spec.rb

@@ -20,42 +20,45 @@ module GithubPivotalFlow
     describe '.pretty_print' do
       it 'pretty-prints story information' do
         story = double('story')
+        expect(story).to receive(:id).and_return(135468)
         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
 
-        expect($stdout.string).to eq(
+        expect($stdout.string).to eq( "         ID: 135468\n" +
                                       "      Title: \n" +
-                                          "Description: description-1\n" +
-                                          "             description-2\n" +
-                                          "     Note 1: note-1\n" +
-                                          "\n")
+                                      "Description: description-1\n" +
+                                      "             description-2\n" +
+                                      "     Note 1: note-1\n" +
+                                      "\n")
       end
 
       it 'does not pretty print description or notes if there are none (empty)' do
         story = double('story')
+        expect(story).to receive(:id).and_return(135468)
         expect(story).to receive(:name)
         expect(story).to receive(:description)
         expect(PivotalTracker::Note).to receive(:all).and_return([])
 
         Story.pretty_print story
 
-        expect($stdout.string).to eq(
+        expect($stdout.string).to eq( "         ID: 135468\n" +
                                       "      Title: \n" +
                                           "\n")
       end
 
       it 'does not pretty print description or notes if there are none (nil)' do
         story = double('story')
+        expect(story).to receive(:id).and_return(135468)
         expect(story).to receive(:name)
         expect(story).to receive(:description).and_return('')
         expect(PivotalTracker::Note).to receive(:all).and_return([])
 
         Story.pretty_print story
 
-        expect($stdout.string).to eq(
+        expect($stdout.string).to eq( "         ID: 135468\n" +
                                       "      Title: \n" +
                                           "\n")
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-pivotal-flow
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Donald Piret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Git commands for integration with Pivotal Tracker and Github pull requests
@@ -220,4 +220,3 @@ test_files:
 - spec/github_pivotal_flow/shell_spec.rb
 - spec/github_pivotal_flow/start_spec.rb
 - spec/github_pivotal_flow/story_spec.rb
-has_rdoc: