rwdschedule 0.96 → 0.97

data/init.rb

@@ -23,6 +23,7 @@
 
 require "ev/rwd"
 require 'fileutils'
+require 'extras/rconftool'
 	
 $progdir = File::expand_path( File.dirname(__FILE__))
 
@@ -51,15 +52,33 @@ $progdir = File::expand_path( File.dirname(__FILE__))
             if(!test(?d,x))
              # only rwd files
               if x =~ /rb|rwd|txt/
-		           load x      #opens the file thats in fileName and reads it
-		           $tempdoc += $rwdguivar # adds the file into the doc string
+                
+		          load x      #opens the file thats in fileName and reads it
+		          $tempdoc += $rwdguivar # adds the file into the doc string
               end
             end
           end
   end 
         
+# integrate the new configuration files
+MAINconfignew =  "rwdconfig.cnf"
+MAINconfigdist = "rwdconfig.dist"
+Rconftool::install(MAINconfigdist,MAINconfignew)
+
+ Dir.chdir("configuration")    #changes the current working directory
+      
+ fileList = Dir.new(".").entries.sort.reverse.delete_if { |x| ! (x =~ /dist$/) } #creates an Array separated with \n
+ @doc = ""
+ fileList.length.times{               #opening of a block
+    configdist =fileList.pop                #pops the first item out of the Array
+tempconfigfile = configdist.gsub(/\.dist$/, "")
+confignew = tempconfigfile + ".cnf"
+Rconftool::install(configdist,confignew)     #integrates new file with old 
+  }       #closing block
+ # END of configuration integration 
+Dir.chdir($progdir)
+
 # Read in the configuration files
- 
  Dir.chdir("configuration")    #changes the current working directory
       
  fileList = Dir.new(".").entries.sort.reverse.delete_if { |x| ! (x =~ /cnf$/) } #creates an Array separated with \n
@@ -69,10 +88,12 @@ $progdir = File::expand_path( File.dirname(__FILE__))
     load fileName     #loads the the config file thats in fileName 
   }       #closing block
  # END of configuration reading 
-
+ 
  Dir.chdir($progdir) # change back to top program directory
 
  # build the English Language hash file from the parts
