git.rb 0.10.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 908407ea9ebf4972a435d8bbdfec53c677b5ac9497adf4575bc650413ef3a7a7
-  data.tar.gz: b196e6a46285002e2a4adf2b0e8d1db128c8ce7fee417bb10438eaf7ba909737
+  metadata.gz: 73aee3654b476be49b07919f42351e4a215eed644ca265e430fa9ae5bb342602
+  data.tar.gz: 5a1d9932d003433378f7e2ca9c3110e1417b0e4758aea2756117e8ad76d8f3d2
 SHA512:
-  metadata.gz: c1ce1fd99b757a370dea97f0d8d006b555f9ba83e5bee4378d749afafb1e9584a20a6cb3a6a9d527feea3cc586000866c456b0289e7048764638fb262da6f26d
-  data.tar.gz: cb8a814563968b969cd3a30b863d8d6a5b888699e539b677c0fc4bb883dd74c68385970cac62b1d63f0ff33fe587f38f58145f3c2c9edbddf6360b99be54bfd3
+  metadata.gz: c767573d7f5d0912231e6f8cbd7ac74d725fd4982494d1d2871eaba18b76bea7b4179684601550603f39b93817462184c32e4f22cba1f44b4494f7c1d20a9ea1
+  data.tar.gz: 84aa02f3100e0cf04e2321f323d5fb35f3cb848791e261382572ed56de93f0750bbfdfd980a9a4408395474e4699356ab24e79f657fcacb856b6a1d1dd136a97

data/lib/Git/Blame.rb

@@ -117,8 +117,7 @@ module Git
     end
 
     def find(line_number)
-      @line_number = line_number
-      entries.detect{|entry| entry.line_number == @line_number}
+      entries.detect{|entry| entry.line_number == line_number}
     end
 
   end

data/lib/Git/Branch.rb

@@ -94,6 +94,10 @@ module Git
       end
       alias_method :head, :current
 
+      def default
+        `git rev-parse --abbrev-ref origin/HEAD`.strip.split('/').last
+      end
+
     end # class << self
 
     attr_accessor :name

data/lib/Git/Log.rb

@@ -18,6 +18,7 @@
 # => "thoran"
 
 require 'Ordinal/Array'
+require 'String/capture'
 
 module Git
   class Log
@@ -26,23 +27,45 @@ module Git
 
       class << self
         def parse(commit_string)
-          parsed_commit_string = commit_string.split("\n").collect{|line| line.strip}.select{|line| !line.empty?}
-          Commit.new(
-            hash: parsed_commit_string.first.gsub(/^commit /, ''),
-            author: parsed_commit_string.second.gsub(/^Author: /, ''),
-            date: parsed_commit_string.third.gsub(/^Date:   /, ''),
-            message: parsed_commit_string.fourth
-          )
+          hash = merge = author = date = message = ''
+          commit_string.split("\n").each do |line|
+            case line.strip
+            when /^commit (\w+)/
+              hash = line.strip.capture(/^commit (\w+)/)
+            when /^Merge: /
+              merge = line.strip.gsub(/^Merge: /, '')
+            when /^Author: /
+              author = line.strip.gsub(/^Author: /, '')
+            when /^Date:   /
+              date = line.strip.gsub(/^Date:   /, '')
+            else
+              if line.strip.empty?
+                (message ||= '') << "\n\n"
+              else
+                (message ||= '') << line.lstrip
+              end
+            end
+          end
+          commit_args = {
+            hash: hash,
+            author: author,
+            date: date,
+            message: message.lstrip
+          }
+          commit_args.merge!(merge: merge)
+          Commit.new(commit_args)
         end
       end # class << self
 
       attr_reader :hash
+      attr_reader :merge
       attr_reader :author
       attr_reader :date
       attr_reader :message
 
       def initialize(values = {})
         @hash = values[:hash]
+        @merge = values[:merge]
         @author = values[:author]
         @date = values[:date]
         @message = values[:message]
@@ -60,7 +83,6 @@ module Git
         commit_log = Log.new
         commit_string = ''
         log_stream.each_line do |line|
-          line.lstrip!
           if line =~ /^commit/ && !commit_string.empty?
             commit_log.prepend(Commit.parse(commit_string))
             commit_string = line

data/lib/Git/VERSION.rb

@@ -1,3 +1,5 @@
 module Git
-  VERSION = '0.10.0'
+
+  VERSION = '0.13.0'
+
 end

data/lib/String/capture.rb

@@ -0,0 +1,28 @@
+# Thoran/String/Capture/capture.rb
+# Thoran::String::Capture#capture
+
+# 20161109
+# 0.3.1
+
+# Changes since 0.2:
+# 1. + Thoran namespace.
+# 0/1
+# 2. Updated the MiniTest superclass only---no implementation changes.
+
+module Thoran
+  module String
+    module Capture
+
+      def capture(regex)
+        if md = self.match(regex)
+          md[1]
+        else
+          nil
+        end
+      end
+
+    end
+  end
+end
+
+String.send(:include, Thoran::String::Capture)

data/lib/Thoran/String/Capture/capture.rb

@@ -0,0 +1,7 @@
+# String/capture.rb
+# String#capture
+
+# 20201008
+# 0.3.1 (The same version number as the current version of Thoran/String/Capture.)
+
+require 'Thoran/String/Capture/capture'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git.rb
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.13.0
 platform: ruby
 authors:
 - thoran
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies: []
 description: Do stuff with git-blame, git-branch, git-log, and git-remote from Ruby.
 email: code@thoran.com
@@ -26,15 +26,17 @@ files:
 - lib/Git/VERSION.rb
 - lib/Ordinal.rb
 - lib/Ordinal/Array.rb
+- lib/String/capture.rb
 - lib/Thoran/Array/AllButFirst/all_but_first.rb
 - lib/Thoran/Array/AllButLast/all_but_last.rb
 - lib/Thoran/Array/FirstX/firstX.rb
 - lib/Thoran/Array/LastX/lastX.rb
+- lib/Thoran/String/Capture/capture.rb
 homepage: http://github.com/thoran/git.rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -49,8 +51,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Do git stuff from Ruby.
 test_files: []