pik 0.2.7 → 0.2.8

data/lib/pik/commands/config_command.rb

@@ -3,7 +3,6 @@ module Pik
   class  Config < Command
     
     it "Adds/modifies configuration options."
-    include BatchFileEditor
     include ConfigFileEditor
     
     attr_accessor :global

data/lib/pik/commands/default_command.rb

@@ -7,15 +7,15 @@ module Pik
   
     attr_accessor :verbose
   
-    include BatchFileEditor
+    include ScriptFileEditor
   
     def execute
       sys = WindowsEnv.system
       usr = WindowsEnv.user
       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'] )
+      @script.set('PATH' => SearchPath.new(new_path) )
+      @script.set('GEM_PATH' => usr['GEM_PATH'] || sys['GEM_PATH'] )
+      @script.set('GEM_HOME' => usr['GEM_HOME'] || sys['GEM_HOME'] )
       echo_ruby_version(Which::Ruby.find(new_path)) if verbose
     end
     

data/lib/pik/commands/devkit_command.rb

@@ -27,7 +27,7 @@ module Pik
     end
     
     def write_make(path)
-      BatchFile.new(path + 'make.bat') do |b|
+      Pik::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")
@@ -37,7 +37,7 @@ module Pik
     end
     
     def write_sh(path)
-      BatchFile.new(path + 'sh.bat') do |b|
+      Pik::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")
@@ -47,7 +47,7 @@ module Pik
     end
     
     def write_gcc(path)
-      BatchFile.new(path + 'sh.bat') do |b|
+      Pik::BatchFile.new(path + 'gcc.bat') do |b|
         b.file_data << 'setlocal'
         b.set(:DEVKIT => config.global[:devkit])
         b.set(:PATH => "%DEVKIT%\\gcc\\3.4.5\\bin;%PATH%")

data/lib/pik/commands/install_command.rb

@@ -14,7 +14,7 @@ module Pik
     def initialize(args=ARGV, config_=nil)
       super
       @download_dir = config.global[:download_dir] || PIK_HOME + 'downloads'
-      @install_root = config.global[:install_dir]  || PIK_BATCH.dirname + 'pik'
+      @install_root = config.global[:install_dir]  || PIK_HOME + 'rubies'
       FileUtils.mkdir_p @download_dir.to_s
     end
     
@@ -79,7 +79,7 @@ SEP
       if @hl.agree(question){|answer| answer.default = 'yes' }
         uri  = 'http://downloads.sourceforge.net/sevenzip/7za465.zip'
         file = download(uri)
-        Zip.fake_unzip(file.to_s, /\.exe|\.dll$/, PIK_BATCH.dirname.to_s)
+        Zip.fake_unzip(file.to_s, /\.exe|\.dll$/, PIK_SCRIPT.dirname.to_s)
       else
         raise QuitError
       end

data/lib/pik/commands/{batch_file_editor.rb → script_file_editor.rb}

@@ -1,24 +1,18 @@
 module Pik
 
-  module BatchFileEditor
+  module ScriptFileEditor
     
-    attr_reader :batch
+    attr_reader :script
         
     def initialize(args=ARGV,config=nil)
       super
-      batch_file = File.join(PIK_HOME, "#{File.basename($0)}_#{$$}.bat")
-      @batch = BatchFile.new( batch_file )
-      editors << @batch
-    end
-    
-    def close
-      update_gem_batch
-      super
+      @script = SCRIPT_FILE
+      editors << @script
     end
 
     def set(items)
       items.each do |k, v|
-        @batch.set(k => v)
+        @script.set(k => v)
         WindowsEnv.user.set(k => v) if global
       end
     end  
@@ -34,33 +28,20 @@ module Pik
       
       # if the new version has a GEM_HOME, add it's bin dir to the path
       new_path.add(Pathname.new(other[:gem_home]) + 'bin') if other[:gem_home]
-      
-      @batch.set('PATH' => new_path.join )
+      @script.set('PATH' => new_path )
     end
     
     def switch_gem_home_to(gem_home)
       gem_home = Pathname(gem_home).to_windows rescue nil
-      @batch.set('GEM_PATH' => gem_home )
-      @batch.set('GEM_HOME' => gem_home )
+      @script.set('GEM_PATH' => gem_home )
+      @script.set('GEM_HOME' => gem_home )
     end
   
     def echo_ruby_version(path, verb='')
       rb = Which::Ruby.exe(path).basename
-      @batch.file_data << "for /f \"delims=\" %%a in ('#{rb} -v') do @echo #{verb} %%a "
+      @script.call "#{rb} -v"
     end
-  
-    def echo_running_with_ruby_version(path)
-      echo_ruby_version('Running with')
-    end 
-    
-    def update_gem_batch
-      BatchFile.open(PIK_BATCH) do |gem_bat|
-        # call new .pik/pik batch
-        gem_bat.call(%Q("#{@batch.path.to_windows}")) if @batch
-        gem_bat.write        
-      end
-    end
-  
+   
   end
   
 end

data/lib/pik/commands/update_command.rb

@@ -4,11 +4,11 @@ module Pik
    
     aka :up
     it "updates pik."
