pik 0.1.1 → 0.2.0

data/lib/pik/contrib/zip/ziprequire.rb

@@ -0,0 +1,90 @@
+# With ziprequire you can load ruby modules from a zip file. This means
+# ruby's module include path can include zip-files.
+#
+# The following example creates a zip file with a single entry 
+# <code>log/simplelog.rb</code> that contains a single function 
+# <code>simpleLog</code>: 
+#
+#   require 'zip/zipfilesystem'
+#   
+#   Zip::ZipFile.open("my.zip", true) {
+#     |zf| 
+#     zf.file.open("log/simplelog.rb", "w") { 
+#       |f|
+#       f.puts "def simpleLog(v)"
+#       f.puts '  Kernel.puts "INFO: #{v}"'
+#       f.puts "end"
+#     }
+#   }
+#
+# To use the ruby module stored in the zip archive simply require
+# <code>zip/ziprequire</code> and include the <code>my.zip</code> zip 
+# file in the module search path. The following command shows one 
+# way to do this:
+#
+#   ruby -rzip/ziprequire -Imy.zip  -e " require 'log/simplelog'; simpleLog 'Hello world' "
+
+#$: << 'data/rubycode.zip' << 'data/rubycode2.zip'
+
+
+require 'zip/zip'
+
+class ZipList #:nodoc:all
+  def initialize(zipFileList)
+      @zipFileList = zipFileList
+  end
+
+  def get_input_stream(entry, &aProc)
+    @zipFileList.each {
+      |zfName|
+      Zip::ZipFile.open(zfName) {
+	|zf|
+	begin
+	  return zf.get_input_stream(entry, &aProc) 
+	rescue Errno::ENOENT
+	end
+      }
+    }
+    raise Errno::ENOENT,
+      "No matching entry found in zip files '#{@zipFileList.join(', ')}' "+
+      " for '#{entry}'"
+  end
+end
+
+
+module Kernel #:nodoc:all
+  alias :oldRequire :require
+
+  def require(moduleName)
+    zip_require(moduleName) || oldRequire(moduleName)
+  end
+
+  def zip_require(moduleName)
+    return false if already_loaded?(moduleName)
+    get_resource(ensure_rb_extension(moduleName)) { 
+      |zis| 
+      eval(zis.read); $" << moduleName 
+    }
+    return true
+  rescue Errno::ENOENT => ex
+    return false
+  end
+
+  def get_resource(resourceName, &aProc)
+    zl = ZipList.new($:.grep(/\.zip$/))
+    zl.get_input_stream(resourceName, &aProc)
+  end
+
+  def already_loaded?(moduleName)
+    moduleRE = Regexp.new("^"+moduleName+"(\.rb|\.so|\.dll|\.o)?$")
+    $".detect { |e| e =~ moduleRE } != nil
+  end
+
+  def ensure_rb_extension(aString)
+    aString.sub(/(\.rb)?$/i, ".rb")
+  end
+end
+
+# Copyright (C) 2002 Thomas Sondergaard
+# rubyzip is free software; you can redistribute it and/or
+# modify it under the terms of the ruby license.

data/lib/pik/core_ext/pathname.rb

@@ -1,15 +1,28 @@
 
 class Pathname
 
-  def to_windows
-    @path.gsub!('/','\\')
-    self
+  def to_s
+    @path.gsub('/','\\')
   end
+  alias to_windows to_s
   
   def to_ruby
-    @path.gsub!('\\','/')
-    self
+    @path.gsub('\\','/')
   end
-
+  
+  def ruby
+    Pathname(self.to_ruby)
+  end
+  
+  def windows
+    Pathname(self.to_s)
+  end
+  
+  def ==(other)
+    return false unless Pathname === other
+    self_ = self.dup.to_ruby.downcase
+    other = other.dup.to_ruby.downcase
+    self_ == other
+  end
+  
 end
-

data/lib/pik/search_path.rb

@@ -1,38 +1,46 @@
 
 class SearchPath
 
+  include Enumerable
+
 	def initialize(path)
-	  @path = path.to_s.split(';')
+	  @path = path.to_s.split(';').reject{|i| i.empty? }
 	end
 
 	def remove(old_path)
-    old = Pathname.new(old_path).to_windows
-		@path.reject!{|dir| dir =~ regex(old.to_s) }
+    old = Pathname(old_path).expand_path.to_windows
+    @path = @path.reject{|dir| Pathname(dir) == old }
+    @path = @path.uniq
 		self
 	end
 
 	def replace(old_path, new_path)
