pik 0.2.6 → 0.2.7

data/features/version.feature

@@ -7,4 +7,5 @@ Feature: display pik version
   Scenario: Listing versions
     When I run "pik -V"
     Then I should see "pik "
-    And I should see the Pik::VERSION
+    And I should see the Pik::VERSION
+    And I should not see "Usage: pik command [options]"

data/lib/pik.rb

@@ -1,11 +1,9 @@
 module Pik
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-
-ENV['GEM_HOME'] = nil
-ENV['GEM_PATH'] = nil
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'vendor/lib'))
 
 require 'yaml'
 require 'pathname'
@@ -13,7 +11,16 @@ require 'fileutils'
 require 'find'
 require 'open-uri'
 require 'rbconfig'
-require 'rubygems'
+
+ENV['GEM_HOME'] = nil
+ENV['GEM_PATH'] = nil
+# real_home       = ENV['HOME']
+# ENV['HOME']     = "nul"
+
+# require 'rubygems'
+
+# ENV['HOME']    = real_home
+
 require 'hpricot'
 require 'highline'
 
@@ -24,6 +31,7 @@ require 'pik/commands'
 require 'pik/commands/config_file_editor'
 require 'pik/commands/batch_file_editor'
 require 'pik/commands/command'
+require 'pik/commands/devkit_command'
 require 'pik/commands/install_command'
 require 'pik/commands/list_command'
 require 'pik/commands/add_command'
@@ -46,7 +54,6 @@ require 'pik/version_parser'
 require 'pik/windows_env'
 require 'pik/which'
 
-
 PIK_HOME  = Pathname.new( ENV['HOME'] || ENV['USERPROFILE'] ) + '.pik'
 
 if defined? ExerbRuntime

data/lib/pik/commands/add_command.rb

@@ -16,11 +16,12 @@ module Pik
     def add(path)
       path = Pathname.new(path)
       path = path.dirname if path.file?
-      if Which::Ruby.exist?(path) 
+      if Which::Ruby.exist?(path)
         if find_config_from_path(path)
           puts "This version has already been added."
         else
           version = get_version(path)
+          version = modify_version(version) if config[version]
           path    = Pathname(path.expand_path.to_ruby)
           puts "** Adding:  #{version}\n Located at:  #{path}\n"
           @config[version] = {}
@@ -61,6 +62,17 @@ module Pik
       end        
     
     end
+
+    def modify_version(version)
+      puts "This version appears to exist in another location."
+      puts "Path:  " + config[version][:path]
+      puts "If you'd still like to add this version, you can."
+      modifier = @hl.ask("Enter a unique name to modify the name of this version. (enter to quit)")
+      raise QuitError if modifier.empty?
+      ver = version.split(':')
+      ["#{ver.shift}-#{modifier}", ver].join(':')
+    end
+
   end
 
 end

data/lib/pik/commands/command.rb

@@ -60,7 +60,7 @@ module Pik
       if patterns.empty?
         possibles = config.keys  
       else
-        possibles = patterns.map{|p| config.keys.grep(Regexp.new(Regexp.escape(p.to_s))) }
+        possibles = patterns.map{|p| config.keys.grep(Regexp.new(Regexp.escape(p.to_s),Regexp::IGNORECASE) ) }
         possibles = possibles.inject{|m,v| m & v }.flatten.uniq
       end
       case possibles.size
@@ -108,6 +108,7 @@ module Pik
     
     def parse_options
       options.on("--version", "-V", "Pik version") do |value|
+        @version = true
         puts pik_version
       end
       options.on("--debug", "-d", "Outputs debug information") do |value|
@@ -145,16 +146,15 @@ module Pik
     end
 
     def default_gem_home
-      get_gem_home(:first)
+      gem_path.first
     end
     
     def actual_gem_home
-      get_gem_home(:last)
+      gem_path.last
     end
     
-    def get_gem_home(position)
-      path = `#{Which::Ruby.exe} -rubygems -e\"require 'rubygems' ; puts Gem.default_path.#{position}\"`
-      Pathname.new(path.chomp).to_windows    
+    def gem_path
+      `\"#{Which::Gem.exe}\" env gempath`.chomp.split(';').map{|p| Pathname(p).to_windows }
     end
     
     def create(home)

data/lib/pik/commands/config_command.rb

@@ -19,14 +19,16 @@ module Pik
         end
       when 'gem_home'
         config[find_config_from_path][:gem_home] = if @args.include?('default') 
-          Pathname.new(default_gem_home)
+          Pathname(default_gem_home)
         else
-          Pathname.new(value)
+          Pathname(value)
         end
       when 'downloads', 'download_dir'
         config.global[:download_dir] = Pathname.new(value)
       when 'installs', 'install_dir'
         config.global[:install_dir] = Pathname.new(value)
