rwdtinker 1.57 → 1.58

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

@@ -9,6 +9,7 @@
       
       rwdtinker applets packaged as RubyGems can be used if you have RubyGems installed.
       You can download rwdtinker gems at the 'Install Remote Applets' tab
+      to install applets you need the ruby zlib library installed
       ",
      :applet_viewing   =>  "You can get a list of all installed applets by clicking the 'listfiles button'
          To see the text of a install file
@@ -32,7 +33,9 @@
       chose the applet you want\n
       click on 'install applet'\n
       If all goes well the applet should be installed.\n
-      You will need to restart rwdtinker to see the new screens",
+      You will need to restart rwdtinker to see the new screens
+       to install applets you need the ruby zlib library installed",
+
      :applet_tinkerbackeditconfiguration  => " You can edit the configuration
   
   Remember to reload the configuration variables if you want your

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

@@ -1,10 +1,12 @@
 # code in install rwdtinker applets - now uses ruby.zip module
   def installapplet
-   require 'fileutils'
-   require 'extras/zip/zip'
+   
     nametext = "%s" % [@a_installapplet]
-	 
+
         begin # exception trapped block
+
+
+   require 'extras/zip/zip'
    	 fullname =  nametext + ".zip"
      fileName = File.join($zipslocation,fullname)
 

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

@@ -2,7 +2,7 @@
    require 'fileutils'
     nametext = "%s" % [@a_removeapplet]
 	 
-      #  begin # exception trapped block
+        begin # exception trapped block
    	 fileName = "installed/" + nametext + ".inf"
         count =  0
 	fd = File.open(fileName,"r") 
@@ -10,21 +10,23 @@
    	    
    	    fd.each { |oneline|   
          if count == 1
-         puts oneline
+        if File.exist?(oneline.chop)
         FileUtils.rm_rf( oneline.chop)
+         end
         
          end
          count = 1
       }
    fd.close
-   puts fileName
+   
     FileUtils.rm_rf( fileName)
     
     
    @removeapplettext = "applet files removed! - restart rwd to finish uninstalling"    
  
-       # rescue
-        #    @removeapplettext = "\n" + "error"
-       # end # exception rescue
+        rescue
+           @removeapplettext = "\n" + "error"
+       
+   end # exception rescue
 
   end

data/configuration/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION:1/57
+##VERSION:1.58
 ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
 CodeName = "rwdtinker"
 CodeNameFile = CodeName + ".rb"
@@ -12,4 +12,4 @@ LangDir = "lang"
    $rwdcontrolports =["13713","13714","13715","13716","13717","13718"]
  $port = 7705
 
-RwdTinkerVersion = "1.57"
+RwdTinkerVersion = "1.58"

data/extras/zip/zip.rb

@@ -1,3 +1,4 @@
+
 require 'delegate'
 require 'singleton'
 require 'tempfile'

data/rwd_files/HowTo_Tinker.txt

@@ -227,6 +227,10 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+version 1.58
+ check for zlib
+ check for files to delete
+
 version 1.57
   added rconftool use to update configuration files
   changed applets remove to not used external rm

data/tests/checkdepends.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+ruby rdep.rb ../*.rb
+echo "checking installapplet.rb"
+ruby rdep.rb ../code/superant.com.rwdtinkerbackwindow/installapplet.rb

data/tests/makedist.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/ruby -w
+#***********************************************************************
+#* Rwd/Tinker -- A Ruby program for the RudyWebDialog.
+#* Copyright (c) 2004, 2005 by Steven Gibson. All Rights Reserved.
+#* at "steven@superant.com".
+#***********************************************************************/
+
+require 'fileutils'
+load 'configuration/rwdtinker.dist'
+	
+$progdir = File::expand_path( File.dirname(__FILE__))
+results = " "
+puts "creating rwdtinker distribution files version #{RwdTinkerVersion}"
+puts "cleaning conf files"
+`tests/cleancnf.sh`
+puts "moving up one directory"
+Dir.chdir("..")
+
+zipcreatecmd = "zip  -r rwdtinker-#{RwdTinkerVersion}.zip rwdtinker" 
+puts "#{zipcreatecmd}"
+ `#{zipcreatecmd}`
+ tarcreatecmd = "tar --gzip -cf  rwdtinker-#{RwdTinkerVersion}.tar.gz rwdtinker"
+puts "#{tarcreatecmd}"
+`#{tarcreatecmd}`
+ tarcreatecmd2 = "tar --bzip2 -cf  rwdtinker-#{RwdTinkerVersion}.tar.bz2 rwdtinker"
+puts "#{tarcreatecmd2}"
+`#{tarcreatecmd2}`
+
+print Dir["rwdtinker*.{gz,bz2,deb,gem}"]

