branch_cleaner 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8fa8cf28f6f6b14ba600f51c2b4ebd7672bc094
-  data.tar.gz: b480562f355473d3bdf2c94656528cb73fa12ef9
+  metadata.gz: 01fbd5af8345011ce7b8810cf3391b009cae8acb
+  data.tar.gz: a7049c74a6afb08385ade65213190b6c8ce2652f
 SHA512:
-  metadata.gz: 3951b67729e2e56633eb3a96f32121d832b90bafbce13d57b540f70a88a89ed0694343fa936c204eb3f560ba8c78c25ff60a78984c7957b87485abaa9550ddef
-  data.tar.gz: 5a5b1127b1c8f0759455141530b1f65302319fdf3025455003ca6606d97344499a967bbec9f1c56d1d722dd51d4026564d46d1dc57d706239a69bbf4625eb91a
+  metadata.gz: 2dcb9df50ea2e37d70a64761706114e19df7884ce97653bec939d99e8776f732d93e573dafc24b0232c8a6ec4d86e9f9c00a9ef9fd75dde8fb12fe123571c95d
+  data.tar.gz: 3c8ecfb2f8620d9fef4be72fb76886f274da1af18ee16a0bdadc7abe72a162a52a503e37f1b0b3c42d03bc1059400d284d15112e7238515db2694a0755822bec

data/lib/branch_cleaner.rb

@@ -1,48 +1,45 @@
 require 'set'
 
 class BranchCleaner
+  def self.get_current_directory()
+    `pwd`
+  end
 
-  KEEP_BRANCHES_PATH = "./.keep_branches"
+  def self.get_repository_root()
+    `git rev-parse --show-toplevel`.strip
+  end
 
   def self.get_branches()
-    branches = `git branch`.split("\n")
+    `git branch`.split("\n").map {|b| b.strip }
+  end
+
+  def self.get_branches_to_keep()
+    file = get_repository_root() + "/.branches_to_keep"
+    keepers = Set.new ["master"]
+    if File.exist?(file)
+      File.readlines(file).each do |line|
+        keepers.add(line.strip)
+      end
+    end
+    return keepers
   end
 
   def self.clean()
+    repo_root = get_repository_root() ; result = $?.success?
+    if !result
+      abort("Exiting, not in a git repository")
+    end
     branches = get_branches()
-    branches_to_keep = Set.new ["master"]
+    branches_to_keep = get_branches_to_keep()
     for branch in branches do
-      branch = branch.gsub(/^\s+/, '')
-      if branch.start_with?('*') || branches_to_keep.include?(branch)
-        puts "Skipping branch " + branch.gsub(/^\*?\s*/, '')
+      branch_name = branch.gsub(/^\*?\s*/, '')
+      if branches_to_keep.include?(branch_name)
+        puts "Skipping branch " + branch_name
+      elsif branch.start_with?('*')
+        puts "Skipping active branch " + branch_name
       else
-        system("git branch -d " + branch)
+        system("git branch -d " + branch_name)
       end
     end
   end
 end
-
-# def get_branches_to_keep()
-#   branches_to_keep = Set.new ["master"]
-  # File.open(KEEP_BRANCHES_PATH, "r") do |f|
-  #   f.each_line do |line|
-  #     branches_to_keep.add(line.gsub(/\n/, ''))
-  #   end
-  # end
-#   return branches_to_keep
-# end
-
-# def clean_branches()
-#   branches_to_keep = Set.new ["master"]
-#   branches = `git branch`.split("\n")
-#   for branch in branches do
-#     branch = branch.gsub(/^\s+/, '')
-#     if branch.start_with?('*') || branches_to_keep.include?(branch)
-#       puts "Skipping branch " + branch.gsub(/^\*?\s*/, '')
-#     else
-#       system("git branch -d " + branch)
-#     end
-#   end
-# end
-#
-# clean_branches()

metadata

@@ -1,16 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: branch_cleaner
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Flickner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2020-03-22 00:00:00.000000000 Z
 dependencies: []
-description: Simple gem that will delete all fully merged branches.
+description: Are you tired of cleaning your git repository's branches manually? This
+  simple gem will delete all fully merged branches that are not the active branch
+  or the master branch.
 email: mwflickner@gmail.com
 executables:
 - cleanbranches
@@ -43,5 +45,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: This is an example!
+summary: A simple gem that will delete all fully merged branches
 test_files: []