-    include BatchFileEditor
+    include ScriptFileEditor
     
     def execute
       sh "#{Which::Gem.exe} install pik"
-      @batch.call("pik_install #{PIK_BATCH.dirname}")
+      @script.call("pik_install #{PIK_SCRIPT.dirname}")
     end
      
   end

data/lib/pik/commands/{switch_command.rb → use_command.rb}

@@ -1,10 +1,10 @@
 module Pik
 
-  class  Switch < Command
+  class  Use < Command
    
-    aka :sw, :use
+    aka :switch, :sw
     it "Switches ruby versions based on patterns."
-    include BatchFileEditor
+    include ScriptFileEditor
     
     attr_accessor :global
     attr_accessor :gem_home

data/lib/pik/core_ext/pathname.rb

@@ -2,12 +2,16 @@
 class Pathname
 
   def to_s
-    @path.tr('/','\\').sub(/^.:/){|s| s.upcase }
+    @path.tr('/','\\').sub(/^(.):/){|s| s.upcase }
   end
   alias to_windows to_s
   
   def to_ruby
-    @path.tr('\\','/').sub(/^.:/){|s| s.upcase }
+    @path.tr('\\','/').sub(/^(.):/){|s| s.upcase }
+  end
+
+  def to_bash
+    @path.tr('\\','/').sub(/^(.):/){|s| "/#{s[0,1].downcase}"}
   end
   
   def ruby

data/lib/pik/scripts/bash_file.rb

@@ -0,0 +1,36 @@
+module Pik
+
+  class BashFile < ScriptFile
+
+    attr_accessor :file_data, :file_name, :ruby_dir
+
+    def extname
+      ".sh"
+    end
+
+    def header
+      string =  "#!/bin/sh\n"
+      string << "#  This bash script generated by Pik, the\n"
+      string << "#  Ruby Manager for Windows\n"
+    end  
+    
+    def call(exe)
+      @file_data << "#{exe}\n"
+      self
+    end
+
+    def set(items)
+      items.each{|k,v| 
+         v = v.to_bash if v.respond_to? 'to_bash'
+        @file_data << "export #{k}='#{v}'" }
+      self
+    end
+
+    def unset(items)
+      items.each{|k| @file_data << "export #{k}=" }
+      self
+    end
+
+  end
+
+end

data/lib/pik/scripts/batch_file.rb

@@ -0,0 +1,32 @@
+module Pik
+
+  class BatchFile < ScriptFile
+
+    def extname
+      ".bat"
+    end
+
+    def header
+      string =  "@ECHO OFF\n\n" 
+      string << "::  This batch file generated by Pik, the\n"
+      string << "::  Ruby Manager for Windows\n"  
+    end  
+
+    def call(bat)
+      @file_data << "CALL #{bat}\n"
+      self
+    end
+
+    def set(items)
+      items.each{|k,v| @file_data << "SET #{k}=#{v}" }
+      self
+    end
+
+    def unset(*items)
+      items.flatten.each{|k| @file_data << "SET #{k}=" }
+      self
+    end
+
+  end
+
+end

data/lib/pik/scripts/ps_file.rb

@@ -0,0 +1,33 @@
+module Pik
+  
+  class PsFile < ScriptFile
+
+    attr_accessor :file_data, :file_name, :ruby_dir
+
+    def extname
+      ".ps1"
+    end
+
+    def header
+      string =  "#  This powshell script generated by Pik, the\n"
+      string << "#  Ruby Manager for Windows\n"  
+    end  
+    
+    def call(exe)
+      @file_data << "#{exe}\n"
+      self
+    end
+
+    def set(items)
+      items.each{|k,v| @file_data << "$ENV:#{k}=\"#{v}\"" }
+      self
+    end
+
+    def unset(items)
+      items.each{|k| @file_data << "Remove-Item ENV:#{k}" }
+      self
+    end
+
+  end
+
+end

data/lib/pik/scripts/script_file.rb

@@ -0,0 +1,45 @@
+module Pik
+
+  class ScriptFile
+
+    attr_accessor :file_data, :file_name, :ruby_dir
+
+    def initialize(file) #, mode=:new)
+      @file = Pathname.new(file.to_s + extname) 
+      @file_data = [header]
+      yield self if block_given?
+    end
+    
+    def path
+      @file
+    end
+
+    def extname
+      raise
+    end
+
+    def echo(string='.')
+      string = ' ' + string unless string == '.'
+      @file_data << "ECHO#{string}"
+      self
+    end
+
+    def remove_line(re)
+      @file_data.reject!{ |i| i =~ re }
+    end
+
+    def to_s
+      @file_data.join("\n")
+    end
+
+    def write
+      File.open(@file, 'w+'){|f| f.puts self.to_s }
+    end
+
+    def << (cmd)
+      @file_data <<  cmd
+    end
+
+  end
+
+end

data/lib/pik/search_path.rb

@@ -57,6 +57,10 @@ class SearchPath
 	end
 	alias :to_s :join
 
