pik 0.1.1 → 0.2.0

data/lib/pik/commands/remove_command.rb

@@ -6,24 +6,24 @@ module Pik
     it "Removes a ruby location from pik."
     include ConfigFileEditor
     
-    attr_reader :quiet
+    attr_reader :force
     
     def execute
       to_remove = self.class.choose_from(@args, @config)
       raise QuitError unless to_remove
-      if quiet || @hl.agree("Are you sure you'd like to remove '#{to_remove}'? [Yn] ")  
+      if force || @hl.agree("Are you sure you'd like to remove '#{to_remove}'? [Yn] ")  
         @config.delete(to_remove)
-        @hl.say("#{to_remove} removed") unless quiet
+        @hl.say("#{to_remove} removed")
       end
     end
     
     def command_options
       super
-      options.on("--quiet", "-q", "Remove without prompting") do |value|
-        @quiet = value
+      options.on("--force", "-f", "Remove without prompting") do |value|
+        @force = value
       end
     end
     
   end
   
-end
+end

data/lib/pik/commands/run_command.rb

@@ -2,21 +2,21 @@ module Pik
 
   class  Run < Command
   	
-  	it "Runs command with all version of ruby that pik is aware of."
-    include BatchFileEditor
+  	it "Runs command with all versions of ruby that pik is aware of."
 
     def execute
-      command = @args.join(' ')
-      current_ruby = @config[get_version]
       @config.sort.each do |version,hash|
         switch_path_to(hash)
         switch_gem_home_to(hash[:gem_home])
-        echo_running_with_ruby_version
-        @batch.call command
-        @batch.echo "."
+        echo_ruby_version(hash[:path])
+        puts `#{command}`
+        puts
       end
-      switch_path_to(current_ruby)
-      switch_gem_home_to(current_ruby[:gem_home])
+    end
+    
+    def command(cmd='CALL')
+      args = @args.map{|a| a.sub(/.*\s.*/m, '"\&"')}.join(' ')
+      "#{cmd} #{args}"
     end
     
     def command_options
@@ -31,7 +31,67 @@ module Pik
 SEP
       options.separator sep  
     end
+    
+    def parse_options
+    end
+
+    def switch_path_to(new_ver)
+      dir = Which::Ruby.find
+      current_config = config[ find_config_from_path(dir) ]
+      
+      new_path = SearchPath.new(ENV['PATH']).replace_or_add(dir, new_ver[:path])
+      if new_gem_home = new_ver[:gem_home]
+        
+        new_gem_bin = Pathname.new(new_gem_home) + 'bin'
+        
+        if current_config && (current_gem_home = current_config[:gem_home])
+          current_gem_bin = Pathname.new(current_gem_home) + 'bin'
+          new_path.replace(current_gem_bin, new_gem_bin)
+        else
+          new_path.add(new_gem_bin)
+        end
+      else
+        if current_config && (current_gem_home = current_config[:gem_home])
+          current_gem_bin = Pathname.new(current_gem_home) + 'bin'
+          new_path.remove(current_gem_bin)
+        end
+      end
+      ENV['PATH'] = new_path.join
+    end
+
+    def switch_gem_home_to(gem_home)
+      gem_home = Pathname(gem_home).to_windows rescue nil
+      ENV['GEM_PATH'] = gem_home
+      ENV['GEM_HOME'] = gem_home
+    end
+        
+    def echo_ruby_version(path)
+      rb = Which::Ruby.exe(path)
+      puts `#{rb} -v `
+    end
 
   end
+
+  class Ruby < Run
   
-end
+    aka :rb
+    it "Runs ruby with all versions that pik is aware of."
+    
+    def command(cmd=Which::Ruby.exe.basename)
+      super(cmd)
+    end
+    
+  end
+  
+  class Gem < Run
+  
+    it "Runs the gem command with all versions that pik is aware of."
+    
+    def command(cmd=Which::Gem.bat.basename)
+      super(cmd)
+    end
+    
+  end
+  
+end
+

data/lib/pik/commands/switch_command.rb

@@ -8,24 +8,24 @@ module Pik
     
     attr_accessor :global
     attr_accessor :gem_home
+    attr_accessor :verbose
     
     def execute
       abort('Nothing matches:') unless new_ver = self.class.choose_from(@args, @config)
       switch_path_to(@config[new_ver])
-      switch_gem_home_to(@config[new_ver][:gem_home]) 
-      echo_ruby_version
+      switch_gem_home_to(@config[new_ver][:gem_home])
+      echo_ruby_version(@config[new_ver][:path]) if verbose
     end
     
     def command_options
-      # options.on("--global", "-g", "Make changes globally") do |value|
-      #   @global = value
-      # end
-      
-      # options.on("-m name", "specify gem_home (Named gem sets)") do |value|
-      #   @gem_home = value
-      # end
-      
       super
+      
+      options.on("--verbose", "-v",
+         "Display verbose output"
+         ) do |value|
+        @verbose = true
+      end
+
       sep =<<SEP
   Examples:
 

data/lib/pik/commands/tag_command.rb

@@ -0,0 +1,56 @@
+module Pik
+
+  class  Tags < Command
+    
+    it 'Runs the pik command against the given tags.'
+    
+    def execute
+      config.global[:tags] ||= Hash.new{|h,k| h[k] = [] }
+      @tag_config = config.dup
+      @tag_config.clear
+      tags = @args.shift.split(',')
+      tags.each do |tag|
+        versions = config.global[:tags][tag]
+        raise "Tag '#{tag}' unknown" unless versions
+        versions.each{|version| @tag_config[version] = config[version] }
+      end
+      command = Commands.find(@args.shift)
+      raise "The command '#{args.join(' ')}' is unknown." unless command
+  
+      cmd = command.new(@args, @tag_config)
+      cmd.execute
+      
+    rescue QuitError
+      puts "\nQuitting..."
+    rescue => e
+      puts "\nThere was an error"
+      puts " Error: #{e.message}\n\n"
+      puts e.backtrace.map{|m| "  in: #{m}" }
+    ensure
+      cmd.close if cmd
+    end
+    
+    def parse_options
+    end
+    
+  end
+
+  class Tag < Command
+  
+    it 'Adds the given tag to the current version.'
+
+    include ConfigFileEditor
+
+    def execute
+      config.global[:tags] ||= Hash.new
+      @args.each do |arg|
+        tags = config.global[:tags] 
+        tags[arg] ||= []
+        tags[arg] << find_config_from_path 
+      end
+    end
+  
+  end
+  
+end
+

data/lib/pik/config_file.rb

@@ -3,19 +3,43 @@ require 'yaml'
 module Pik
 
   class ConfigFile < Hash
+  
+    attr_reader :global
       
     def initialize
       @file = File.join(PIK_HOME, 'config.yml')
       super
       if File.exists? @file
-        self.update( YAML.load( File.read( @file ) ) )
+        contents = File.read( @file )
+        unless contents.empty?
+          documents = YAML.load_stream( contents )  
+          self.update( documents[0] )
+          @global =  documents[1] || {}
+        end
       end
     end
 
     def write
-      File.open(@file, 'w'){|f| f.puts YAML::dump(Hash[self]) }
+      File.open(@file, 'w')do |f| 
+        f.puts YAML::dump_stream( Hash[self]), YAML.dump(global) 
+      end
     end
 
   end
 
 end
+
+class Hash
+  # Replacing the to_yaml function so it'll serialize hashes sorted (by their keys)
+  #
+  # Original function is in /usr/lib/ruby/1.8/yaml/rubytypes.rb
+  def to_yaml( opts = {} )
+    YAML::quick_emit( object_id, opts ) do |out|
+      out.map( taguri, to_yaml_style ) do |map|
+        sort_by{|s| s[0].to_s}.each do |k, v|   # <-- here's my addition (the 'sort')
+          map.add( k, v )
+        end
+      end
+    end
+  end
+end

data/lib/pik/contrib/progressbar.rb

