rwdshell 0.95 → 0.96

data/Readme.txt

@@ -193,13 +193,17 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+version 0.96
+ updated for rwdtinker 1.56
+ first debian version
+ 
 version 0.95
  added ruby script running
  add back window for more control tabs
  beginning of context sensitive help
  wider text boxes for configuration information
  updated for rwdtinker 1.51 - finds available port and remote control
- updated for rwdtinker 1.52 - cam install applets from Gems  
+ updated for rwdtinker 1.52 - can install applets from Gems  
 
 version 0.94
  updated for rwdtinker 1.44 - refactor gui directory structure

data/code/superant.com.rwdtinkerbackwindow/controlclient.rb

@@ -1,28 +1,22 @@
-#
+# Bind message passing socket to rwdtinker application
 
 def runcontrolcommand
 require 'socket'
 
 # Change this line... 
-ip =  '127.0.0.1' 
+ ip =  '127.0.0.1' 
 # And this one...
-port =  $rwdcontrolport1
-if @a_remoteportinput
-port = @a_remoteportinput.to_i
-end
-# Done!
+ port =  $rwdcontrolport1
+ if @a_remoteportinput
+ port = @a_remoteportinput.to_i
+ end
 
- 
     commandtext =  @a_remotecommandinput.to_s 
-  
- remotehostnotfound = true
-
-client = UDPSocket::new()
-client.send(commandtext, 0, ip, port)
-
-
-if (commandtext == "stop")
-begin
+   remotehostnotfound = true
+ if (commandtext == "stop")
+ begin
+ client = UDPSocket::new()
+ client.send(commandtext, 0, ip, port)
 		@socket = UDPSocket::new()
 		@socket.bind(ip, port)
 	 # Rescue the "Address in use" error
@@ -51,17 +45,20 @@ begin
      @remotecommandresult =  "Remote Host not running"
      end
  @socket.close
-end
+  # Close the socket after use
+ client.close()
+ end
 
-remotehostnotfound = true
-if (commandtext == "query")
-begin
+ remotehostnotfound = true
+ if (commandtext == "query") 
+ begin
+ client = UDPSocket::new()
+ client.send(commandtext, 0, ip, port)
 		@socket = UDPSocket::new()
 		@socket.bind(ip, port)
 	 # Rescue the "Address in use" error
 	 rescue Errno::EADDRINUSE
 		
-     
   databack, info = client.recv(128)
   @remotecommandresult =  databack
   @lastremotecommand = "rwdtinker remote: Port #{port} on host #{ip} "
@@ -82,15 +79,17 @@ begin
 	 # Rescue all other errors
 	 end
 @socket.close
-end
-  if remotehostnotfound
-     @remotecommandresult =  "Remote Host not running"
-     end
+
 # Close the socket after use
 client.close()
+end
 
+ if remotehostnotfound
+     @remotecommandresult =  "Remote Host not running"
+ end
 end
 
+# list the remote control options on the screen
 def showremoteportoptions
  
  @remoteportoptions = $rwdcontrolports.rwd_options

data/code/superant.com.rwdtinkerbackwindow/helptexthashtinkerwin2.rb

@@ -1,11 +1,15 @@
-  
+# help text files used by context sensitive help  
 
  Helptext.update( :tinkerwin2_help => "    You can view the list of applets you can install
       by clicking on the list files button
 
            You can download an applet created by someone else
            
-      put the file in the zips directory",
+      put the file in the zips directory
+      
+      rwdtinker applets packaged as RubyGems can be used if you have RubyGems installed.
+      You can download rwdtinker gems at the 'Install Remote Applets' tab
+      ",
      :applet_viewing   =>  "You can get a list of all installed applets by clicking the 'listfiles button'
          To see the text of a install file
        Type in the name of the file you want.
@@ -32,6 +36,23 @@
      :applet_tinkerbackeditconfiguration  => " You can edit the configuration
   
   Remember to reload the configuration variables if you want your
-  changes used."
-
+  changes used.",
+  :remotegemapplet_install  => " To download and install use the 'Install Remote Applets'
+  
+  First click on 'List applets in the Remote GEM Repository available for downloading'
+  then go to the very bottom to click on the applet you want
+  then on the top click 'install remote Gem applet package'
+  
+  This installs the package in the Gem system
+  You still need to install it into rwdtinker - do that in the 'List Zips' tab
+  
+  For this feature to work, you need
+  RubyGems installed
+   Variables set correctly in the tinerwin2.cnf file
+      $xpcommand,  $gemdirectory_withgemfiles and  $geminstalled_directory
+    the defaults as shipped will normally be for a Debian Linux system  
+   On Debian Linux, you would usually need to be running rwdtinker as root in order to install RubyGems
+   
+   You can view the list of rwdtinker applets you have installed already by clicking 'view already installed GEM applets'
+ "
 )