+  def to_bash
+    @path.map{|i| Pathname.new(i).to_bash }.join(':')
+  end
+
   def regex(string)
     Regexp.new(Regexp.escape(string.to_s), true)
   end

data/spec/batch_file_spec.rb

@@ -1,8 +1,8 @@
 
-describe BatchFile do
+describe Pik::BatchFile do
 
   before do
-    @bf = BatchFile.new('pik.bat')
+    @bf = Pik::BatchFile.new('pik.bat')
   end
 
 	it "should have a header" do

data/spec/pathname_spec.rb

@@ -35,4 +35,11 @@ describe Pathname do
     end
   end
 
+  describe 'to_bash' do
+    it 'should change the file and disk separator' do
+      path   = Pathname("z:\\This\\is\\to\\test\\separators")
+      result = '/z/This/is/to/test/separators'
+      path.to_bash.should eql(result)
+    end
+  end
 end

data/spec/search_path_spec.rb

@@ -117,16 +117,37 @@ describe SearchPath do
 			@path.replace_or_add('C:/xray/yankee/alpha', path)
 			@path.join.should == new_path
 		end
+	end
 
-		describe "find" do
-			it "should return the first path where block is not false" do
-				path = SearchPath.new(ENV['PATH'])
-				dir = path.find{|i| !!Dir[ File.join(i.gsub('\\','/'), '{ruby.exe, ir.exe}') ].first }
-				dir.should_not be_nil
-				dir.should be_a(String)
-			end
+	describe "#find" do
+		it "should return the first path where block is not false" do
+			path = SearchPath.new(ENV['PATH'])
+			dir = path.find{|i| !!Dir[ File.join(i.gsub('\\','/'), '{ruby.exe, ir.exe}') ].first }
+			dir.should_not be_nil
+			dir.should be_a(String)
 		end
-
 	end
 
+	describe '#to_bash' do
+    it 'should change the file and disk separator' do
+			new_path =  'C:\xray\yankee\zebra;'
+			new_path <<	'C:\Program Files\Common Files\Shoes\0.r1134\..;'
+			new_path <<	'C:\bin;'
+			new_path <<	'C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;'
+			new_path <<	'C:\Program Files\Common Files\Shoes\0.r395\..;'
+			new_path <<	'C:\windows\system32'
+
+			bash_path =  '/c/xray/yankee/zebra:'
+			bash_path <<	'/c/Program Files/Common Files/Shoes/0.r1134/..:'
+			bash_path <<	'/c/bin:'
+			bash_path <<	'/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727:'
+			bash_path <<	'/c/Program Files/Common Files/Shoes/0.r395/..:'
+			bash_path <<	'/c/windows/system32'
+							
+      path = SearchPath.new(new_path)
+      path.should be_a SearchPath
+      path.to_bash.should eql(bash_path)
+    end
+  end
+
 end

data/spec/switch_command_spec.rb

@@ -1,26 +1,26 @@
 require 'pathname'
 
-describe Pik::Switch do
+describe Pik::Use do
   
   it "should have a summary" do
-    Pik::Switch.summary.should eql("Switches ruby versions based on patterns.")
+    Pik::Use.summary.should eql("Switches ruby versions based on patterns.")
   end
   
   it "should have an alias of sw" do
-    Pik::Switch.names.should include(:sw)
+    Pik::Use.names.should include(:sw)
   end
   
   it "should have an alias of use" do
-    Pik::Switch.names.should include(:use)
+    Pik::Use.names.should include(:use)
   end
   
   it "should have a global option" #do
-  #   sw = Pik::Switch.new(['-g'])
+  #   sw = Pik::Use.new(['-g'])
   #   sw.global.should be_true
   # end
 
   it "should have a gem_home option" # do
-  #   sw = Pik::Switch.new(['-m', 'test'])
+  #   sw = Pik::Use.new(['-m', 'test'])
   #   sw.gem_home.should eql("test")
   # end
   
@@ -29,9 +29,9 @@ describe Pik::Switch do
       'spec ' => {:path => Pathname('C:/ruby/bin')},
       'real ' => {:path => Pathname.new(::RbConfig::CONFIG['bindir'] )}
     }
-    cmd = Pik::Switch.new(['spec'], conf)
+    cmd = Pik::Use.new(['spec'], conf)
     cmd.execute
-    batch = cmd.instance_variable_get('@batch').file_data
+    batch = cmd.instance_variable_get('@script').file_data
     batch.should include("SET GEM_PATH=")
     batch.should include("SET GEM_HOME=")
     set_path = batch.grep(/set/i).first
@@ -46,9 +46,9 @@ describe Pik::Switch do
         },
       'real ' => {:path => Pathname.new(::RbConfig::CONFIG['bindir'] )}
       }
-    cmd = Pik::Switch.new(['spec'], conf)
+    cmd = Pik::Use.new(['spec'], conf)
     cmd.execute
-    batch = cmd.instance_variable_get('@batch').file_data
+    batch = cmd.instance_variable_get('@script').file_data
     batch.should include("SET GEM_PATH=C:\\Users\\martin_blanke\\.gems")
     batch.should include("SET GEM_HOME=C:\\Users\\martin_blanke\\.gems")
   end