augit 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2309674756759ab5ecec61613fc5ee70ef94a7e1
-  data.tar.gz: 4076dc8852e2b58bedfde0a1e28dd0d60927ed08
+  metadata.gz: abcbcda785918c9b50ce54c9539efd1762cfcd73
+  data.tar.gz: 635648ceeb5d05925a9eeee4cd9ecad51fb43f77
 SHA512:
-  metadata.gz: 4673ad51463400f89d6695281a2ad96cc0ea96548122e16cf8928f7cca666952f961b7729855070b3a7080a022ef40f30e5efd18f3829637f839272f07f187c3
-  data.tar.gz: 9cf0807546cc59e07937784f8cbb1f01e5fdb70ecb0643e184a6b827331926e4e08d275e8377dbb895e36841364735bc8012f60075ec350be4fc5258449f181a
+  metadata.gz: 8266d58311c621693ec87de01126477d5fa57408888c310d778389bdd0307da57720b10e8ab39b7f7e2b3db86cf230122d2b886cf1551847530ef534579657a7
+  data.tar.gz: fe95058d6ffd844e2281a4fef0200f9b13954ab35168912ebfdb80eb9097bc86d5b7f9dabeb7459f01a331fbecee9a083dd959997cec588aedc7ee93b6a5838f

data/.gitignore

@@ -0,0 +1,14 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    augit (0.0.1)
+    augit (0.0.2)
       actionview
       colorize
       highline

data/README.md

@@ -12,10 +12,14 @@ $ gem install augit
 
 Augit will inspect your repository and evaluate the age and diffs of all remote and local branches.
 
+    cd /path/to/my/git/repo
+    augit audit
+
+![augit](http://i.imgur.com/73TrMeN.png)
 
 It will display all the remote branches that have been merged into master and give you the option of removing all of them in one go.
 
-Augit will then iterate through all unmerged branches one by one and give you the age, author and files changed. It will also print a link to a compare page on Github.
+Augit will then iterate through all unmerged branches one by one and give you the age, author and files changed. It will also print a link to a compare page on Github. This is useful when using iTerm to cmd+click the link to open a diff.
 
 ## Contributing
 

data/bin/augit

@@ -4,16 +4,22 @@ require 'augit'
 
 module Augit
   class Command < Thor
+
     desc "audit", "Audit the current directory"
+    method_option(:regexp, {
+      aliases: '-e',
+      desc: 'Only consider branches matching the provided regular expression'
+    })
+    method_option(:status, {
+      aliases: '-s',
+      desc: 'Show the statuses of the specified git branches'
+    })
+
     def audit
-      Augit.audit
+      Augit.audit(options)
     end
+    default_task :audit
 
-    private
-
-    def directory
-      `pwd`.rstrip
-    end
   end
 end
 

data/lib/augit.rb

@@ -7,6 +7,7 @@ module Augit
   autoload :Presenter, 'augit/presenter'
 
   def self.audit(options = {})
-    Augit::Inspector.new.list
+    inspector = Augit::Inspector.new(options)
+    options[:status] ? inspector.status : inspector.list
   end
 end

data/lib/augit/branch.rb

@@ -1,7 +1,16 @@
 module Augit
   class Branch
+    include ::ActionView::Helpers::DateHelper
+
     attr_reader :name, :author, :origin, :commits, :age
 
+    CHANGE_MAP = [
+      { name: 'commit',    regex: /^commit\s(.*)/ },
+      { name: 'author',    regex: /^Author:\s(.*)\s</ },
+      { name: 'timestamp', regex: /^Date:\s*(.*)$/ },
+      { name: 'file',      regex: /^:.*\s(.*)/ }
+    ]
+
     def initialize(name, origin)
       @name = name
       @origin = origin
@@ -31,7 +40,7 @@ module Augit
       changes.each do |line|
         next if line.nil? || line == ''
 
-        checks.each do |check|
+        CHANGE_MAP.each do |check|
           value = line.match(check[:regex])
           next if value.nil?
 
@@ -54,12 +63,5 @@ module Augit
     def changes
       `git whatchanged --abbrev-commit master.. origin/#{name}`.split("\n")
     end
-
-    def checks
-      [{ name: 'commit',    regex: /^commit\s(.*)/ },
-        { name: 'author',    regex: /^Author:\s(.*)\s</ },
-        { name: 'timestamp', regex: /^Date:\s*(.*)$/ },
-        { name: 'file',      regex: /^:.*\s(.*)/ }]
-    end
   end
 end

data/lib/augit/inspector.rb

@@ -8,14 +8,13 @@ module Augit
     include ::ActionView::Helpers::TextHelper
     attr_reader :term, :origin, :branches, :merged, :unmerged, :repo
 
-    def initialize(term = nil)
-      @term = term
-
-      @repo = Augit::Repo.new
+    def initialize(options = {})
+      @repo = Augit::Repo.new(options)
       @origin = repo.origin
       @branches = repo.branch_names
       @merged = repo.merged_branches
       @unmerged = branches - merged
+      @regexp   = options[:regexp]
     end
 
     def list
@@ -35,6 +34,22 @@ module Augit
       end
     end
 
+    def section_message(data, filter)
+      filter = @regexp ? "matching /#{@regexp}/ " : ''
+      branches = pluralize(data.length, 'branch')
+      body = 'merged into master'
+      message = "#{branches} #{filter}#{body}"
+      data.any? ? "#{message}:" : message
+    end
+
+    def status
+      puts section_message(merged, @regexp).green
+      puts "  #{merged.join("\n  ")}"
+
+      puts section_message(unmerged, @regexp).red
+      puts "  #{unmerged.join("\n  ")}"
+    end
+
     def prompt(message)
       choice = ask("#{message} |(y)es, (n)o, (q)uit|".cyan)
       choice.strip.downcase.to_sym

data/lib/augit/repo.rb

@@ -1,7 +1,9 @@
 module Augit
   class Repo
-    def initialize
-      
+    attr_reader :regexp
+
+    def initialize(options = {})
+      @regexp = options[:regexp]
     end
 
     def origin
@@ -20,7 +22,8 @@ module Augit
     private
 
     def sanitize_string
-      "grep -v master | sed \"s/ *origin\\///\" | sed \"s/ *tddium\\///\""
+      sanitize = "grep -v master | sed \"s/ *origin\\///\" | sed \"s/ *tddium\\///\""
+      regexp.nil? ? sanitize : "grep #{regexp} | #{sanitize}"
     end
   end
 end

data/lib/augit/version.rb

@@ -1,3 +1,3 @@
 module Augit
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: augit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Matthew Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -102,6 +102,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt