git.rb 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52833f20baf0598073541425701ec14677832f98aa5a5f10d6b6fabb647c6b5e
-  data.tar.gz: f579c6fcc86ad91fdb91983ab08c0acb2bdfe33f7c160693406daeccfc6a9b62
+  metadata.gz: 459398f5d902325a3770ac8c518c9a8013fcc1628cdd9b378928c511bc4ef60d
+  data.tar.gz: 8ca58382ad1011dad9a66e78cf4afefbc6ccc9ce4c7bf5b257d019a5a60a6f7e
 SHA512:
-  metadata.gz: 8eec775af216cf3e2a1c3d87eb23763d74c7e7f2f6f29e764f5e70ba6880533ea7245f5d7722c980c082e24a4463eebf274d617af5ce62779b1ef940cf6d477d
-  data.tar.gz: 74ccdf65e4842e68b17f5f9f64cb8c79eda27d5b4b12753ea5cc4965041e72a6e4d608387f02f390b7ffe9a594b46d9753f5c383cdc4093c9afd5985373d96b9
+  metadata.gz: 1c34905fa20b9f3c0ae51d5525afab7cc2714c7c4f68e89c3be1a8cd114b662b7564a31d1dbb511aa8f1c06b01a64602612c51a5d418764bb245a6830365b8db
+  data.tar.gz: 6022dd1235db64aef9b2a9d64775a3603c97fb7d73632b10836438c1f8bbc5064663bff882df1c6686d6ea0a335370a78ccc6e6377ed668213bb65ec85b75f0d

data/lib/Git.rb

@@ -1,8 +1,8 @@
 # Git.rb
 # Git
 
-# 20200127, 0128, 0202, 0207, 0208
-# 0.10.0
+# 20200330
+# 0.10.1
 
 lib_dir = File.expand_path(File.join(__FILE__, '..'))
 $LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)

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.12.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.0
+  version: 0.12.0
 platform: ruby
 authors:
 - thoran
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2020-10-22 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/Thoran/AllButFirst/all_but_first.rb
-- lib/Thoran/AllButLast/all_but_last.rb
-- lib/Thoran/FirstX/firstX.rb
-- lib/Thoran/LastX/lastX.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.0.rc.1
+signing_key:
 specification_version: 4
 summary: Do git stuff from Ruby.
 test_files: []