thicket 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 78d11e58027823d2bc19891269bdcf93c6b8d5ed8396cef5fe275f75282e27c9
-  data.tar.gz: 99e6feb765c64cb6359b8014d26014812620d76185424695fa07103cf480c57f
+SHA1:
+  metadata.gz: c541a3fa38a35509b3833a3f584359a661b34f2e
+  data.tar.gz: d4d781ec4b428b1e1f439bb807a1a91c3e0fe33d
 SHA512:
-  metadata.gz: 99a311df3ab8cddbc14ac9d9d52f16a51762c9505f9eca6aae22a069eb486b351e6cdc45bc935a53e806bc83111f9daf8579ff8d4bad7561b3bd359529117143
-  data.tar.gz: 4130465a692a997d098b30f776c7bfe46ed04bf1c53c93f927fb6c7066dd9569ce1eea4e32668f183570dd24d65627643f2883f900ba8b8ee3f9ba2848cfddae
+  metadata.gz: c782cf435c8eb5cf9b753982a2415403ed0c0b872b97f2fea9391e71d9e66bdb5936f2f72c21cd18b481707cfa15158499f9efa012c6bd006d8a60c5f23e1ddf
+  data.tar.gz: 6229ade1765ded8520550923aafa07046b94306b490a6747ff22604d036e5fbcdc600b4c8076305c0a9ab7c0c71838c197bfbe0c16d03b55e13e429b642d5a3f

data/lib/thicket/log.rb

@@ -26,7 +26,7 @@ module Thicket
 
         puts "..."
         puts "Stopped after #{@options[:limit]} commits. More commit history exists."
-        exit
+        break
       end
     rescue Errno::EPIPE, SystemExit, Interrupt
       exit
@@ -41,6 +41,7 @@ module Thicket
 
       line.match(LOG_PARSE_REGEX) do |matcher|
         line = process_date_time(matcher[1], line, matcher[3])
+        line = process_refs(matcher[3], line) if matcher[3] && @options[:consolidate_refs]
         line = process_message_prefix(matcher[4], line) if @options[:color_prefixes]
         line = process_author_name(matcher[2], line)
         @count_parsed += 1
@@ -61,6 +62,60 @@ module Thicket
       line.sub(time_string, to_sub)
     end
 
+    # Takes an input log string and a refs list, and formats the refs list in a
+    # more consolidated way.
+    def process_refs(refs, line)
+      original_refs = refs
+      main_remote = @options[:main_remote] || "origin"
+      refs = strip_color(refs).split(",").map(&:strip)
+      tags = []
+
+      head_ref_index = refs.find_index { |r| r.start_with?("HEAD -> ") }
+
+      refs_to_delete = []
+      refs.each do |r|
+        refs_to_delete << r if r == "#{main_remote}/HEAD"
+        next if r.start_with?("#{main_remote}/")
+
+        ref_without_head = r.delete("HEAD -> ")
+        branch = "#{main_remote}/#{ref_without_head}"
+        if refs.include?(branch)
+          refs_to_delete << branch
+          r << "#"
+        end
+
+        if r.start_with?("tag:")
+          tag = r
+          tag.slice!("tag: ")
+
+          refs_to_delete << r
+          tags << tag
+        end
+      end
+
+      refs[head_ref_index].sub!("HEAD -> ", "@") if head_ref_index
+      refs.delete_if { |r| refs_to_delete.include? r }
+
+      refs = if refs.any?
+               "(#{refs.join(", ")})"
+             else
+               ""
+             end
+
+      substitute = if tags.any?
+                     tags = "\e[35m[#{tags.join(", ")}]\e[0m"
+                     if refs.empty?
+                       tags
+                     else
+                       "#{refs} #{tags}"
+                     end
+                   else
+                     refs
+                   end
+
+      line.sub("(#{original_refs})", substitute)
+    end
+
     # Takes an input log string and commit message, finds commit messages
     # prefixes, and darkens them.
     def process_message_prefix(message, line)

data/lib/thicket/option_parser.rb

@@ -19,7 +19,7 @@ module Thicket
       args = Options.new("world")
 
       opt_parser = ::OptionParser.new do |opts|
-        opts.banner = "Usage: thicket [options] <command>"
+        opts.banner = "Usage: thicket [options]"
 
         opts.on("-v", "--version", "Print the version number") do |v|
           args.name = v
@@ -42,11 +42,21 @@ module Thicket
           @options[:limit] = limit
         end
 
-        opts.on("-a", "--all", TrueClass, "Displays all branches on all remotes.") do |all|
+        opts.on("-a", "--all", TrueClass, "Displays all branches on all remotes") do |all|
           args.name = all
           @options[:all] = all
         end
 
+        opts.on("-r", "--refs", TrueClass, "Consolidate the refs list") do |refs|
+          args.name = refs
+          @options[:consolidate_refs] = refs
+        end
+
+        opts.on("--main-remote=MAIN_REMOTE", String, "The name of the primary remote, defaults to 'origin'") do |main_remote|
+          args.name = main_remote
+          @options[:main_remote] = main_remote
+        end
+
         opts.on("-p", "--color-prefixes", TrueClass, "Adds coloring to commit message prefixes.") do |prefixes|
           args.name = prefixes
           @options[:color_prefixes] = prefixes

data/lib/thicket/version.rb

@@ -2,5 +2,5 @@
 
 module Thicket
   #:nodoc:
-  VERSION ||= "0.1.4"
+  VERSION ||= "0.1.6"
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: thicket
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Taylor Thurlow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2019-06-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: as-duration
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +185,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: An opinionated replacement for git's log command.