wwine 0.1.2 → 0.2

data/wwine

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 # wwine
-# Copyright (C) Eskild Hustvedt 2009, 2010
+# Copyright (C) Eskild Hustvedt 2009, 2010, 2011, 2012
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ require 'getoptlong'
 # To read info for --debuginfo
 require 'open3'
 # Application version
-$version = '0.1.2'
+$version = '0.2'
 # The wine flavour to use
 $wine = nil
 # The bottle to use
@@ -35,6 +35,10 @@ $wrapperPath = nil
 $wrapperCwd = nil
 # File to load wwine data from
 $wwineDataFrom = nil
+# true if we're in --env mode
+$envMode = false
+# true if we're in --tricks mode
+$tricksMode = false
 
 # Purpose: Attempt to kill all running wine processes
 def killWine (dryRun = false, signal = 15)
@@ -189,7 +193,7 @@ def shellQuote(target)
 	end
 
 	fixedTarget = target.gsub('\\') { '\\\\' }
-	fixedTarget.gsub!(/'/,"\\\\'")
+	fixedTarget.gsub!(/'/,"'\"'\"'")
 
 	finalTarget = "'"
 	finalTarget.concat(fixedTarget)
@@ -219,7 +223,7 @@ end
 
 # Purpose: Write a wrapper script
 def writeWrapper (targetFile, wwineCommand, otherCommand, cwd, wwineInfo, args, wineprefix = nil)
-	# Open the file for riting
+	# Open the file for writing
 	begin
 		file = File.open(targetFile,'w')
 	rescue
@@ -234,9 +238,23 @@ def writeWrapper (targetFile, wwineCommand, otherCommand, cwd, wwineInfo, args,
 	file.puts('# You should have received a copy of the GNU General Public License')
 	file.puts('# along with wwine. If not, see <http://www.gnu.org/licenses/>.')
 	file.puts('#')
-	file.puts('# The following two lines contain wwine metadata');
-	file.puts('# wwineInfo: v1 '+shellQuote(wwineInfo).join(' '))
-	file.puts('# wwineCmd: '+shellQuote(args).join(' '));
+	file.puts('# -- Begin wwine metadata --')
+	file.puts('# wwineInfo: v2')
+	file.puts('# wwineDir: '+wwineInfo[0])
+	file.puts('# wwineWine: '+wwineInfo[1])
+	file.puts('# wwineBottle: '+wwineInfo[2])
+	file.puts('# wwineCxinstalldir: '+wwineInfo[3])
+	# wwineCmd isn't used in v2, but v1 outputs an invalid message if it
+	# doesn't exist. wwineCmd (unnumbered) will be dropped in a later version.
+	file.puts('# wwineCmd: nil')
+
+	subN = 0
+	args.each do |sub|
+		file.puts("# wwineCmd["+subN.to_s+"]: "+sub)
+		subN += 1
+	end
+
+	file.puts('# -- End wwine metadata  --')
 	file.puts('')
 	file.puts("cd "+shellQuote(cwd)+" || exit 1")
 	file.puts('wwine='+shellQuote(File.expand_path($0)))
@@ -264,17 +282,11 @@ def writeWrapper (targetFile, wwineCommand, otherCommand, cwd, wwineInfo, args,
 	puts('Wrote wrapper script to '+targetFile)
 end
 
-# Purpose: Prepare to generate a wrapper script
-def generateWrapper (wine,bottle,targetFile,wineCommand,args,type = nil)
+# Purpose: Generate a wwine command and wwineInfo array
+def generateWwineCmd (wine,bottle,wineCommand,type = nil)
 	wwineCmd = []
 	wwineInfo = ['nil','nil','nil','nil']
 
-	if File.exists?(targetFile)
-		puts(targetFile+': already exists. Bailing out')
-		puts('Remove the target file first, then try again')
-		exit(1)
-	end
-
 	# Generate a wwine command-line
 	if $verbose
 		wwineCmd.push('--verbose')
@@ -291,6 +303,20 @@ def generateWrapper (wine,bottle,targetFile,wineCommand,args,type = nil)
 		wwineCmd.push('--bottle',bottle)
 		wwineInfo[2] = bottle;
 	end
+	return wwineCmd, wwineInfo
+end
+
+# Purpose: Prepare to generate a wrapper script
+def generateWrapper (wine,bottle,targetFile,wineCommand,args,type = nil)
+
+	if File.exists?(targetFile)
+		puts(targetFile+': already exists. Bailing out')
+		puts('Remove the target file first, then try again')
+		exit(1)
+	end
+
+	wwineCmd, wwineInfo = generateWwineCmd(wine,bottle,wineCommand,type)
+
 	# Append -- if it isn't already
 	if ! args.join(' ').match(/ -- /)
 		wwineCmd.push('--')
@@ -315,6 +341,39 @@ def generateWrapper (wine,bottle,targetFile,wineCommand,args,type = nil)
 	writeWrapper(targetFile ,wwineCmd, wineCommand, $wrapperCwd, wwineInfo, args, wineprefix)
 end
 
+# Purpose: Sets WINE and WINEPREFIX, and then either outputs them to STDOUT, or
+# 		executes whatever native command was supplied (the logic that handles --env)
+def setEnvAndExec (wine,bottle,cmd,args,type)
+	wwineCmd, wwineInfo = generateWwineCmd(wine,nil,cmd,type)
+
+	wwineCmd.push('--env-bottle')
+	wwineCmd.push('--')
+	wwineCmd.unshift(File.expand_path($0))
+
+	if !bottle
+		puts("--env requires a --bottle")
+		exit(1)
+	end
+
+	if wine == 'wine' || File.exists?(wine)
+		bottlePath = ENV['WINEPREFIX']
+	elsif wine == 'cedega'
+		bottlePath = ENV['HOME']+'/.cedega/'+bottle
+	else
+		bottlePath = ENV['HOME']+'/.'+wine+'/'+bottle
+	end
+
+	ENV['WINEPREFIX'] = bottlePath
+	ENV['WINE'] = wwineCmd.join(" ")
+	if args.length > 0
+		exec *args
+	else
+		puts("WINE="+shellQuote(ENV['WINE']))
+		puts("WINEPREFIX="+shellQuote(ENV['WINEPREFIX']))
+	end
+	exit
+end
+
 # Purpose: Load wwine data from a wrapper script
 def loadWwineDataFromFile (file,dryRun = false)
 	begin
@@ -325,8 +384,14 @@ def loadWwineDataFromFile (file,dryRun = false)
 			puts file+': is not readable'
 			exit(1)
 		end
-		puts 'Loading settings from '+file+':'
-		outFormat = '%-20s: %s'+"\n"
+
+		# Don't output any info-messages when in --env mode
+		if $envMode
+			outFormat = ''
+		else
+			puts 'Loading settings from '+file+':'
+			outFormat = '%-20s: %s'+"\n"
+		end
 		source = File.open(file)
 
 		if $wrapperPath
@@ -335,93 +400,127 @@ def loadWwineDataFromFile (file,dryRun = false)
 			outMessage = 'Using '
 		end
 
+		info = Hash.new
 		wwineInfo = ''
 		wwineCmd = ''
 
 		source.each do |line|
-			if line.sub!(/^#\s+wwineInfo:\s*/,'')
-				wwineInfo = line
-			elsif line.sub!(/^#\s+wwineCmd:\s*/,'')
-				wwineCmd = line
-			end
-			if wwineInfo != '' && wwineCmd != ''
-				break
+			if line.match(/^#\s+wwine/)
+				key = line.sub(/^#\s+wwine(\S+):\s*(.+)$/,'\1').chomp
+				value = line.sub(/^#\s+wwine(\S+):\s*(.+)$/,'\2').chomp
+				info[key] = value
 			end
 		end
 
-		info = []
-		cmd = []
-
-		if wwineInfo == nil || wwineCmd == nil || wwineInfo == '' || wwineCmd == ''
+		if ! info['Info']
 			puts "The wwine header in this file is broken or missing."
 			puts "Unable to continue."
 			exit(0)
 		end
-
-		unquoteShellArray(wwineInfo,info)
-		unquoteShellArray(wwineCmd,cmd)
-
-		if info[0] != 'v1'
-			puts "This version of wwine only supports info format v1."
-			puts "This file is version "+info[0]
+		if info['Info'] == 'v2'
+			info = parseWwineDataV2(info);
+		elsif info['Info'].match(/^v1/)
+			info = parseWwineDataV1(info)
+		else
+			version = info['Info'].sub(/^(v\S+).+/,'\1').chomp
+			puts "This version of wwine supports info format v1 and v2."
+			puts "This file is version "+version
 			puts "Unable to continue."
 			exit(0)
 		end
 
-		if wwineInfo.length < 6 || wwineCmd.length < 1
+		if info['Cmd'].length < 1
 			puts "The wwine header in this file is broken."
 			puts "Unable to continue."
 			exit(0)
 		end
 
-		if info[1] != 'nil' && !$wrapperCwd
+		# Get the directory
+		if info['Dir'] != 'nil' && !$wrapperCwd && !$envMode
 			if $wrapperPath
 				switchMessage = '--wrapdir'
 			else
 				switchMessage = 'Switching to directory'
 			end
-			printf(outFormat,switchMessage,info[1])
-			if File.exists?(info[1])
+			printf(outFormat,switchMessage,info['Dir'])
+			if File.exists?(info['Dir'])
 				if $wrapperPath
-					$wrapperCwd = info[1]
+					$wrapperCwd = info['Dir']
 				else
-					Dir.chdir(info[1])
+					Dir.chdir(info['Dir'])
 				end
 			else
-				puts info[1]+': does not exist, giving up.'
+				puts info['Dir']+': does not exist, giving up.'
 				exit(0)
 			end
 		end
 
-		if $wine == nil && info[2] != 'nil'
-			$wine = info[2]
+		# Get the --wine to use
+		if $wine == nil && info['Wine'] != 'nil'
+			$wine = info['Wine']
 			printf(outFormat,outMessage+'--wine',$wine)
 		end
 
-		if $bottle == nil && info[3] != 'nil'
-			$bottle = info[3]
+		# Get the --bottle to use
+		if $bottle == nil && info['Bottle'] != 'nil'
+			$bottle = info['Bottle']
 			printf(outFormat,outMessage+'--bottle',$bottle)
 		end
 
-		if $cxPath == nil && info[4] != 'nil'
-			$cxPath = info[4]
+		# Get the --cxinstalldir to use
+		if $cxPath == nil && info['Cxinstalldir'] != 'nil'
+			$cxPath = info['Cxinstalldir']
 			printf(outFormat,outMessage+'--cxinstalldir',$cxPath)
 		end
 
-		if ! dryRun
+		# Set the command to run
+		if ! dryRun && !$envMode
 			if $wrapperPath
 				out = 'Program command'
 			else
 				out = 'Will now run'
 			end
-			printf(outFormat,out,cmd.join(' '))
-			ARGV.unshift(*cmd)
+			printf(outFormat,out,info['Cmd'].join(' '))
+			ARGV.unshift(*info['Cmd'])
 		end
 	rescue => ex
 		handleException(ex)
 	end
 end
 
+# Parses wwine metadata version 1 (wwine 0.1.x)
+def parseWwineDataV1 (rawData)
+	data = []
+	unquoteShellArray(rawData['Info'],data)
+	info = Hash.new
+	info['Dir'] = data[1]
+	info['Wine'] = data[2]
+	info['Bottle'] = data[3]
+	info['Cxinstalldir'] = data[4]
+
+	cmd = []
+
+	unquoteShellArray(rawData['Cmd'],cmd)
+	info['Cmd'] = cmd
+	return info
+end
+
+# Parses wwine metadata version 2 (wwine 0.2+)
+def parseWwineDataV2 (data)
+	cmd = []
+	currNo = 0
+	while currNo < 999
+		if data['Cmd['+currNo.to_s+']'] != nil
+			cmd.push(data['Cmd['+currNo.to_s+']'])
+		else
+			break
+		end
+		currNo += 1
+	end
+	data['Cmd'] = cmd
+	return data
+end
+
 # Purpose: Run a command, outputting info of it in verbose mode
 def runcmd(cmd, type = 'exec')
 	if(type == 'exec')
@@ -457,8 +556,9 @@ def Help ()
 	puts "Usage: wwine (WWINE PARAMETERS) PROGRAM -- [PROGRAM ARGUMENTS]"
 	puts ""
 	printHelp('-h','--help','Display this help text')
-	printHelp('-w','--wine','Select the wine to use: wine, cxoffice, cxgames, cedega, or a path to a wine bin. Default: wine')
+	printHelp('-w','--wine','Select the wine to use: wine, crossover, cxgames, cedega, or a path to a wine bin. Default: wine')
 	printHelp('-b','--bottle','Use the selected bottle (~/.wwinebottles/[NAME] for wine, CX bottle or cedega folder, depending on the --wine in use). The bottle will be created if it does not exist.')
+	printHelp('','--env','Set the WINE and WINEPREFIX environment variables to match the parameters provided to wwine and optionally run a program with those variables set.')
 	printHelp('-k','--kill','Attempt to kill all running wine processes')
 	printHelp('','--drykill','Print what --kill would have done, but don\'t actually do anything')
 	printHelp('-c','--cxinstalldir','Use the supplied path as the install path for CXoffice/CXgames (default: autodetect).')
@@ -665,11 +765,16 @@ def debugInfo ()
 
 		cxgBin = getCXwithParams('cxgames',nil,false)
 		cxgVer = getCXVersionsFrom(cxgBin,true)
-		printf(outFormat,'Crossover Games',cxgVer)
 
 		cxoBin = getCXwithParams('cxoffice',nil,false)
 		cxoVer = getCXVersionsFrom(cxoBin,true)
-		printf(outFormat,'Crossover Office',cxoVer)
+
+		if(cxoBin && !cxgBin)
+			cxgVer = '(not available - aliased to crossover)'
+		end
+
+		printf(outFormat,'Crossover Games',cxgVer)
+		printf(outFormat,'Crossover',cxoVer)
 
 		cedegaVer = getCedegaVersionString()
 		printf(outFormat,'Cedega',cedegaVer)
@@ -772,25 +877,41 @@ def getCXwithParams (wine,bottle, missingIsFatal = true)
 	final = []
 	cxdir = nil
 
+	mode = wine
+	bottleDir = '.'+wine
+
 	# Various crossover install paths
 	wines = ['/opt/'+wine, ENV['HOME']+'/'+wine, ENV['HOME']+'/.local/'+wine, ENV['HOME']+'/games/'+wine]
 
 	# If cxpath is set then overwrite the default paths
 	if $cxPath != nil
-		wines = [ $cxPath+'/'+wine ]
+		wines = [ $cxPath+'/'+wine, $cxPath ]
 	end
 
 	wines.each do |path|
-		if File.exists?(path) and File.executable?(path+'/bin/cxstart')
-			cxdir = path
-			break
+		if File.exists?(path)
+			if ( File.executable?(path+'/bin/cximportbottles') || File.executable?(path+'/bin/crossover') ) and wine != 'cxgames'
+                # Perform additional detection of dotDir, as that one tends to change
+                dotDir = Dir.glob(path+'/etc/cxoffice*.conf').shift
+                if( dotDir != nil && dotDir.sub!(/^.*(cxoffice\d*)\.conf$/,'\1') )
+                    mode = 'crossover'
+                    cxdir = path
+                    bottleDir = '.'+dotDir
+                    break
+                end
+			elsif File.executable?(path+'/bin/cxstart')
+				cxdir = path
+				break
+			end
 		end
 	end
 
 	# If we're using cxPath, perform some additional detection
-	if $cxPath != nil
+	if $cxPath != nil and mode != 'crossover'
 		if File.exists?($cxPath+'/etc/'+wine+'.conf')
 			cxdir = $cxPath
+		else
+			cxdir = nil
 		end
 	end
 
@@ -826,10 +947,10 @@ def getCXwithParams (wine,bottle, missingIsFatal = true)
 	final.push('--');
 
 	# Create the bottle if it does not exist
-	if bottle != nil and ! File.exists?(ENV['HOME']+'/.'+wine+'/'+bottle)
+	if bottle != nil and ! File.exists?(ENV['HOME']+'/'+bottleDir+'/'+bottle)
 		puts 'The bottle '+bottle+' did not exist, creating...'
 		runcmd([ cxdir+'/bin/cxbottle', '--bottle',bottle,'--create','--template','winxp'],'system')
-		if ! File.exists?(ENV['HOME']+'/.'+wine+'/'+bottle)
+		if ! File.exists?(ENV['HOME']+'/'+bottleDir+'/'+bottle)
 			puts 'Bottle creation failed.'
 			exit 1
 		end
@@ -898,18 +1019,25 @@ def runWine (wine,bottle,args)
 
 	if wine == nil
 		type,cmd = getAutoWithParams(bottle)
+		wine = type
 	else
-		# Expand cxg and cxo
+		# Expand cx*
 		if wine == 'cxg'
 			wine = 'cxgames'
-		elsif wine == 'cxo'
-			wine = 'cxoffice'
+		elsif wine == 'cxo' || wine == 'cx' || wine == 'cxoffice'
+			wine = 'crossover'
 		end
 
 		type = wine
 
-		if wine == 'cxgames' || wine == 'cxoffice'
+		if wine == 'cxgames' || wine == 'cxoffice' || wine == 'crossover'
 			cmd = getCXwithParams(wine,bottle)
+            if wine == 'cxgames' && cmd == nil
+                cmd = getCXwithParams('crossover',bottle)
+                if cmd != nil
+                    puts('Converting --wine cxgames to --wine crossover since cxgames is not installed')
+                end
+            end
 		elsif wine == 'wine' || File.executable?(wine)
 			type = 'wine'
 			cmd = getWineWithParams(wine,bottle)
@@ -917,15 +1045,40 @@ def runWine (wine,bottle,args)
 			cmd = getCedegaWithParams(wine,bottle)
 		else
 			puts('Unknown --wine: '+wine)
-			puts('Must be one of: wine, cxgames, cxoffice, cedega, or the path to a wine executable')
+			puts('Must be one of: wine, crossover, cxgames, cedega, or the path to a wine executable')
 			exit(1)
 		end
 	end
 	cmd.concat(args)
 
+	# If args is a single parameter, that parameter is --version, and we're not using
+	# vanilla wine, then we emulate vanilla wine's --version output. This helps
+	# utilities like winetricks when it is running under "wwine --env"
+	if args.length == 1 && args[0] == '--version'
+		# For CX* we can actually output a useful version number, namely the
+		# wine version that CX* release was based on
+		if wine == 'cxgames' || wine == 'cxoffice' || wine == 'crossover'
+			cxgBin = getCXwithParams(wine,nil,false)
+			cxVer, cxwVer = getCXVersionsFrom( cxgBin )
+			# CX* wine --versions often contain git revisions and other additional
+			# information in the version number, this strips that out.
+			cxwVer.sub!(/-.*/,'')
+			puts 'wine-'+cxwVer
+			exit
+		# For cedega we just output an invalid version number in the same syntax
+		# as vanilla wine would have done
+		elsif wine == 'cedega'
+			puts 'wine-0.0.0'
+			exit
+		end
+	end
+
+	# If we're in envMode, then we let setEnvAndExec handle the rest
+	if $envMode
+		setEnvAndExec(wine,bottle,cmd,args,type)
 	# If wrapperPath is set, then we're suppose to generate a wrapper script instead
 	# of actually executing it.
-	if $wrapperPath != nil
+	elsif $wrapperPath != nil
 		generateWrapper(wine,bottle,$wrapperPath,cmd,args,type)
 	else
 		runcmd(cmd)
@@ -944,6 +1097,9 @@ opts = GetoptLong.new(
 	[ '--wrapdir', GetoptLong::REQUIRED_ARGUMENT ],
 	[ '--debuginfo', GetoptLong::NO_ARGUMENT ],
 	[ '--man', GetoptLong::NO_ARGUMENT ],
+	[ '--env', GetoptLong::NO_ARGUMENT ],
+	[ '--tricks', GetoptLong::NO_ARGUMENT ],
+	[ '--env-bottle', GetoptLong::NO_ARGUMENT ],
 	[ '--from', '-s', GetoptLong::REQUIRED_ARGUMENT ],
 	[ '--verbose', '-v', GetoptLong::NO_ARGUMENT ]
 )
@@ -959,6 +1115,13 @@ begin
 			$wine = arg
 		when '--bottle'
 			$bottle = arg
+		when '--env-bottle'
+			if ENV['WINEPREFIX'] && ENV['WINEPREFIX'].length > 0
+				$bottle = File.basename(ENV['WINEPREFIX'])
+			else
+				puts 'wwine: --env-bottle supplied but WINEPREFIX is not set'
+				exit(1)
+			end
 		when '--verbose'
 			$verbose = true
 		when '--drykill'
@@ -984,6 +1147,11 @@ begin
 			$wrapperCwd = arg
 		when '--from'
 			$wwineDataFrom = arg
+		when '--env'
+			$envMode = true
+		when '--tricks'
+			$tricksMode = true
+			$envMode = true
 		when '--man'
 			showManPage()
 			exit(0)
@@ -1003,11 +1171,15 @@ if $wwineDataFrom
 	loadWwineDataFromFile($wwineDataFrom)
 end
 
-if ARGV.length == 0
+if ARGV.length == 0 && !$envMode
 	Help()
 	exit(1)
 end
 
+if $tricksMode
+	ARGV.unshift('winetricks','--no-isolate')
+end
+
 begin
 	runWine($wine,$bottle,ARGV)
 rescue => ex

data/wwine.1

@@ -1,5 +1,5 @@
 .IX Title "WWINE 1"
-.TH WWINE 1 "2010-07-07" "wwine 0.1.2" ""
+.TH WWINE 1 "2011-12-03" "wwine 0.2" ""
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -61,6 +61,26 @@ you want (ie. \*(L"wwine \-k9\*(R").
 .IP "\fB\-\-drykill\fR" 4
 .IX Item "--drykill"
 Print what \fI\-\-kill\fR would have done, without actually doing anything.
+.IP "\fB\-\-env\fR" 4
+.IX Item "--env"
+\&\fB\-\-env\fR causes wwine to set the \s-1WINE\s0 and \s-1WINEPREFIX\s0 environment
+variables, and (optionally) run a native program with those variables
+set. This lets you run any program that uses the \s-1WINE\s0 and \s-1WINEPREFIX\s0
+variables with wwine instead of wine (effectively giving you bottle
+support, as well as support for using cxgames/cxoffice/.. instead
+of wine).
+
+When you use \-\-env, wwine will obey \-\-bottle and \-\-wine (or \-\-from) and set
+\&\s-1WINE\s0 and \s-1WINEPREFIX\s0 accordingly. If you supply additional parameters, then
+wwine will run that command, otherwise it will output the variables that would
+have been set.
+
+See the \s-1EXAMPLES\s0 section for an example of how to use winetricks
+with cxgames using wwine's \fB\-\-env\fR
+.IP "\fB\-\-env\-bottle\fR" 4
+.IX Item "--env-bottle"
+This option is primarily for internal use. It causes wwine to parse which
+\&\-\-bottle to use from the \s-1WINEPREFIX\s0 variable.
 .IP "\fB\-c, \-\-cxinstalldir\fR \fI\s-1PATH\s0\fR" 4
 .IX Item "-c, --cxinstalldir PATH"
 Use the supplied path as the path to either a crossover office/games install
@@ -150,6 +170,13 @@ This causes wwine to run the command specified in ~/bin/startFile
 using the parameters specified in ~/bin/startFile, with the exception of
 \&\-\-wine, which would be wine instead of cxgames (here assuming this
 is the file created by the above example).
+.IP "\fIwwine \-w cxg \-b file \-\-env \*(-- winetricks \-\-no\-isolate vcrun6\fR" 4
+.IX Item "wwine -w cxg -b file --env  winetricks --no-isolate vcrun6"
+This causes wwine to set the environment variables \s-1WINE\s0 and \s-1WINEPREFIX\s0,
+and then execute the command supplied. In this case it would run
+winetricks, which would be told to install \*(L"vcrun6\*(R". Because it is running
+under wwine's \-\-env parameter, winetricks will use wwine to perform
+the actions, thus allowing you to use winetricks with cxgames.
 .IP "\fIwwine \-k\fR" 4
 .IX Item "wwine -k"
 Will make wwine attempt to kill all running wine processes on this system by
@@ -191,7 +218,7 @@ submit feature requests there as well.
 \&\fBwwine\fR is written by Eskild Hustvedt <\fIcode at zerodogg dot org\fR>
 .SH "LICENSE AND COPYRIGHT"
 .IX Header "LICENSE AND COPYRIGHT"
-Copyright (C) Eskild Hustvedt 2009, 2010
+Copyright (C) Eskild Hustvedt 2009, 2010, 2011
 .PP
 This is free software; see the source for copying conditions.  There is \s-1NO\s0
 warranty; not even for \s-1MERCHANTABILITY\s0 or \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\s0.

metadata

@@ -1,71 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: wwine
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+version: !ruby/object:Gem::Version
+  version: '0.2'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Eskild Hustvedt
 autorequire: 
 bindir: .
 cert_chain: []
-
-date: 2010-08-22 00:00:00 +02:00
-default_executable: 
+date: 2012-03-09 00:00:00.000000000 Z
 dependencies: []
-
 description: wwine is a simple wine wrapper.
 email: code at zerodogg dot org
-executables: 
+executables:
 - wwine
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - wwine
 - README
 - COPYING
 - wwine.1
 - ./wwine
-has_rdoc: true
 homepage: http://random.zerodogg.org/wwine
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: wwine is a simple wine wrapper.
 test_files: []
-