pivotal_tracker_pr 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9c3e9901c795695f1626f9b9a511ae70ea08557
-  data.tar.gz: 3a053c2ac7bb181918a6c7c74b4a4ee844e8f946
+  metadata.gz: b31214a83e3747a65c01fc9bdce4d4ea2399eeaa
+  data.tar.gz: 07176180c76bc00aa6913482b1ca4269673ed41f
 SHA512:
-  metadata.gz: fce63427146fc9e5a2f831b6d60d2d38f1d0c5b5966fc19429eb863a8fef23b7cb107032d4656c582e47bb6fd5e0f990cac37216ca1fc451a6bc86c97ce99bbf
-  data.tar.gz: ab00cfb57aab45211347a390bf698e2c444a0f8ad4f2c4e49ce0a4fe2b3d2dd8cea3532b6eb44bd87cfc9f43a000770f324b86b9ccfc9e7cbff6abb5cfb6b8ef
+  metadata.gz: b8a2f590cbe8025bdc1c4e494448ca54577bc80d22983e186e81f86539c82ca2386135d4441155f218d3d62b0e2a6477aa6cd10aee439e4a3777c1946bd82987
+  data.tar.gz: 7984823b003c0254d33b4f86202202f5075c66c640b3e2e2821e05b1b0da05717bfeafa909a0527f8841b9e1c346088d667e04b640386186cb76484c2763aae0

data/lib/pivotal_tracker_pr/cli.rb

@@ -4,7 +4,8 @@ require 'net/http'
 require 'thor'
 
 module PivotalTrackerPr
-  PULL_REQUEST_TEMPLATE = 'PULLREQ_EDITMSG'.freeze
+  PULL_REQUEST_MESSAGE = 'PULLREQ_EDITMSG'.freeze
+  MESSAGE_TEMPLATE = 'PULLREQ_MSG_TEMPLATE'.freeze
 
   class CLI < Thor
     desc 'create', 'Generate pull request use story id / story name.'
@@ -21,7 +22,6 @@ module PivotalTrackerPr
         write_pull_request_template story_id, story_name
       end
 
-      say 'Done.'
       system 'hub pull-request --browse'
     end
 
@@ -61,15 +61,34 @@ module PivotalTrackerPr
     end
 
     def write_pull_request_template(story_id, story_name)
-      open(template_path, 'w') do |file|
-        file.puts "[fixed ##{story_id}]#{story_name}"
-        file.puts "\n"
-        file.puts "https://www.pivotaltracker.com/story/show/#{story_id}"
+      message_context = if File.exists?(message_template_path)
+        message_from_template(story_id, story_name)
+      else
+        default_message
       end
+
+      open(pull_request_message, 'w') { |file| file.puts message_context }
+    end
+
+    def message_template_path
+      File.join(Dir.pwd, '.git', MESSAGE_TEMPLATE)
+    end
+
+    def message_from_template(story_id, story_name)
+      template_content = File.open(message_template_path).read
+      template_content.gsub('{{STORY_ID}}', story_id).gsub('{{STORY_NAME}}')
+    end
+
+    def pull_request_message
+      File.join(Dir.pwd, '.git', PULL_REQUEST_MESSAGE)
     end
 
-    def template_path
-      File.join(Dir.pwd, '.git', PULL_REQUEST_TEMPLATE)
+    def default_message(story_id, story_name)
+      <<~EOF
+        "[fixed ##{story_id}]#{story_name}"
+        "\n"
+        "https://www.pivotaltracker.com/story/show/#{story_id}"
+      EOF
     end
   end
 end

data/lib/pivotal_tracker_pr/version.rb

@@ -1,3 +1,3 @@
 module PivotalTrackerPr
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pivotal_tracker_pr
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - blueplanet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler