git-storyid 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea0c96c0cc6afc52210c376d0c46ed4e58ce27f4
-  data.tar.gz: 958cd9d0871e7a71dd45ae14f3585bcd6c3236d1
+  metadata.gz: 757a81b3f19ee8d91bc9db03cf31703b37497aed
+  data.tar.gz: 8d066a7703fc70bd9bc87870aac767e3f013f7b2
 SHA512:
-  metadata.gz: 330859df25358888f7f78bf48b003d9abe3003ac291e7c9bbd8ed2c5a0a9eabc2227b8a5c05dd3ba07c828f5fca8d0155fb22ef40b1f037533b59528f28ae098
-  data.tar.gz: 49ddd88705a4466a6facf5bf9c48e9bf94e38c1269fe8b5dd5d4466212f7ce26044a4997a0e2368fed1604d02a78fcda0d5b1cc5975fe2a7342250e4c7e5f2d5
+  metadata.gz: 5bf8479a6b9f94c9e8e92639511268525e56d7fd4b0b6ee8bb2c617a5176276d734d8167fb5bc6e6e85f1ff251e2c5d655ced3ae2d232b7cfe4552be962116fb
+  data.tar.gz: c83427661cfe8e12cec738c976d4083b791be0c24f1d349f6440a56a81f8fe2c808b9a635c5a6af3af0e647595a53dfd233764a26a0224d9a50f2bb7a1484fc2

data/Gemfile.lock

@@ -38,7 +38,7 @@ GEM
       nokogiri (~> 1.4)
       rest-client (~> 1.6.0)
       rest-client (~> 1.6.0)
-    rake (10.2.2)
+    rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
     rest-client (1.6.7)

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/git-storyid.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: git-storyid 0.3.2 ruby lib
+# stub: git-storyid 0.3.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-storyid"
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2014-04-14"
+  s.date = "2015-02-06"
   s.description = "Helps include pivotal story id and description in commit"
   s.email = "agresso@gmail.com"
   s.executables = ["git-storyid"]
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/bogdan/git-storyid"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.5"
   s.summary = "Attach commits to pivotal stories"
 
   if s.respond_to? :specification_version then

data/lib/git_storyid.rb

@@ -17,6 +17,9 @@ class GitStoryid
       opts.on("-m", "--message [MESSAGE]", "Add addional MESSAGE to comit") do |custom_message|
         @custom_message = custom_message
       end
+      opts.on("-f", "--finish", "Specify that this commit finishes a story or fixes a bug") do 
+        @finish_stories = true
+      end
     end
     parser.parse!(arguments)
 
@@ -40,7 +43,12 @@ class GitStoryid
       quit_if_no_stories
       output stories_menu
       @stories = readline_story_ids.map do |index|
-        all_stories[index - 1] || (quit("Story index #{index} not found."))
+        if index > 1_000_000
+          # Consider it a direct story id
+          Configuration.project.stories.find(index)
+        else
+          all_stories[index - 1] || (quit("Story index #{index} not found."))
+        end
       end
     end
   end
@@ -92,15 +100,24 @@ class GitStoryid
   end
 
   def build_commit_message
-    message = ("[#{@stories.map { |s| "\##{s.id}"}.join(", ")}]").rjust 12
-    message += ' '
+    message = @stories.map do |story|
+      "#{finish_story_prefix(story)}##{story.id}"
+    end.join(", ")
+    message = "[#{message}] "
     if @custom_message && !@custom_message.empty?
       message += @custom_message.to_s + "\n\n"
     end
-    message += @stories.map {|s| "#{s.story_type.capitalize}: " + s.name.strip}.join("\n\n")
+    message += @stories.map do |story|
+      "#{story.story_type.capitalize}: " + story.name.strip
+    end.join("\n\n")
     message
   end
 
+  def finish_story_prefix(story)
+    return "" unless @finish_stories
+    story.story_type == "bug" ? "Fixes " : "Finishes "
+  end
+
   def execute(*args)
     Open3.popen3(*args) {|i, o| return o.read }
   end

data/spec/git_storyid_spec.rb

@@ -102,15 +102,11 @@ describe GitStoryid do
   end
 
   context "when stories exists" do
-    
-    before(:each) do
-
-      GitStoryid.any_instance.stubs(:readline).returns('1')
-    end
 
     it "should commit changes" do
+      GitStoryid.any_instance.stubs(:readline).returns('1')
       run("-m",  'Hello world')
-      commands.should include(["git", "commit", "-m", " [#44647731] Hello world\n\nFeature: Strip Default paypal credentials"])
+      commands.should include(["git", "commit", "-m", "[#44647731] Hello world\n\nFeature: Strip Default paypal credentials"])
     end
 
     it "should render stories menu correctly" do
@@ -120,6 +116,21 @@ describe GitStoryid do
 
 EOI
     end
+
+    it "should commit to multiple stories" do
+      GitStoryid.any_instance.stubs(:readline).returns('1,2')
+      run("-m",  'Hello world')
+      commands.should include(
+        ["git", "commit", "-m",
+          "[#44647731, #44647732] Hello world\n\nFeature: Strip Default paypal credentials\n\nFeature: Require pro paypal account for mass payments"]
+      )
+    end
+
+    it "should support finishing" do
+      GitStoryid.any_instance.stubs(:readline).returns('1')
+      run('-f')
+      commands.should include(["git", "commit", "-m", "[Finishes #44647731] Feature: Strip Default paypal credentials"])
+    end
   end
 
   it "should quit if no stories specified" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-storyid
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Attach commits to pivotal stories