git_left 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70e1da0581b561e432b0676c50e4fe84ccc681e0
-  data.tar.gz: 6a5e54ab4e3d39c3345db03d53ca578334662141
+  metadata.gz: 2760c0ff60fc7835d8f6fe11af1121a9b87b5dce
+  data.tar.gz: fdfb54e749546fc4b36a02d2dac64a330ed1c8e9
 SHA512:
-  metadata.gz: abda837f7ea2d42bf79dde62b731a5f30817e3c42bd77d2be87a7202d6fd07a84dbfb8fb5f3c75d41cfbe8b8ecc2c38c078f6db2f4a507db5dcbd0817a405eb7
-  data.tar.gz: 255be76e956cfe0120cd8baeed77d6a2dd74c3c00c1f77546039d2c26ff7469eec7ef961242c18cfb1358bd6e2366b4a96e1f051279411041c10b7d9a104fc12
+  metadata.gz: f344ff90fdb42821e67157c357bda9d9a5a1a70170dd010b2b72370e820ecf06f89bb28e231dae9fa3c42290b316226ddc8063e5b2087c93cd43b6e7a4eb33d0
+  data.tar.gz: a3ebc0a2c332e28dc3996213358063afde5647247aca4e711dab1632a9cc3ae7e9f130a5af7904b1c3bde2b00106860fe64f33d6c838f29d28a5e6d40799ad47

data/lib/git_left/branch.rb

@@ -0,0 +1,21 @@
+module GitLeft
+  class Branch
+    def initialize(branch)
+      @branch = branch
+    end
+
+    def is_upstream?
+      GitLeft::Branches.remote_branches.map(&:name).include?(@branch.name)
+    end
+
+    # Delegated Methods
+
+    def name
+      @branch.name
+    end
+
+    def delete
+      @branch.delete
+    end
+  end
+end

data/lib/git_left/branch_reporter.rb

@@ -0,0 +1,34 @@
+module GitLeft
+  class BranchReporter
+    def initialize(branch)
+      @branch = branch
+    end
+
+    def report
+      puts branch_info
+      puts instructions
+    end
+
+    def branch_info
+      str = "\nDeciding time: #{underlined(@branch.name)}"
+
+      if @branch.is_upstream?
+        str << green(" (exists upstream)") 
+      end
+
+      str
+    end
+
+    def instructions
+      "(h to delete, l to skip, anything else to quit)\n"
+    end
+
+    def underlined(text)
+      "\e[4m" << text << "\e[24m"
+    end
+
+    def green(text)
+      "\e[32m#{text}\e[0m"
+    end
+  end
+end

data/lib/git_left/branches.rb

@@ -1,5 +1,9 @@
 module GitLeft
   module Branches
+    def self.git_instance
+      @git_instance ||= Git.open('.')      
+    end
+
     def self.skipped_branches
       @@skipped_branches || []
     end
@@ -28,12 +32,16 @@ module GitLeft
       branches.sample
     end
 
+    def self.remote_branches
+      @remote_branches ||= git_instance.branches.remote
+    end
+
     def self.branches
       @@skipped_branches ||= []
       @@deleted_branches ||= []
 
-      @@all_branches ||= Git.open('.').branches.to_a
-      @@all_branches.select { |b| !branches_to_omit.include?(b.name) && !b.remote }
+      @@all_branches ||= git_instance.branches.local.to_a.map { |b| GitLeft::Branch.new(b) }
+      @@all_branches.select { |b| !branches_to_omit.include?(b.name) }
     end
   end
 end

data/lib/git_left/cli.rb

@@ -5,7 +5,13 @@ module GitLeft
   class CLI < Thor
     desc "begin", "Begin swiping left"
     def begin(opts = {})
-      puts "Time to clean up your #{GitLeft::Branches.branches.count} local branches..."
+      puts "Before we begin, prune remote branches? (y/n)"
+      if STDIN.getch == 'y'
+        puts "Pruning remote branches..."
+        `git remote prune origin`
+      end
+
+      puts "Okay, time to clean up your #{GitLeft::Branches.branches.count} local branches..."
 
       while(1) do
         begin
@@ -13,13 +19,11 @@ module GitLeft
 
           if @random_branch.nil?
             puts "\nYou cleaned up all your branches!"
-            puts "\t#{GitLeft::Branches.skipped_branches.count} skipped"
-            puts "\t#{GitLeft::Branches.deleted_branches.count} deleted"
             break
           end
 
-          underlined = "\e[4m" << @random_branch.name << "\e[24m"
-          puts "\nDeciding time: #{underlined} (h to delete, l to skip, anything else to quit)\n"
+          @reporter = GitLeft::BranchReporter.new(@random_branch)
+          @reporter.report
 
           case GitLeft::KeyParser.new(STDIN.getch).action
           when :delete

data/lib/git_left/version.rb

@@ -1,3 +1,3 @@
 module GitLeft
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/git_left.rb

@@ -1,4 +1,6 @@
 require_relative "git_left/version"
+require_relative "git_left/branch"
+require_relative "git_left/branch_reporter"
 require_relative "git_left/branches"
 require_relative "git_left/key_parser"
 require_relative "git_left/cli"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_left
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Chuck Callebs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -114,6 +114,8 @@ files:
 - bin/setup
 - git_left.gemspec
 - lib/git_left.rb
+- lib/git_left/branch.rb
+- lib/git_left/branch_reporter.rb
 - lib/git_left/branches.rb
 - lib/git_left/cli.rb
 - lib/git_left/key_parser.rb