rwdhypernote 0.10 → 0.11

data/Readme.txt

@@ -81,6 +81,12 @@ Steven Gibson
 steven@superant.com
 
 == Changelog
+Version 0.11
+ updated to newer ruby webdialogs
+
+Version 0.10
+ Bug fix for html note editing
+ 
 Version 0.09
  added html view tab
  added 2nd html view tab

data/code/superant.com.hypernote/listdirectories.rb

@@ -9,8 +9,6 @@ def rwdhypernotedirectories
  
   fileList      = Dir.new(temp_dir).entries.sort.reverse.delete_if { |x| (x =~ /lnk$|txt$/) }
  @noterecordsresult = ""
- @noterecordsresulth = ""
-
 @notedirectoriesresult  = fileList.rwd_method("fillrwdhypernotedirs")
  end
 end

data/configuration/rwdhypernote.dist

@@ -1,4 +1,4 @@
-##VERSION:0.10
+##VERSION:0.11
 ##NAME:$rwdhypernote_directory:0
 $rwdhypernote_directory = "Notes"
 ##NAME:$notesarray:0
@@ -13,5 +13,5 @@ $rwdhypernote_updatedirectory = "updates"
 $testharnessarray += ["rwdhypernote_all_tests"]
 $tinkerhelpaboutarray += ["RwdHypernote"] 
 $tinkerdocumentsarray += ["HowTo_HyperNote.txt"]
-RwdHyperNoteVersion = "0.10"
+RwdHyperNoteVersion = "0.11"
 

data/ev/browser.rb

@@ -16,20 +16,33 @@ def windowsbrowser
   application	= nil
 
   begin
-    Win32::Registry::HKEY_CLASSES_ROOT.open('.html') do |reg|
+    Win32::Registry::HKEY_CLASSES_ROOT.open(".html") do |reg|
       filetype		= reg[""]
     end
 
-    Win32::Registry::HKEY_CLASSES_ROOT.open(filetype + '\shell\open\command') do |reg|
+    Win32::Registry::HKEY_CLASSES_ROOT.open(filetype + "\\shell\\open\\command") do |reg|
       application	= reg[""]
     end
   rescue NameError
-    $stderr.puts "Only available for Windows."
+    $stderr.puts "Only available for Windows and Cygwin."
   end
 
   application
 end
 
+def cygwinbrowser
+  browser, *args	= windowsbrowser.splitwords
+  browser		= browser.gsub(/\\/, "/")
+  #browser		= browser
+
+  args.collect!{|a| a.gsub(/\\/, "/")}
+  #args.collect!{|a| "\"%s\"" % [a.gsub(/\\/, "/")]}
+  #args.collect!{|a| "\"%s\"" % [a]}
+
+  res	= "\"%s\" %s" % [browser, args.join(" ")]
+  res
+end
+
 def linuxbrowser
   application	= ""
 
@@ -47,25 +60,26 @@ end
 def defaultbrowser
   res	= nil
   res	= windowsbrowser	if windows?
+  res	= cygwinbrowser		if cygwin?
   res	= linuxbrowser		if linux?
   res
 end
 
+def showurlinbrowser(url, browser=defaultbrowser)
+  command	= "#{browser} \"#{url}\""
+
+  system(command)	or $stderr.puts "Starting of the browser failed, or the browser terminated abnormally.\nCommand => #{command}"
+end
+
 def showinbrowser(html, browser=defaultbrowser)
   port, io	= TCPServer.freeport(7701, 7709)
 
   unless browser.nil?
     Thread.new do
       begin
-	#command	= "1234 \"http://localhost:#{port}\""										if linux?
-	#command	= "L:/prog/MozillaFirefox/firefox.exe \"http://localhost:#{port}\""						if cygwin?
-	#command	= Win32::Registry::HKEY_CLASSES_ROOT.open('htmlfile\shell\open\command')[0] + " \"http://localhost:#{port}/\""	if windows?
-
-	command	= "#{browser} \"http://localhost:#{port}\""
-
 	Thread.pass
 
-	system(command)
+        showurlinbrowser("http://localhost:#{port}/", browser)
       rescue
       end
     end

data/ev/ftools.rb

@@ -1,22 +1,12 @@
 require "ftools"
 
 class Dir
-  def self.mkdirrec(dir)
-    pdir	= File.dirname(dir)
-
-    if not pdir.empty? and not File.directory?(pdir)
-      Dir.mkdirrec(pdir)
-    end
-
-    Dir.mkdir(dir)	rescue nil
-  end
-
   def self.copy(from, to)
     if File.directory?(from)
       pdir	= Dir.pwd
       todir	= File.expand_path(to)
 
-      mkdirrec(todir)
+      File.mkpath(todir)
 
       Dir.chdir(from)
         Dir.new(".").each do |e|
@@ -26,7 +16,7 @@ class Dir
     else
       todir	= File.dirname(File.expand_path(to))
 
-      mkdirrec(todir)
+      File.mkpath(todir)
 
       File.copy(from, to)
     end
@@ -38,6 +28,8 @@ class Dir
   end
 
   def self.rm_rf(entry)
+    File.chmod(0755, entry)
+
     if File.ftype(entry) == "directory"
       pdir	= Dir.pwd
 
@@ -47,16 +39,24 @@ class Dir
         end
       Dir.chdir(pdir)
 
-      Dir.delete(entry)
+      begin
+        Dir.delete(entry)
+      rescue => e
+        $stderr.puts e.message
+      end
     else
-      File.delete(entry)
+      begin
+        File.delete(entry)
+      rescue => e
+        $stderr.puts e.message
+      end
     end
   end
 
   def self.find(entry=nil, mask=nil)
     entry	= "."	if entry.nil?
 
-    entry	= entry.gsub!(/[\/\\]*$/, "")	unless entry.nil?
+    entry	= entry.gsub(/[\/\\]*$/, "")	unless entry.nil?
 
     mask	= /^#{mask}$/i	if mask.kind_of?(String)
 
@@ -77,8 +77,8 @@ class Dir
         ensure
           Dir.chdir(pdir)
         end
-      rescue Errno::EACCES => error
-        puts error
+      rescue Errno::EACCES => e
+        $stderr.puts e.message
       end
     else
       res += [entry]	if mask.nil? or entry =~ mask
@@ -99,7 +99,7 @@ class File
 	# Rollback
 
     if File.file?(backupfile) and File.file?(controlfile)
-      $stdout.puts "Restoring #{file}..."
+      $stderr.puts "Restoring #{file}..."
 
       File.copy(backupfile, file)				# Rollback from phase 3
     end
@@ -139,7 +139,11 @@ class File
   end
 
   def self.touch(file)
-    File.open(file, "a"){|f|}
+    if File.exists?(file)
+      File.utime(Time.now, File.mtime(file), file)
+    else
+      File.open(file, "a"){|f|}
+    end
   end
 
   def self.which(file)