rwdschedule 0.6 → 0.07
Sign up to get free protection for your applications and to get access to all the features.
- data/Readme.txt +435 -17
- data/bin/rwdschedule +0 -0
- data/code/01rwdcore/01rwdcore.rb +29 -0
- data/code/01rwdcore/02helptexthashbegin.rb +16 -0
- data/code/01rwdcore/03helptexthash.rb +21 -0
- data/code/01rwdcore/jumplinkcommand.rb +36 -0
- data/code/01rwdcore/openhelpwindow.rb +38 -0
- data/code/01rwdcore/returntomain.rb +10 -0
- data/code/01rwdcore/rundocuments.rb +10 -0
- data/code/01rwdcore/runeditconfiguration.rb +10 -0
- data/code/01rwdcore/runhelpabout.rb +15 -0
- data/code/01rwdcore/runopentinkerdocument.rb +7 -0
- data/code/01rwdcore/runtab.rb +15 -0
- data/code/01rwdcore/rwdtinkerversion.rb +22 -0
- data/code/01rwdcore/rwdwindowreturn.rb +9 -0
- data/code/01rwdcore/selectiontab.rb +11 -0
- data/code/01rwdcore/setuphelpaboutoptions.rb +15 -0
- data/code/01rwdcore/setuptinkerdocuments.rb +7 -0
- data/code/01rwdcore/test_cases.rb +158 -0
- data/code/01rwdcore/test_harness.rb +20 -0
- data/code/01rwdcore/uploadreturns.rb +65 -0
- data/code/dd0viewphoto/dd0viewphoto.rb +5 -0
- data/code/superant.com.rwdcalendar/gh9calendar.rb +40 -0
- data/code/superant.com.rwdcalendar/helptexthashrwdschedule.rb +14 -0
- data/code/superant.com.rwdcalendar/openhelpwindowrwdschedule.rb +17 -0
- data/code/superant.com.rwdtinkerbackwindow/changelocale.rb +84 -0
- data/code/superant.com.rwdtinkerbackwindow/diagnostictab.rb +19 -0
- data/code/superant.com.rwdtinkerbackwindow/initiateapplets.rb +169 -0
- data/code/superant.com.rwdtinkerbackwindow/installgemapplet.rb +38 -0
- data/code/superant.com.rwdtinkerbackwindow/installremotegem.rb +20 -0
- data/code/superant.com.rwdtinkerbackwindow/listgemdirs.rb +12 -0
- data/code/superant.com.rwdtinkerbackwindow/listgemzips.rb +55 -0
- data/code/superant.com.rwdtinkerbackwindow/listinstalledfiles.rb +14 -0
- data/code/superant.com.rwdtinkerbackwindow/listzips.rb +37 -0
- data/code/superant.com.rwdtinkerbackwindow/loadconfigurationrecord.rb +24 -0
- data/code/superant.com.rwdtinkerbackwindow/loadconfigurationvariables.rb +14 -0
- data/code/superant.com.rwdtinkerbackwindow/network.rb +87 -0
- data/code/superant.com.rwdtinkerbackwindow/openappletname.rb +19 -0
- data/code/superant.com.rwdtinkerbackwindow/openhelpwindowtinkerwin2.rb +40 -0
- data/code/superant.com.rwdtinkerbackwindow/remotegemlist.rb +24 -0
- data/code/superant.com.rwdtinkerbackwindow/removeapplet.rb +46 -0
- data/code/superant.com.rwdtinkerbackwindow/removeappletvariables.rb +52 -0
- data/code/superant.com.rwdtinkerbackwindow/runremoteinstall.rb +11 -0
- data/code/superant.com.rwdtinkerbackwindow/runrwdtinkerbackwindow.rb +15 -0
- data/code/superant.com.rwdtinkerbackwindow/rwdtinkerwin2version.rb +13 -0
- data/code/superant.com.rwdtinkerbackwindow/saveconfigurationrecord.rb +19 -0
- data/code/superant.com.rwdtinkerbackwindow/showlocaleoptions.rb +9 -0
- data/code/superant.com.rwdtinkerbackwindow/viewappletcontents.rb +23 -0
- data/code/superant.com.rwdtinkerbackwindow/viewgemappletcontents.rb +24 -0
- data/code/superant.com.rwdtinkerbackwindow/viewlogfile.rb +16 -0
- data/code/superant.com.schedule/0uninstallapplet.rb +24 -0
- data/code/superant.com.schedule/archiveevent.rb +14 -0
- data/code/superant.com.schedule/archiveicsevent.rb +14 -0
- data/code/superant.com.schedule/cleareventscreendisplay.rb +19 -0
- data/code/{gg0schedules → superant.com.schedule}/deleteeventrecord.rb +18 -18
- data/code/superant.com.schedule/deleteicseventrecord.rb +19 -0
- data/code/superant.com.schedule/deleterwdscheduleupdatefiles.rb +20 -0
- data/code/superant.com.schedule/downloadrwdschedulefiles.rb +37 -0
- data/code/superant.com.schedule/exporticseventrecord.rb +97 -0
- data/code/superant.com.schedule/helptexthashload.rb +22 -0
- data/code/{gg0schedules/gh5listdaterecords.rb → superant.com.schedule/listeventdates.rb} +18 -18
- data/code/superant.com.schedule/listicseventdates.rb +19 -0
- data/code/superant.com.schedule/loadconfigurationrecord.rb +22 -0
- data/code/superant.com.schedule/loadconfigurationvariables.rb +14 -0
- data/code/superant.com.schedule/loadeventrecord.rb +38 -0
- data/code/{gg0schedules/loadeventrecord.rb → superant.com.schedule/loadicseventrecord.rb} +29 -29
- data/code/superant.com.schedule/openhelpwindowrwdschedule.rb +43 -0
- data/code/{gg0schedules → superant.com.schedule}/renameeventdata.rb +10 -10
- data/code/superant.com.schedule/renameicseventdata.rb +17 -0
- data/code/superant.com.schedule/returntomain.rb +10 -0
- data/code/superant.com.schedule/runrwdscheduleicsbackwindow.rb +10 -0
- data/code/superant.com.schedule/runrwdschedulemenu1.rb +34 -0
- data/code/superant.com.schedule/runrwdschedulesyncbackwindow.rb +10 -0
- data/code/superant.com.schedule/rwdversion.rb +10 -0
- data/code/superant.com.schedule/saveconfigurationrecord.rb +19 -0
- data/code/{gg0schedules/gg9saveeventchanges.rb → superant.com.schedule/saveeventrecord.rb} +25 -18
- data/code/superant.com.schedule/saveicseventrecord.rb +98 -0
- data/code/superant.com.schedule/syncrwdschedule.rb +30 -0
- data/code/superant.com.schedule/test_cases.rb +45 -0
- data/code/superant.com.schedule/uploadrwdschedulefiles.rb +30 -0
- data/code/{gg0schedules/gg0viewevent.rb → superant.com.schedule/viewevent.rb} +20 -20
- data/code/superant.com.schedule/viewicsevent.rb +20 -0
- data/code/superant.com.schedule/viewrwdschedulesconfiguration.rb +21 -0
- data/code/zz0applicationend/zz0end.rb +2 -1
- data/configuration/rwdtinker.dist +15 -0
- data/configuration/rwdwschedule.dist +28 -0
- data/configuration/tinkerwin2variables.dist +23 -0
- data/gui/00coreguibegin/applicationguitop.rwd +9 -0
- data/gui/frontwindow0/cc0openphoto.rwd +22 -0
- data/gui/frontwindowselections/00selectiontabbegin.rwd +11 -0
- data/gui/frontwindowselections/jumplinkcommands.rwd +15 -0
- data/gui/{lz1selectiontabend/endselectiontab.rwd → frontwindowselections/wwselectionend.rwd} +0 -0
- data/gui/frontwindowtdocuments/00documentbegin.rwd +6 -0
- data/gui/frontwindowtdocuments/tinkerdocuments.rwd +14 -0
- data/gui/frontwindowtdocuments/zzdocumentend.rwd +8 -0
- data/gui/{wz6finaltabs/xx0rwdfirsttab.rwd → helpaboutbegin/zzzrwdlasttab.rwd} +0 -0
- data/gui/helpaboutbegin/zzzzhelpscreenstart.rwd +3 -0
- data/gui/helpaboutbegin/zzzzzzhelpabouttab.rwd +15 -0
- data/gui/{yy5helpaboutend → helpaboutzend}/helpscreenend.rwd +0 -0
- data/gui/helpaboutzend/zhelpscreenstart2.rwd +3 -0
- data/gui/helpaboutzend/zzzzhelpabout2.rwd +15 -0
- data/gui/helpaboutzend/zzzzhelpscreen2end.rwd +3 -0
- data/gui/tinkerbackwindows/superant.com.rwdschedulebackwindow/1appname.rwd +5 -0
- data/gui/tinkerbackwindows/superant.com.rwdschedulebackwindow/20downloadftp.rwd +45 -0
- data/gui/tinkerbackwindows/superant.com.rwdschedulebackwindow/67viewconfiguration.rwd +29 -0
- data/gui/tinkerbackwindows/superant.com.rwdschedulebackwindow/70rwddiagnostics.rwd +16 -0
- data/gui/tinkerbackwindows/superant.com.rwdschedulebackwindow/m01menubegin.rwd +18 -0
- data/gui/tinkerbackwindows/superant.com.rwdschedulebackwindow/zvbackend.rwd +6 -0
- data/gui/tinkerbackwindows/superant.com.rwdschedules/1appname.rwd +5 -0
- data/gui/{gg0schedules → tinkerbackwindows/superant.com.rwdschedules}/gg0viewevent.rwd +27 -27
- data/gui/tinkerbackwindows/superant.com.rwdschedules/gl6editrecord.rwd +56 -0
- data/gui/{gg0schedules → tinkerbackwindows/superant.com.rwdschedules}/gl8contactutilities.rwd +25 -24
- data/gui/tinkerbackwindows/superant.com.rwdschedules/hl9calendar.rwd +27 -0
- data/gui/tinkerbackwindows/superant.com.rwdschedules/m01menubegin.rwd +18 -0
- data/gui/tinkerbackwindows/superant.com.rwdschedules/zvbackend.rwd +6 -0
- data/gui/tinkerbackwindows/superant.com.rwdschedulesback/1appname.rwd +5 -0
- data/gui/tinkerbackwindows/superant.com.rwdschedulesback/30viewevent.rwd +27 -0
- data/gui/tinkerbackwindows/superant.com.rwdschedulesback/40editrecord.rwd +49 -0
- data/gui/tinkerbackwindows/superant.com.rwdschedulesback/60eventicsutilities.rwd +25 -0
- data/gui/tinkerbackwindows/superant.com.rwdschedulesback/m01menubegin.rwd +18 -0
- data/gui/tinkerbackwindows/superant.com.rwdschedulesback/zvbackend.rwd +6 -0
- data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/1appname.rwd +5 -0
- data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/40rwdlistzips.rwd +41 -0
- data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/45installremotezip.rwd +44 -0
- data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/50rwdlistapplets.rwd +44 -0
- data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/60editconfiguration.rwd +30 -0
- data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/70rwddiagnostics.rwd +29 -0
- data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/75rwdlogfile.rwd +20 -0
- data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/80localechanger.rwd +17 -0
- data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/81jumplinkcommands.rwd +17 -0
- data/gui/{xb1rwdtinkerbackwindow → tinkerbackwindows/superant.com.tinkerbackwindow}/9backend.rwd +0 -0
- data/gui/tinkerbackwindows/superant.com.tinkerhelpwindow/1appname.rwd +31 -0
- data/gui/{xa5rwdtinkercallablewindow → tinkerbackwindows/superant.com.tinkerhelpwindow}/9end.rwd +0 -0
- data/gui/{xa1versionwindow → tinkerbackwindows/superant.com.versionwindow}/1appname.rwd +2 -2
- data/gui/tinkerbackwindows/superant.com.versionwindow/helpaboutwindow.rwd +17 -0
- data/gui/{za1applicationend → zzcoreguiend}/yy9rwdend.rwd +0 -0
- data/init.rb +144 -198
- data/installed/rwdscheduledate2.inf +6 -0
- data/installed/rwdwschedule.inf +20 -0
- data/{lib → installed}/temp.rb +0 -0
- data/lang/en/rwdcalendar/en.po +32 -0
- data/lang/en/rwdcore/en.po +197 -0
- data/lang/es/rwdcalendar/es.po +10 -0
- data/lang/es/rwdcore/es.po +184 -0
- data/lang/fr/rwdcalendar/fr.po +11 -0
- data/lang/fr/rwdcore/fr.po +169 -0
- data/lang/hi/rwdcalendar/hi.po +11 -0
- data/lang/hi/rwdcore/hi.po +173 -0
- data/lang/ja/rwdcalendar/ja.po +11 -0
- data/lang/ja/rwdcore/ja.po +171 -0
- data/lang/nl/rwdcalendar/nl.po +12 -0
- data/lang/nl/rwdcore/nl.po +169 -0
- data/{extras → lib}/cal.rb +158 -166
- data/lib/icalendar/base.rb +17 -0
- data/lib/icalendar/calendar.rb +44 -0
- data/lib/icalendar/calendar_parser.rb +237 -0
- data/lib/icalendar/component/alarm.rb +16 -0
- data/lib/icalendar/component/event.rb +25 -0
- data/lib/icalendar/component/freebusy.rb +12 -0
- data/lib/icalendar/component/journal.rb +25 -0
- data/lib/icalendar/component/timezone.rb +26 -0
- data/lib/icalendar/component/todo.rb +21 -0
- data/lib/icalendar/component.rb +91 -0
- data/lib/icalendar/helpers.rb +103 -0
- data/lib/icalendar/parameter.rb +25 -0
- data/lib/icalendar.rb +18 -0
- data/lib/rconftool.rb +387 -0
- data/{ev → lib/rwd}/browser.rb +26 -12
- data/{ev → lib/rwd}/ftools.rb +23 -19
- data/lib/rwd/mime.rb +328 -0
- data/{ev → lib/rwd}/net.rb +172 -45
- data/{ev → lib/rwd}/ruby.rb +97 -27
- data/{ev → lib/rwd}/rwd.rb +245 -668
- data/{ev → lib/rwd}/sgml.rb +2 -2
- data/{ev → lib/rwd}/thread.rb +1 -1
- data/{ev → lib/rwd}/tree.rb +35 -7
- data/lib/rwd/xml.rb +101 -0
- data/lib/rwdthemes/default.rwd +317 -0
- data/lib/rwdthemes/pda.rwd +72 -0
- data/lib/rwdthemes/windowslike.rwd +171 -0
- data/lib/rwdtinker/rwdcodedir.rb +56 -0
- data/lib/rwdtinker/rwdguidir.rb +57 -0
- data/lib/rwdtinker/rwdlangdir.rb +60 -0
- data/lib/rwdtinker/rwdtinkertools.rb +25 -0
- data/lib/zip/ioextras.rb +155 -0
- data/lib/zip/stdrubyext.rb +111 -0
- data/lib/zip/tempfile_bugfixed.rb +195 -0
- data/lib/zip/zip.rb +1847 -0
- data/lib/zip/zipfilesystem.rb +609 -0
- data/lib/zip/ziprequire.rb +90 -0
- data/rwd_files/HowTo_Schedule.txt +259 -82
- data/rwd_files/HowTo_Tinker.txt +274 -35
- data/rwd_files/{rwdindex.html → RubyWebDialogs.html} +0 -0
- data/rwd_files/Tinkerhelptexthash.txt +84 -0
- data/rwd_files/log/rwdtinker.log +2 -0
- data/rwd_files/rwdapplications.html +23 -1
- data/rwd_files/rwdschedulehelpfiles.txt +19 -0
- data/rwd_files/schedules/20050120T09.ics +9 -0
- data/rwd_files/schedules/200505may02a.sch +4 -0
- data/rwd_files/schedules/Enterprise.ics +411 -0
- data/rwd_files/schedules/US Holidays.ics +575 -0
- data/rwd_files/schedules/archive/sample.archive +1 -0
- data/rwd_files/schedules/testics05.ics +11 -0
- data/rwd_files/tinker.png +0 -0
- data/rwdconfig.dist +24 -0
- data/rwdschedule.rb +1 -0
- data/tests/RubyGauge.rb +179 -0
- data/tests/checkdepends.sh +4 -0
- data/tests/cleancnf.sh +6 -0
- data/tests/makedist-rwdwhypernote.rb +56 -0
- data/tests/makedist.rb +66 -0
- data/tests/rdep.rb +354 -0
- data/updates/temp.rb +1 -0
- data/zips/rwdwcalc-0.63.zip +0 -0
- data/zips/rwdwfoldeditor-0.07.zip +0 -0
- data/zips/rwdwhypernote-0.16.zip +0 -0
- data/zips/rwdwmovies-0.98.zip +0 -0
- data/zips/rwdwruby-1.08.zip +0 -0
- data/zips/rwdwschedule-1.07.zip +0 -0
- data/zips/temp.rb +1 -0
- data/zips/tinkerbellw-0.04.zip +0 -0
- data/zips/wrubyslippers-1.08.zip +0 -0
- metadata +279 -139
- data/code/ag1core/aa0begin.rb +0 -18
- data/code/ag1core/rwdtinkerversion.rb +0 -15
- data/code/gg0schedules/gl7clearscreendisplay.rb +0 -15
- data/code/gg0schedules/gm3deletecontactrecord.rb +0 -24
- data/code/gg0schedules/rwdaddresseshelpabout.rb +0 -14
- data/code/gg0schedules/rwdschedulehelpabout.rb +0 -14
- data/code/gh9calendar/gh9calendar.rb +0 -16
- data/code/xa5rwdtinkercallable/callable.rb +0 -13
- data/code/xb1rwdtinkerbackwindow/05listinstalledfiles.rb +0 -11
- data/code/xb1rwdtinkerbackwindow/diagnostictab.rb +0 -21
- data/code/xb1rwdtinkerbackwindow/ll1openname.rb +0 -18
- data/code/xb1rwdtinkerbackwindow/ll5listzips.rb +0 -14
- data/code/xb1rwdtinkerbackwindow/lm1installapplet.rb +0 -20
- data/code/xb1rwdtinkerbackwindow/mm1removeapplet.rb +0 -28
- data/code/xb1rwdtinkerbackwindow/rwdtinkerwin2version.rb +0 -14
- data/configuration/aa0rwdframework.cnf +0 -13
- data/configuration/ab1tinkerwin2.cnf +0 -4
- data/configuration/gg1rwdschedule.cnf +0 -3
- data/configuration/gh1rwdcalendar.cnf +0 -27
- data/ev/xml.rb +0 -4
- data/gui/aa2core/aa0rwdtop.rwd +0 -4
- data/gui/gg0schedules/gl6editrecord.rwd +0 -36
- data/gui/hl9calendar/hl9calendar.rwd +0 -20
- data/gui/ll1selectiontabbegin/selectiontabbegin.rwd +0 -16
- data/gui/ll5rwdtinkerwin2selectiontab/rwdwin2selectiontab.rwd +0 -12
- data/gui/tt0documentsbegin/tt0documentbegin.rwd +0 -6
- data/gui/uu5rwddocuments/uu5documents.rwd +0 -15
- data/gui/uu6rwdtinkerwin2documents/uu5documents.rwd +0 -6
- data/gui/uu8schedule/uu8doc_rwdschedule.rwd +0 -5
- data/gui/ww0documentsend/ww0documentend.rwd +0 -7
- data/gui/xa5rwdtinkercallablewindow/1appname.rwd +0 -17
- data/gui/xb1rwdtinkerbackwindow/1appname.rwd +0 -5
- data/gui/xb1rwdtinkerbackwindow/2tab1.rwd +0 -11
- data/gui/xb1rwdtinkerbackwindow/3arwddiagnostics.rwd +0 -33
- data/gui/xb1rwdtinkerbackwindow/4arwdlistapplets.rwd +0 -44
- data/gui/xb1rwdtinkerbackwindow/4arwdlistzips.rwd +0 -35
- data/gui/ya1helpaboutbegin/ya0helpscreenstart.rwd +0 -3
- data/gui/yg5rwdhelpabout/1appname.rwd +0 -4
- data/gui/yg5rwdhelpabout/3copyright.rwd +0 -3
- data/gui/yg5rwdhelpabout/5version.rwd +0 -10
- data/gui/yg6rwdwin2helpabout/1appname.rwd +0 -4
- data/gui/yg6rwdwin2helpabout/3copyright.rwd +0 -3
- data/gui/yg6rwdwin2helpabout/5version.rwd +0 -10
- data/gui/yh1helpschedule/1rwdschedule.rwd +0 -6
- data/gui/yh1helpschedule/5version.rwd +0 -9
- data/installed/rwdcalendar-0.4.inf +0 -6
- data/installed/rwdschedule-0.5.inf +0 -7
- data/installed/rwdtinkerwin2-0.5.inf +0 -8
- data/installed/schedulesampledata1.inf +0 -3
- data/lang/alanguagehashbegin.rb +0 -4
- data/lang/en/rwdcore/languagefile.rb +0 -7
- data/lang/es/rwdcore/languagefile.rb +0 -3
- data/lang/languagehash.rb +0 -4
- data/lang/nl/rwdcore/languagefile.rb +0 -4
- data/lang/templangfile.rb +0 -7
- data/lang/vlanguagehashend.rb +0 -6
- data/lang/wlocallangstart.rb +0 -5
- data/lang/xlocallangfile.rb +0 -7
- data/lang/zlocallangend.rb +0 -2
- data/rwd_files/HowTo_Shell.txt +0 -97
- data/schedules/200501january23CharlotteB-Day.sch +0 -8
- data/schedules/200501january24jazzfuller.sch +0 -8
- data/tests/rubyslippers-0.92.gemspec +0 -17
- data/tests/rwdtinker-1.2.gemspec +0 -17
- data/tests/rwdtinkertestEN.rb +0 -87
- data/tests/temptest.out +0 -18
- data/zips/rwdhelloworld-0.3.zip +0 -0
- data/zips/rwdwshell-0.91.zip +0 -0
- data/zips/wrubyslippers-0.93.zip +0 -0
data/{ev → lib/rwd}/net.rb
RENAMED
@@ -1,5 +1,6 @@
|
|
1
|
-
require "
|
2
|
-
require "
|
1
|
+
require "lib/rwd/ruby"
|
2
|
+
require "lib/rwd/ftools"
|
3
|
+
require "lib/rwd/mime"
|
3
4
|
require "net/http"
|
4
5
|
require "socket"
|
5
6
|
require "uri"
|
@@ -13,11 +14,11 @@ file = "#{home}/.evnet"
|
|
13
14
|
if File.file?(file)
|
14
15
|
Hash.file(file).each do |k, v|
|
15
16
|
eval "$#{k} = '#{v}'" unless k=~ /^\#/
|
16
|
-
#$proxy_auth = [$proxy_auth].pack("m").chomp if k == "proxy_auth"
|
17
17
|
end
|
18
18
|
end
|
19
19
|
|
20
20
|
def uri2txt(s)
|
21
|
+
# ??? Werkt niet goed
|
21
22
|
i = s.index(/%[[:digit:]]{2}/)
|
22
23
|
while not i.nil?
|
23
24
|
s = s[0..(i-1)] + s[(i+1)..(i+2)].unpack('H2').shift.to_i.chr + s[(i+3)..-1]
|
@@ -147,6 +148,8 @@ class EVURI
|
|
147
148
|
rescue
|
148
149
|
end
|
149
150
|
|
151
|
+
@path = "/" if (not @path.nil? and @path.empty? and @protocol == "http")
|
152
|
+
|
150
153
|
@protocol = "" if @protocol.nil?
|
151
154
|
@userpass = "" if @userpass.nil?
|
152
155
|
@host = "" if @host.nil?
|
@@ -163,7 +166,7 @@ class EVURI
|
|
163
166
|
@port = @port.to_i
|
164
167
|
end
|
165
168
|
|
166
|
-
def +
|
169
|
+
def +(url2)
|
167
170
|
url1 = self.to_s
|
168
171
|
url2 = url2.to_s if url2.kind_of?(self.class)
|
169
172
|
|
@@ -174,7 +177,7 @@ class EVURI
|
|
174
177
|
protocol = @protocol
|
175
178
|
userpass = @userpass
|
176
179
|
host = @host
|
177
|
-
port = @port
|
180
|
+
port = @port
|
178
181
|
path = @path
|
179
182
|
vars = varstring
|
180
183
|
anchor = @anchor
|
@@ -196,6 +199,33 @@ class EVURI
|
|
196
199
|
return res
|
197
200
|
end
|
198
201
|
|
202
|
+
def localname
|
203
|
+
protocol = @protocol
|
204
|
+
userpass = @userpass
|
205
|
+
host = @host
|
206
|
+
port = @port
|
207
|
+
path = @path
|
208
|
+
vars = varstring
|
209
|
+
anchor = @anchor
|
210
|
+
|
211
|
+
protocol = nil if @protocol.empty?
|
212
|
+
userpass = nil if @userpass.empty?
|
213
|
+
host = nil if @host.empty?
|
214
|
+
port = nil if @port.zero?
|
215
|
+
path = nil if @path.empty?
|
216
|
+
vars = nil if @vars.empty?
|
217
|
+
anchor = nil if @anchor.empty?
|
218
|
+
|
219
|
+
path = "#{path}." if path =~ /[\/\\]$/
|
220
|
+
|
221
|
+
f = MD5.new(protocol.to_s + userpass.to_s + host.to_s + port.to_s + File.dirname(path.to_s) + vars.to_s).to_s
|
222
|
+
e = File.basename(path.to_s).gsub(/[^\w\.\-]/, "_").gsub(/_+/, "_")
|
223
|
+
res = f + "." + e
|
224
|
+
res.gsub!(/[^\w]+$/, "")
|
225
|
+
|
226
|
+
return res
|
227
|
+
end
|
228
|
+
|
199
229
|
def varstring
|
200
230
|
res = []
|
201
231
|
vars = @vars.dup
|
@@ -281,36 +311,52 @@ class HTTPClient
|
|
281
311
|
end
|
282
312
|
end
|
283
313
|
|
314
|
+
class NoAddressException < StandardError
|
315
|
+
end
|
316
|
+
|
317
|
+
def self.getaddress(host)
|
318
|
+
if not @@hosts.include?(host)
|
319
|
+
@@hosts[host] = ""
|
320
|
+
evtimeout(5) do # ??? Doet 'ut niet?...
|
321
|
+
@@hosts[host] = IPSocket.getaddress(host)
|
322
|
+
end
|
323
|
+
end
|
324
|
+
|
325
|
+
raise NoAddressException, host if @@hosts[host].empty?
|
326
|
+
|
327
|
+
@@hosts[host]
|
328
|
+
end
|
329
|
+
|
284
330
|
def self.head(uri, form={}, recursive=true)
|
285
331
|
header = Header.new(nil)
|
286
332
|
|
287
333
|
begin
|
288
334
|
while not uri.nil?
|
289
|
-
|
290
|
-
|
291
|
-
|
292
|
-
|
335
|
+
uri = EVURI.new(uri) if uri.kind_of? String
|
336
|
+
host = uri.host
|
337
|
+
port = uri.port
|
338
|
+
|
339
|
+
if $proxy.nil? or $proxy.empty? or host == "localhost"
|
293
340
|
io = nil
|
294
341
|
|
295
342
|
@@mutex.synchronize do
|
296
|
-
|
297
|
-
io = TCPSocket.new(@@hosts[host], port.zero? ? 80 : port)
|
343
|
+
io = TCPSocket.new(getaddress(host), port.zero? ? 80 : port)
|
298
344
|
end
|
299
345
|
|
300
346
|
io.write("HEAD #{uri.path or '/'}#{uri.varstring.empty? ? '' : '?' + uri.varstring} HTTP/1.0\r\nHost: #{host}\r\n\r\n")
|
301
347
|
else
|
302
348
|
proxy = EVURI.new($proxy)
|
303
|
-
|
304
|
-
port = proxy.port
|
305
|
-
|
306
|
-
io = TCPSocket.new(host, port.zero? ? 8080 : port)
|
349
|
+
io = TCPSocket.new(proxy.host, proxy.port.zero? ? 8080 : proxy.port)
|
307
350
|
|
308
351
|
io.write("HEAD #{uri} HTTP/1.0\r\n#{"Proxy-Authorization: Basic "+$proxy_auth+"\r\n" if not $proxy_auth.nil?}\r\n\r\n")
|
309
352
|
end
|
310
353
|
|
311
354
|
io.close_write
|
312
355
|
|
313
|
-
res
|
356
|
+
res = io.read
|
357
|
+
|
358
|
+
io.close_read
|
359
|
+
|
314
360
|
header, data = nil, nil
|
315
361
|
header, data = res.split(/\r*\n\r*\n/, 2) if not res.nil?
|
316
362
|
header = Header.new(header)
|
@@ -321,14 +367,23 @@ class HTTPClient
|
|
321
367
|
uri = nil
|
322
368
|
end
|
323
369
|
end
|
324
|
-
rescue
|
370
|
+
rescue Errno::ECONNRESET, Errno::EHOSTUNREACH => e
|
371
|
+
$stderr.puts e.message
|
372
|
+
sleep 1
|
373
|
+
retry
|
374
|
+
rescue Errno::ECONNREFUSED => e
|
375
|
+
data = nil
|
376
|
+
rescue NoAddressException => e
|
377
|
+
$stderr.puts e.message
|
325
378
|
header = Header.new(nil)
|
326
379
|
end
|
327
380
|
|
381
|
+
GC.start
|
382
|
+
|
328
383
|
return header
|
329
384
|
end
|
330
385
|
|
331
|
-
def self.get(uri, form={})
|
386
|
+
def self.get(uri, httpheader={}, form={})
|
332
387
|
post = Array.new
|
333
388
|
form.each_pair do |var, value|
|
334
389
|
post << "#{var.to_html}=#{value.to_html}"
|
@@ -339,15 +394,14 @@ class HTTPClient
|
|
339
394
|
|
340
395
|
begin
|
341
396
|
while not uri.nil?
|
342
|
-
|
343
|
-
|
344
|
-
|
345
|
-
port = uri.port
|
397
|
+
uri = EVURI.new(uri) if uri.kind_of? String
|
398
|
+
host = uri.host
|
399
|
+
port = uri.port
|
346
400
|
|
401
|
+
if $proxy.nil? or $proxy.empty? or host == "localhost"
|
347
402
|
io = nil
|
348
403
|
@@mutex.synchronize do
|
349
|
-
|
350
|
-
io = TCPSocket.new(@@hosts[host], port.zero? ? 80 : port)
|
404
|
+
io = TCPSocket.new(getaddress(host), port.zero? ? 80 : port)
|
351
405
|
end
|
352
406
|
|
353
407
|
if post.empty?
|
@@ -357,10 +411,7 @@ class HTTPClient
|
|
357
411
|
end
|
358
412
|
else
|
359
413
|
proxy = EVURI.new($proxy)
|
360
|
-
|
361
|
-
port = proxy.port
|
362
|
-
|
363
|
-
io = TCPSocket.new(host, port.zero? ? 8080 : port)
|
414
|
+
io = TCPSocket.new(proxy.host, proxy.port.zero? ? 8080 : proxy.port)
|
364
415
|
|
365
416
|
if post.empty?
|
366
417
|
io.write "GET %s HTTP/1.0\r\n" % uri
|
@@ -370,22 +421,32 @@ class HTTPClient
|
|
370
421
|
end
|
371
422
|
|
372
423
|
io.write "Host: %s\r\n" % host
|
373
|
-
io.write "User-Agent:
|
374
|
-
io.write "Proxy-Authorization: Basic %s\r\n" % $proxy_auth
|
424
|
+
io.write "User-Agent: xyz\r\n"
|
425
|
+
io.write "Proxy-Authorization: Basic %s\r\n" % $proxy_auth unless $proxy_auth.nil?
|
375
426
|
#io.write "Accept-Encoding: deflate\r\n"
|
376
|
-
#io.write "
|
427
|
+
#io.write "Accept-Charset: ISO-8859-1\r\n"
|
428
|
+
io.write "Connection: close\r\n"
|
377
429
|
io.write "Content-Type: application/x-www-form-urlencoded\r\n" unless post.empty?
|
378
430
|
io.write "Content-Length: %s\r\n" % post.length unless post.empty?
|
431
|
+
httpheader.each do |k, v|
|
432
|
+
$stderr.puts "%s: %s\r\n" % [k, v]
|
433
|
+
io.write "%s: %s\r\n" % [k, v]
|
434
|
+
end
|
379
435
|
io.write "\r\n"
|
380
436
|
io.write post unless post.empty?
|
381
437
|
|
382
438
|
io.close_write
|
383
439
|
|
384
440
|
res = io.read
|
441
|
+
|
442
|
+
io.close_read
|
443
|
+
|
385
444
|
header, data = nil, nil
|
386
445
|
header, data = res.split(/\r*\n\r*\n/, 2) if not res.nil?
|
387
446
|
|
388
447
|
header = Header.new(header)
|
448
|
+
length = header.header["content-length"]
|
449
|
+
data = "" if length == "0"
|
389
450
|
|
390
451
|
if header.header["location"] != uri.to_s
|
391
452
|
uri = EVURI.new(uri) + header.header["location"]
|
@@ -397,12 +458,25 @@ class HTTPClient
|
|
397
458
|
data = Chunk.new(data).to_s if not data.nil?
|
398
459
|
end
|
399
460
|
|
461
|
+
#if header.header["content-encoding"] == "gzip"
|
462
|
+
#data = "gzip -d".exec(data) if not data.nil?
|
463
|
+
#end
|
464
|
+
|
400
465
|
data = nil unless header.code == 200
|
401
466
|
end
|
402
|
-
rescue
|
467
|
+
rescue Errno::ECONNRESET, Errno::EHOSTUNREACH => e
|
468
|
+
$stderr.puts e.message
|
469
|
+
sleep 1
|
470
|
+
retry
|
471
|
+
rescue Errno::ECONNREFUSED => e
|
472
|
+
data = nil
|
473
|
+
rescue NoAddressException, Errno::ECONNREFUSED => e
|
474
|
+
$stderr.puts e.message
|
403
475
|
data = nil
|
404
476
|
end
|
405
477
|
|
478
|
+
GC.start
|
479
|
+
|
406
480
|
return data
|
407
481
|
end
|
408
482
|
|
@@ -422,7 +496,7 @@ class HTTPClient
|
|
422
496
|
file = "#{dir}/#{hash}"
|
423
497
|
data = nil
|
424
498
|
|
425
|
-
|
499
|
+
File.mkpath(dir)
|
426
500
|
|
427
501
|
expire = 356*24*60*60
|
428
502
|
|
@@ -447,7 +521,7 @@ end
|
|
447
521
|
class RequestGet < Hash
|
448
522
|
def initialize(data)
|
449
523
|
CGI.parse(data).each do |k, v|
|
450
|
-
self[k] = v
|
524
|
+
self[k] = v
|
451
525
|
end
|
452
526
|
end
|
453
527
|
end
|
@@ -455,7 +529,7 @@ end
|
|
455
529
|
class RequestPost < Hash
|
456
530
|
def initialize(data)
|
457
531
|
CGI.parse(data).each do |k, v|
|
458
|
-
self[k] = v
|
532
|
+
self[k] = v
|
459
533
|
end
|
460
534
|
end
|
461
535
|
end
|
@@ -488,11 +562,19 @@ class RequestRequest
|
|
488
562
|
end
|
489
563
|
end
|
490
564
|
|
565
|
+
def url_unescape(string)
|
566
|
+
string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n) do
|
567
|
+
[$1.delete('%')].pack('H*')
|
568
|
+
end
|
569
|
+
end
|
570
|
+
|
491
571
|
class Request < Hash
|
492
572
|
attr_reader :peeraddr
|
493
573
|
attr_reader :request
|
494
574
|
attr_reader :cookies
|
495
575
|
attr_reader :vars
|
576
|
+
attr_reader :user
|
577
|
+
attr_writer :user
|
496
578
|
|
497
579
|
def initialize(io)
|
498
580
|
@io = io
|
@@ -528,10 +610,14 @@ class Request < Hash
|
|
528
610
|
@vars = RequestGet.new(@request.data.nil? ? "" : @request.data)
|
529
611
|
when "POST"
|
530
612
|
data = (@io.read(self["content-length"].to_i) or "")
|
613
|
+
# data = url_unescape(data)
|
531
614
|
@vars = RequestPost.new((self["content-type"] == "application/x-www-form-urlencoded") ? data : "")
|
532
615
|
else
|
533
616
|
$stderr.puts "Unknown request ('#{firstline}')."
|
534
|
-
|
617
|
+
end
|
618
|
+
|
619
|
+
$rwdtinkerlog.debug data
|
620
|
+
|
535
621
|
end
|
536
622
|
|
537
623
|
@peeraddr = @io.peeraddr
|
@@ -562,6 +648,7 @@ end
|
|
562
648
|
|
563
649
|
class Response < Hash
|
564
650
|
attr_writer :response
|
651
|
+
attr_writer :file
|
565
652
|
attr_reader :cookies
|
566
653
|
attr_reader :stop
|
567
654
|
attr_reader :at_stop
|
@@ -574,10 +661,20 @@ class Response < Hash
|
|
574
661
|
@syncd = false
|
575
662
|
@stop = false
|
576
663
|
@at_stop = lambda{}
|
664
|
+
@file = nil
|
577
665
|
end
|
578
666
|
|
579
667
|
def flush
|
580
668
|
sync
|
669
|
+
|
670
|
+
if @file
|
671
|
+
File.open(@file, "rb") do |f|
|
672
|
+
while data = f.read(10_000)
|
673
|
+
@io.write data
|
674
|
+
end
|
675
|
+
end
|
676
|
+
end
|
677
|
+
|
581
678
|
@io.close
|
582
679
|
end
|
583
680
|
|
@@ -595,6 +692,21 @@ class Response < Hash
|
|
595
692
|
end
|
596
693
|
|
597
694
|
def sync
|
695
|
+
size = (@data or "").length
|
696
|
+
|
697
|
+
if @file
|
698
|
+
ext = @file.scan(/\.[^\.]*$/)
|
699
|
+
ext = ext.shift
|
700
|
+
ext = ext[1..-1] unless ext.nil?
|
701
|
+
mimetype = EVMime::MimeType[ext]
|
702
|
+
|
703
|
+
self["Content-Type"] = mimetype unless mimetype.nil?
|
704
|
+
|
705
|
+
size += File.size(@file) if File.file?(@file)
|
706
|
+
end
|
707
|
+
|
708
|
+
self["Content-Length"] = size
|
709
|
+
|
598
710
|
@io.write("#{to_s}\r\n") unless @syncd
|
599
711
|
@io.write(@data)
|
600
712
|
@data = ""
|
@@ -605,6 +717,10 @@ class Response < Hash
|
|
605
717
|
@data << s
|
606
718
|
end
|
607
719
|
|
720
|
+
def clean
|
721
|
+
@data = ""
|
722
|
+
end
|
723
|
+
|
608
724
|
def inspect
|
609
725
|
"(Response: %s)" % [@response, @data].join(", ")
|
610
726
|
end
|
@@ -623,14 +739,15 @@ class HTTPServerException < Exception
|
|
623
739
|
end
|
624
740
|
|
625
741
|
class HTTPServer
|
626
|
-
def self.serve(portio=80, remote=false, auth=nil, realm="
|
742
|
+
def self.serve(portio=80, remote=false, auth=nil, realm="rwd/net")
|
627
743
|
port, server = portio
|
628
744
|
|
629
745
|
begin
|
630
746
|
server = TCPServer.new(remote ? "0.0.0.0" : "localhost", port) if server.nil?
|
631
|
-
|
747
|
+
if $DEBUG
|
632
748
|
$stderr.puts "Just point your browser to http://localhost:#{port}/ ..."
|
633
|
-
|
749
|
+
end
|
750
|
+
rescue
|
634
751
|
server = nil
|
635
752
|
|
636
753
|
$stderr.puts "Port #{port} is in use."
|
@@ -640,7 +757,7 @@ class HTTPServer
|
|
640
757
|
count = 0
|
641
758
|
|
642
759
|
at_exit do
|
643
|
-
|
760
|
+
#$stderr.puts "Received #{count} requests"
|
644
761
|
end
|
645
762
|
|
646
763
|
serverthread =
|
@@ -678,8 +795,8 @@ class HTTPServer
|
|
678
795
|
end
|
679
796
|
|
680
797
|
if (not remote) or (remote and (auth.nil? or auth.empty? or authenticate(auth, realm, req, resp)))
|
681
|
-
|
682
|
-
|
798
|
+
# $stderr.puts "#{count2} #{Time.new.strftime("%Y-%m-%d %H:%M:%S")} #{ip} #{req.user} #{req.request.to_s.strip}"
|
799
|
+
1 == 1
|
683
800
|
begin
|
684
801
|
yield(req, resp)
|
685
802
|
rescue Exception => e
|
@@ -687,6 +804,16 @@ class HTTPServer
|
|
687
804
|
$stderr.puts e.class.to_s + ": " + e.message
|
688
805
|
$stderr.puts e.backtrace.collect{|s| "\t"+s}.join("\n")
|
689
806
|
end
|
807
|
+
resp["Content-Type"] = "text/plain"
|
808
|
+
resp.response = "HTTP/1.0 200 ???"
|
809
|
+
resp.clean
|
810
|
+
resp << e.class.to_s + ": " + e.message
|
811
|
+
resp << "\n"
|
812
|
+
resp << "\n"
|
813
|
+
resp << e.backtrace.collect{|s| "\t"+s}.join("\n")
|
814
|
+
resp << "\n"
|
815
|
+
resp << "\n"
|
816
|
+
resp << "(You can use the back button and stop the application properly, if appropriate.)"
|
690
817
|
end
|
691
818
|
|
692
819
|
stop = true if resp.stop?
|
@@ -738,13 +865,13 @@ class HTTPServer
|
|
738
865
|
|
739
866
|
ok = (auths.include?(u) and auths[u] == p)
|
740
867
|
|
741
|
-
|
742
|
-
|
743
|
-
else
|
868
|
+
unless ok
|
744
869
|
resp["WWW-Authenticate"] = "Basic realm=\"#{realm}\""
|
745
870
|
resp.response = "HTTP/1.0 401 Unauthorized"
|
746
871
|
end
|
747
872
|
|
873
|
+
req.user = u
|
874
|
+
|
748
875
|
return ok
|
749
876
|
end
|
750
877
|
end
|
data/{ev → lib/rwd}/ruby.rb
RENAMED
@@ -18,14 +18,16 @@ tekens23 = tekens + "'"
|
|
18
18
|
|
19
19
|
tekens31 = '\w\s\r\n'
|
20
20
|
|
21
|
-
RegExpStringWord = "([#{tekens11}]+)" ; RegExpWord
|
22
|
-
RegExpStringWord2 = "([#{tekens21}]([#{tekens22}]*[#{tekens23}])?)" ; RegExpWord2
|
23
|
-
RegExpStringText = "([#{tekens31}]+)" ; RegExpText
|
24
|
-
RegExpStringFile = '(\w[\w\.\-]*)' ; RegExpFile
|
25
|
-
RegExpStringEmail = '([\w\-\.]+@[\w\-\.]+)' ; RegExpEmail
|
26
|
-
RegExpStringURL = '(\w+:\/\/[\w\.\-]+(:\d*)?\/[\w\.\-\/\#\?\=\%]*)' ; RegExpURL
|
27
|
-
RegExpStringPrint = '([\w \t\r\n\`\~\!\@\#\$\%\^\&\*\(\)\-\+\=\[\]\{\}\;\:\'\"\,\.\/\<\>\?\\\|]+)' ; RegExpPrint
|
28
|
-
RegExpStringDiff = '(^[\-\+]([^\-\+].*)?)' ; RegExpDiff
|
21
|
+
RegExpStringWord = "([#{tekens11}]+)" ; RegExpWord = Regexp.new(RegExpStringWord)
|
22
|
+
RegExpStringWord2 = "([#{tekens21}]([#{tekens22}]*[#{tekens23}])?)" ; RegExpWord2 = Regexp.new(RegExpStringWord2)
|
23
|
+
RegExpStringText = "([#{tekens31}]+)" ; RegExpText = Regexp.new(RegExpStringText)
|
24
|
+
RegExpStringFile = '(\w[\w\.\-]*)' ; RegExpFile = Regexp.new(RegExpStringFile)
|
25
|
+
RegExpStringEmail = '([\w\-\.]+@[\w\-\.]+)' ; RegExpEmail = Regexp.new(RegExpStringEmail)
|
26
|
+
RegExpStringURL = '(\w+:\/\/[\w\.\-]+(:\d*)?\/[\w\.\-\/\#\?\=\%]*)' ; RegExpURL = Regexp.new(RegExpStringURL)
|
27
|
+
RegExpStringPrint = '([\w \t\r\n\`\~\!\@\#\$\%\^\&\*\(\)\-\+\=\[\]\{\}\;\:\'\"\,\.\/\<\>\?\\\|]+)' ; RegExpPrint = Regexp.new(RegExpStringPrint)
|
28
|
+
RegExpStringDiff = '(^[\-\+]([^\-\+].*)?)' ; RegExpDiff = Regexp.new(RegExpStringDiff)
|
29
|
+
RegExpStringHTHLink = '(`[\w\,]*\ba\b[^`]*`)' ; RegExpHTHLink = Regexp.new(RegExpStringHTHLink)
|
30
|
+
RegExpStringHTHSpecial = '(`[^`]*`)' ; RegExpHTHSpecial = Regexp.new(RegExpStringHTHSpecial)
|
29
31
|
|
30
32
|
module Enumerable
|
31
33
|
def deep_dup
|
@@ -64,6 +66,10 @@ class Numeric
|
|
64
66
|
def to_fs
|
65
67
|
to_f
|
66
68
|
end
|
69
|
+
|
70
|
+
def to_html(eolconversion=true)
|
71
|
+
self.to_s.to_html(eolconversion)
|
72
|
+
end
|
67
73
|
end
|
68
74
|
|
69
75
|
class Integer
|
@@ -211,8 +217,8 @@ class String
|
|
211
217
|
end
|
212
218
|
|
213
219
|
def splitwords(tokens=[])
|
214
|
-
tokens
|
215
|
-
res
|
220
|
+
tokens = [tokens] unless tokens.kind_of?(Array)
|
221
|
+
res = []
|
216
222
|
|
217
223
|
self.splitblocks(["'", "'"], ['"', '"']).each do |type, s|
|
218
224
|
case type
|
@@ -269,7 +275,7 @@ class String
|
|
269
275
|
s.gsub!(/"/ , "\"")
|
270
276
|
s.gsub!(/´/, "\'")
|
271
277
|
|
272
|
-
|
278
|
+
# s = CGI.unescapeHTML(self)
|
273
279
|
|
274
280
|
if eolconversion
|
275
281
|
s.gsub!(/<br>/, "\n")
|
@@ -437,13 +443,14 @@ class Array
|
|
437
443
|
end
|
438
444
|
|
439
445
|
def format(format)
|
446
|
+
format = format.gsub(/\s/, "")
|
440
447
|
res = []
|
441
448
|
|
442
449
|
[format.length, self.length].min.times do |n|
|
443
|
-
case format[n].chr
|
444
|
-
when "i" then
|
445
|
-
when "s" then
|
446
|
-
|
450
|
+
case format[n].chr.downcase
|
451
|
+
when "i" then res << self[n].to_i
|
452
|
+
when "s" then res << self[n].to_s
|
453
|
+
else res << self[n]
|
447
454
|
end
|
448
455
|
end
|
449
456
|
|
@@ -540,6 +547,36 @@ class Array
|
|
540
547
|
def ids
|
541
548
|
collect{|e| e.ids}
|
542
549
|
end
|
550
|
+
|
551
|
+
def rotate
|
552
|
+
raise "Array has to be 2D (An Array of Arrays)." unless self.dup.delete_if{|a| a.kind_of?(Array)}.empty?
|
553
|
+
|
554
|
+
res = []
|
555
|
+
|
556
|
+
self[0].length.times do |x|
|
557
|
+
a = []
|
558
|
+
|
559
|
+
self.length.times do |y|
|
560
|
+
a << self[y][x]
|
561
|
+
end
|
562
|
+
|
563
|
+
res << a
|
564
|
+
end
|
565
|
+
|
566
|
+
res
|
567
|
+
end
|
568
|
+
|
569
|
+
def to_h
|
570
|
+
raise "Array has to be 2D (An Array of Arrays)." unless self.dup.delete_if{|a| a.kind_of?(Array)}.empty?
|
571
|
+
|
572
|
+
res = {}
|
573
|
+
|
574
|
+
self.each do |k, v, *rest|
|
575
|
+
res[k] = v
|
576
|
+
end
|
577
|
+
|
578
|
+
res
|
579
|
+
end
|
543
580
|
end
|
544
581
|
|
545
582
|
class Hash
|
@@ -699,7 +736,11 @@ def trap(signal)
|
|
699
736
|
end
|
700
737
|
|
701
738
|
def linux?
|
702
|
-
not
|
739
|
+
not (target_os.downcase =~ /linux/).nil?
|
740
|
+
end
|
741
|
+
|
742
|
+
def darwin?
|
743
|
+
not (target_os.downcase =~ /darwin/).nil?
|
703
744
|
end
|
704
745
|
|
705
746
|
def windows?
|
@@ -727,8 +768,9 @@ def temp
|
|
727
768
|
end
|
728
769
|
|
729
770
|
def stdtmp
|
730
|
-
$stderr = $stdout = File.new("#{temp}/ruby.#{Process.pid}.log", "a")
|
771
|
+
$stderr = $stdout = File.new("#{temp}/ruby.#{Process.pid}.log", "a")
|
731
772
|
end
|
773
|
+
stdtmp if defined?(RUBYSCRIPT2EXE) and (RUBYSCRIPT2EXE =~ /rubyw/i)
|
732
774
|
|
733
775
|
$nobm = false
|
734
776
|
|
@@ -745,7 +787,7 @@ def bm(label="")
|
|
745
787
|
end
|
746
788
|
end
|
747
789
|
|
748
|
-
label = label.
|
790
|
+
label = label.inspect #unless label.kind_of?(String)
|
749
791
|
res = nil
|
750
792
|
|
751
793
|
$bm_mutex = ($bm_mutex or Mutex.new)
|
@@ -757,29 +799,41 @@ def bm(label="")
|
|
757
799
|
$bm = {}
|
758
800
|
|
759
801
|
at_exit do
|
760
|
-
|
761
|
-
|
762
|
-
|
763
|
-
|
764
|
-
|
765
|
-
|
802
|
+
l = $bm.keys.collect{|s| s.length}.max
|
803
|
+
#format1 = "%10s %10s %10s %10s %10s %10s %s"
|
804
|
+
#format2 = "%10.6f %10.6f %10.6f %10.6f %10.6f %10d %s"
|
805
|
+
#$stderr.puts format1 % ["USERCPU", "SYSCPU", "CUSERCPU", "CSYSCPU", "ELAPSED", "COUNT", "LABEL"]
|
806
|
+
#$bm.sort{|a, b| [b[1], b[0]] <=> [a[1], a[0]]}.each do |k, v|
|
807
|
+
#$stderr.puts format2 % (v + [k])
|
808
|
+
#end
|
809
|
+
|
810
|
+
format1 = "%10s %10s %10s %s"
|
811
|
+
format2 = "%10.6f %10.6f %10d %s"
|
812
|
+
$bm.each do |k, v|
|
813
|
+
$bm[k] = [v[0]+v[1], v[4], v[5]]
|
814
|
+
end
|
815
|
+
$stderr.puts format1 % ["CPU", "ELAPSED", "COUNT", "LABEL"]
|
816
|
+
$bm.sort{|a, b| [b[1], b[0]] <=> [a[1], a[0]]}.each do |k, v|
|
817
|
+
$stderr.puts format2 % (v + [k])
|
766
818
|
end
|
767
819
|
end
|
768
820
|
end
|
769
821
|
|
770
822
|
$bm[label] = [0.0]*5 + [0] unless $bm.include?(label)
|
823
|
+
$bm[label][5] += 1
|
771
824
|
end
|
772
825
|
|
773
826
|
if block_given?
|
774
827
|
bm = Benchmark.measure{res = yield}
|
775
828
|
bma = bm.to_a # [dummy label, user CPU time, system CPU time, childrens user CPU time, childrens system CPU time, elapsed real time]
|
776
829
|
|
830
|
+
$bm_last = bma
|
831
|
+
|
777
832
|
$bm_mutex.synchronize do
|
833
|
+
e = $bm[label]
|
778
834
|
0.upto(4) do |n|
|
779
|
-
|
835
|
+
e[n] += bma[n+1]
|
780
836
|
end
|
781
|
-
|
782
|
-
$bm[label][5] += 1
|
783
837
|
end
|
784
838
|
end
|
785
839
|
|
@@ -817,3 +871,19 @@ def lambda_cached(&block)
|
|
817
871
|
res
|
818
872
|
end
|
819
873
|
end
|
874
|
+
|
875
|
+
def ask(options, text=false)
|
876
|
+
i = 0
|
877
|
+
$stderr.puts ""
|
878
|
+
options.each do |s|
|
879
|
+
$stderr.puts " %d %s" % [i+=1, s]
|
880
|
+
end
|
881
|
+
$stderr.puts ""
|
882
|
+
$stderr.print "? "
|
883
|
+
res = $stdin.gets
|
884
|
+
unless res.nil?
|
885
|
+
res = res.strip
|
886
|
+
res = options[res.to_i-1] if text and not res.empty?
|
887
|
+
end
|
888
|
+
res
|
889
|
+
end
|