jiragit 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0b9e5fb059f4e4a481b1a8790b9c744da7c7923
-  data.tar.gz: 9f5b09b6e372d0ab464468773f7431b03f481a2a
+  metadata.gz: 3934b14132024fc659b50eeee4af934b9c4a873f
+  data.tar.gz: c34ecbdfddfba26150405510569a76d16a24c054
 SHA512:
-  metadata.gz: 032443a2011cfe360d4be3ef610be4a9aab7197b73002d4d68789217860e03e776e1f54463b17792edfa7454960dffd43a4fc02fcd1f25a462b87b6ab8d7f94c
-  data.tar.gz: a2d287d10166c6311ccc24abbe018599aab94e3cc95704a06a2c6fafae200370c592b05509e0e4dafc4eae2f816428763db5844c8d5a0eafa9e9c9e5949103aa
+  metadata.gz: f22b118a55b3dacc7242f8369b98f47af5c6475bb64ac130afef0c9ab8e15c73d6c7e81750a1e8770d73f66c609cd4bf45ee7310a3f56317917bcea0a6e4ba6d
+  data.tar.gz: 25ec4819eb6df828f20338bd5d9615eeb3c72d1a4f63100bdf8c7d2fa4a7580c59df6204b9c04d5e224c5c556538f6ce0881cd7f1233ce664ed678746e124486

data/Rakefile

@@ -12,7 +12,7 @@ namespace :gem do
   end
 
   task :install => [:build] do
-    `gem install pkg/jiragit-1.0.0.gem`
+    `gem install pkg/jiragit*.gem`
   end
 
 end

data/hooks/post-checkout

@@ -23,11 +23,11 @@ def branch_switch?
 end
 
 def current_branch
-  Jiragit::Git.current_branch
+  @current_branch ||= Jiragit::Git.current_branch
 end
 
 def previous_branch
-  Jiragit::Git.previous_branch
+  @previous_branch ||= Jiragit::Git.previous_branch
 end
 
 def new_branch?
@@ -84,8 +84,15 @@ def message_jiras_related_to_current_branch
   message("JIRA(s): #{related_jiras(branch: current_branch).join(', ')}")
 end
 
+def jiras_from_current_branch_name
+  current_branch.scan(/([A-Z]{1,4}-[1-9][0-9]{0,6})/).to_a
+end
+
 def query_for_related_jiras
-  default = related_jiras(branch: previous_branch).join(', ') if new_branch?
+  related = related_jiras(branch: previous_branch)
+  branch = jiras_from_current_branch_name
+  puts "default branch: #{branch}"
+  default = [related, branch].flatten.join(', ')
   query("What is the JIRA Number?", default)
 end
 

data/lib/jiragit.rb

@@ -4,6 +4,7 @@ require 'jiragit/configuration'
 require 'jiragit/cli'
 require 'jiragit/git/repository'
 require 'jiragit/git/commit_response'
+require 'jiragit/git/commit'
 require 'jiragit/git/branch'
 require 'jiragit/tag'
 require 'jiragit/vault'

data/lib/jiragit/cli.rb

@@ -12,7 +12,8 @@ module Jiragit
       :remote,
       :local,
       :configure,
