git.rb 0.10.4 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8811ab31189842e2c75abf4af873bf6083ebb1fa38cd0bff1504384551f06712
-  data.tar.gz: a2d6d29989ed7ee61ef72378ea647087d9973a42d7415c1ee827baade92ed806
+  metadata.gz: 877ad4b138a4459b013c00d5fffd8bbd42ef5dbd3062141fdca0e4392ecc18b5
+  data.tar.gz: a81786d724174284167edb05749c6dece6e76624b4fefe2dfb1d2f90b3d172c5
 SHA512:
-  metadata.gz: 6a4b85a1ca3cb6e7f4c4cec89117b52590a72c5acbf4427cafb391deb87feee626e8f874f98d5efd0f068547d56cb75a753eb58a8a8c90174bae3a829c9ff82f
-  data.tar.gz: ed51826c59eb3669cd39703242949f9fe164b5a73137f6e128d5fc620567c24bac24bd8909f607cc98a138dbf139e74627443414395126584fd6671ea75e7117
+  metadata.gz: a76547e738e94c23a6f316c650dc7b23851fba39fe9a4d9dd66ce236bde3bb7832b1fa53dac8cba9175b6bfdc8e6c5e8ce431723ae56f943b5fd33752855ff87
+  data.tar.gz: 11bad50830bc2e8126db9ba55792df46ac5df5cbe7d5047899770c071344a913b52edabaacbda4f80eea5ed8287891700b0adb3169793751d2d0e4e127b7a929

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]

data/lib/Git/VERSION.rb

@@ -1,5 +1,5 @@
 module Git
 
-  VERSION = '0.10.4'
+  VERSION = '0.11.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.4
+  version: 0.11.0
 platform: ruby
 authors:
 - thoran
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-10-08 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.0.3
-signing_key: 
+rubygems_version: 3.2.0.rc.1
+signing_key:
 specification_version: 4
 summary: Do git stuff from Ruby.
 test_files: []