patheditor 1.0.1 → 1.0.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
 	s.name = "patheditor"
 	s.summary = "A simple program to manage the Windows PATH environment variable."
-	s.version = "1.0.1"
+	s.version = "1.0.2"
 	s.author = "Justin Bailey"
 	s.email = "jgbailey@nospam@gmail.com"
 	

data/bin/path_editor

@@ -83,8 +83,13 @@ Forces changes to occur with confirmation. True by default unless paths are bein
 					idx += 1
         end
 
-				remove_paths(duplicates) unless duplicates.empty?
-				remove_paths(nonexistent) unless nonexistent.empty?	
+				unless duplicates.empty?
+					remove_paths(duplicates) { |p| @hl.say "Removing #{p} (duplicate)" } 
+				end
+
+				unless nonexistent.empty?					
+					remove_paths(nonexistent){ |p| @hl.say "Removing #{p} (doesn't exist)" } 
+				end
       end
       
       if @add
@@ -138,24 +143,27 @@ Forces changes to occur with confirmation. True by default unless paths are bein
 		(@automatic_confirm && ! @confirm_disabled) || false
   end
   
-  # Takes an array of paths or indices and removes them from the current path
+  # Takes an array of paths or indices and removes them from the current path. Yields
+  # each path before deleting it, if a block was provided
   def remove_paths(paths_to_remove)
-		cnt = 0
+		@paths_removed ||= 0
+		adjust = 0
     paths_to_remove.each do |p| 
 			if p.is_a?(Fixnum)
-				idx = p - cnt # adjust index based on paths removed so far.
-				@hl.say "Removing #{@currPath.paths[idx]}"
+				idx = p - adjust # adjust index based on paths removed so far.
+				yield @currPath.paths[idx] if block_given?
 				@currPath.paths.delete_at(idx)
 			else
-				@hl.say "Removing #{p}"
+				yield p if block_given?
 				@currPath.paths.delete p
       end
       
 			# If more than one path matches and the user did not specify "--no-confirmation", make
 			# sure to enable it here.
 			@path_updated = true
-      @automatic_confirm = true if cnt > 0
-      cnt += 1
+      @automatic_confirm = true if @paths_removed > 0
+      @paths_removed += 1
+      adjust += 1
     end
   end
   

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: patheditor
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2007-02-06 00:00:00 -08:00
+  version: 1.0.2
+date: 2007-02-07 00:00:00 -08:00
 summary: A simple program to manage the Windows PATH environment variable.
 require_paths: 
 - lib