-      :configuration
+      :configuration,
+      :build
     ]
 
     FLAGS = [
@@ -68,21 +69,18 @@ module Jiragit
         return
       end
       puts "Listing all relations for jira #{@params[0]}"
-      js = JiraStore.new("#{Jiragit::Git.repository_root}/.git/jiragit/jira_store")
-      puts js.relations(jira: @params[0]).to_a
+      puts jira_store.relations(jira: @params[0]).to_a
     end
 
     def branch
       branch = @params[0] || Jiragit::Git.current_branch
       puts "Listing all relations for branch #{branch}"
-      js = JiraStore.new("#{Jiragit::Git.repository_root}/.git/jiragit/jira_store")
-      puts js.relations(branch: branch).to_a
+      puts jira_store.relations(branch: branch).to_a
     end
 
     def jira_branch
       puts "Relating jira #{@params[0]} and branch #{@params[1]}"
-      js = JiraStore.new("#{Jiragit::Git.repository_root}/.git/jiragit/jira_store")
-      js.relate(jira: @params[0], branch: @params[1])
+      jira_store.relate(jira: @params[0], branch: @params[1])
     end
 
     def browse
@@ -135,8 +133,23 @@ module Jiragit
       end
     end
 
+    def build
+      commits = Jiragit::Git.log
+      commits.each do |commit|
+        commit.jiras.each do |jira|
+          puts "relating: commit #{commit.sha} to jira: #{jira}"
+          jira_store.relate(commit: commit.sha, jira: jira, save: false)
+        end
+      end
+      jira_store.save
+    end
+
     private
 
+      def jira_store
+        @jira_store ||= JiraStore.new("#{Jiragit::Git.repository_root}/.git/jiragit/jira_store")
+      end
+
       def run(command)
         `#{command}`
       end
@@ -192,8 +205,7 @@ module Jiragit
       end
 
       def related(type, relation)
-        js = JiraStore.new("#{Jiragit::Git.repository_root}/.git/jiragit/jira_store")
-        jiras = js
+        jiras = jira_store
           .relations(relation)
           .to_a
           .select { |r| r.type == type }

data/lib/jiragit/git/commit.rb

@@ -0,0 +1,43 @@
+module Jiragit
+
+  module Git
+
+    class Commit
+
+      attr_accessor :log
+
+      def initialize(log)
+        @log = log
+      end
+
+      def sha
+        @sha ||= log[/(?<=commit )[0-9a-f]{40}/]
+      end
+
+      def date
+        @date ||= log[/(?<=Date:)\s+\b.*?$/].gsub(/^\s+/,'')
+      end
+
+      def author
+        @author ||= log[/(?<=Author:)\s+\b.*?$/].gsub(/^\s+/,'')
+      end
+
+      def merge
+        @merge ||= log[/(?<=Merge:)\s+\b.*?$/].gsub(/^\s+/,'')
+      end
+
+      def body
+        @body ||= log.gsub(/^.*Date:.*?\n/m,'')
+      end
+
+      IS_JIRA = /\b([A-Z]{1,4}-[1-9][0-9]{0,6})\b/
+
+      def jiras
+        @jiras ||= log.scan(IS_JIRA).to_a.flatten.uniq
+      end
+
+    end
+
+  end
+
+end

data/lib/jiragit/git/repository.rb

@@ -101,6 +101,13 @@ module Jiragit
       value
     end
 
+    def self.log
+      log = `git log 2>&1`.chomp
+      raise NoRepositoryError if log=~/^Not a git repository/
+      commits = log.split(/(?=commit [0-9a-f]{40})/)
+      commits.map { |commit| Commit.new(commit) }
+    end
+
     class Repository
 
       def self.create(path)

data/lib/jiragit/jira_store.rb

@@ -11,7 +11,7 @@ module Jiragit
     def relate(params)
       tags = extract_tags(params).compact
       vault.relate(*tags)
-      vault.save
+      vault.save unless params[:save] == false
     end
 
     def relations(params)
@@ -26,6 +26,10 @@ module Jiragit
       vault.load
     end
 
+    def save
+      vault.save
+    end
+
     private
 
       attr_accessor :location

data/lib/jiragit/version.rb

@@ -1,3 +1,3 @@
 module Jiragit
-  VERSION = "0.5.1"
+  VERSION = "0.5.3"
 end

data/spec/branch_spec.rb

@@ -42,6 +42,20 @@ describe "Repository Branching Behaviors" do
 
     end
 
+    context "the new branch name includes a jira" do
+
+      before do
+        checkout_a_new_branch('parent_branch')
+        @repo.make_a_commit
+      end
+
+      it "should provide and accept default jira from branch name" do
+        checkout_a_new_branch_with_default('PA-12345_branch')
+        assert_relation({jira: 'PA-12345'}, {branch: 'PA-12345_branch'})
+      end
+
+    end
+
   end
 
   context "when checking out an existing branch" do

data/spec/test_support.rb

@@ -8,7 +8,7 @@ module TestSupport
     rake = Rake.application
     rake.init
     rake.load_rakefile
-    rake['gem:install'].invoke
+    rake['install'].invoke
   end
 
   def create_test_repository(repository)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jiragit
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Derrick Parkhurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,7 @@ files:
 - lib/jiragit/cli.rb
 - lib/jiragit/configuration.rb
 - lib/jiragit/git/branch.rb
+- lib/jiragit/git/commit.rb
 - lib/jiragit/git/commit_response.rb
 - lib/jiragit/git/repository.rb
 - lib/jiragit/jira_store.rb