branch-cleaner 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12716974eac388586df7653ab531b8a4d824a1cc
-  data.tar.gz: d08b0e40e6cdc0abf5693a24a516a8fdb77596cb
+  metadata.gz: 5acb9b7fe222c6cf31a8903f06b0cc56801ccf5f
+  data.tar.gz: fef5387f3c1676c2ae23da5effe3f08e38119ea8
 SHA512:
-  metadata.gz: fa7f430447fe65113ed13830ef3b14f23d3bd029a09d6873ccbc4762a71c71cc69d1d058f08096958d9c66192dc4dbddc18ba7f1fc4d1dc5d5d191b8d0f4afac
-  data.tar.gz: c0f8e54087336d002e7c2e68c3a84f7b845348cd85e4b4f022304ce19841147dfba1665e583dcd41c9ae3bcff339646a0310435a21af06613ee77469ea0b726a
+  metadata.gz: 14b439dec003e5d0fb377f89ca0f2e955539026e7270e96a20e6d87c8133ff2210eb05562816f8f4feffe379611b5ba201a88ebb4586d92df2bcbfed46cb706a
+  data.tar.gz: a8b18260ed431c49713e72ac34c6b9cc2a6f180fab7ffd081d648e987b98389cfafa92cf0f85eaa8e44b4b510f9e1b851239e3071108423729da056e53b95c8b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    branch-cleaner (0.1.1)
+    branch-cleaner (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/branch/cleaner.rb

@@ -6,18 +6,23 @@ module Branch
   module Cleaner
   	NOBLE_BRANCHES_NAMES = ["master", "develop"]
   	DEFAULT_WEEKS = 2
+    DEFAULT_PROFIXS = ['keep']
 
   	options = {}
   	OptionParser.new do |opts|
-  		opts.banner = "bcleaner is a tool to clean branch which is out of date."
+  		opts.banner = "bcleaner is a tool to clean branch which is out of date. master and develop branch is being protected."
 
   		opts.on('-p', '--push', 'push to remote repo.') do 
   			options[:push] = true
   		end
 
-  		opts.on('-w=NUMBER', '--week=NUMBER', 'number of weeks. If last commit of branch if before the date, the branch will be deleted.') do |value|
+  		opts.on('-w NUMBER', '--week NUMBER', 'number of weeks. If last commit of branch if before the date, the branch will be deleted.') do |value|
     		options[:weeks] = Float(value) rescue DEFAULT_WEEKS
   		end
+
+      opts.on('-b PROFIXA,PROFIXB', '--branch-profixs PROFIXA,PROFIXB', Array, 'profixs of branch that is protected from being deleting. For default value is [keep], a branch with name "keep/branch_subname" will be protected from being deleting, while a branch with name "keep_branch_subname" will not.') do |value|
+        options[:protected_profixs] = Array(value) rescue DEFAULT_PROFIXS
+      end
   	end.parse!
 
   	exec_command_result = `for branch in \`git branch -r | grep -v HEAD\`;do echo -e \`git show --format="%ci %cr" $branch | head -n 1\` $branch; done | sort -r`	
@@ -28,11 +33,26 @@ module Branch
   	end
 
 		all_remote_branches = exec_command_result.split("\n")
-		branches_to_delete = all_remote_branches.select do |branch|
+
+    protected_profixs = options[:protected_profixs] || DEFAULT_PROFIXS
+    protected_branches = all_remote_branches.select do |branch|
+      valid_branch_name = branch.split(' ').last.split('/', 2).last
+
+      protected_profixs.include?(valid_branch_name.split('/').first)
+    end
+
+    puts  <<-FOO
+these branches will be protected (branch profixs #{protected_profixs}) : \n#{protected_branches.join("\n")}\n\n
+     FOO
+
+    not_protected_branches = all_remote_branches - protected_branches
+		branches_to_delete = not_protected_branches.select do |branch|
 			branch_time = Time.parse(branch)
 			now_time = Time.new
 			weeks = (now_time - branch_time) / 3600 / 24 / 7
-			(weeks > (options[:weeks] || DEFAULT_WEEKS)) && !(NOBLE_BRANCHES_NAMES.include?(branch.split(' ').last.split('/', 2).last))
+      valid_branch_name = branch.split(' ').last.split('/', 2).last
+      
+			(weeks > (options[:weeks] || DEFAULT_WEEKS)) && !(NOBLE_BRANCHES_NAMES.include?(valid_branch_name)) 
 		end
 		
 		puts  <<-FOO

data/lib/branch/cleaner/version.rb

@@ -1,5 +1,5 @@
 module Branch
   module Cleaner
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: branch-cleaner
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler