wwine 0.2.1 → 0.2.2

data/wwine

@@ -20,13 +20,11 @@ require 'getoptlong'
 # To read info for --debuginfo
 require 'open3'
 # Application version
-$version = '0.2.1'
+$version = '0.2.2'
 # The wine flavour to use
 $wine = nil
 # The bottle to use
 $bottle = nil
-# Verbose mode (true/false)
-$verbose = false
 # CX path
 $cxPath = nil
 # Path to write wrapper to
@@ -39,6 +37,10 @@ $wwineDataFrom = nil
 $envMode = false
 # true if we're in --tricks mode
 $tricksMode = false
+# Verbosity level
+$verbosity = 0
+V_INFO=1
+V_DBG=2
 
 # Purpose: Attempt to kill all running wine processes
 def killWine (dryRun = false, signal = 15)
@@ -288,7 +290,7 @@ def generateWwineCmd (wine,bottle,wineCommand,type = nil)
 	wwineInfo = ['nil','nil','nil','nil']
 
 	# Generate a wwine command-line
-	if $verbose
+	if $verbosity > 0
 		wwineCmd.push('--verbose')
 	end
 	if $cxPath
@@ -335,7 +337,7 @@ def generateWrapper (wine,bottle,targetFile,wineCommand,args,type = nil)
 	# For wine there is no --bottle definition in the wine command itself,
 	# so we need to export a wineprefix in the launch script
 	if type == 'wine'
-		wineprefix = ENV['WINEPREFIX']
+		wineprefix = ENV['WINEPREFIX'].dup
 	end
 
 	writeWrapper(targetFile ,wwineCmd, wineCommand, $wrapperCwd, wwineInfo, args, wineprefix)
@@ -344,28 +346,51 @@ 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 wine == nil
+		type,cmd = getAutoWithParams(bottle)
+	end
+	ENV['__WWINE_INT_WINE'] = wine
+	vputs(V_DBG,'Set __WWINE_INT_WINE='+wine)
+
+	if wine == 'cxoffice' || wine == 'cxgames' || wine == 'crossover'
+		cxdir = getCXwithParams(wine,bottle,true,false,true)
+		if File.executable?(cxdir+'/bin/wineserver')
+			vputs(V_DBG,'Set WINESERVER='+cxdir+'/bin/wineserver')
+			ENV['WINESERVER'] = cxdir+'/bin/wineserver'
+		end
+	end
 
 	if !bottle
 		puts("--env requires a --bottle")
 		exit(1)
 	end
+	vputs(V_DBG,'Set __WWINE_INT_BOTTLE='+bottle)
+	ENV['__WWINE_INT_BOTTLE'] = bottle
+	vputs(V_DBG,'Set __WWINE_INT_ENVMODE='+$version)
+	ENV['__WWINE_INT_ENVMODE'] = $version
+	if $verbosity > 0
+		vputs(V_DBG,'Set __WWINE_INT_VERBOSITY='+$verbosity.to_s)
+		ENV['__WWINE_INT_VERBOSITY'] = $verbosity.to_s
+	end
+	if $cxPath
+		vputs(V_DBG,'Set __WWINE_INT_CXPATH='+$cxpath)
+		ENV['__WWINE_INT_CXPATH'] = $cxPath
+	end
 
 	if wine == 'wine' || File.exists?(wine)
 		bottlePath = ENV['WINEPREFIX']
 	elsif wine == 'cedega'
 		bottlePath = ENV['HOME']+'/.cedega/'+bottle
 	else
-		bottlePath = ENV['HOME']+'/.'+wine+'/'+bottle
+		bottlePath = getCXwithParams(wine,bottle,true,true)
 	end
 
+	vputs(V_INFO,"Set WINEPREFIX="+bottlePath)
+	vputs(V_INFO,"Set WINE="+File.expand_path($0))
 	ENV['WINEPREFIX'] = bottlePath
-	ENV['WINE'] = wwineCmd.join(" ")
+	ENV['WINE'] = File.expand_path($0)
 	if args.length > 0
+		puts("Executing "+args.join(' '))
 		exec *args
 	else
 		puts("WINE="+shellQuote(ENV['WINE']))
@@ -524,10 +549,10 @@ end
 # Purpose: Run a command, outputting info of it in verbose mode
 def runcmd(cmd, type = 'exec')
 	if(type == 'exec')
-		vputs 'Executing: '+cmd.join(' ')
+		vputs(V_INFO,'Executing: '+cmd.join(' '))
 		exec *cmd
 	else
-		vputs 'Running: '+cmd.join(' ')
+		vputs(V_INFO,'Running: '+cmd.join(' '))
 		return system(*cmd)
 	end
 end
@@ -543,8 +568,11 @@ def inPath(exec)
 end
 
 # Purpose: Output a string if in verbose mode
-def vputs (str)
-	if $verbose
+def vputs (level,str)
+	if(level == V_DBG)
+		str = 'Debug: '+str
+	end
+	if $verbosity >= level
 		puts(str)
 	end
 end
@@ -565,7 +593,7 @@ def Help ()
 	printHelp('','--wrap','Write a wrapper script of your current wwine command to the path supplied')
 	printHelp('','--wrapdir','Use the supplied directory as the working directory for the script created by --wrap (default: current directory)')
 	printHelp('-s','--from','Load parameters and program from the wrapper script supplied. Command-line arguments overrides settings from wrapper script.')
-	printHelp('-v','--verbose','Enable verbose mode')
+	printHelp('-v','--verbose','Enable verbose mode. Supply multiple times to further increase verbosity.')
 	printHelp('','--man','Show the wwine manpage')
 end
 
