pik 0.1.1 → 0.2.0

data/lib/pik/commands/command.rb

@@ -4,7 +4,10 @@ module Pik
 
   class QuitError < StandardError
   end
-
+  
+  class VersionUnknown < StandardError
+  end
+  
   class  Command
     
     attr_reader :config
@@ -13,6 +16,8 @@ module Pik
     
     attr_accessor :output
     
+    attr_accessor :version
+    
     def self.cmd_name
       name.split('::').last.downcase.to_sym
     end
@@ -42,7 +47,7 @@ module Pik
     end
   
     def self.clean_gem_batch
-      BatchFile.open("#{$0}.bat") do |gem_bat|
+      BatchFile.open(PIK_BATCH) do |gem_bat|
         # remove old calls to .pik/pik batches
         gem_bat.remove_line( /call.+pik.+bat/i )
         gem_bat.write  
@@ -82,7 +87,6 @@ module Pik
       command_options
       parse_options
       create(PIK_HOME) unless PIK_HOME.exist?
-      # Add.new(nil, config).execute if config.empty?
       delete_old_pik_batches
     end
 
@@ -101,45 +105,45 @@ module Pik
     end
     
     def parse_options
-      options.parse! @args
+      options.on("--version", "-V", "Pik version") do |value|
+        puts "pik " + Pik::VERSION
+        @version = true
+      end
+      options.parse! @args 
     end
    
     def current_version?(string)
       string == get_version
     end
         
-    def get_version(path=current_ruby_bin_path)
-      cmd = ruby_exe(path).basename
-      cmd = Pathname.new(path) + cmd
+    def get_version(path=Which::Ruby.find)
+      cmd = Which::Ruby.exe(path)
       ruby_ver = `#{cmd} -v`
-      ruby_ver =~ /ruby (\d\.\d\.\d)/
+      ruby_ver =~ /ruby (\d\.\d\.\d)/i
       major    = $1.gsub('.','')
       "#{major}: #{ruby_ver.strip}"
     end
-        
-    def current_ruby_bin_path
-      Pathname.new(::RbConfig::CONFIG['bindir'] )
-    end
-
-    def ruby_exists_at?(path)
-      !!ruby_exe(path)
-    end
     
-    def ruby_exe(path)
-      ruby_glob(path).first
-    end
+    # def current_path?(config_path)
+    #   @path ||= SearchPath.new(ENV['PATH'])
+    #   @path.find{|dir| Pathname(dir) == Pathname(config_path) }
+    # end
     
-    def ruby_glob(path)
-      glob = "#{Pathname.new(path).to_ruby}/{ruby.exe}"
-      Pathname.glob(glob)
+    def find_config_from_path(path=Which::Ruby.find)
+      config.find{|k,v| 
+        Pathname(v[:path])== Pathname(path)
+      }.first rescue nil
     end
     
     def current_gem_bin_path
-      default_gem_home + 'bin'
+      cfg = config[find_config_from_path]
+      p = cfg[:gem_home] || default_gem_home 
+      p + 'bin'
     end
 
     def default_gem_home
-      Pathname.new(Gem.default_path.first).to_windows
+      path = `#{Which::Ruby.exe} -rubygems -e\"require 'rubygems' ; puts Gem.default_path.first\"`
+      Pathname.new(path.chomp).to_windows
     end
     
     def create(home)
@@ -148,7 +152,7 @@ module Pik
     end
    
     def delete_old_pik_batches( cutoff=(Time.now - (2 * 60 * 60)) )
-      Dir[(PIK_HOME + "*.bat").to_windows.to_s].each do |f| 
+      Dir[(PIK_HOME + "*.bat").to_ruby.to_s].each do |f|
         File.delete(f) if File.ctime(f) < cutoff 
       end
     end
@@ -163,4 +167,4 @@ module Pik
     
   end  
     
-end
+end

data/lib/pik/commands/config_command.rb

@@ -9,6 +9,7 @@ module Pik
     attr_accessor :global
 
     def execute
+      return list if @args.empty?
       item, value = @args.shift.downcase.split('=')
       case item
       when 'rubyopt'
@@ -17,12 +18,63 @@ module Pik
         when 'off' then set('RUBYOPT' => nil)
         end
       when 'gem_home'