-  
-    old_path = Pathname.new(old_path)
-    new_path = Pathname.new(new_path)
+    old_path = Pathname(old_path)
+    new_path = Pathname(new_path)
 		@path.map!{|dir|
-			case dir
-			when regex(old_path.to_windows)
-				new_path.to_windows.to_s
-			else 
-				dir 
+			if Pathname(dir) == old_path
+ 				new_path.to_windows.to_s
+			else
+ 				dir 
 			end
-		}.uniq.compact
+		}
+    @path = @path.uniq.compact
 		self
 	end
+  
+  def each
+    @path.each{|path| yield path }
+  end
 
 	def add(new_path)
-    new_path = Pathname.new(new_path)
+    new_path = Pathname(new_path)
 		@path << new_path.to_windows.to_s
 		self
 	end
 
 	def replace_or_add(old_path, new_path)
+    old_path = Pathname(old_path)
+    new_path = Pathname(new_path)
 	  return self if old_path == new_path
 		old_search_path = @path.dup
 		replace(old_path, new_path)

data/lib/pik/which.rb

@@ -0,0 +1,52 @@
+
+module Which
+
+  class Base
+
+    class << self
+      def find(search_path=ENV['PATH'])
+        path = SearchPath.new(search_path)
+        path = path.find{|dir| exist?(dir)}
+        Pathname(path) rescue nil
+      end
+  
+      def exist?(path)
+        !!exe(path)
+      end
+      
+      def exe(path=find)
+        glob(path).first
+      end
+      alias :bat :exe
+      
+      def glob(path)
+        return [] if path.nil?
+        glob = "#{Pathname.new(path).to_ruby}/{#{executables.join(',')}}"
+        Pathname.glob(glob)
+      end
+    end
+  end
+
+  class Ruby < Base
+  
+    def self.executables
+      ['ruby.exe', 'ir.exe', 'jruby.exe', 'jruby.bat']
+    end
+  
+  end
+  
+  class Gem  < Base
+
+    def self.executables
+      ['gem.bat', 'igem.bat']
+    end  
+  
+  end
+  
+  class SevenZip < Base
+    def self.executables
+      ['7za.exe']
+    end 
+  end
+
+end

data/lib/pik/windows_env.rb

@@ -1,17 +1,25 @@
-require 'win32ole'
+require 'win32/registry'
+require 'Win32API'
+
 
 class WindowsEnv
 
   def self.system
-    @system ||= new('SYSTEM', shell)
+    key     = :HKEY_LOCAL_MACHINE
+    subkey = 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment'
+    new(key, subkey)
   end
 
   def self.user
-    @user ||= new('User', shell)
+    key = :HKEY_CURRENT_USER
+    subkey = 'Environment'
+    new(key, subkey)
   end
 
-  def initialize(account, shell)
-    @env = shell.environment(account)
+  def initialize(key, subkey)
+    @key    = key
+    @subkey = subkey
+    @reg    = Reg.new
   end
 
   def set(items)
@@ -19,7 +27,7 @@ class WindowsEnv
   end
   
   def [](name)
-    @env.item(name)
+    @reg.open(@key, @subkey, name)
   end
 
   def []=(name, other)
@@ -34,31 +42,62 @@ class WindowsEnv
     !!self[key]
   end
 
-  private
-
-  def self.shell
-    @shell ||= WIN32OLE.new('WScript.Shell')
-  end
-
 end
 
-# env = WindowsEnv.user
-
-# home = env['home']
-# p home
-
-# env['home'] = nil
+class Reg
+  
+  def initialize(user=User.new)
+    @user = user
+  end
 
-# p env['home'] 
+  # reads the registry hive that the installer would write to
+  # based on user rights
+  def install_hkey(subkey, name='')
+    @user.admin? ? hklm(subkey,name) : hkcu(subkey,name)
+  end
 
-# env['rubyopt'] = '-rubygems'
+  def hklm(subkey, name='')
+    open(:HKEY_LOCAL_MACHINE, subkey, name)
+  end
+  
+  def hkcu(subkey,name='')
+    open(:HKEY_CURRENT_USER, subkey, name)
+  end
+  
+  def hkcr(subkey,name='')
+    open(:HKEY_CLASSES_ROOT, subkey, name)
+  end
+  
+  def open(key, subkey, name)
+    key = Win32::Registry.const_get(key)
 
-# env['home'] = home
-# p env['home']
+    key.open(subkey) do |reg|
+      reg_typ, reg_val = reg.read(name) rescue nil
+      return reg_val
+    end
+  end
+end
 
-# p env['path']
+class User
 
