Permalink
Browse files

readme updates, installer upgrade, version bump

  • Loading branch information...
1 parent 2327410 commit 6c28bced57726daaf0baa93f7127193e0025698c @vertiginous committed Jun 21, 2010
Showing with 26 additions and 5 deletions.
  1. +2 −2 README.rdoc
  2. +23 −2 Rakefile
  3. +1 −1 lib/pik.rb
View
4 README.rdoc
@@ -12,7 +12,7 @@ Gordon Thiesfeld
== DESCRIPTION:
-Pik is a tool to manage multiple versions of ruby on Windows.
+Pik is a tool to manage multiple versions of ruby on Windows. It can be used from the Windows command line (cmd.exe), Windows PowerShell, or Git Bash. I have yet to test on cygwin.
>pik help commands
@@ -78,7 +78,7 @@ So I run:
=== Install pik using the installer
-If you want to install to a machine that doesn't have Ruby installed yet, you can download the latest msi file from github[http://github.com/vertiginous/pik/downloads]. Or, just run:
+If you want to install to a machine that doesn't have Ruby installed yet, you can download the latest msi file from github[http://github.com/vertiginous/pik/downloads]. The MSI installer currently doesn't install the needed files to use Pik from Git Bash. Or, just run:
>msiexec /i http://github.com/downloads/vertiginous/pik/pik-n.n.n.msi
View
25 Rakefile
@@ -136,11 +136,15 @@ task :guid do
puts UUID.new.generate.upcase
end
+require 'nokogiri'
directory 'pkg'
+@package = 'pik'
+@wix_file = "lib/installer/#{@package}.wxs"
+@wxs = Nokogiri::XML(File.open(@wix_file))
+@product = @wxs.at_css("Product")
-@package = 'pik'
+msi_file = "pkg/#{@package}-#{Pik::VERSION}.msi"
-msi_file = "pkg/#{@package}-#{Pik::VERSION}.msi"
file msi_file, :needs => 'tools/pik_runner.exe'
task :installer, :needs => [msi_file, :light]
@@ -164,5 +168,22 @@ task :light, :needs => :candle do
sh("light -nologo -ext WixUtilExtension -ext WixUIExtension #{wixobj_files} -o ../../#{msi_file}")
end
end
+
+def version_string
+ @version.gsub(".","")
+end
+
+task :upgrade do
+ @product["Version"] = Pik::VERSION
+
+ upgrade_max = @product.at_css("UpgradeVersion[Property = 'OLDAPPFOUND']")
+ upgrade_max["Maximum"] = Pik::VERSION
+
+ upgrade_min = @product.at_css("UpgradeVersion[Property = 'NEWAPPFOUND']")
+ upgrade_min["Minimum"] = Pik::VERSION
+
+ @product["Id"] = UUID.new.generate
+ File.open(@wix_file, 'w+'){|f| f.puts @wxs }
+end
# vim: syntax=Ruby
View
2 lib/pik.rb
@@ -44,7 +44,7 @@
require 'pik/which'
module Pik
- VERSION = '0.2.7'
+ VERSION = '0.2.8'
Scripts = {
'.cmd' => BatchFile,
'.bat' => BatchFile,

0 comments on commit 6c28bce

Please sign in to comment.