git-redmine-commit 0.7.0 → 0.8.0

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/git-redmine-commit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-redmine-commit}
-  s.version = "0.7.0"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robin Lu"]
-  s.date = %q{2011-05-26}
+  s.date = %q{2012-12-01}
   s.default_executable = %q{git-redmine-commit}
   s.description = %q{With this tool, you can do a git commit with a redmine issue id. The message of the commit is filled with the title of the issue automatically.}
   s.email = %q{iamawalrus@gmail.com}
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/robin/git-redmine-commit}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{git commit with redmine issue id}
   s.test_files = [
     "test/helper.rb",
@@ -43,7 +43,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/git-redmine-commit.rb

@@ -10,10 +10,13 @@ require 'ostruct'
 
 require 'rubygems'
 require 'xmlsimple'
+require 'erb'
 
 class GitRedmineCommit  
   defaults = {}
   REDMINECOMMIT_RC = File.join("#{ENV['HOME']}",".redmine_commit_rc")
+  REDMINECOMMIT_TEMPLATE = File.join("#{ENV['HOME']}",".redmine_commit_template")
+  
   GRC_CONFIG = if File.exist?(REDMINECOMMIT_RC)
             defaults.merge(YAML.load_file(REDMINECOMMIT_RC))
           else
@@ -73,6 +76,15 @@ class GitRedmineCommit
     end    
   end
   
+  def message_template
+    template_src = if File.file?(REDMINECOMMIT_TEMPLATE)
+      open(REDMINECOMMIT_TEMPLATE) {|f| f.read}
+    else
+      "#<%= issue_id %>:<%= issue_subject %>\n"
+    end
+    ERB.new template_src
+  end
+  
   def run
     git_repo = @options[:repo]
     unless @options[:key] && @options[:url]
@@ -84,11 +96,18 @@ class GitRedmineCommit
     
     url = File.join(@options[:url], "issues", "#{@options[:issue_id]}.xml?key=#{@options[:key]}")
     issue = XmlSimple.xml_in(open(url).read)
-    title = "fix issue ##{issue['id']} : #{issue['subject']}" 
+    issue_id = issue['id']
+    issue_subject = issue['subject']
+    title = message_template.result(binding)
     temp = Tempfile.new('redmine_commit')
     temp << title
     temp.close
-    puts `git commit #{@options[:git_options]} -F #{temp.path}`
+    
+    commit_template = `git config --get commit.template`
+    `git config commit.template #{temp.path}`    
+    system "git commit #{@options[:git_options]}"
+    system "git config --unset commit.template"
+    `git config commit.template #{commit_template}` if commit_template && commit_template.size > 0
   end
 
   def get_config(git_repo)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-redmine-commit
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 63
+  prerelease: 
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Robin Lu
@@ -15,11 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 +08:00
+date: 2012-12-01 00:00:00 +08:00
 default_executable: git-redmine-commit
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: bundler
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +32,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  requirement: *id001
   type: :development
-  name: bundler
-  prerelease: false
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: jeweler
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +48,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
+  requirement: *id002
   type: :development
-  name: jeweler
-  prerelease: false
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: xml-simple
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,10 +64,8 @@ dependencies:
         - 0
         - 12
         version: 1.0.12
+  requirement: *id003
   type: :runtime
-  name: xml-simple
-  prerelease: false
-  version_requirements: *id003
 description: With this tool, you can do a git commit with a redmine issue id. The message of the commit is filled with the title of the issue automatically.
 email: iamawalrus@gmail.com
 executables: 
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: git commit with redmine issue id