-# p env.has_key?('path')
-# p env.has_key?('rubyopt')
+  IsUserAnAdmin = Win32API.new('shell32', 'IsUserAnAdmin', 'v', 'i')
+  
+  # the logged on user's name
+  def name
+    ENV['username']
+  end
 
+  # the logged on user's domain
+  def domain
+    ENV['userdomain']
+  end
+  
+  # determines if the user has admin rights
+  # not if the user is a member of the local admins group
+  # (allows for nested groups)
+  def admin?
+    true if IsUserAnAdmin.call.nonzero?
+  end
 
+end
+    

data/spec/add_command_spec.rb

@@ -10,6 +10,4 @@ describe Pik::Add do
     add.interactive.should be_true
   end
 
-  it "should exit with a message if nothing is found"
-
 end

data/spec/batch_file_spec.rb

@@ -12,9 +12,9 @@ describe BatchFile do
 		@bf.to_s.should == string	
 	end
 
-	it "should generate an ftype command for ruby.exe and rubyw.exe" do
-		@bf.ftype.to_s.should match(/FTYPE rbfile\=ruby\.exe \"%1\" \%\*\n\nFTYPE rbwfile\=rubyw\.exe \"\%1\" \%\*/)
-	end
+	# it "should generate an ftype command for ruby.exe and rubyw.exe" do
+	# 	@bf.ftype.to_s.should match(/FTYPE rbfile\=ruby\.exe \"%1\" \%\*\n\nFTYPE rbwfile\=rubyw\.exe \"\%1\" \%\*/)
+	# end
 
 	it "should generate a path command with the updated ruby path" do
 		@bf.set('PATH' => "C:\\ruby\\191\\bin").to_s.should match(/SET PATH\=C:\\ruby\\191\\bin/)

data/spec/command_spec.rb

@@ -24,11 +24,4 @@ describe Pik::Command do
     end
   end
   
-  describe "current_ruby_bin_path" do
-    it "should be a Pathname" do
-      @cmd.current_ruby_bin_path.should be_a(Pathname)
-      @cmd.current_ruby_bin_path.basename.to_s.should == "bin"
-    end
-  end
-  
 end

data/spec/gemsync_command_spec.rb

@@ -9,7 +9,7 @@ describe Pik::GemSync do
       gemsync = Pik::GemSync.new([])
       gemsync.gem_install(Pathname.new('c:/fake/file.gem'))
       gemsync.batch.file_data.should include( "ECHO Installing file.gem" )
-      gemsync.batch.file_data.should include( "CALL gem install -q --no-rdoc --no-ri c:/fake/file.gem\n" )
+      gemsync.batch.file_data.should include( "CALL gem install -q --no-rdoc --no-ri c:\\fake\\file.gem\n" )
     end
   end
 end

data/spec/help_command_spec.rb

@@ -2,7 +2,7 @@
 describe Pik::Help do
 
   before do
-    @cmd = 'bin\\pik.bat'
+    @cmd = 'tools\\pik.bat'
   end
 
   it "should have a summary" do

data/spec/list_command_spec.rb

@@ -1,7 +1,7 @@
 describe Pik::List do
 
   before do
-    @cmd = 'bin\\pik.bat'
+    @cmd = 'tools\\pik.bat'
     Pik::Commands.clear
     Pik::Commands.add(Pik::List)
     #Pik::ConfigFile.stub!(:new).and_return({})

data/spec/pathname_spec.rb

@@ -0,0 +1,30 @@
+
+describe Pathname do
+
+  describe '==' do
+    it 'should test for equality' do
+      path1 = Pathname('Z:/This/is/to/test/EQUALITY')
+      path2 = Pathname('Z:\\this\\is\\to\\test\\equality')
+      path1.should == path2
+    end
+  end
+  
+  describe 'to_windows' do
+    it 'should change the file separator' do
+      path   = Pathname('Z:/This/is/to/test/separators')
+      result = "Z:\\This\\is\\to\\test\\separators"
+      path.to_windows.should eql(result)
+      p = "C:\\Doc\\gthiesfeld/.pik/dl/ir.zip"
+      Pathname(p).to_windows.should eql("C:\\Doc\\gthiesfeld\\.pik\\dl\\ir.zip")    
+    end
+  end
+  
+  describe 'to_ruby' do
+    it 'should change the file separator' do
+      path   = Pathname("Z:\\This\\is\\to\\test\\separators")
+      result = 'Z:/This/is/to/test/separators'
+      path.to_ruby.should eql(result)
+    end
+  end
+
+end