@@ -849,7 +877,8 @@ def getWineWithParams (wine,bottle, missingIsFatal = true)
 		if ! (bottle =~ /^\.?\//)
 			bottle = ENV['HOME']+'/.wwinebottles/'+bottle
 			if !File.exists?(ENV['HOME']+'/.wwinebottles/')
-				vputs(ENV['HOME']+'/.wwinebottles/: does not exist, creating')
+				vputs(V_INFO,ENV['HOME']+'/.wwinebottles/: does not exist, creating')
+				vputs(V_DBG,ENV['HOME']+'/'+bottleDir+'/'+bottle+' did not exist')
 				begin
 					Dir.mkdir(ENV['HOME']+'/.wwinebottles/')
 				rescue SystemCallError
@@ -860,29 +889,30 @@ def getWineWithParams (wine,bottle, missingIsFatal = true)
 			end
 		end
 		ENV['WINEPREFIX'] = bottle
-		vputs('Set WINEPREFIX='+bottle)
+		vputs(V_INFO,'Set WINEPREFIX='+bottle)
 	end
 
 	# Default to no debugging output if WINEDEBUG is not set yet
 	if ! ENV.has_key?('WINEDEBUG')
-		vputs 'Set WINEDEBUG=-all'
+		vputs(V_INFO,'Set WINEDEBUG=-all')
 		ENV['WINEDEBUG'] = '-all'
 	end
 
+	vputs(V_DBG,'Detected wine: '+final.join(' '))
 	return final
 end
 
 # Purpose: Get parameters for crossover
-def getCXwithParams (wine,bottle, missingIsFatal = true)
+def getCXwithParams (wine,bottle, missingIsFatal = true, getBottleDir = false, getCXpath = false)
 	final = []
 	cxdir = nil
 
-    installName = wine
-    if wine == 'crossover'
-        installName = 'cxoffice'
-    end
+	installName = wine
+	if wine == 'crossover'
+		installName = 'cxoffice'
+	end
 	mode = wine
-	bottleDir = '.'+wine
+	bottleDir = '.'+installName
 
 	# Various crossover install paths
 	wines = ['/opt/'+installName, ENV['HOME']+'/'+installName, ENV['HOME']+'/.local/'+installName, ENV['HOME']+'/games/'+installName]
@@ -895,14 +925,14 @@ def getCXwithParams (wine,bottle, missingIsFatal = true)
 	wines.each do |path|
 		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
+				# 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
@@ -922,12 +952,13 @@ def getCXwithParams (wine,bottle, missingIsFatal = true)
 	# If the dir does not exist, give up
 	if not cxdir
 		if !missingIsFatal
+			vputs(V_DBG,'Failed to detect cxdir')
 			return nil
 		end
 		if $cxPath != nil
-			puts('Could not find a directory named "'+wine+'" in '+$cxPath)
-			puts('and '+$cxPath+' does not appear to be a '+wine+' install directory')
-			if wine == 'cxgames'
+			puts('Could not find a directory named "'+installName+'" in '+$cxPath)
+			puts('and '+$cxPath+' does not appear to be a '+installName+' install directory')
+			if installName == 'cxgames'
 				reverse = 'cxoffice'
 			else
 				reverse = 'cxgames'
@@ -942,6 +973,8 @@ def getCXwithParams (wine,bottle, missingIsFatal = true)
 			puts('by supplying --cxinstalldir')
 		end
 		exit(1)
+	elsif getCXpath
+		return cxdir
 	end
 
 	final.push(cxdir+'/bin/cxstart')
@@ -952,6 +985,7 @@ def getCXwithParams (wine,bottle, missingIsFatal = true)
 
 	# Create the bottle if it does not exist
 	if bottle != nil and ! File.exists?(ENV['HOME']+'/'+bottleDir+'/'+bottle)
+		vputs(V_DBG,ENV['HOME']+'/'+bottleDir+'/'+bottle+' did not exist')
 		puts 'The bottle '+bottle+' did not exist, creating...'
 		runcmd([ cxdir+'/bin/cxbottle', '--bottle',bottle,'--create','--template','winxp'],'system')
 		if ! File.exists?(ENV['HOME']+'/'+bottleDir+'/'+bottle)
@@ -960,7 +994,12 @@ def getCXwithParams (wine,bottle, missingIsFatal = true)
 		end
 	end
 
-	return final
+	if getBottleDir
+		return ENV['HOME']+'/'+bottleDir+'/'+bottle
+	else
+		vputs(V_DBG,'Detected cx: '+final.join(' '))
+		return final
+	end
 end
 
 # Purpose: Get parameters for cedega
@@ -984,6 +1023,7 @@ def getCedegaWithParams (wine,bottle, missingIsFatal = true)
 	end
 	final.push(bottle)
 
+	vputs(V_DBG,'Detected cedega: '+final.join(' '))
 	return final
 end
 
@@ -1012,6 +1052,7 @@ def getAutoWithParams (bottle, missingIsFatal = true, returnFlavour = false)
 			return nil
 		end
 	else
+		vputs(V_DBG,'Autodetected wine command: '+cmd.join(' '))
 		return type,cmd
 	end
 end
@@ -1035,13 +1076,17 @@ def runWine (wine,bottle,args)
 		type = wine
 
 		if wine == 'cxgames' || wine == 'cxoffice' || wine == 'crossover'
-			cmd = getCXwithParams(wine,bottle,false)
-            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
+			missingIsFatal = true
+			if wine == 'cxgames'
+				missingIsFatal = false
+			end
+			cmd = getCXwithParams(wine,bottle,missingIsFatal)
+			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)
@@ -1053,6 +1098,10 @@ def runWine (wine,bottle,args)
 			exit(1)
 		end
 	end
+	if cmd == nil
+		puts('Command detection failed. This is a bug')
+		exit(1)
+	end
 	cmd.concat(args)
 
 	# If args is a single parameter, that parameter is --version, and we're not using
@@ -1089,24 +1138,41 @@ def runWine (wine,bottle,args)
 	end
 end
 
