git_tools 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 559e0661bd71f674ea66ed8e42f586b498e70cc9
-  data.tar.gz: 16aace169bb88aa04d24039738e8763b9bb35563
+  metadata.gz: 3d30825406fc8a411689aa5cda1e57ef7ffed29b
+  data.tar.gz: 1b557251ae763367f7fe60aeab01c8d842afbd03
 SHA512:
-  metadata.gz: a73fbf197ccfe8fd873fc8569eca0ae4c5fc9e7510096d65e14297858f4f6271e37165674b669a20175c38fe1b01223679c7539d5a1978822ed461bd008ec700
-  data.tar.gz: 611e03f9f3a58dc5fd6d9897b0b32617c6f36a01349d8652c0544d59f5ad7f13dd36ebd42621c97a5648d5c7273f1dd919c5190df12a376ee6dcc4c441ef7189
+  metadata.gz: 311ab97eae9528e7ec46782950bbe1c7c00ba608aa2884d5ac3c6cb2d2295013af7c79c038fdf4516cf6e54091bcd9bce5ceee65df223877bed65eca6fa67903
+  data.tar.gz: bfd8214bc882ead2b2ea1f2b6ddf7efeedd01b365a6a7a730a42bf50032e29153b3e9c537d62c3709baa269757cd14beaf950c02eb6eca5e4746612fcd7d6a2d

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rake'
+require 'git_tools'
 
 namespace :gem do
   desc 'Build the gem'

data/VERSION

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

data/git_tools.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "git_tools"
 
-  s.add_runtime_dependency("docopt")
+  s.add_runtime_dependency("docopt", '~> 0')
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/git_tools/hooks/prepare-commit-msg/01_capture_issue_tracker_number_from_branch_name.rb

@@ -13,7 +13,9 @@ contents = File.read(message_file)
 
 has_merge_message = contents.match(/^Merge branch/m) # Commit with resolved merge conflicts don't have a commit source.
 exit if has_merge_message
-ticket_no_from_branch_name = contents.scan(/On branch .+#(\d{1,5})/)
+
+branch_name = contents.match(/^# On branch(.+)$/).captures.first.strip
+ticket_no_from_branch_name = branch_name.scan(/[0-9]+/)
 
 if ticket_no_from_branch_name.empty?
   references = nil
@@ -24,7 +26,7 @@ if ticket_no_from_branch_name.empty?
 MESSAGE
 else
   references = ticket_no_from_branch_name.join(', #')
-  default_line = "Issue tracker: ##{references}"
+  default_line = "Issue references: ##{references}"
 end
 
 if File.exists?(template_file)

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: git_tools
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Birkir A. Barkarson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 description: Git tools for installing hooks, cleaning up branches and more.
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: git_tools
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Collection of various handy git commands and tasks.