+ languagehashvariable = 'Message = Hash.new { |hh, kk| hh[kk] = "ERROR: Message not found: #{kk.inspect}."; hh[kk] }
+    langmessage = {' + "\n"
  startlangdir = File.join(LangDir,"en")
  #get a list of the files and subdirectories on the starting directory only
         alanghash = Array.new(Dir[startlangdir].entries.sort)
@@ -100,10 +121,11 @@ $progdir = File::expand_path( File.dirname(__FILE__))
                 end
         end
 
- fileLangHash=File.open(TempLangHashFile,"w")        #deletes and opens a the file in fileName
- fileLangHash.write($tempdoc)                     #writes the contents of doc into the file
- fileLangHash.close 
- # END of Lang building
+ 
+       #writes the contents of doc into the  languagehashvariable 
+  languagehashvariable  =  languagehashvariable + $tempdoc + "}  ; langmessage.each { |kk, vv| Message[kk] = vv }"
+ 
+ # END of en Lang building
   $tempdoc = " "
   Dir.chdir($progdir) # change back to top program directory
  
@@ -135,31 +157,16 @@ $progdir = File::expand_path( File.dirname(__FILE__))
                 end
         end
 
- filelocalLangHash=File.open(LocalLangHashFile,"w")        #deletes and opens a the file in fileName
- filelocalLangHash.write($tempdoc)                     #writes the contents of doc into the file
- filelocalLangHash.close
+ 
+                #writes the contents of doc into the variable
+  languagehashvariable =  languagehashvariable  + " ; Message.update(" + $tempdoc + ' :rwdtinker => "Rwdtinker" ) '
+  
 
 $tempdoc = " "
  
  Dir.chdir($progdir) # change back to top program directory
-
- # build the language hash constant object from the lang parts
- #get a list of the files in lang directory only
-        alangfile = Dir.new(LangDir).entries.sort.reverse.delete_if { |x| ! (x =~ /rb$/) }
-        alangfile.length.times{
-        fileName = alangfile.pop
-        Dir.chdir($progdir)
-        Dir.chdir(LangDir) 
-        fileLangA=File.open("#{fileName}","r")        #opens the file thats in fileName as read only
-        $tempdoc += fileLangA.read    #reads the file into the doc string
-        fileLangA.close    
-        }
-        
-Dir.chdir($progdir)
- fileLangB=File.open(LangNameFile,"w")        #deletes and opens a the file in fileName
- fileLangB.write($tempdoc)                     #writes the contents of doc into the file
- fileLangB.close 
- load LangNameFile # load the  file
+ 
+ temp = eval(   languagehashvariable )
 
  $tempdoc = " "
 
@@ -190,10 +197,9 @@ Dir.chdir($progdir)
                 end
         end
 
- fileB=File.open(CodeNameFile,"w")        #deletes and opens a the file in fileName
- fileB.write($tempdoc)                     #writes the contents of doc into the file
- fileB.close 
- require CodeName # load the program file
+
+# load the program file
+ tempcoderesult = eval( $tempdoc )
 
 # build the actual GUI from the gui parts
  $tempdoc = " "
@@ -224,9 +230,8 @@ Dir.chdir($progdir)
                 end
         end
 
-   fileB=File.open(RWDFile,"w")        #deletes and opens a the file in fileName
-   fileB.write($tempdoc)                     #writes the contents of doc into the file
-   fileB.close
+   # gui variable is done
+    guiRWD = $tempdoc
    
    require 'socket'		# Network stuff
     host = "127.0.0.1"
@@ -266,4 +271,4 @@ $port = port
 end
 
 
-RwdTinker.file(RWDFile).serve(port) # start the main class and program
+RwdTinker.new(  guiRWD).serve(port) # start the main class and program

data/rwd_files/HowTo_Schedule.txt

@@ -154,6 +154,11 @@ Steven Gibson
 steven@superant.com
 
 == Changelog 
+version 0.97
+ added rconftool use to update configuration files
+ changed applet removal to not use external rm
+ removed version number from directory name
+
 version 0.96
  added export ics record
  added end time for ics create record 

data/rwd_files/HowTo_Tinker.txt

@@ -227,6 +227,22 @@ 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
+
+version 1.56
+ refactored gui files to load without intermediate files
+  refactored code files to load without intermediate files
+
+version 1.55
+ refactored language files to load without intermediate files
+  refactored language files to load without intermediate files
+
 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

data/rwdconfig.dist

@@ -0,0 +1,6 @@
+##VERSION:1.57
+# rwdtinker core configuration file
+##NAME: ConfigLocation:0
+ConfigLocation=""
+##NAME: ZipsLocation:0
+ ZipsLocation=""

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/cleancnf.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+rm *.cnf
+rm *.bak
+rm configuration/*.cnf
+rm configuration/*.bak

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/rwdschedule.dist'
+	
+$progdir = File::expand_path( File.dirname(__FILE__))
+results = " "
+puts "creating rwdschedule distribution files version #{RwdScheduleVersion}"
+puts "cleaning conf files"
+`tests/cleancnf.sh`
+puts "moving up one directory"
+Dir.chdir("..")
+
+zipcreatecmd = "zip  -r rwdschedule-#{RwdScheduleVersion}.zip rwdschedule" 
+puts "#{zipcreatecmd}"
+ `#{zipcreatecmd}`
+ tarcreatecmd = "tar --gzip -cf  rwdschedule-#{RwdScheduleVersion}.tar.gz rwdschedule"
+puts "#{tarcreatecmd}"
+`#{tarcreatecmd}`
+ tarcreatecmd2 = "tar --bzip2 -cf  rwdschedule-#{RwdScheduleVersion}.tar.bz2 rwdschedule"
+puts "#{tarcreatecmd2}"
+`#{tarcreatecmd2}`
+
+print Dir["rwdschedule*.{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

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.6
 specification_version: 1
 name: rwdschedule
 version: !ruby/object:Gem::Version 
-  version: "0.96"
-date: 2005-02-22
+  version: "0.97"
+date: 2005-03-06
 summary: rwdschedule is an calendar application using rwdtinker and RubyWebDialogs.
 require_paths: 
   - "."
@@ -35,6 +35,7 @@ files:
   - code/01rwdcore/returntomain.rb
   - code/01rwdcore/rwdtinkerversion.rb
   - code/01rwdcore/rwdwindowreturn.rb
+  - code/dd0viewphoto/dd0viewphoto.rb
   - code/superant.com.rwdtinkerbackwindow/controlclient.rb
   - code/superant.com.rwdtinkerbackwindow/diagnostictab.rb
   - code/superant.com.rwdtinkerbackwindow/helptexthashtinkerwin2.rb
@@ -90,19 +91,24 @@ files:
   - code/superant.com.schedule/deleteicseventrecord.rb
   - code/superant.com.schedule/renameicseventdata.rb
   - code/superant.com.schedule/exporticseventrecord.rb
-  - configuration/language.cnf
-  - configuration/rwdapplicationidentity.cnf
-  - configuration/rwdtinker.cnf
-  - configuration/rwdtinkerversion.cnf
-  - configuration/tinkerwin2variables.cnf
-  - configuration/tinkerwin2version.cnf
-  - configuration/rwdcalendar.cnf
-  - configuration/rwdcalendarversion.cnf
-  - configuration/rwdschedule.cnf
-  - configuration/rwdscheduleversion.cnf
+  - configuration/tinkerwin2variables.dist
+  - configuration/rwdtinker.dist
+  - configuration/language.dist
+  - configuration/rwdapplicationidentity.dist
+  - configuration/rwdschedule.dist
+  - configuration/rwdcalendar.dist
   - extras/zip
-  - extras/cal.rb
+  - extras/cmdline_parse
+  - extras/config_file
+  - extras/errorMsg
+  - extras/makePlaylist
+  - extras/mp3controld
+  - extras/playlist
+  - extras/plugins
+  - extras/showHelp
+  - extras/rconftool.rb
   - extras/icalendar
+  - extras/cal.rb
   - extras/icalendar.rb
   - schedules/archive
   - schedules/20050120T09.ics
@@ -122,13 +128,6 @@ files:
   - ev/thread.rb
   - ev/tree.rb
   - ev/xml.rb
-  - lang/alanguagehashbegin.rb
-  - lang/languagehash.rb
-  - lang/templangfile.rb
-  - lang/vlanguagehashend.rb
-  - lang/wlocallangstart.rb
-  - lang/xlocallangfile.rb
-  - lang/zlocallangend.rb
   - lang/en/rwdcore/languagefile.rb
   - lang/en/rwdcalendar/calendar-en.rb
   - lang/es/rwdcore/languagefile-es.rb
@@ -239,9 +238,13 @@ files:
   - tests/rwdtinkertestEN.rb
   - tests/test.result
   - tests/totranslate.lang
-  - Readme.txt
+  - tests/cleancnf.sh
+  - tests/rdep.rb
+  - tests/checkdepends.sh
+  - tests/makedist.rb
   - init.rb
-  - rwdschedule-0.96.gem
+  - Readme.txt
+  - rwdconfig.dist
 test_files: []
 rdoc_options: 
   - "--main"

data/configuration/language.cnf

@@ -1,5 +0,0 @@
-
-#$lang = "jp"
-$lang= "en"
-#$lang= "nl"
-#$lang= "es"

data/configuration/rwdapplicationidentity.cnf

@@ -1,3 +0,0 @@
-
-$rwdapplicationidentity = "rwdschedule - event book"
-

data/configuration/rwdcalendar.cnf

@@ -1,4 +0,0 @@
-
-$extras_directory = "extras"
-
-

data/configuration/rwdcalendarversion.cnf

@@ -1,4 +0,0 @@
-
-
-
-