-opts = GetoptLong.new(
-	[ '--help', '-h', GetoptLong::NO_ARGUMENT ],
-	[ '--wine', '-w', GetoptLong::REQUIRED_ARGUMENT ],
-	[ '--bottle', '-b', GetoptLong::REQUIRED_ARGUMENT ],
-	[ '--kill', '-k', GetoptLong::OPTIONAL_ARGUMENT ],
-	[ '--drykill', GetoptLong::NO_ARGUMENT ],
-	[ '--cxinstalldir','-c',GetoptLong::REQUIRED_ARGUMENT ],
-	[ '--version',GetoptLong::NO_ARGUMENT ],
-	[ '--wrap', GetoptLong::REQUIRED_ARGUMENT ],
-	[ '--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 ]
-)
+# Note: These environment variables are not considered a stable interface to wwine
+# (hence the version specific ENVMODE), they should never ever be used by any
+# outside program.
+if ENV['__WWINE_INT_ENVMODE'] == $version
+	opts = Hash.new
+	if ENV['__WWINE_INT_WINE']
+		opts['--wine'] = ENV['__WWINE_INT_WINE']
+	end
+	if ENV['__WWINE_INT_VERBOSITY'] && ENV['__WWINE_INT_VERBOSITY'].to_i > 0
+		$verbosity = ENV['__WWINE_INT_VERBOSITY'].to_i
+	end
+	if ENV['__WWINE_INT_CXPATH']
+		opts['--cxinstalldir'] = ENV['__WWINE_INT_CXPATH']
+	end
+	opts['--bottle'] = ENV['__WWINE_INT_BOTTLE']
+else
+	opts = GetoptLong.new(
+		[ '--help', '-h', GetoptLong::NO_ARGUMENT ],
+		[ '--wine', '-w', GetoptLong::REQUIRED_ARGUMENT ],
+		[ '--bottle', '-b', GetoptLong::REQUIRED_ARGUMENT ],
+		[ '--kill', '-k', GetoptLong::OPTIONAL_ARGUMENT ],
+		[ '--drykill', GetoptLong::NO_ARGUMENT ],
+		[ '--cxinstalldir','-c',GetoptLong::REQUIRED_ARGUMENT ],
+		[ '--version',GetoptLong::NO_ARGUMENT ],
+		[ '--wrap', GetoptLong::REQUIRED_ARGUMENT ],
+		[ '--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 ]
+	)
+end
 
 # Handle command-line arguments
 begin
@@ -1120,6 +1186,8 @@ begin
 		when '--bottle'
 			$bottle = arg
 		when '--env-bottle'
+			puts 'DEPRECATED: --env-bottle is deprecated as of wwine 0.2.2'
+			puts '            pending removal in 0.3'
 			if ENV['WINEPREFIX'] && ENV['WINEPREFIX'].length > 0
 				$bottle = File.basename(ENV['WINEPREFIX'])
 			else
@@ -1127,7 +1195,7 @@ begin
 				exit(1)
 			end
 		when '--verbose'
-			$verbose = true
+			$verbosity = $verbosity+1
 		when '--drykill'
 			killWine(true)
 			exit(0)
@@ -1142,6 +1210,10 @@ begin
 			exit(0)
 		when '--cxinstalldir'
 			$cxPath = arg
+			if ! File.exists?($cxPath)
+				puts('The supplied --cxinstalldir "'+$cxPath+'" does not exist')
+				exit(1)
+			end
 		when '--version'
 			puts('wwine version '+$version+' (for wine version info, run wwine --debuginfo)')
 			exit(0)
@@ -1164,7 +1236,7 @@ begin
 
 	if ENV['WWINE_VERBOSE'] != nil && ENV['WWINE_VERBOSE'] == '1'
 		puts('--verbose assumed because the environment variable WWINE_VERBOSE is set to 1')
-		$verbose = true
+		$verbosity = 1
 	end
 rescue
 	puts('See --help for more inforation')
@@ -1189,3 +1261,4 @@ begin
 rescue => ex
 	handleException(ex)
 end
+# vim: noexpandtab

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wwine
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: .
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies: []
 description: wwine is a simple wine wrapper.
 email: code at zerodogg dot org
@@ -43,7 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: wwine is a simple wine wrapper.