data/tests/rdep.rb

@@ -0,0 +1,354 @@
+=begin
+
+rdep - The Ruby Dependency Tool
+Version 1.4
+
+Hal E. Fulton
+2 November 2002
+Ruby's license
+
+Purpose
+
+  Determine the library files on which a specified Ruby file is dependent 
+  (and their location and availability).
+
+Usage notes
+
+  Usage: ruby rdep.rb sourcefile
+
+  The sourcefile may or may not have a .rb extension.
+
+  The directories in the $: array (which includes the RUBYLIB environment 
+  variable) are searched first. File extensions are currently searched for 
+  in this order: no extension, .rb, .o, .so, .dll (this may not be correct).
+
+  If there are no detected dependencies, the program will give the
+  message, "No dependencies found."
+
+  If the program finds [auto]load and require statements that it can 
+  understand, it searches for the specified files. Any recognized Ruby 
+  source files (*.rb) are processed recursively in the same way. No attempt 
+  is made to open the files that appear to be binary.
+
+  The program will print up to four lists (any or all may be omitted):
+    1. A list of files it found by going through RUBYLIB.;
+    2. A list of files found under the searchroot (or under '.');
+    3. A list of directories under searchroot which should perhaps be 
+       added to RUBYLIB; and
+    4. A list of files (without extensions) which could not be found.
+
+  If there were unparseable [auto]load or require statements, a warning 
+  will be issued.
+
+  Between lists 3 and 4, the program will give an opinion about the overall
+  situation. The worst case is that files were not found; the uncertain
+  case is when there were unparseable statements; and the best case is 
+  when all files could be found (lists 1 and 2).
+  
+Exit codes
+
+  0 - Usage or successful execution
+  1 - Nonexistent sourcefile specified
+  2 - Improper sourcefile (pipe, special file, ...)
+  3 - Some kind of problem reading a file
+
+Limitations
+
+  Requires Ruby 1.6.0 or higher
+  No recursion on binaries
+  Can't look at dynamically built names
+  Can't detect "tested" requires (e.g.: flag = require "foo.rb")
+  [auto]load/require can be preceded only by whitespace on the line
+  Only recognizes simple strings ("file" or 'file')
+  Does not recognized named constants (e.g.: require MyFile)
+  Assumes every directory entry is either a file or subdirectory
+  Does not handle the Windows variable RUBYLIB_PREFIX
+  May be SLOW if a directory structure is deep (especially
+    on Windows with 1.6.x)
+
+Known bugs:
+
+  Logic may be incorrect in terms of search order, file extensions, etc.
+  Injected a bug in 1.3: In rare cases will recurse until stack overflow
+
+Revision history
+
+  Version 1.0 - 13 October 2000  - Initial release
+  Version 1.1 - 10 July 2001     - Bug fixes
+  Version 1.2 - 15 August 2002   - Works correctly on Win98
+  Version 1.3 - 21 October 2002  - Removed globals; removed search root;
+                                   added $: instead of RUBYLIB; etc.
+  Version 1.4 -  2 November 2002 - Fixed autoload recursion bug
+
+To-do list
+
+  Possibly change extension search order?
+  Possibly add extensions to list?
+  Are explicit extensions allowed other than .rb?
+  Is a null extension really legal?
+  Additional tests/safeguards? (file permissions, non-empty files,...)
+  Change inconsistent expansion of tilde, dot, etc.?
+  Make it smarter somehow??
+
+=end
+
+#
+# File.doc_skip - iterator to skip embedded docs in Ruby input file
+#
+
+class File
+
+  def doc_skip
+    loop do
+      str = gets
+      break if not str
+      if str =~ /^=begin([ \t]|$)/
+        loop do
+          str = gets
+          break if not str
+          break if str =~ /^=end([ \t]|$)/
+        end
+      else
+        yield str
+      end
+    end
+  end
+
+end
+
+class Dependency
+
+#
+# unquote - Find the value of a string. Called from scan.
+#
+
+def unquote(str)
+  # Still more kludgy code.
+  return nil if str == nil
+  if [?', ?"].include? str[0]       # ' Unconfuse gvim 
+    str = str[1..-2]
+  else
+    ""
+  end
+end
+
+#
+# scan - Scans a line and returns the filename from a load or require
+#        statement. Returns null string if there was a parsing problem.
+#        Returns nil if this is not a load or require.
+#
+
+def scan(line)
+  line.strip!
+  if line =~ /^load/ or line =~ /^auto/ or line =~ /^require/
+    @has_dep = true   # At least one dependency found.
+    # Kludge!!
+    junk = %w[ require load autoload ( ) , ] + [""]
+    temp = line.split(/[ \t\(\),]/) - junk
+    if temp[2] and temp[2][0].chr =~ /[#;]/ # Comments, semi...
+      temp = temp[0..1]
+    end
+    if temp[-1] =~ /\#\{/          # #{} means trouble
+      str = ""
+    else
+      str = unquote(temp[-1])      # May return nil.
+    end
+    str
+  else
+    nil
+  end
+end
+
+#
+# find_files - The heart of the program. Search for files using $:
+#
+
+def find_files(source)
+  # loadable - This file or some variant can be found in one of the
+  #            directories in $:
+  loadable = false
+
+  files = []  # Save a list of load/require files.
+  found = []  # Save a list of files found (.rb only for now)
+  
+  # Open the file, strip embedded docs, and look for load/require statements.
+  
+  begin
+    File.open(source).doc_skip {|line| files << scan(line)}
+  rescue => err
+    puts "Problem processing file #{source}: #{err}"
+    caller.each {|x| puts "  #{x}"}
+    exit 3
+  end
+
+  # If no dependencies, don't bother searching!
+  if ! @has_dep
+    puts "No dependencies found."
+    exit 0
+  end
+
+  files.compact!
+  catch(:skip) do
+    for file in files
+  
+      if file == ""   # Warning
+        @warnfiles << source
+        next
+      end
+  
+      throw :skip if (@inpath.include? file) || (@cantfind.include? file)
+  
+      if file =~ /\.rb$/ then  # Don't add suffix to *.rb
+        suffixes = [""]  # Hmm... .rbw?? Probably not needed.
+      else 
+        suffixes = @suffixes   # Use any suffix (extension)
+      end
+  
+      # Look through search path (@search_path)
+  
+      for dir in @search_path
+  
+        for suf in suffixes
+          filename = dir + file + suf
+          loadable = test ?e, filename
+          break if loadable
+        end
+  
+        if loadable
+          @inpath << filename  # Files we found in RUBYLIB
+          # Add to 'found' if it's a source file (so we can recurse)
+          found << filename if filename =~ /\.rb$/
+          break
+        end
+  
+      end
+    
+      @cantfind << file if !loadable
+    end
+  end
+
+  found.uniq!
+  found.compact!
+  list = found
+  found.each {|x| list += find_files(x)}
+  
+  list
+end
+
+#
+# print_list - Print a header message followed by a list of files 
+#              or directories.
+#
+
+def print_list(header, list)
+  return if list.empty?
+  puts header + "\n\n"  # Extra newlines
+  list.each {|x| puts "  #{x}"}
+  puts "\n"             # Extra newline
+end
+
+SEP = File::Separator
+DIRSEP = if SEP=="/" then ":" else ";" end
+
+def execute
+  @has_dep    = false
+  @warnfiles  = []
+  @newdirs    = []
+  @inpath     = []
+  @cantfind   = []
+  @suffixes   = [""] + %w[ .rb .o .so .dll ]
+  @rdirs = []
+  @global_found = []
+  
+  # No parameters? Usage message
+  
+  if not ARGV[0]
+    puts "Usage: ruby rdep.rb sourcefile [searchroot]"
+    exit 0
+  end
+  
+  # Does sourcefile exist?
+  
+  if ! test ?e, ARGV[0]
+    puts "#{ARGV[0]} does not exist."
+    exit 1
+  end
+  
+  # Is sourcefile a "real" file? 
+  
+  if ! test ?f, ARGV[0]
+    puts "#{ARGV[0]} is not a regular file."
+    exit 2
+  end
+
+  # Be sure to search under the dir where the 
+  # program lives...
+
+  @proghome = File.dirname(File.expand_path(ARGV[0]))
+  if @proghome != File.expand_path(".")
+    $: << @proghome
+  end
+  
+  # Get list of dirs in $:
+  
+  @search_path = $:
+  @search_path.collect! {|x| x[-1] == SEP ? x : x + SEP }
+  
+  # All real work happens here -- big recursive find
+  
+  find_files(ARGV[0])
+  
+  @warnfiles.uniq!
+  @cantfind.uniq!
+  @newdirs.uniq!
+  @inpath.map! {|x| File.expand_path(x)}
+  @inpath.uniq!
+  
+  #
+  # Now, what are all the results? Report to user.
+  #
+  
+  if @inpath[0]
+    print_list("Found in search path:", @inpath)
+    if ! @cantfind.empty? && @warnfiles.empty?
+      puts "This will probably be sufficient.\n"
+    end
+  end
+
+  # Did we use any dirs under the "home"?
+
+  homedirs = @inpath.find_all {|x| x =~ Regexp.new("^"+@proghome)}
+  if homedirs[0]  # not empty
+    homedirs.map! {|x| File.dirname(x) }.uniq!
+    puts "Consider adding these directories to RUBYPATH:\n\n"
+    homedirs.each {|x| puts "  #{x}" }
+    puts
+    if @warnfiles[0] and homedirs == [] # There are unparseable statements.
+      puts "This will probably NOT be sufficient. See below.\n\n"
+    end
+  end
+  
+  # What's our opinion?
+
+  if @cantfind[0]     # There are unknown files.
+    puts "This will probably NOT be sufficient. See below.\n\n"
+  elsif @warnfiles[0] and homedirs == [] # There are unparseable statements.
+    puts "Files may still be missing. See below.\n\n"
+  else                # We think everything is OK.
+    puts "This will probably be sufficient."
+  end
+  
+  # Report unknown files
+  print_list("Not located anywhere:", @cantfind)
+  
+  # Print warning about load/require strings we couldn't understand
+  print_list("Warning: Unparseable usages of 'load' or 'require' in:",
+             @warnfiles)
+end
+
+end
+
+Dependency.new.execute
+ 
+exit 0
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.6
 specification_version: 1
 name: rwdtinker
 version: !ruby/object:Gem::Version 
-  version: "1.57"
-date: 2005-03-05
+  version: "1.58"
+date: 2005-03-06
 summary: rwdtinker application is a framework to program for RubyWebDialogs.
 require_paths: 
   - "."
@@ -141,6 +141,9 @@ files:
   - tests/test.result
   - tests/totranslate.lang
   - tests/cleancnf.sh
+  - tests/rdep.rb
+  - tests/checkdepends.sh
+  - tests/makedist.rb
   - init.rb
   - Readme.txt
   - rwdconfig.dist