-        config[get_version][:gem_home] = @args.include?('default') ? default_gem_home : value
+        config[find_config_from_path][:gem_home] = if @args.include?('default') 
+          Pathname.new(default_gem_home)
+        else
+          Pathname.new(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 'list'
+        list
       else
         puts "Unknown configuration option"
       end
     end
+    
+    def list
+      version = find_config_from_path
+      puts "** CURRENT CONFIGURATION **"
+      puts
+      puts version + ' *'
+      config[version].each{|k,v| puts "     %s: %s" % [k, v]}
+      puts
+      puts "** GLOBAL CONFIGURATION **"
+      puts
+      cfg = stringify(config.global.dup)
+      puts cfg.to_yaml.gsub(/"/, '')
+    end
+    
+    def stringify(item)
+      case item
+      when Array
+        item.map{|i| stringify(i) }
+      when Hash
+        h = {}
+        item.map{|k,v| h[stringify(k)] = stringify(v)} 
+        h
+      else
+        item.to_s
+      end
+    end
+    
+    def command_options
+      super
+      sep =<<SEP
+  Configuration options are:
+    
+    rubyopt      on = -rubygems, off = blank         
+    gem_home     Location of current version's GEM_HOME env. var.
+    downloads    Location where 'pik install' will download new versions
+    installs     Location where 'pik install' will install new versions
 
+SEP
+      options.separator sep  
+    end
+    
   end 
   
-end
+end
+

data/lib/pik/commands/default_command.rb

@@ -3,20 +3,34 @@ module Pik
   
   class Default < Command
   
-    it "switches back to the default settings"
+    it "Switches back to the default settings."
+  
+    attr_accessor :verbose
   
     include BatchFileEditor
   
     def execute
+      unless User.new.admin?
+        raise "You must have admin rights for the default command"
+      end
       sys = WindowsEnv.system
       usr = WindowsEnv.user
-      
-      @batch.set('PATH' => sys['PATH'] + ';' + usr['PATH'] )
+      new_path = [sys['PATH'],usr['PATH']].compact.join(';')
+      @batch.set('PATH' => new_path )
       @batch.set('GEM_PATH' => usr['GEM_PATH'] || sys['GEM_PATH'] )
       @batch.set('GEM_HOME' => usr['GEM_HOME'] || sys['GEM_HOME'] )
-      echo_ruby_version
+      echo_ruby_version(Which::Ruby.find(new_path)) if verbose
+    end
+    
+    def command_options
+      super
+      @options.on("--verbose", "-v",
+         "Verbose output"
+         ) do |value|
+        @verbose = value
+      end
     end
   
   end
 
-end
+end

data/lib/pik/commands/help_command.rb

@@ -5,7 +5,7 @@ module Pik
     it 'Displays help information.'
     
     def execute
-      puts options if @args.empty?
+      puts options if @args.empty? && !version
       
       @args.each do |a|
         @msg = case a.to_sym

data/lib/pik/commands/implode_command.rb

@@ -5,11 +5,22 @@ module Pik
   
     it "Removes your pik configuration."
   
+    attr_reader :force
+  
     def execute
-      if @hl.agree("Are you sure you want pik to implode? This will remove '#{PIK_HOME.to_ruby}'. [Yn] ") 
+      msg =  "Are you sure you want pik to implode? "
+      msg << "This will remove '#{PIK_HOME.to_ruby}'. [Yn] "
+      if @force || @hl.agree(msg)
         PIK_HOME.rmtree
       end
     end
+    
+    def command_options
+      super  
+      options.on("--force", "-f", "Force") do |value|
+        @force = value
+      end 
+    end 
   
   end
 

data/lib/pik/commands/install_command.rb

@@ -0,0 +1,182 @@
+require 'pik/contrib/uri_ext'
+require 'pik/contrib/unzip'
+require 'pik/contrib/progressbar'
+
+module Pik
+
+  class  Install < Command
+  
+    aka :in
+    it "Downloads and installs different ruby versions."
+    
+    def versions
+       {
+        'ruby' => {
+          '1.8.6-p383' =>
+          'http://rubyforge.org/frs/download.php/62267/ruby-1.8.6-p383-i386-mingw32.7z',
+          '1.9.1-p243' =>
+          'http://rubyforge.org/frs/download.php/62269/ruby-1.9.1-p243-i386-mingw32.7z'
+          },
+        'ironruby' => {
+          '0.9.1' =>
+          'http://rubyforge.org/frs/download.php/64504/ironruby-0.9.1.zip',
+          '0.9.0' =>
+          'http://rubyforge.org/frs/download.php/61382/ironruby-0.9.0.zip'
+        },
+        'jruby' => {
+          '1.4.0RC1' =>
+          'http://dist.codehaus.org/jruby/1.4.0RC1/jruby-bin-1.4.0RC1.zip'
+        }
+      }
+    end
+    
+    def execute
+      target = ''
+      @download_dir = config.global[:download_dir] || PIK_HOME + 'downloads'
+      FileUtils.mkdir_p @download_dir.to_s
+      version = @args.shift
+      if versions[version]
+        target += version
+        version = versions[version]
+        @args.each{ |i| version = version.select{|k,v| k =~ Regexp.new(Regexp.escape(i)) } }
+        t, version = most_recent(version)
+        target += "_#{t}"
+      elsif URI.parse(version.to_s) === URI::HTTP
+        version = URI.parse(version.to_s)
+        target  = @args.shift
+      else
+        raise VersionUnknown
+      end
+      install_root = config.global[:install_dir] || PIK_BATCH.dirname + 'pik'
+      target =  install_root + target.gsub('.','')
+      FileUtils.mkdir_p target
+      file = download(version)
+      extract(target, file)
+      add( Pathname(target) + 'bin' )
+    rescue VersionUnknown
+      puts 'unknown'   
+    end
+    
+    def command_options
+      super
+      sep =<<SEP
+  Choices are: ruby, jruby, or ironruby
+  
+  If no version is specified, the latest version will be installed.
+  Download and install locations can be configured with 'pik config'.
+  
+  Examples:
+
+    # install the latest version of JRuby (currently 1.4.0RC1)
+    >pik install jruby
+
+    # install the latest 1.8 version of MinGW Ruby 
+    >pik install ruby 1.8    
+
+SEP
+      options.separator sep  
+    end
+    
+    def most_recent(version)
+      version.sort.last
+    end
+    
+    def download(version, download_dir=@download_dir)   
+      target = download_dir + version.split('/').last
+      puts "** Downloading:  #{version}\n   to:  #{target.windows}\n\n"
+      URI.download(version,target.to_s, {:progress => true})
+      puts
+      return target
+    end
+    
+    def extract(target, file)
+      if Which::SevenZip.exe
+        extract_(file, target)
+      else
+        file = download_seven_zip
+        extract(target, file)
+      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 
+      puts "** Extracting:  #{file.windows}\n   to:  #{target}" #if verbose
+      system("#{seven_zip} x -y -o\"#{target}\" \"#{file.windows}\" > NUL")
+      puts 'done'
+    end
+    
+    def download_seven_zip
+      question = "You need the 7zip utility to extract this file.\n"
+      question << "Would you like me to download it? [Yn]"
+      if @hl.agree question
+        uri    = 'http://downloads.sourceforge.net/sevenzip/7za465.zip'
+        file = download(uri)
+        Zip.fake_unzip(file.to_s, /\.exe|\.dll$/, PIK_BATCH.dirname.to_s)
+      else
+        raise QuitError
+      end
+    end
+    
+    def extract_(file, target, options = {})
+      fail unless File.directory?(target)
+      
+      # create a temporary folder used to extract files there
+      tmpdir = File.expand_path(File.join(Dir.tmpdir, "extract_sandbox_#{$$}"))
+      FileUtils.mkpath(tmpdir) unless File.exist?(tmpdir)
+    
+      # based on filetypes, extract the intermediate file into the temporary folder
+      case file
+        # tar.z, tar.gz and tar.bz2 contains .tar files inside, extract into 
+        # temp first
+        when /(^.+\.tar)\.z$/, /(^.+\.tar)\.gz$/, /(^.+\.tar)\.bz2$/
+          seven_zip tmpdir, file
+          seven_zip target, File.join(tmpdir, File.basename($1))
+        when /(^.+)\.tgz$/
+          seven_zip tmpdir, file
+          seven_zip target, File.join(tmpdir, "#{File.basename($1)}.tar")
+        when /(^.+\.zip$)/, /(^.+\.7z$)/
+          seven_zip(target, $1)
+        else
+          raise "Unknown file extension! (for file #{file})"
+      end
+    
+      # after extraction, lookup for a folder that contains '-' (version number or datestamp)
+      folders_in_target = []
+      Dir.chdir(target) { folders_in_target = Dir.glob('*') }
+    
+      # the package was created inside another folder
+      # exclude folders packagename-X.Y.Z or packagename-DATE
+      # move all the folders within that into target directly.
+      folders_in_target.each do |folder|
+        next unless File.directory?(File.join(target, folder)) && folder =~ /\-/
+    
+        # take the folder contents out!, now!
+        contents = []
+        Dir.chdir(File.join(target, folder)) { contents = Dir.glob('*') }
+    
+        contents.each do |c|
+          #puts "** Moving out #{c} from #{folder} and drop into #{target}" if Rake.application.options.trace
+          FileUtils.mv File.join(target, folder, c), target, :force => true
+        end
+        
+        # remove the now empty folder
+        # puts "** Removing #{folder}" if Rake.application.options.trace
+        FileUtils.rm_rf File.join(target, folder)
+      end
+    
+      # remove the temporary directory
+      # puts "** Removing #{tmpdir}" if Rake.application.options.trace
+      FileUtils.rm_rf tmpdir
+    end
+    
+  end
+  
+end

data/lib/pik/commands/list_command.rb

@@ -7,9 +7,10 @@ module Pik
 
     attr_reader :verbose 
     
-    def execute
+    def execute 
+      current_path = Which::Ruby.find
       config.sort.each do |name, conf|
-        name += ' *' if current_version?(name)
+        name += ' *' if current_path == conf[:path]
         puts name
         if verbose
           conf.each{|k,v| puts "     %s: %s" % [k, v]}