git_left 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2ed757ebc1fe0dd43a521586a07f39f75a7d278
-  data.tar.gz: 00be165a1a6fe1f382618125f33e6815a04c8a53
+  metadata.gz: 70e1da0581b561e432b0676c50e4fe84ccc681e0
+  data.tar.gz: 6a5e54ab4e3d39c3345db03d53ca578334662141
 SHA512:
-  metadata.gz: 7c7441e6cfa668114cd08afbbf3d543bbd9e91c89ef6f98a0a3797c3231ce417845e8634843b0247e6395cfd707663b34dd34071681ed0086226316c0c1021d5
-  data.tar.gz: 5a328e417fd3955f1d39206992012cdf1383b3cf2eac5678efd21ca96491f05d943605741c6441524cf86bf77670ea83ffea1866386f06218c20e0157cc68d50
+  metadata.gz: abda837f7ea2d42bf79dde62b731a5f30817e3c42bd77d2be87a7202d6fd07a84dbfb8fb5f3c75d41cfbe8b8ecc2c38c078f6db2f4a507db5dcbd0817a405eb7
+  data.tar.gz: 255be76e956cfe0120cd8baeed77d6a2dd74c3c00c1f77546039d2c26ff7469eec7ef961242c18cfb1358bd6e2366b4a96e1f051279411041c10b7d9a104fc12

data/lib/git_left/branches.rb

@@ -32,8 +32,8 @@ module GitLeft
       @@skipped_branches ||= []
       @@deleted_branches ||= []
 
-      @@all_branches = Git.open('.').branches.to_a
-      @@all_branches.select { |b| !branches_to_omit.include?(b.name) }
+      @@all_branches ||= Git.open('.').branches.to_a
+      @@all_branches.select { |b| !branches_to_omit.include?(b.name) && !b.remote }
     end
   end
 end

data/lib/git_left/cli.rb

@@ -8,30 +8,35 @@ module GitLeft
       puts "Time to clean up your #{GitLeft::Branches.branches.count} local branches..."
 
       while(1) do
-        random_branch = GitLeft::Branches.random_branch
+        begin
+          @random_branch = GitLeft::Branches.random_branch
 
-        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
+          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"
+          underlined = "\e[4m" << @random_branch.name << "\e[24m"
+          puts "\nDeciding time: #{underlined} (h to delete, l to skip, anything else to quit)\n"
 
-        case GitLeft::KeyParser.new(STDIN.getch).action
-        when :delete
-          GitLeft::Branches.delete(random_branch)
-          puts "#{random_branch.name} deleted"
-          next
-        when :skip
-          GitLeft::Branches.skip(random_branch)
-          puts "#{random_branch.name} skipped"
-          next
-        when :quit
-          puts "See ya!"
-          break
+          case GitLeft::KeyParser.new(STDIN.getch).action
+          when :delete
+            GitLeft::Branches.delete(@random_branch)
+            puts "#{@random_branch.name} deleted"
+            next
+          when :skip
+            GitLeft::Branches.skip(@random_branch)
+            puts "#{@random_branch.name} skipped"
+            next
+          when :quit
+            puts "See ya!"
+            break
+          end
+        rescue
+          puts "A problem occurred performing that action. Skipping."
+          GitLeft::Branches.skip(@random_branch)
         end
       end
     end

data/lib/git_left/version.rb

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

data/lib/git_left.rb

@@ -1,7 +1,7 @@
-require "git_left/version"
-require "git_left/branches"
-require "git_left/key_parser"
-require "git_left/cli"
+require_relative "git_left/version"
+require_relative "git_left/branches"
+require_relative "git_left/key_parser"
+require_relative "git_left/cli"
 
 module GitLeft
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_left
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Chuck Callebs