rwdtinker 1.77 → 1.78

data/configuration/language.dist

@@ -1,6 +1,6 @@
-##VERSION:1.69
+##VERSION: (1.78)
 #language selection file
-##NAME:$lang:0
+##NAME: ($lang):(1.78)
 #$lang = "jp"
 $lang= "en"
 #$lang= "nl"

data/configuration/rwdapplicationidentity.dist

@@ -1,3 +1,3 @@
-##VERSION:1.69
+##VERSION: (1.78)
 $rwdapplicationidentity = "rwdtinker main application"
 

data/configuration/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION:1.77
+##VERSION: (1.78)
 ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
 CodeName = "rwdtinker"
 CodeNameFile = CodeName + ".rb"
@@ -7,12 +7,9 @@ LangDir = "lang"
  CodeDir = "code" 
  GuiDir = "gui"  
   $help_topic = "general_help"
-   $helptopicsarray = [ "general_help","network_help"]
-  $prevouswindow ="main" 
-   $rwdcontrolports =["13713","13714","13715","13716","13717","13718"]   # remote control code not actived 2007
+    $prevouswindow ="main" 
+   $rwdcontrolports =["13713","13714","13715","13716"]   # remote control code not actived 2007
  $port = 7705
-$rwdjumplink = ["helpscreen","tinkerbackwindow","returntomain","opendocuments","editconfiguration"]
 Browser_Exe = 'mozilla '
-$tinkerdocumentsarray +=["HowTo_Tinker.txt","rwdapplications.html","RubyWebDialogs.html"]
-RwdTinkerVersion = "1.77"
+RwdTinkerVersion = "1.78"
 

data/configuration/tinkerwin2variables.dist

@@ -1,17 +1,18 @@
-##VERSION:1.69
+##VERSION: (1.78)
 TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
-##NAME:$zipslocation:0
+##NAME: ($zipslocation):(1.78)
 $zipslocation = "zips" # location of applets to add
- $zipsarray = [""] ; $zipsarraylocal = [""]
-##NAME:$xpcommand:0
+ $zipsarray = [""]
+  $zipsarraylocal = [""]
+##NAME: ($xpcommand):(1.78)
  $xpcommand = " "  # Linux machines
 # $xpcommand =  "cmd /C "  # XP machines with cmd shell
-##NAME:$gemdirectory_withgemfiles:0
+##NAME: ($gemdirectory_withgemfiles):(1.78)
  $gemdirectory_withgemfiles = "/var/lib/gems/1.8/gems"
 # $gemdirectory_withgemfiles = "c:\\ruby\\lib\\ruby\\gems\\1.8\\gems"  # XP machine
-##NAME:$geminstalled_directory:0
+##NAME: ($geminstalled_directory):(1.78)
 # $geminstalled_directory = "/ruby/lib/ruby/gems/1.8/gems" # XP machine
  $geminstalled_directory = "/var/lib/gems/1.8/gems" # Debian Linux
 
-RwdTinkerWin2Version = "0.8"
+RwdTinkerWin2Version = "1.78"
 

data/lib/rconftool.rb

@@ -121,13 +121,17 @@ module Rconftool
         next
       end
       if old_setting.version == src_setting.version
+	      if $DEBUG
+		      $stderr.puts "old setting: #{old_setting.version}"
+		      $stderr.puts "src setting: #{src_setting.version}"
+		 end     
         debug << "  #{name}: unchanged\n"
-        src_setting.add_comment("\n DEFAULT SETTING from #{distfile}:\n")
+         src_setting.add_comment("\n DEFAULT SETTING from #{distfile}:\n")
         src_setting.add_comment(src_setting.content)
         src_setting.content = old_setting.content
         next
       end
-      # Otherwise, must install updated setting and comment out
+       # Otherwise, must install updated setting and comment out
       # the current setting for reference
       debug << "  #{name}: UPDATED\n"
       src_setting.add_comment("\n Previous setting (inserted by rconftool):\n\n")
@@ -215,9 +219,10 @@ module Rconftool
         20.times do
           line = f.gets
           break unless line
-          curr_setting << line
+	  linetmp = line.chop + "\r\n"
+          curr_setting << linetmp
           if line =~ /\A##VERSION:/
-            @version = line
+            @version = line.chop
             break
           end
         end
@@ -225,7 +230,8 @@ module Rconftool
 
         while line = f.gets
           unless line =~ /\A##NAME:(.*):(.*)/
-            curr_setting << line
+	   linetmp = line.chop + "\r\n"
+            curr_setting << linetmp
             next
           end
           curr_setting = Setting.new($1,$2)
@@ -238,7 +244,8 @@ module Rconftool
     def write(filename)
       File.open(filename,"w") do |f|
         @settings.each do |s|
-          f << s.to_s
+		stmp =  s.to_s.chop + "\r\n"
+          f << stmp
         end
       end
     end

data/lib/rwd/net.rb

@@ -562,6 +562,12 @@ class RequestRequest
   end
 end
 
+def url_unescape(string)
+string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n) do
+[$1.delete('%')].pack('H*')
+end
+end
+
 class Request < Hash
   attr_reader :peeraddr
   attr_reader :request