data/code/superant.com.rwdtinkerbackwindow/installapplet.rb

@@ -1,3 +1,4 @@
+# code in install rwdtinker applets - now uses ruby.zip module
   def installapplet
    require 'fileutils'
    require 'extras/zip/zip'

data/code/superant.com.rwdtinkerbackwindow/installgemapplet.rb

@@ -1,3 +1,4 @@
+# install rwdtinker applet from a long directory location 
   def installgemapplet
    require 'fileutils'
    require 'extras/zip/zip'
@@ -6,16 +7,14 @@
         begin # exception trapped block
    	 fullname =  nametext + ".zip"
      
-
-  zf = Zip::ZipFile.new(fullname)
- zf.sort.each {
-  |entry|
-      zf.extract(entry.to_s, entry.to_s)
+         zf = Zip::ZipFile.new(fullname)
+         zf.sort.each {
+         |entry|
+         zf.extract(entry.to_s, entry.to_s)
                      }
-   @installapplettext = Message[:applet_installed]  
+         @installapplettext = Message[:applet_installed]  
    
        rescue
             @installapplettext = "unzip error - applet may not be installed correctly"
         end # exception rescue
-
   end

data/code/superant.com.rwdtinkerbackwindow/installremotegem.rb

@@ -0,0 +1,19 @@
+# download gem of rwdtinker applet
+  def superantcominstallremotegemapplet
+   require 'fileutils'
+   
+    tempnametext = "%s" % [@superantcominstallremoteappletinput]
+	 temparray = tempnametext.split(/ /)
+   nametext  = temparray[0]
+        begin # exception trapped block
+   	 
+  	
+	        commandline = $xpcommand + "gem install " + nametext
+         
+         @superantcominstallremotegemappletresult = `#{commandline}`
+   
+       rescue
+            @superantcominstallremotegemappletresult  = "error during gem install!"
+        end # exception rescue
+
+  end

data/code/superant.com.rwdtinkerbackwindow/listgemdirs.rb

@@ -0,0 +1,12 @@
+# this code is to list the gem directories that are installed
+def superantcomshowgemfiledirs
+ 
+  fileList      = Dir.new($gemdirectory_withgemfiles).entries.sort.delete_if { |x| ! (x =~ /\Arwdzip/) }
+  @superantcomshowgemappletdirsresult  = fileList.rwd_method("superantcomshowgemappletdirsname")
+end
+ 
+def superantcomshowgemappletdirsname(inffile)
+  applet                = inffile
+  @a_gemfiledirsinput       = applet
+  
+end

data/code/superant.com.rwdtinkerbackwindow/listgemzips.rb

@@ -1,7 +1,7 @@
 # this code is to list the zips
 
 
-def fillhypernotename(inffile)
+def fillzipappletname(inffile)
   applet                = inffile.gsub(/\.zip$/, "")
   @a_installapplet = applet
   
@@ -50,5 +50,5 @@ def listgemzips
                         findzipfiles(x + "/**")
                 end
         end
-         @zipslistresult = $zipsarray.rwd_method("fillhypernotename")
+         @zipslistresult = $zipsarray.rwd_method("fillzipappletname")
       end  

data/code/superant.com.rwdtinkerbackwindow/listzips.rb

@@ -1,16 +1,31 @@
 # this code is to list the zipped applets that can be installed
-def listzipfilestoinstall
- if File.exist?($zipslocation)
-  fileList      = Dir.new($zipslocation).entries.sort.delete_if { |x| ! (x =~ /zip$/) }
-  @zipslistresult  = fileList.rwd_method("fillziptoinstallname")
-  end
-end
+
  
 def fillziptoinstallname(inffile)
   applet                = inffile.gsub(/\.zip$/, "")
   @a_installapplet        = applet
   
 end
+
 
 
-
+  
+def  listzipfilestoinstall
+ startlangdir = File.join($progdir, $zipslocation )
+ #get a list of the files and subdirectories on the starting directory only
+      
+    
+        a = Array.new(Dir["#{startlangdir}/*"].entries.sort)
+        
+         #loop through and get the files names
+         a.each do |x|
+               # only zip files
+                  if x =~ /\.zip/
+                  #  puts "#{x}"        #adds the file to the array to display on the screen
+                   $zipsarraylocal =  $zipsarraylocal | ["#{x}"] 
+               end
+              
+             end
+      
+         @zipslistresult = $zipsarraylocal.rwd_method("fillziptoinstallname")
+      end  

data/code/superant.com.rwdtinkerbackwindow/openhelpwindowtinkerwin2.rb

@@ -24,6 +24,9 @@ def runhelpwindowtinkerwin2
       $help_topic = "remote_control"
       
       end
+       if @rwd_tab == "superantcomremotezipsinstall"
+       $help_topic = "remotegemapplet_install"
+       end
           
   
  if @rwd_window != "rwdtinkerhelpwindow"

data/code/superant.com.rwdtinkerbackwindow/remotegemlist.rb

@@ -0,0 +1,24 @@
+# This tinker method is to retrieve the list of rwdzip applets available to install from the remote repository
+  
+def superantcomremotegemlist
+  gemcommandoption = "search --remote "
+    gemfilename = "rwdzip"
+    commandtext = "gem search --remote rwdzip"  
+    commandtemp = $xpcommand  + commandtext
+    begin # exception trapped block
+         
+     tempremotegemappletsresult = `#{commandtemp}  2>&1`
+     @superantcomremotegemappletsfullresult = tempremotegemappletsresult
+     fileList = tempremotegemappletsresult.split(/\n/).delete_if { |x| ! (x =~ /\Arwdzip/) }
+    
+  @superantcomremotegemappletsresult = fileList.rwd_method("superantcomremotegemappletdirsname")
+      rescue SystemCallError, StandardError
+     @superantcomremotegemappletsresult  = "system call error: " + $!
+    end # exception rescue
+end
+ 
+def superantcomremotegemappletdirsname(inffile)
+  applet                = inffile
+  @superantcominstallremoteappletinput       = applet
+  
+end

data/code/superant.com.rwdtinkerbackwindow/saveconfigurationrecord.rb

@@ -1,4 +1,4 @@
-  # this method adds a new address record
+  # this method saves the configuration record
   def saveconfigurationrecord 
    require 'fileutils'
    if @a_configurationfilename

data/configuration/rwdshellversion.cnf

@@ -1,2 +1,2 @@
 
-RwdShellVersion = "0.95"
+RwdShellVersion = "0.96"

data/configuration/rwdtinker.cnf

@@ -2,11 +2,8 @@
 ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
 CodeName = "rwdtinker"
 CodeNameFile = CodeName + ".rb"
-LangNameFile = "rwdlanguage.rb"
 RWDFile	= "rwdtinker.rwd"
 LangDir = "lang"
-TempLangHashFile = LangDir + "/" + "templangfile.rb"
-LocalLangHashFile = LangDir + "/" + "xlocallangfile.rb" 
  CodeDir = "code" 
  GuiDir = "gui"  
   $help_topic = "general_help"

data/configuration/rwdtinkerversion.cnf

@@ -1,2 +1,2 @@
 
-RwdTinkerVersion = "1.52"
+RwdTinkerVersion = "1.56"

data/configuration/tinkerwin2variables.cnf

@@ -1,7 +1,11 @@
 
 TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
 $zipslocation = "zips" # location of applets to add
- $zipsarray = [""]
+ $zipsarray = [""] ; $zipsarraylocal = [""]
+ $xpcommand = " "  # Linux machines
+# $xpcommand =  "cmd /C "  # XP machines with cmd shell
+ $gemdirectory_withgemfiles = "/usr/lib/ruby/gems/1.8/gems"
+# $gemdirectory_withgemfiles = "c:\\ruby\\lib\\ruby\\gems\\1.8\\gems"  # XP machine
 # $geminstalled_directory = "/ruby/lib/ruby/gems/1.8/gems" # XP machine
  $geminstalled_directory = "/usr/lib/ruby/gems/1.8/gems" # Debian Linux
 

data/extras/cmdline_parse

@@ -0,0 +1,47 @@
+#!/usr/bin/ruby
+# --- Parse command line ---
+#
+# Author:	Magnus Engstr�m
+# Email:		magnus@gisab.se
+# File:		cmdline_parse
+#
+# Description
+# -----------
+# Parses the commandline and
+# returns a hash with the 
+# switch as key and the 
+# value as value :)
+# --------------------------
+
+class Commandline
+  def Commandline::parse()
+
+	 params	= Hash::new()	# Could be useful to have something to put the commandline in ;)
+	 key		= false			# Just a really ugly hack to keep track on if we're reading key or value
+	 foo		= ''				# Keeps the key name
+
+	 # Iterate through the command line ($*) and put it in the params hash
+	 $*.each { |param|
+		key = ( key == true ? false : true ) # Negate the value of key
+		if(key)
+		  foo = param
+		else
+		  params[foo] = param
+		end
+	 }
+
+	 # Validate the command line.
+	 # Every key should begin with at least one '-' and have a value
+	 if( !key ) # If key equals true, then the user should enter one more parameter
+		passed = true
+		params.each { |key, value| # Iterate through all parameters
+		  passed = false if(key[0].chr() != '-') # Doesn't it start with a '-'? Not passed...
+		  passed = false if(value == '') # I really want a value here, not just an empty string
+		}
+	 end
+
+	 # Return params if check passed, else return -1
+	 passed ? params : -1
+
+  end
+end

data/extras/config_file

@@ -0,0 +1,69 @@
+#!ruby
+require 'ftools'
+require 'tempfile'
+
+class ConfigFile
+
+  def ConfigFile::parse(filename)
+	 # Make sure this file exists and is readable
+	 if( FileTest::readable_real?(filename) )
+		new(filename) # Return the class instance
+	 else
+		-1 # Return -1 on failure
+	 end
+  end
+
+  def initialize(filename)
+	 @filename	= filename
+	 @config		= Hash::new() # The class internal variable that holds the config data
+	 section		= ''
+
+	 # Parse the configuration file (and in only TWO rows, God I love Ruby! =)
+	 IO::foreach(@filename) { |configLine| @config[section = $1] = Hash::new() if(configLine.gsub(/\s*#.*$/, '') =~ /\s*(\S+)\s*\{/) 
+	 @config[section].update({$1 => $2}) if(configLine.gsub(/\s*#.*$/, '') =~ /\s*(\S+)\s*=\s*(.*)/) }
+  end
+
+  # Return the requested parameter
+  def getParam(section, parameter)
+	 @config[section][parameter] if(@config[section].type == Hash)
+  end
+
+  # Set the provided parameter
+  def setParam(section, parameter, value)
+	 # Create a temp file
+	 temp = Tempfile::new('config')
+
+	 current_section = ''
+	 # Loop through the config file
+	 IO::foreach(@filename) { |line|
+		current_section = $1 if( line =~ /^\s*(\S+)\s*{\s*(#.*)?$/ ) # Handle the section stuff
+		# Is this a correct parameter entry?
+		if( line =~ /^\s*(\S+)\s*=\s*\S+\s*(#.*)?$/ )
+		  
+		  if( current_section == section && $1 == parameter ) # This is the line we want to change!
+			 line.gsub!( /^(\s*\S+\s*=\s*)\S+(\s*(#.*)?)$/, "\\1#{value}\\2" ) # Change the parameter value to the one the user supplied
+		  end
+		  
+		end
+
+		temp.puts(line) # Write the line to the tempfile
+	 }
+
+	 temp.close() # Close the file
+	 File::copy(temp.path, @filename) # Copy the tempfile to overwrite the old one
+	 temp.close(true) # Remove the file
+  end
+
+  # Loop through all sections
+  def each_section()
+	 @config.each { |key,value| yield(key) }
+  end
+
+  # Loop through all parameters in a section
+  def each_parameter(section)
+	 @config[section].each { |key,value| yield(key) }
+  end
+
+  attr_reader :filename
+
+end

data/extras/errorMsg

@@ -0,0 +1,19 @@
+#!ruby
+
+# --- errorMsg ---
+#
+# Author:	Magnus Engstr�m
+# Email:		magnus@gisab.se
+# File:		errorWrite
+#
+# Description
+# -----------
+# Outputs an error message to the administrator
+# ------------------
+
+def errorMsg(message, exitapp = false)
+  STDERR.puts(message)
+  MP3Control::exit_mpg123() if(exitapp)
+  Kernel::exit(exitapp) if(exitapp) # Terminate application and return the exitapp value if it isn't falsew
+
+end

data/extras/makePlaylist

@@ -0,0 +1,34 @@
+#!/usr/bin/ruby
+require 'mp3tag'
+
+def getList(dir)
+  Dir::chdir(dir)
+
+  # Find the files in this directory
+  Dir['*mp3'].each { |file|
+	 if(FileTest::file?(file))
+		mp3tag = Mp3Tag::new(Dir::getwd()+"/"+file)
+		if(mp3tag.songname.length > 0)
+		  puts("#{Dir::getwd()+"/"+file}||#{mp3tag.songname}||#{mp3tag.artist}||#{mp3tag.album}||#{mp3tag.year}||#{mp3tag.comment}||#{mp3tag.tracknum}||#{mp3tag.genre_id}||#{mp3tag.genre}")
+		else
+		  name = Dir::getwd()+"/"+file
+		  name =~ /([^\/]+)\.mp3$/
+		  puts("#{Dir::getwd()+"/"+file}||#{$1}||#{mp3tag.artist}||#{mp3tag.album}||#{mp3tag.year}||#{mp3tag.comment}||#{mp3tag.tracknum}||#{mp3tag.genre_id}||#{mp3tag.genre}")
+		end
+	 end
+  }
+
+  Dir['*'].each { |entry|
+	 if(FileTest::directory?(entry))
+		getList(entry)
+	 end
+  }
+  Dir::chdir('..')
+end
+
+# Change current directory to user supplied one
+Dir::chdir(ARGV[0])
+getList(ARGV[0])
+
+#song = Mp3Tag::new(ARGV[0])
+#puts song.songname()