+      when 'devkit', 'devkit_dir'
+        config.global[:devkit] = Pathname.new(value)
       when 'list'
         list
       else

data/lib/pik/commands/devkit_command.rb

@@ -0,0 +1,69 @@
+module Pik
+
+  class  Devkit < Command
+    
+    it "Configures devkit settings"
+
+    def execute
+      if @args.include? 'update'
+        puts "Updating devkit batch files for:"
+        config.each{|ruby_version, ruby_config|
+             ver = Pik::VersionParser.parse(ruby_version)
+             if ver.platform =~ /mingw/
+               puts "   #{ver.full_version}"
+               write_batch_files(ruby_config[:path])
+             end
+            config.global[:devkit]
+          }
+      else
+        help
+      end
+    end
+  
+    def write_batch_files(path)
+      write_make(path)
+      write_sh(path)
+      write_gcc(path)
+    end
+    
+    def write_make(path)
+      BatchFile.new(path + 'make.bat') do |b|
+        b.file_data << 'setlocal'
+        b.set(:DEVKIT => config.global[:devkit])
+        b.set(:PATH => "%DEVKIT%\\gcc\\3.4.5\\bin;%DEVKIT%\\msys\\1.0.11\\bin")
+        b.file_data << "bash.exe --login -i -c \"make %*\""
+        b.write
+      end
+    end
+    
+    def write_sh(path)
+      BatchFile.new(path + 'sh.bat') do |b|
+        b.file_data << 'setlocal'
+        b.set(:DEVKIT => config.global[:devkit])
+        b.set(:PATH => "%DEVKIT%\\gcc\\3.4.5\\bin;%DEVKIT%\\msys\\1.0.11\\bin")
+        b.file_data << "bash.exe --login -i -c \"sh %*\""
+        b.write
+      end
+    end
+    
+    def write_gcc(path)
+      BatchFile.new(path + 'sh.bat') do |b|
+        b.file_data << 'setlocal'
+        b.set(:DEVKIT => config.global[:devkit])
+        b.set(:PATH => "%DEVKIT%\\gcc\\3.4.5\\bin;%PATH%")
+        b.file_data << "gcc.exe %*"
+        b.write
+      end
+    end
+  
+    def command_options
+      super
+      sep =<<SEP
+SEP
+      options.separator sep  
+    end
+    
+  end 
+  
+end
+

data/lib/pik/commands/gemsync_command.rb

@@ -71,8 +71,10 @@ MSG
       conf = config[version]
       cmd = Which::Ruby.exe(conf[:path]).to_s + " -rubygems -e \"puts Gem.default_path.last\""
       
-      path = conf[:gem_home] ? Pathname( conf[:gem_home] ) : Pathname( `#{cmd}`.chomp ) 
-      path + "cache"
+      path = conf[:gem_home] ? Pathname( conf[:gem_home] ) : Pathname( `#{cmd}`.chomp )
+      cache = path + "cache"
+      puts "cache: #{cache}" if debug
+      cache      
     end
     
     def command_options

data/lib/pik/commands/help_command.rb

@@ -24,7 +24,7 @@ module Pik
     end
    
     def command_options
-      options.program_name = "#{PIK_BATCH.basename('.*')} command"
+      options.program_name = "pik command"
       sep = <<SEP
 
 To get help with a command

data/lib/pik/commands/info_command.rb

@@ -7,18 +7,16 @@ module Pik
     aka :checkup, :cu
     
     def execute
-      puts info      
-    end
-    
-    def info
-      ruby = Which::Ruby.exe
-      ruby_version = find_config_from_path(ruby.dirname)
+      puts pik_version
+      
+      ruby = check_path
+      
+      ruby_version = find_config_from_path(ruby)
       current = config[ruby_version]
       gem_home = current[:gem_home] || actual_gem_home
       ruby_version = Pik::VersionParser.parse(ruby_version)
 
-      return info =<<INFO
-#{pik_version}
+      puts info =<<INFO
 
 ruby:
 interpreter:  "#{ruby_version.interpreter}"
@@ -30,7 +28,7 @@ full_version: "#{ruby_version.full_version}"
 
 homes:
 gem:          "#{gem_home}"
-ruby:         "#{ruby.dirname.dirname}"
+ruby:         "#{ruby.dirname}"
 
 binaries:
 ruby:         "#{ruby}"
@@ -46,24 +44,47 @@ RUBYOPT:      "#{ENV['RUBYOPT']}"
 
 file associations:
 .rb:           #{file_associations('.rb')}
-.rbw:          #{file_associations('.rbw')}#{check_path} 
+.rbw:          #{file_associations('.rbw')}
 INFO
     end
     
     def check_path
       dirs = Which::Ruby.find_all