@@ -0,0 +1,237 @@
+# = progressbar.rb
+#
+# == Copyright (C) 2001 Satoru Takabayashi
+#
+#   Ruby License
+#
+#   This module is free software. You may use, modify, and/or redistribute this
+#   software under the same terms as Ruby.
+#
+#   This program is distributed in the hope that it will be useful, but WITHOUT
+#   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#   FOR A PARTICULAR PURPOSE.
+#
+# == Author(s)
+#
+# * Satoru Takabayashi
+
+# Author::    Satoru Takabayashi
+# Copyright:: Copyright (c) 2001 Satoru Takabayashi
+# License::   Ruby License
+
+# = Console Progress Bar
+#
+# Console::ProgressBar is a terminal-based progress bar library.
+#
+# == Usage
+#
+#   pbar = ConsoleProgressBar.new( "Demo", 100 )
+#   100.times { pbar.inc }
+#   pbar.finish
+#
+
+module Console; end
+
+class Console::ProgressBar
+
+  def initialize(title, total, out = STDERR)
+    @title = title
+    @total = total
+    @out = out
+    @bar_length = 80
+    @bar_mark = "o"
+    @total_overflow = true
+    @current = 0
+    @previous = 0
+    @is_finished = false
+    @start_time = Time.now
+    @format = "%-14s %3d%% %s %s"
+    @format_arguments = [:title, :percentage, :bar, :stat]
+    show_progress
+  end
+
+  private
+  def convert_bytes (bytes)
+    if bytes < 1024
+      sprintf("%6dB", bytes)
+    elsif bytes < 1024 * 1000 # 1000kb
+      sprintf("%5.1fKB", bytes.to_f / 1024)
+    elsif bytes < 1024 * 1024 * 1000  # 1000mb
+      sprintf("%5.1fMB", bytes.to_f / 1024 / 1024)
+    else
+      sprintf("%5.1fGB", bytes.to_f / 1024 / 1024 / 1024)
+    end
+  end
+
+  def transfer_rate
+    bytes_per_second = @current.to_f / (Time.now - @start_time)
+    sprintf("%s/s", convert_bytes(bytes_per_second))
+  end
+
+  def bytes
+    convert_bytes(@current)
+  end
+
+  def format_time (t)
+    t = t.to_i
+    sec = t % 60
+    min  = (t / 60) % 60
+    hour = t / 3600
+    sprintf("%02d:%02d:%02d", hour, min, sec);
+  end
+
+  # ETA stands for Estimated Time of Arrival.
+  def eta
+    if @current == 0
+      "ETA:  --:--:--"
+    else
+      elapsed = Time.now - @start_time
+      eta = elapsed * @total / @current - elapsed;
+      sprintf("ETA:  %s", format_time(eta))
+    end
+  end
+
+  def elapsed
+    elapsed = Time.now - @start_time
+    sprintf("Time: %s", format_time(elapsed))
+  end
+
+  def stat
+    if @is_finished then elapsed else eta end
+  end
+
+  def stat_for_file_transfer
+    if @is_finished then 
+      sprintf("%s %s %s", bytes, transfer_rate, elapsed)
+    else 
+      sprintf("%s %s %s", bytes, transfer_rate, eta)
+    end
+  end
+
+  def eol
+    if @is_finished then "\n" else "\r" end
+  end
+
+  def bar
+    len = percentage * @bar_length / 100
+    sprintf("|%s%s|", @bar_mark * len, " " *  (@bar_length - len))
+  end
+
+  def percentage
+    if @total.zero?
+      100
+    else
+      @current  * 100 / @total
+    end
+  end
+
+  def title
+    @title[0,13] + ":"
+  end
+
+  def get_width
+    # FIXME: I don't know how portable it is.
+    default_width = 80
+    begin
+      tiocgwinsz = 0x5413
+      data = [0, 0, 0, 0].pack("SSSS")
+      if @out.ioctl(tiocgwinsz, data) >= 0 then
+        rows, cols, xpixels, ypixels = data.unpack("SSSS")
+        if cols >= 0 then cols else default_width end
+      else
+        default_width
+      end
+    rescue Exception
+      default_width
+    end
+  end
+
+  def show
+    arguments = @format_arguments.map {|method| send(method) }
+    line = sprintf(@format, *arguments)
+
+    width = get_width
+    if line.length == width - 1 
+      @out.print(line + eol)
+    elsif line.length >= width
+      @bar_length = [@bar_length - (line.length - width + 1), 0].max
+      if @bar_length == 0 then @out.print(line + eol) else show end
+    else #line.length < width - 1
+      @bar_length += width - line.length + 1
+      show
+    end
+  end
+
+  def show_progress
+    if @total.zero?
+      cur_percentage = 100
+      prev_percentage = 0
+    else
+      cur_percentage  = (@current  * 100 / @total).to_i
+      prev_percentage = (@previous * 100 / @total).to_i
+    end
+
+    if cur_percentage > prev_percentage || @is_finished
+      show
+    end
+  end
+
+  public
+  def file_transfer_mode
+    @format_arguments = [:title, :percentage, :bar, :stat_for_file_transfer]  
+  end
+
+  def bar_mark= (mark)
+    @bar_mark = String(mark)[0..0]
+  end
+
+  def total_overflow= (boolv)
+    @total_overflow = boolv ? true : false
+  end
+
+  def format= (format)
+    @format = format
+  end
+
+  def format_arguments= (arguments)
+    @format_arguments = arguments
+  end
+
+  def finish
+    @current = @total
+    @is_finished = true
+    show_progress
+  end
+
+  def halt
+    @is_finished = true
+    show_progress
+  end
+
+  def set (count)
+    if count < 0
+      raise "invalid count less than zero: #{count}"
+    elsif count > @total
+      if @total_overflow
+        @total = count + 1
+      else
+        raise "invalid count greater than total: #{count}"
+      end
+    end
+    @current = count
+    show_progress
+    @previous = @current
+  end
+
+  def inc (step = 1)
+    @current += step
+    @current = @total if @current > @total
+    show_progress
+    @previous = @current
+  end
+
+  def inspect
+    "(ProgressBar: #{@current}/#{@total})"
+  end
+
+end