patheditor 1.0.0 → 1.0.1

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.0"
+	s.version = "1.0.1"
 	s.author = "Justin Bailey"
 	s.email = "jgbailey@nospam@gmail.com"
 	

data/bin/path_editor

@@ -63,18 +63,33 @@ Forces changes to occur with confirmation. True by default unless paths are bein
 
   def main
     @hl = HighLine.new
-    @paths = WindowsPath.new
+    @currPath = WindowsPath.new
     
     if @clean || @add || @remove
       if @clean
-				paths_to_remove = []
-        @paths.each { |p| paths_to_remove << p unless Pathname.new(p).exist? }
-        remove_paths(paths_to_remove) unless paths_to_remove.empty?
+				nonexistent = []
+				found = WindowsPathArray.new
+				duplicates = []
+				idx = 0 
+        @currPath.paths.each do |p| 
+          pathname = Pathname.new(p).cleanpath
+					if ! pathname.exist? 
+						nonexistent << p  
+					elsif found.include?(pathname)
+						duplicates << idx
+					else
+						found << pathname
+					end
+					idx += 1
+        end
+
+				remove_paths(duplicates) unless duplicates.empty?
+				remove_paths(nonexistent) unless nonexistent.empty?	
       end
       
       if @add
-        unless @paths.include? @add
-          @paths.add(@add)
+        unless @currPath.paths.include? @add
+          @currPath.paths.add(@add)
           @path_updated = true
           @hl.say "Added #{@add} to path." 
         else
@@ -91,26 +106,26 @@ Forces changes to occur with confirmation. True by default unless paths are bein
           exp = @case_sensitive ? Regexp.new("^#{@remove}$") : Regexp.new("^#{@remove}$", Regexp::IGNORECASE)
           paths_to_remove = []
           
-          @paths.each { |p| paths_to_remove << p if exp.match(p) }
+          @currPath.paths.each { |p| paths_to_remove << p if exp.match(p) }
           remove_paths(paths_to_remove) unless paths_to_remove.empty?
-        elsif @paths.include?(@remove)
+        elsif @currPath.paths.include?(@remove)
           @hl.say "Removing path #{@remove}"
-          @paths.remove(@remove) 
+          @currPath.paths.remove(@remove) 
           @path_updated = true
         end
       end
 
       if @path_updated
         if confirmation_needed? 
-					@paths.update if @hl.agree("Would you like to commit the changes made? [Yn] ", true)
+					@currPath.update if @hl.agree("Would you like to commit the changes made? [Yn] ", true)
         else
-          @paths.update
+          @currPath.update
         end
       end
     else
       # Print path
       @hl.say "Current path entries:" 
-      @paths.each { |p| @hl.say "\t#{p}" } 
+      @currPath.paths.each { |p| @hl.say "\t#{p}" } 
     end
   rescue 
     puts "Exception: #{$!.message}"
@@ -123,14 +138,22 @@ 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
   def remove_paths(paths_to_remove)
 		cnt = 0
     paths_to_remove.each do |p| 
-      @hl.say "Removing #{p}"
-      @paths.remove p
-      @path_updated = true
-      # If more than one path matches and the user did not specify "--no-confirmation", make
-      # sure to enable it here.
+			if p.is_a?(Fixnum)
+				idx = p - cnt # adjust index based on paths removed so far.
+				@hl.say "Removing #{@currPath.paths[idx]}"
+				@currPath.paths.delete_at(idx)
+			else
+				@hl.say "Removing #{p}"
+				@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
     end

data/lib/windows_path.rb

@@ -1,74 +1,78 @@
 require 'win32ole'
+require 'pathname'
 
-# Manages access to and updating of windows path setting. Also manages
-# enumerating paths available, and checking if a given path exists. 
-class WindowsPath
-  include Enumerable
-  FILE_SEPARATOR = File::ALT_SEPARATOR
+# Specialized array that knows how to compare paths.
+class WindowsPathArray < Array
+	
+	def include?(path)
+    # Compare paths case-insensitive, and also checking
+    # trailing separators (so c:\program files == c:\program files\)
+    self.any? { |p| compare_paths(path, p) }
+	end
 