-      unless dirs.size == 1
-        dirs.unshift("\n\nwarning: There is more than one version of ruby in the system path")
-        dirs.join("\n")
+      case dirs.size 
+      when 0
+        $stdout.flush
+        abort no_ruby
+      when 1
+        dirs.first
+      else
+        puts too_many_rubies(dirs)
+        dirs.first
       end
     end
     
+    def too_many_rubies(dirs)
+      msg =<<MSG
+      
+warning: There is more than one version of ruby in the system path
+#{dirs.join("\n")}
+MSG
+    end
+
+    def no_ruby
+      msg =<<MSG
+
+Pik info will not work unless there is a version of ruby in the path.
+
+You can use pik switch to add one.
+MSG
+    end
+    
     def file_associations(extension)
       @reg = Reg.new
       assoc = @reg.hkcr(extension) rescue nil
       ftype = @reg.hkcr("#{assoc}\\Shell\\open\\command") rescue nil
     end
-
+        
   end
   
 end

data/lib/pik/commands/install_command.rb

@@ -9,6 +9,8 @@ module Pik
     aka :in
     it "Downloads and installs different ruby versions."
     
+    attr_reader :target
+    
     def initialize(args=ARGV, config_=nil)
       super
       @download_dir = config.global[:download_dir] || PIK_HOME + 'downloads'
@@ -18,11 +20,11 @@ module Pik
     
     def execute
       implementation  = Implementations[@args.shift]
-      target, package = implementation.find(*@args)
-      target          = @install_root + "#{implementation.name}-#{target.gsub('.','')}"
+      @target, package = implementation.find(*@args)
+      @target          = @install_root + "#{implementation.name}-#{@target.gsub('.','')}"
       file            = download(package)
-      extract(target, file)
-      add( Pathname(target) + 'bin' )
+      extract(@target, file)
+      implementation.after_install(self)
     end
     
     def command_options
@@ -63,13 +65,6 @@ SEP
       end  
     end
     
-    def add(path)
-      puts
-      p = Pik::Add.new([path], config)
-      p.execute
-      p.close
-    end
-    
     def seven_zip(target, file)
       file = Pathname(file)
       seven_zip = Which::SevenZip.exe.basename 

data/lib/pik/commands/list_command.rb

@@ -20,19 +20,38 @@ module Pik
     end
     
     def list
-      current_path = Which::Ruby.find
+      
       config.sort.each do |name, conf|
-        name += ' *' if current_path == conf[:path]
-        puts name
-        if verbose
-          conf.each{|k,v| puts "     %s: %s" % [k, v]} 
-          puts
-        end
+        puts layout(name, conf)
+        puts conf.map{|k,v| "       %s: %s" % [k, v]} + ["\n"] if verbose
+        
       end
     end
     
     private
     
+    def layout(name, conf)
+      name = current?(conf) ? "* #{name}" : "  #{name}"
+      if name.length > columns
+        remainder = -(name.length - columns + 5)
+        "#{name[0,columns-5]}...#{"         ...%s" % name[remainder..-1] if verbose}"
+      else
+        name
+      end
+    end
+    
+    def current?(conf)
+      current_path == conf[:path]
+    end
+
+    def current_path 
+      @current_path ||= Which::Ruby.find
+    end
+    
+    def columns
+      @hl.output_cols
+    end
+    
     def command_options
       super
       @options.on("--verbose", "-v",

data/lib/pik/commands/uninstall_command.rb

@@ -15,21 +15,21 @@ module Pik
         puts "** Deleting #{config[to_remove][:path].dirname}"
         path = config[to_remove][:path].dirname
         FileUtils.rm_rf(path) if path.exist?
-        remove
+        remove(to_remove)
         puts
         @hl.say("#{to_remove} has been uninstalled.")
       end
     end
     
-    def remove
-      rm = Pik::Remove.new(@args + ['--force', '--quiet'], config)
+    def remove(to_remove)
+      rm = Pik::Remove.new([to_remove, '--force', '--quiet'], config)
       rm.execute
       rm.close
     end
     
     def command_options
       super
-      options.on("--force", "-f", "Remove without prompting") do |value|
+      options.on("--force", "-f", "Uninstall without prompting") do |value|
         @force = value
       end
     end

data/lib/pik/contrib/uri_ext.rb

@@ -8,7 +8,7 @@
 require 'cgi'
 require 'uri'
 require 'net/http'
-require 'net/https'
+# require 'net/https'
 require 'tempfile'
 require 'fileutils'
 

data/lib/pik/core_ext/pathname.rb

@@ -2,12 +2,12 @@
 class Pathname
 
   def to_s
-    @path.tr('/','\\')
+    @path.tr('/','\\').sub(/^.:/){|s| s.upcase }
   end
   alias to_windows to_s
   
   def to_ruby
-    @path.tr('\\','/')
+    @path.tr('\\','/').sub(/^.:/){|s| s.upcase }
   end
   
   def ruby