@@ -604,10 +610,13 @@ class Request < Hash
         @vars	= RequestGet.new(@request.data.nil? ? "" : @request.data)
       when "POST"
         data	= (@io.read(self["content-length"].to_i) or "")
+        data = url_unescape(data)
         @vars	= RequestPost.new((self["content-type"] == "application/x-www-form-urlencoded") ? data : "")
       else
         $stderr.puts "Unknown request ('#{firstline}')."
       end
+    $stderr.puts data  
+    
     end
 
     @peeraddr	= @io.peeraddr

data/rwdconfig.dist

@@ -1,21 +1,22 @@
-##VERSION:1.69
+##VERSION: (1.78)
 # rwdtinker core configuration file
-##NAME: ConfigLocation:0
+##NAME: (ConfigLocation):(1.78)
 ConfigLocation=""
-##NAME: ZipsLocation:0
+##NAME: (ZipsLocation):(1.78)
  ZipsLocation=""
-##NAME:$testharnessarray:0
+##NAME: ($testharnessarray):(1.78)
 $testharnessarray = ["rwdtinker_all_tests"]
-##NAME:TestNow:0
+##NAME: (TestNow):(1.78)
 TestNow=false  # turning this on will run the unit tests
-##NAME:$testharness:0
+##NAME: ($testharness):(1.78)
 $testharness=true
-##NAME:$tinkerhelpaboutarray:0
+##NAME: ($tinkerhelpaboutarray):(1.78)
 $tinkerhelpaboutarray = ["Tinker"]
-##NAME:$tinkerdocumentsarray:0
-$tinkerdocumentsarray = ["Readme.txt"]
-##NAME:$tinkeruninstallarray:0
-$tinkeruninstallarray = ["Tinker"]
-##NAME:JumpLink:0
+##NAME: ($helptopicsarray):(1.78)
+$helptopicsarray = [ "general_help","network_help"]
+##NAME: ($tinkerdocumentsarray):(1.78)
+$tinkerdocumentsarray = ["HowTo_Tinker.txt" , "rwdapplications.html" , "RubyWebDialogs.html"]
+##NAME: (JumpLink):(1.78)
 JumpLink = Hash.new { |hh, kk| hh[kk] = "ERROR: link not found: #{kk.inspect}."; hh[kk] }
-
+##NAME: ($rwdjumplink):(1.78)
+$rwdjumplink = ["helpscreen", "tinkerbackwindow", "returntomain",  "opendocuments",  "editconfiguration"]

data/tests/makedist.rb

@@ -8,13 +8,14 @@ $progdir =""
 $tinkerhelpaboutarray = [""]
 $tinkerdocumentsarray = [""]
 $testharnessarray = [""]
+$helptopicsarray = [""]
 $rwdjumplink = [""]
 JumpLink = Hash.new("default")
 require 'fileutils'
 
 DistroName = "rwdtinker"
 
-DistroVersion="1.77"
+DistroVersion="1.78"
 
 DistroTitle="#{DistroName}.dist"
 load "configuration/#{DistroTitle}"
@@ -31,15 +32,18 @@ puts "moving up one directory"
 Dir.chdir("..")
 
 
+findcmd = "find #{DistroName}/_arx > /tmp/excludezip"
+puts "#{findcmd}"
+`#{findcmd}`
 
 FileUtils.rm_rf("#{DistroTitle}.zip")
-zipcreatecmd = "zip  -r #{DistroTitle}.zip #{DistroName}" 
+zipcreatecmd = "zip  -r  #{DistroTitle}.zip #{DistroName} -x@/tmp/excludezip" 
 puts "#{zipcreatecmd}"
  `#{zipcreatecmd}`
- tarcreatecmd = "tar --gzip -cf  #{DistroTitle}.tar.gz #{DistroName}"
+ tarcreatecmd = "tar --exclude-tag-all=++manifest --gzip -cf  #{DistroTitle}.tar.gz #{DistroName}"
 puts "#{tarcreatecmd}"
 `#{tarcreatecmd}`
- tarcreatecmd2 = "tar --bzip2 -cf  #{DistroTitle}.tar.bz2 #{DistroName}"
+ tarcreatecmd2 = "tar --exclude-tag-all=++manifest --bzip2 -cf  #{DistroTitle}.tar.bz2 #{DistroName}"
 puts "#{tarcreatecmd2}"
 `#{tarcreatecmd2}`
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rwdtinker
 version: !ruby/object:Gem::Version 
-  version: "1.77"
+  version: "1.78"
 platform: ruby
 authors: 
 - Steven Gibson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-17 00:00:00 -07:00
+date: 2008-09-24 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -139,9 +139,10 @@ files:
 - rwd_files/HowTo_Tinker.txt
 - zips/rwdwgutenberg-0.09.zip
 - zips/temp.rb
-- zips/rwdwcalc-0.61.zip
-- zips/rwdwshell-1.04.zip
-- zips/rwdwaddresses-1.05.zip
+- zips/rwdwfoldeditor-0.04.zip
+- zips/rwdwcalc-0.62.zip
+- zips/rwdwruby-1.06.zip
+- zips/rwdwaddresses-1.06.zip
 - zips/wrubyslippers-1.06.zip
 - tests/rdep.rb
 - tests/cleancnf.sh