rwdtinker 1.53 → 1.54

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,4 +1,4 @@
-  
+# 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

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

@@ -1,3 +1,4 @@
+# download gem of rwdtinker applet
   def superantcominstallremotegemapplet
    require 'fileutils'
    

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/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/rwdtinkerversion.cnf

@@ -1,2 +1,2 @@
 
-RwdTinkerVersion = "1.53"
+RwdTinkerVersion = "1.54"

data/configuration/tinkerwin2variables.cnf

@@ -1,7 +1,7 @@
 
 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"

data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/40rwdlistzips.rwd

@@ -6,30 +6,29 @@ $rwdguivar=
       <row> <p align=\"right\">File Name:</p>  <text size=70 name=\"a_installapplet\"/> </row>
 
     </table>
-      <horizontal>
-        <button caption=\"view applet contents\" action=\"viewappletcontents\"/>
-       <button caption=\"view (GEM Directory) applet contents\" action=\"viewgemappletcontents\"/>
-    </horizontal>
-    <p>%appletcontentstext%</p>
+     
 
       <horizontal>
 
-
-<button caption=\"install applet\" action=\"installapplet\"/>
-<button caption=\"install (Gem Directory) applet\" action=\"installgemapplet\"/>
+
+<button caption=\"install (rwdtinker) applet\" action=\"installgemapplet\"/>
       <button caption=\"Help\" action=\"runhelpwindowtinkerwin2\"/>
       
     </horizontal>
     <p>%installapplettext%</p>
 
-
+ <horizontal>
+      
+       <button caption=\"view (rwdtinker) applet contents\" action=\"viewgemappletcontents\"/>
+    </horizontal>
+    <p>%appletcontentstext%</p>
     <table>
       <row> <p align=\"right\">Click below to view the list of zip files </row>
       
     </table>
 
     <horizontal>
-       <button caption=\"List applets available for installing\" action=\"listzipfilestoinstall\"/>
+       <button caption=\"List (zip directory) applets available for installing\" action=\"listzipfilestoinstall\"/>
       
      <button caption=\"List applets (in the GEM Directory) available for installing\" action=\"listgemzips\"/>
       

data/rwd_files/HowTo_Tinker.txt

@@ -227,6 +227,10 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+version 1.54
+ refactored rwdtinker applet installation tab - remote gem and local installs share menu buttons
+ corrected some program logic errors in remote control code including close socket
+
 version 1.53
  added search of Gems repository for rwdtinker gems
  download and install of Gems

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: rwdtinker
 version: !ruby/object:Gem::Version 
-  version: "1.53"
-date: 2005-02-12
+  version: "1.54"
+date: 2005-02-13
 summary: rwdtinker application is a framework to program for RubyWebDialogs.
 require_paths: 
   - "."
@@ -145,8 +145,6 @@ files:
   - rwd_files/rwdindex.html
   - rwd_files/tinker.png
   - zips/rwdahelloworld-0.5.zip
-  - zips/rwdwcalc-0.50.zip
-  - zips/rwdmovies-0.90.zip
   - tests/rwdtinkertestEN.rb
   - tests/test.result
   - tests/totranslate.lang