-  def initialize
-    @shell = WIN32OLE.new("WScript.Shell")
-    @system = @shell.Environment("System")
-    @paths = []
-    @paths = @system.Item("Path").split(";").collect { |p| p.strip }
-  end
-  
-  def expand_vars(val)
-    while m = val.match(/%.*?%/)
-      val = val.gsub(m[0], @shell.ExpandEnvironmentStrings(m[0]))
-    end
+	def compare_paths(left, right)
+    left = Pathname.new(WindowsPath.expand_vars(left.to_s).downcase).cleanpath
+    right = Pathname.new(WindowsPath.expand_vars(right.to_s).downcase).cleanpath
     
-    val
+    return left.eql?(right)
   end
 
-  def add(p)
-    @paths << p.to_s unless self.include?(p)
+  def <<(p)
+    super(p.to_s)
   end
+	
+  alias_method :add, :<<
 
-  alias_method :<<, :add
-  
-  def remove(r)
-    # Find all paths that match and delete them.
-    @paths = @paths.delete_if { |p| compare_paths(r, p) }
-  end
-  
-  # Update any changes 
-  def update
-    @system["Item", "Path"] = @paths.join(";")
-  end
-  
-  def each
-    @paths.each { |p| yield expand_vars(p) }
-  end  
+	def delete(path)
+		self.delete_if { |p| compare_paths(path, p) }
+	end
+	
+	def each
+		for i in 0..size - 1
+			yield WindowsPath.expand_vars(raw_item(i))
+		end
+	end
+	
+	# Preserve access to base class definition of []
+	alias_method :raw_item, :[]
+	
+	def [](idx)
+		WindowsPath.expand_vars(super)
+	end
+end
 
-  def compare_paths(left, right)
-    left = expand_vars(left.to_s).downcase
-    right = expand_vars(right.to_s).downcase
-    
-    if left == right 
-      true
-    else
-      left_sep = left.length > 1 && left.rindex(FILE_SEPARATOR) == left.length - 1 
-      right_sep = right.length > 1 && right.rindex(FILE_SEPARATOR) == right.length - 1
-      
-      if ! left_sep && right_sep 
-        left == right[0, right.length - 1]
-      elsif left_sep && ! right_sep 
-        left[0, left.length - 1] == right 
-      else
-        false
-      end
+# Manages access to and updating of windows path setting. 
+class WindowsPath
+  include Enumerable
+  FILE_SEPARATOR = File::ALT_SEPARATOR
+	
+	# paths is a WindowsPathArray holding all paths in the system.
+	attr_accessor :paths
+
+	# Holds a reference to the Win32 Shell COM object.
+	def self.shell
+    @shell ||= WIN32OLE.new("WScript.Shell")
+	end
+
+	# Given a path, expands any environment variables found in it.
+	# Returns the expanded path.
+	def self.expand_vars(path)
+    while m = path.match(/%.*?%/)
+      path = path.gsub(m[0], shell.ExpandEnvironmentStrings(m[0]))
     end
+		
+    path
   end
-    
-  def include?(path)
-    # Compare paths case-insensitive, and also checking
-    # trailing separators (so c:\program files == c:\program files\)
-    @paths.any? { |p| compare_paths(path, p) }
+	
+  def initialize
+    @system = WindowsPath.shell.Environment("System")
+    @paths = WindowsPathArray.new
+    @system.Item("Path").split(";").each { |p| @paths.add(p.strip) }
   end
   
-  def inspect
-    @paths.inspect
+  # Update any changes 
+  def update
+    @system["Item", "Path"] = @paths.join(";")
   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.0
-date: 2007-02-05 00:00:00 -08:00
+  version: 1.0.1
+date: 2007-02-06 00:00:00 -08:00
 summary: A simple program to manage the Windows PATH environment variable.
 require_paths: 
 - lib