' - source += ' ' - source += ' ' - - if (data[STATE] != 2) - { - source += ' ' - } - source += ' '; - source += ' '; - source += ' ' - source += '

'; switch (data[STATE]) { case 0: - source += ' '; break; case 1: - source += ' '; - break; + return data[CONTENTS1] + 'open' + data[CONTENTS2]; case 2: - break; + return data[CONTENTS1]; default: alert('Unknown state: ' + data[STATE]); } - source += '	' + data[NAME] + '	' + data[STATUS] + '

'; - - return source; + return data[CONTENTS1] + data[CONTENTS2]; } @@ -113,7 +95,7 @@ if (node[STATE] == 0) return ""; else - return uttk_display(node[CONTENTS]); + return uttk_display(node[CONTENTS3]); } @@ -123,7 +105,7 @@ if (leaf[STATE] == 0) return ""; else - return leaf[CONTENTS]; + return leaf[CONTENTS3]; } @@ -165,16 +147,20 @@ { case null: for (i = 0; i < uttk_nodes.length; ++i) + if (uttk_nodes[i][STATE] != 2) uttk_nodes[i][STATE] = state; for (i = 0; i < uttk_leaves.length; ++i) + if (uttk_leaves[i][STATE] != 2) uttk_leaves[i][STATE] = state; break; case "node": for (i = 0; i < uttk_nodes.length; ++i) + if (uttk_nodes[i][STATE] != 2) uttk_nodes[i][STATE] = state; break; case "leaf": for (i = 0; i < uttk_leaves.length; ++i) + if (uttk_leaves[i][STATE] != 2) uttk_leaves[i][STATE] = state; break; default: Index: lib/uttk/filters/Compact.rb --- lib/uttk/filters/Compact.rb (revision 752) +++ lib/uttk/filters/Compact.rb (working copy) @@ -33,6 +33,9 @@ @record[path.to_s] = Buffer.new end end + if node.to_s == 'attributes' + @record[path.to_s] = Buffer.new + end end protected :new_node Index: lib/uttk/dumpers/Html.rb --- lib/uttk/dumpers/Html.rb (revision 752) +++ lib/uttk/dumpers/Html.rb (working copy) @@ -15,6 +15,11 @@ # class Html < Dumper include Concrete + cattr_reader :base_url + @@base_url = 'http://api.uttk.org/' + + # Use this one when you have made changes in lib/www + # @@base_url = "file://#{Uttk.dir.parent.expand_path}/www/" class XmlMarkup < Builder::XmlMarkup def initialize ( *a, &b ) @@ -47,34 +52,94 @@ end class BaseNode - attr_reader :father, :name, :status, :id + attr_reader :father, :name, :status, :id, :contents, :state + + @@template_images = Html.base_url + 'images/%%%IMAGE_SPLIT%%%triangle.gif' def initialize ( h ) @father, @status, @id = h[:father], h[:status], h[:id] - @name, @state = h[:name], h[:state] + @name, @contents, @state = h[:name], h[:contents], h[:state] + end + + def unquote ( s ) + s.gsub('"', '') + end + + def html + @status ||= '' + x = XmlMarkup.new(:indent => 2) + x.div :class => self.class.name.demodulize.underscore do + x.table :class => 'title', :id => unquote(status).sub(/$.+$/, '') do + x.tr do + if state == 2 + x.td { x.text!(name.to_s) } + x.td { x.pre clean_yaml_str(contents), + :class => 'attribute_alone' } + else + x.td :width => '11px', + :onClick => "uttk_toggle_state(#{id.gsub('"', "'")})" do + x.img :src => @@template_images + end + x.td { x.text!(name.to_s) } + x.td(:width => '20px') { x.text!(unquote(status)) } + end + end + end + end + result = x.target! + raise unless result =~ /<\/div>\Z/ + result.sub!(/<\/div>\Z/, '') + result.split('%%%IMAGE_SPLIT%%%').map do |x| + x.dump + end.join(', ') + end + + require 'stringio' + def clean_yaml_str ( anObject ) + str = '' + io = StringIO.new str + log = Logger.new(Dumpers::Yaml.new(io)) + log << anObject + log.close + io.close + str.sub!(/^---\s*/, '') + str.chomp! + str end + private :clean_yaml_str end class Node < BaseNode def to_html_uttk_js ( status_h ) - "uttk_add_node(#@name, #{status_h[@status]}, #@state, #@father, #@id);" + @status = status_h[@status] + "uttk_add_node(#@id, #@father, #@state, #{html});" end end class Leaf < BaseNode - attr_reader :contents - def initialize ( h ) - super - @contents = h[:contents] - end def to_html_uttk_js ( status_h ) - "uttk_add_leaf(#@name, '#@status', #@state, #@father, #@id, #@contents);" + "uttk_add_leaf(#@id, #@father, #@state, #{html}, #{html_contents});" + end + def html_contents + return '""' if state == 2 + x = XmlMarkup.new(:indent => 2) + x.table :class => 'attribute' do + contents.each do |k, v| + x.tr do + x.td "#{k}:", :class => 'key' + x.td :class => 'value' do + x.pre clean_yaml_str(v), :class => 'attribute' + end + end + end + end + x.target!.dump end end def initialize ( *a, &b ) - @uttk_js = 'http://api.uttk.org/js/uttk.js' - @uttk_css = 'http://api.uttk.org/js/css/uttk.css' + @uttk_js = base_url + 'javascripts/uttk.js' + @uttk_css = base_url + 'stylesheets/uttk.css' super reset end @@ -95,7 +160,7 @@ id = id_of :node, path, node status = id_of :status, path + [node, :status] @elts << Node.new(:father => father, - :name => clean_js_str(node), + :name => node, :id => id, :status => status, :state => 1) @@ -106,48 +171,33 @@ def new_leaf ( path, node ) super if path.last == :status - @status[id_of(:status, path)] = clean_js_str(node) + @status[id_of(:status, path)] = node @elts.pop else father = id_of :node, path id = id_of :leaf, path, node if node.is_a? Hash and node.size == 1 node, contents = node.to_a.first - node = clean_js_str(node) else contents = node n = @elts.pop father, node, id, status = n.father, n.name, n.id, n.status end - state, status = 1, '' - x = XmlMarkup.new(:indent => 2) + state, status = 0, '' if contents.is_a? Hash status = contents[:status] [:status].each do |k| contents.delete k if contents.has_key? k end - unless contents.empty? - x.table :class => 'attribute' do - contents.each do |k, v| - x.tr do - x.td "#{k}:", :class => 'key' - x.td :class => 'value' do - x.pre clean_yaml_str(v), :class => 'attribute' - end - end - end - end - end else state = 2 - x.pre clean_yaml_str(contents), :class => 'attribute_alone' end @elts << Leaf.new(:father => father, :id => id, :name => node, :status => status, :state => state, - :contents => x.target!.dump) + :contents => contents) end end protected :new_leaf @@ -205,26 +255,12 @@ end protected :new_id - require 'stringio' - def clean_yaml_str ( anObject ) - str = '' - io = StringIO.new str - log = Logger.new(Dumpers::Yaml.new(io)) - log << anObject - log.close - io.close - str.sub!(/^---\s*/, '') - str - end - private :clean_yaml_str - - def clean_js_str ( str ) + def self.clean_js_str ( str ) res = str.to_s.html_encode.dump res.gsub!(/([^\\])\\n/, '\1
\n') res end - private :clean_js_str end # class Html -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051011/2f90a771/signature-0001.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Tue Oct 11 07:24:21 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Tue, 11 Oct 2005 13:24:21 +0200 (CEST) Subject: [Uttk-Patches] 754: Fix a bug in uttk-unit. Message-ID: <20051011112421.BB949512FD@smtp.feydakins.org> svn://svn.feydakins.org/uttk/trunk You can also view this changeset here: http://http://dev.uttk.org/repository/changesets/754 Index: ChangeLog from Nicolas Pouillard Fix a bug in uttk-unit. * bin/uttk-unit: Use load_path! only if CoreEx is available. uttk-unit | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: bin/uttk-unit --- bin/uttk-unit (revision 753) +++ bin/uttk-unit (working copy) @@ -26,7 +26,7 @@ OptionParser.new do |o| o.on('-I', '--include DIR', 'Add this directory to $LOAD_PATH') do |dir| @options.load_path << dir - @options.actions << proc { dir.to_path.load_path! } + @options.actions << proc { dir.to_path.load_path! if defined? CoreEx } end o.on('-r', '--require FEATURE', 'Require this file') do |file| @options.actions << proc { require file } -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051011/76465e1b/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Tue Oct 11 07:29:19 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Tue, 11 Oct 2005 13:29:19 +0200 (CEST) Subject: [Uttk-Patches] [ruby_ex] 407: Change options for rsync. Message-ID: <20051011112919.1A6B551FAE@smtp.feydakins.org> svn://svn.feydakins.org/ruby_ex/trunk Index: ChangeLog from Nicolas Pouillard Change options for rsync. * lib/uri/rsync.rb: Use -v not -P. rsync.rb | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Index: lib/uri/rsync.rb --- lib/uri/rsync.rb (revision 406) +++ lib/uri/rsync.rb (working copy) @@ -24,7 +24,7 @@ ].freeze def mk_opts - ['-Pa'] + mk_custom_opts + ['-va'] + mk_custom_opts end def mk_arg @@ -56,14 +56,14 @@ def test_mk_opts assert_nothing_raised { @uri = URI.parse('rsync.ssh://foo at bar') } - assert_equal(['-Pa'], @uri.mk_opts) + assert_equal(['-va'], @uri.mk_opts) end def test_mk_opts_with_query assert_nothing_raised do @uri = URI.parse('rsync.ssh://foo at bar/baz?rsh=ssh%20-i%20foo,boo,bee=42') end - ref = ['-Pa', '--rsh', 'ssh -i foo', '--boo', '--bee', '42'] + ref = ['-va', '--rsh', 'ssh -i foo', '--boo', '--bee', '42'] assert_equal(ref, @uri.mk_opts) end -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051011/d1d9cf4e/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Tue Oct 11 07:30:20 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Tue, 11 Oct 2005 13:30:20 +0200 (CEST) Subject: [Uttk-Patches] [ruby_ex] 408: Adapt the unit suite to uttk-unit. Message-ID: <20051011113020.C7B4851B5B@smtp.feydakins.org> svn://svn.feydakins.org/ruby_ex/trunk Index: ChangeLog from Nicolas Pouillard Adapt the unit suite to uttk-unit. * test/unit-suite.yml: Update. unit-suite.yml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Index: test/unit-suite.yml --- test/unit-suite.yml (revision 407) +++ test/unit-suite.yml (working copy) @@ -8,6 +8,7 @@ test: <>: !S::RUnit load_path: <>/../lib - input: !path test/test-unit-setup.rb - args: <> + requires: ruby_ex + input: !path <> + uttk_unit_options: --uttk no verbose: true -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051011/730ec592/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Wed Oct 12 04:41:57 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Wed, 12 Oct 2005 10:41:57 +0200 (CEST) Subject: [Uttk-Patches] 755: Reveal an iterate bug with the Ruby loader. Message-ID: <20051012084157.217B151B64@smtp.feydakins.org> svn://svn.feydakins.org/uttk/trunk You can also view this changeset here: http://http://dev.uttk.org/repository/changesets/755 Index: ChangeLog from Nicolas Pouillard Reveal an iterate bug with the Ruby loader. * lib/uttk/strategies/Iterate.rb: It now accepts more inputs than just a hash. * test/ruby/iterate.rb: New. This test reveal a bug. * test/ruby-suite.rb: Leave another fixme. lib/uttk/strategies/Iterate.rb | 14 ++++++++------ test/ruby-suite.rb | 2 ++ test/ruby/iterate.rb | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 6 deletions(-) Index: test/ruby/iterate.rb --- test/ruby/iterate.rb (revision 0) +++ test/ruby/iterate.rb (revision 0) @@ -0,0 +1,15 @@ +S::Suite.new 'Test the Iterate strategy (Ruby Loader)' do + contents [ + S::Iterate.new('Iterate over a range') { + over 0...4 + with :each + iter :it + test(S::Assert.new('Test on turn <>') { + test(" + assert_equal('<>', '<>') + assert_equal('<>', '<>') + ") + }) + } + ] +end Property changes on: test/ruby/iterate.rb ___________________________________________________________________ Name: svn:keywords + Id Index: test/ruby-suite.rb --- test/ruby-suite.rb (revision 754) +++ test/ruby-suite.rb (working copy) @@ -6,6 +6,8 @@ # test do # S::Import.new("Test <>") { import '<>' } # end + # FIXME This one should works too + # test(S::Import.new("Test <>") { import '<>' }) test "Test <>" => { :strategy => S::Import, :import => '<>' Index: lib/uttk/strategies/Iterate.rb --- lib/uttk/strategies/Iterate.rb (revision 754) +++ lib/uttk/strategies/Iterate.rb (working copy) @@ -53,6 +53,7 @@ if @test.is_a? Hash and @test.size == 1 name, @attributes = @test.to_a.first @attributes[:name] = name + @test = {} else name = @test.name end @@ -79,7 +80,7 @@ symtbl["#{iterators[i]}"] = arg if i < iterators.size end @new_symtbl = symtbl - create + create @test turn += 1 end @@ -89,11 +90,12 @@ def iter= ( iter ) @iter = iter - @iterators = case @iter - when Array then @iter.flatten - when /^\[.*\]$/ then eval @iter - when /,/ then @iter.split(/\s*,\s*/) - else [@iter] + iter = iter.to_s if iter.is_a? Symbol + @iterators = case iter + when Array then iter.flatten + when /^\[.*\]$/ then eval iter + when /,/ then iter.split(/\s*,\s*/) + else [iter] end unless iterators.all? { |it| it.is_a? String } raise ArgumentError, 'The iterator name or list of names ' + -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051012/df0ca2fe/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Wed Oct 12 04:43:22 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Wed, 12 Oct 2005 10:43:22 +0200 (CEST) Subject: [Uttk-Patches] 756: A strategy instance cannot be run twice. Message-ID: <20051012084322.EEE41512DE@smtp.feydakins.org> svn://svn.feydakins.org/uttk/trunk You can also view this changeset here: http://http://dev.uttk.org/repository/changesets/756 Index: ChangeLog from Nicolas Pouillard A strategy instance cannot be run twice. * lib/uttk/strategies/Strategy.rb: Raise an error if the test was already run. Strategy.rb | 3 +++ 1 files changed, 3 insertions(+) Index: lib/uttk/strategies/Strategy.rb --- lib/uttk/strategies/Strategy.rb (revision 755) +++ lib/uttk/strategies/Strategy.rb (working copy) @@ -92,6 +92,9 @@ # - check_post_assertion # - epilogue def run ( log=@symtbl[:log] ) + unless @status.is_a? StartStatus + raise_error("This test was already run (#{self} : #{self.class})") + end @log = log @benchmark = [] initialize_flow_factory if @symtbl[:flow_factory].nil? -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051012/8c38d1b5/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Wed Oct 12 04:51:02 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Wed, 12 Oct 2005 10:51:02 +0200 (CEST) Subject: [Uttk-Patches] 757: Add a simpler test. Message-ID: <20051012085102.22474512DE@smtp.feydakins.org> svn://svn.feydakins.org/uttk/trunk You can also view this changeset here: http://http://dev.uttk.org/repository/changesets/757 Index: ChangeLog from Nicolas Pouillard Add a simpler test. * test/ruby/iterate.rb: Add an iteration over Pass strategies. iterate.rb | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletion(-) Index: test/ruby/iterate.rb --- test/ruby/iterate.rb (revision 756) +++ test/ruby/iterate.rb (working copy) @@ -1,6 +1,12 @@ S::Suite.new 'Test the Iterate strategy (Ruby Loader)' do contents [ - S::Iterate.new('Iterate over a range') { + S::Iterate.new('Iterate over a range of S::Pass') { + over 0...4 + with :each + iter :it + test S::Pass.new('<>') + }, + S::Iterate.new('Iterate over a range of S::Assert') { over 0...4 with :each iter :it -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051012/3b97be42/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Wed Oct 12 05:08:59 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Wed, 12 Oct 2005 11:08:59 +0200 (CEST) Subject: [Uttk-Patches] 758: Strategy#testify now dup itself. Message-ID: <20051012090859.CBBF8400E8@smtp.feydakins.org> svn://svn.feydakins.org/uttk/trunk You can also view this changeset here: http://http://dev.uttk.org/repository/changesets/758 Index: ChangeLog from Nicolas Pouillard Strategy#testify now dup itself. * lib/uttk/strategies/Strategy.rb: This partially fix the problem which ran twice the same test, now the testification of a test duplicate it. Strategy.rb | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) Index: lib/uttk/strategies/Strategy.rb --- lib/uttk/strategies/Strategy.rb (revision 757) +++ lib/uttk/strategies/Strategy.rb (working copy) @@ -544,9 +544,10 @@ # def testify ( symtbl, &block ) - @symtbl ||= symtbl - block[self] if block - self + test = dup + test.symtbl ||= symtbl + block[test] if block + test end def to_s -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051012/50df8da7/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Wed Oct 12 06:37:52 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Wed, 12 Oct 2005 12:37:52 +0200 (CEST) Subject: [Uttk-Patches] 759: Make S::Iterate works with the Ruby loader. Message-ID: <20051012103752.08F4E527BF@smtp.feydakins.org> svn://svn.feydakins.org/uttk/trunk You can also view this changeset here: http://http://dev.uttk.org/repository/changesets/759 Index: ChangeLog from Nicolas Pouillard Make S::Iterate works with the Ruby loader. * test/ruby-suite.rb: Use iterate without a hash. * lib/uttk/strategies/Block.rb: Move the symtbl_gsub of @test in the prologue like the others. * lib/uttk/strategies/Composite.rb: Add an . lib/uttk/strategies/Block.rb | 9 +++++---- lib/uttk/strategies/Composite.rb | 6 ++++++ test/ruby-suite.rb | 7 +------ 3 files changed, 12 insertions(+), 10 deletions(-) Index: test/ruby-suite.rb --- test/ruby-suite.rb (revision 758) +++ test/ruby-suite.rb (working copy) @@ -6,10 +6,5 @@ # test do # S::Import.new("Test <>") { import '<>' } # end - # FIXME This one should works too - # test(S::Import.new("Test <>") { import '<>' }) - test "Test <>" => { - :strategy => S::Import, - :import => '<>' - } + test(S::Import.new("Test <>") { import '<>' }) end Index: lib/uttk/strategies/Block.rb --- lib/uttk/strategies/Block.rb (revision 758) +++ lib/uttk/strategies/Block.rb (working copy) @@ -28,16 +28,17 @@ else raise ArgumentError, 'no block given' end + end + + + def prologue + super if @test.is_a?(String) str = @test.dup @test = lambda { eval str.do_symtbl_gsub(@symtbl) } end - end - - def prologue - super @result, @raised_exception = nil, nil end protected :prologue Index: lib/uttk/strategies/Composite.rb --- lib/uttk/strategies/Composite.rb (revision 758) +++ lib/uttk/strategies/Composite.rb (working copy) @@ -20,6 +20,12 @@ end + def initialize_copy ( aTest ) + super + aTest.contents = @contents.dup + end + + def initialize_test ( aTest ) aTest.wclass = @wclass end -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051012/7147471b/signature-0001.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From nicolas.despres at gmail.com Wed Oct 12 09:33:28 2005 From: nicolas.despres at gmail.com (=?ISO-8859-1?Q?Nicolas_Despr=E8s?=) Date: Wed, 12 Oct 2005 15:33:28 +0200 Subject: [Uttk-Patches] 758: Strategy#testify now dup itself. In-Reply-To: <20051012090859.CBBF8400E8@smtp.feydakins.org> References: <20051012090859.CBBF8400E8@smtp.feydakins.org> Message-ID: <840b875c0510120633jf639d43t16fa98e9322775b8@mail.gmail.com> On 10/12/05, Nicolas Pouillard wrote: > > svn://svn.feydakins.org/uttk/trunk > > You can also view this changeset here: > > http://http://dev.uttk.org/repository/changesets/758 > > Index: ChangeLog > from Nicolas Pouillard > > Strategy#testify now dup itself. > > * lib/uttk/strategies/Strategy.rb: This partially fix the problem which > ran twice the same test, now the testification of a test duplicate it. > Ok. -- Nicolas Despr?s _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From nicolas.despres at gmail.com Wed Oct 12 09:30:52 2005 From: nicolas.despres at gmail.com (=?ISO-8859-1?Q?Nicolas_Despr=E8s?=) Date: Wed, 12 Oct 2005 15:30:52 +0200 Subject: [Uttk-Patches] 756: A strategy instance cannot be run twice. In-Reply-To: <20051012084322.EEE41512DE@smtp.feydakins.org> References: <20051012084322.EEE41512DE@smtp.feydakins.org> Message-ID: <840b875c0510120630pd9aecd1g2f3db6153ea30db7@mail.gmail.com> On 10/12/05, Nicolas Pouillard wrote: > > svn://svn.feydakins.org/uttk/trunk > > You can also view this changeset here: > > http://http://dev.uttk.org/repository/changesets/756 > > Index: ChangeLog > from Nicolas Pouillard > > A strategy instance cannot be run twice. > > * lib/uttk/strategies/Strategy.rb: Raise an error if the test was > already run. > Ok. -- Nicolas Despr?s _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Sat Oct 15 05:59:43 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Sat, 15 Oct 2005 11:59:43 +0200 (CEST) Subject: [Uttk-Patches] 761: Fix D::Basic*. Message-ID: <20051015095943.03CAA5DDF4@smtp1-g19.free.fr> svn://svn.feydakins.org/uttk/trunk You can also view this changeset here: http://http://dev.uttk.org/repository/changesets/761 Index: ChangeLog from Nicolas Pouillard Fix D::Basic*. * lib/uttk/dumpers/Basic.rb: Use b not block. * lib/uttk/dumpers/BasicColor.rb: Likewise, and use a more robust method for coloring. Basic.rb | 2 +- BasicColor.rb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) Index: lib/uttk/dumpers/Basic.rb --- lib/uttk/dumpers/Basic.rb (revision 760) +++ lib/uttk/dumpers/Basic.rb (working copy) @@ -13,7 +13,7 @@ def update ( *a, &b ) super - @io.puts "NOTIFICATION: #{a.inspect} block_given: #{not block.nil?}" + @io.puts "NOTIFICATION: #{a.inspect} block_given: #{not b.nil?}" end end # class Basic Index: lib/uttk/dumpers/BasicColor.rb --- lib/uttk/dumpers/BasicColor.rb (revision 760) +++ lib/uttk/dumpers/BasicColor.rb (working copy) @@ -21,11 +21,11 @@ super msg, path, node, options = a path = Logger::Path.new(path) unless path.nil? - @h.say "<%=color '#{msg.inspect.ljust(10)}', :red %> " + - "<%=color '#{path}', :green %> " + - "<%=color '#{node.inspect}', :magenta %> " + - "<%=color '#{options.inspect}', :yellow %> " + - "<%=color 'block_given: #{not block.nil?}', :cyan %>" + @h.say "#{@h.color msg.inspect.ljust(10), :red} " + + "#{@h.color path, :green} " + + "#{@h.color node.inspect, :magenta} " + + "#{@h.color options.inspect, :yellow} " + + "<%=color 'block_given: #{not b.nil?}', :cyan %>" end end # class BasicColor -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051015/d38eb967/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Sat Oct 15 06:09:43 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Sat, 15 Oct 2005 12:09:43 +0200 (CEST) Subject: [Uttk-Patches] 762: Minor fixes. Message-ID: <20051015100943.4DED25221A@smtp2-g19.free.fr> svn://svn.feydakins.org/uttk/trunk You can also view this changeset here: http://http://dev.uttk.org/repository/changesets/762 Index: ChangeLog from Nicolas Pouillard Minor fixes. * lib/uttk/generators/templates/strategy.yml: Remove the useless x name. * lib/uttk.rb: Import uri_ex. * bin/uttk: Simplify. bin/uttk | 7 ++----- lib/uttk.rb | 1 + lib/uttk/generators/templates/strategy.yml | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) Index: lib/uttk/generators/templates/strategy.yml --- lib/uttk/generators/templates/strategy.yml (revision 761) +++ lib/uttk/generators/templates/strategy.yml (working copy) @@ -2,8 +2,7 @@ Test the <%= class_name %> strategy: !S::Suite contents: - good test 1: !S::RMatch - test: - x: !S::<%= class_name %> + test: !S::<%= class_name %> # ... match: - // # ... @@ -15,8 +14,7 @@ - // - bad test 1: !S::RMatch - test: - x: !S::<%= class_name %> + test: !S::<%= class_name %> # ... match: - // # ... Index: lib/uttk.rb --- lib/uttk.rb (revision 761) +++ lib/uttk.rb (working copy) @@ -68,6 +68,7 @@ RPath.import! Commands.import! Version.import! + UriEx.import! # Mother exception of every exception thrown by Uttk. class UttkException < Exception Index: bin/uttk --- bin/uttk (revision 761) +++ bin/uttk (working copy) @@ -43,11 +43,8 @@ opts[:cache_mode] ||= true end - log_factory = Uttk.default_log_factory(opts) - log = Uttk.default_log(opts, log_factory) - - symtbl = Uttk.default_symtbl(opts, log_factory, log).new_child - symtbl.update(opts.merge(:loader => opts[:loader].new)) + symtbl = Uttk.default_symtbl(opts).new_child + log = symtbl[:log] if opts[:input].nil? -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051015/19cc6d7f/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From nicolas.despres at gmail.com Sat Oct 15 06:05:43 2005 From: nicolas.despres at gmail.com (=?ISO-8859-1?Q?Nicolas_Despr=E8s?=) Date: Sat, 15 Oct 2005 12:05:43 +0200 Subject: [Uttk-Patches] 761: Fix D::Basic*. In-Reply-To: <20051015095943.03CAA5DDF4@smtp1-g19.free.fr> References: <20051015095943.03CAA5DDF4@smtp1-g19.free.fr> Message-ID: <840b875c0510150305h3a6679ackdd80400790f0900c@mail.gmail.com> On 10/15/05, Nicolas Pouillard wrote: > > svn://svn.feydakins.org/uttk/trunk > > You can also view this changeset here: > > http://http://dev.uttk.org/repository/changesets/761 > > Index: ChangeLog > from Nicolas Pouillard > > Fix D::Basic*. > > * lib/uttk/dumpers/Basic.rb: Use b not block. > * lib/uttk/dumpers/BasicColor.rb: Likewise, and use a more robust > method for coloring. Ok. -- Nicolas Despr?s _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From nicolas.despres at gmail.com Sat Oct 15 07:13:33 2005 From: nicolas.despres at gmail.com (=?ISO-8859-1?Q?Nicolas_Despr=E8s?=) Date: Sat, 15 Oct 2005 13:13:33 +0200 Subject: [Uttk-Patches] 762: Minor fixes. In-Reply-To: <20051015100943.4DED25221A@smtp2-g19.free.fr> References: <20051015100943.4DED25221A@smtp2-g19.free.fr> Message-ID: <840b875c0510150413t77afa3a7l5cf292d694dbfbac@mail.gmail.com> On 10/15/05, Nicolas Pouillard wrote: > > svn://svn.feydakins.org/uttk/trunk > > You can also view this changeset here: > > http://http://dev.uttk.org/repository/changesets/762 > > Index: ChangeLog > from Nicolas Pouillard > > Minor fixes. > > * lib/uttk/generators/templates/strategy.yml: Remove the useless x name. > * lib/uttk.rb: Import uri_ex. > * bin/uttk: Simplify. > Ok. -- Nicolas Despr?s _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Sat Oct 22 20:18:09 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Sun, 23 Oct 2005 02:18:09 +0200 (CEST) Subject: [Uttk-Patches] [UttkOnRails]: 6: Setup the environement. Message-ID: <20051023001809.8E9BE93F09@smtp.feydakins.org> svn://svn.feydakins.org/uttk_on_rails/trunk Index: ChangeLog from Nicolas Pouillard Setup the environement. * config/environment.rb: Add the Uttk require. * app/controllers/application.rb, config/routes.rb, * public/dispatch.cgi, public/dispatch.rb, public/dispatch.fcgi: Minor updates. app/controllers/application.rb | 7 +++ config/environment.rb | 80 +++++++++++++++++++++++++++++++++++++++++ config/routes.rb | 6 --- public/dispatch.cgi | 2 - public/dispatch.fcgi | 2 - public/dispatch.rb | 5 -- 6 files changed, 90 insertions(+), 12 deletions(-) Index: app/controllers/application.rb --- app/controllers/application.rb (revision 5) +++ app/controllers/application.rb (working copy) @@ -1,4 +1,9 @@ +require 'user_system' # Filters added to this controller will be run for all controllers in the application. # Likewise, all the methods added will be available for all controllers. class ApplicationController < ActionController::Base -end \ No newline at end of file + include UserSystem + helper :user + model :user + before_filter :login_required +end # class ApplicationController Index: config/routes.rb --- config/routes.rb (revision 5) +++ config/routes.rb (working copy) @@ -1,19 +1,15 @@ ActionController::Routing::Routes.draw do |map| # Add your own custom routes here. # The priority is based upon order of creation: first created -> highest priority. - # Here's a sample route: # map.connect 'products/:id', :controller => 'catalog', :action => 'view' # Keep in mind you can assign values other than :controller and :action - # You can have the root of your site routed by hooking up '' # -- just remember to delete public/index.html. - # map.connect '', :controller => "welcome" - + map.connect '', :controller => "admin" # Allow downloading Web Service WSDL as a file with an extension # instead of a file named 'wsdl' map.connect ':controller/service.wsdl', :action => 'wsdl' - # Install the default route as the lowest priority. map.connect ':controller/:action/:id' end Index: config/environment.rb --- config/environment.rb (revision 5) +++ config/environment.rb (working copy) @@ -4,6 +4,23 @@ # (Use only when you can't set environment variables through your web/app server) # ENV['RAILS_ENV'] = 'production' +require 'pathname' +config = Pathname.new(__FILE__).dirname.parent +vendor = config.parent + 'vendor' +unless defined? Uttk + $CORE_EX_VENDORS ||= [] + $CORE_EX_VENDORS << vendor + file = vendor + 'uttk' + 'lib' + 'uttk.rb' + if file.exist? + require file.to_s + else + require 'rubygems' + require_gem 'uttk' + require 'uttk' + end +end +Uttk.import! + # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') @@ -49,3 +66,66 @@ # end # Include your application configuration below \ No newline at end of file + +Dependencies.mechanism = :require +ActionMailer::Base.server_settings = { + :address => "smtp.feydakins.org", + :port => 25, + :domain => "feydakins.org", + # :user_name => "", + # :password => "", + # :authentication => :login +} +PathList[RAILS_ROOT.to_path + '{app/controllers,components}'].load_path! +# Include your app's configuration here: +require 'environments/user_environment' +# class << URI +# alias parse2 parse +# def parse(*args) + # p "URI.parse" + # p args + # begin + # result = parse2(*args) + # p result + # result + # rescue Exception => ex + # p "ERROR #{ex}" + # raise ex + # end + # # raise args.inspect + # # breakpoint +# end +# end +# p URI.parse('/admin') +# Object.const_set :URI, VerboseObject.new(URI) +class XHtml < TTK::Dumpers::Html::XmlMarkup + class Helpers + include ActionView::Helpers::TagHelper + include ActionView::Helpers::UrlHelper + include ActionView::Helpers::FormHelper + include ActionView::Helpers::FormTagHelper + def initialize ( controller ) + @controller = controller + end + end + def initialize ( opts ) + opts[:indent] ||= 2 + @helpers = Helpers.new(opts[:controller]) + super(opts) + end + def form_tag ( *a, &b ) + start_form_tag(*a) + _nested_structures(b) unless b.nil? + end_form_tag + end + def method_missing ( m, *a, &b ) + if @helpers.respond_to? m + ihtml! @helpers.send(m, *a, &b) + else + super + end + end +end +# TTK::Strategies::Cmd.to_form(XHtml.new(:target => STDERR, :controller => AutoObject.new)) +# STDERR.puts +# exit Index: public/dispatch.cgi --- public/dispatch.cgi (revision 5) +++ public/dispatch.cgi (working copy) @@ -1,4 +1,4 @@ -#!/usr/bin/ruby18 +#!/usr/bin/env ruby require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT) Index: public/dispatch.rb --- public/dispatch.rb (revision 5) +++ public/dispatch.rb (working copy) @@ -1,10 +1,7 @@ -#!/usr/bin/ruby18 - +#!/usr/bin/env ruby require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT) - # If you're using RubyGems and mod_ruby, this require should be changed to an absolute path one, like: # "/usr/local/lib/ruby/gems/1.8/gems/rails-0.8.0/lib/dispatcher" -- otherwise performance is severely impaired require "dispatcher" - ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun) Dispatcher.dispatch \ No newline at end of file Index: public/dispatch.fcgi --- public/dispatch.fcgi (revision 5) +++ public/dispatch.fcgi (working copy) @@ -1,4 +1,4 @@ -#!/usr/bin/ruby18 +#!/usr/bin/env ruby # # You may specify the path to the FastCGI crash log (a log of unhandled # exceptions which forced the FastCGI instance to exit, great for debugging) -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051023/905233e3/signature-0001.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Sat Oct 22 22:57:59 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Sun, 23 Oct 2005 04:57:59 +0200 (CEST) Subject: [Uttk-Patches] [UttkOnRails]: 8: Add a new admin controller. Message-ID: <20051023025759.748A89421F@smtp.feydakins.org> svn://svn.feydakins.org/uttk_on_rails/trunk Index: ChangeLog from Nicolas Pouillard Add a new admin controller. * app/controllers/admin_controller.rb: New. * test/functional/admin_controller_test.rb: New. * app/helpers/admin_helper.rb: New. * app/views/admin/index.rhtml: New. * config/environment.rb: Activate Uttk. * log/test.log: Remove. * log/development.log: Remove. * log/production.log: Remove. * log/server.log: Remove. app/controllers/admin_controller.rb | 119 +++++++++++++++++++++++++++++++ app/helpers/admin_helper.rb | 2 app/views/admin/index.rhtml | 3 config/environment.rb | 93 +++++++++++------------- test/functional/admin_controller_test.rb | 18 ++++ 5 files changed, 187 insertions(+), 48 deletions(-) Index: test/functional/admin_controller_test.rb --- test/functional/admin_controller_test.rb (revision 0) +++ test/functional/admin_controller_test.rb (revision 0) @@ -0,0 +1,18 @@ +require File.dirname(__FILE__) + '/../test_helper' +require 'admin_controller' + +# Re-raise errors caught by the controller. +class AdminController; def rescue_action(e) raise e end; end + +class AdminControllerTest < Test::Unit::TestCase + def setup + @controller = AdminController.new + @request = ActionController::TestRequest.new + @response = ActionController::TestResponse.new + end + + # Replace this with your real tests. + def test_truth + assert true + end +end Property changes on: test/functional/admin_controller_test.rb ___________________________________________________________________ Name: svn:keywords + Id Index: app/helpers/admin_helper.rb --- app/helpers/admin_helper.rb (revision 0) +++ app/helpers/admin_helper.rb (revision 0) @@ -0,0 +1,2 @@ +module AdminHelper +end Property changes on: app/helpers/admin_helper.rb ___________________________________________________________________ Name: svn:keywords + Id Index: app/controllers/admin_controller.rb --- app/controllers/admin_controller.rb (revision 0) +++ app/controllers/admin_controller.rb (revision 0) @@ -0,0 +1,119 @@ +class Object + def default_instance ( *args, &block ) + if block + raise "Too many arguments" unless args.empty? + @default_instance = block + nil + elsif args.size == 1 + value = args.first + @default_instance = proc { value.try_dup } + nil + elsif args.size.zero? + (@default_instance.is_a? Proc)? @default_instance[] : @default_instance + else + raise "Too many arguments" + end + end + def to_gfx_element + GfxElements::None.new + end +end +class String + default_instance '' + def to_gfx_element + GfxElements::TextField.new(:default => self) + end +end +class Array + default_instance [] + def to_gfx_element + GfxElements::Select.new(:choices => map { |x| x.to_s }) + end +end +class Module + default_instance Kernel + def to_gfx_element + GfxElements::Select.new(:choices => constants.map { |x| x.to_s }) + end +end +class Class + default_instance Object + def to_gfx_element + mod = name.sub(/::[^:]*$/, '').constantize + subclasses = mod.constants.find_all do |x| + "#{mod}::#{x}".constantize.ancestors.include? self + end + GfxElements::Select.new :choices => subclasses + end +end +class TrueClass + default_instance true + def to_gfx_element + GfxElements::CheckBox.new(:checked => true) + end +end # class TrueClass +class FalseClass + default_instance false + def to_gfx_element + GfxElements::CheckBox.new(:checked => false) + end +end # class TrueClass +# module ActionView +# +# module Helpers + class TagBuilder < ActionView::Helpers::InstanceTag + def initialize ( value, gfx ) + @value = value + super(gfx.object, gfx.attribute.name, gfx.builder) + end + attr_reader :value + alias_method :value_before_type_cast, :value + end # class TagBuilder +# end # module Helpers +# +# end # module ActionView +module GfxElements + class Gfx + attr_accessor :builder, :attribute, :object + def initialize ( opts=nil ) + return if opts.nil? + opts.each do |k, v| + next unless respond_to? "#{k}=" + send("#{k}=", v) + end + end + def to_form ( str ) + @builder.ihtml! str + end + end # class Gfx + class None < Gfx + def to_form + @builder.bold { @builder.itext! 'GfxElements::None: ' + @attribute.inspect } + end + end # class None + class TextField < Gfx + def to_form + super TagBuilder.new(@default, self).to_input_field_tag('text') + end + end # class TextField + class CheckBox < Gfx + attr_accessor :checked + def to_form + super TagBuilder.new(@checked, self).to_check_box_tag({}, "1", "0") + end + end # class CheckBox + class Select < Gfx + attr_accessor :choices + def to_form + super TagBuilder.new(@choices.first, self).to_select_tag(@choices, {}, {}) + end + end # class Select +end # module GfxElements +class AdminController < ApplicationController + def index + @test = AutoObject.new + @result = '' + Uttk::Strategies::Cmd.to_form(XHtml.new(:target => @result, :controller => AutoObject.new)) + logger.info { @result } + end +end Property changes on: app/controllers/admin_controller.rb ___________________________________________________________________ Name: svn:keywords + Id Index: app/views/admin/index.rhtml --- app/views/admin/index.rhtml (revision 0) +++ app/views/admin/index.rhtml (revision 0) @@ -0,0 +1,3 @@ + + <%= @result %> + Index: config/database.yml Index: config/environment.rb --- config/environment.rb (revision 7) +++ config/environment.rb (working copy) @@ -4,22 +4,22 @@ # (Use only when you can't set environment variables through your web/app server) # ENV['RAILS_ENV'] = 'production' -# require 'pathname' -# config = Pathname.new(__FILE__).dirname.parent -# vendor = config.parent + 'vendor' -# unless defined? Uttk - # $CORE_EX_VENDORS ||= [] - # $CORE_EX_VENDORS << vendor - # file = vendor + 'uttk' + 'lib' + 'uttk.rb' - # if file.exist? - # require file.to_s - # else - # require 'rubygems' - # require_gem 'uttk' - # require 'uttk' - # end -# end -# Uttk.import! +require 'pathname' +config = Pathname.new(__FILE__).dirname.parent +vendor = config.parent + 'vendor' +unless defined? Uttk + $CORE_EX_VENDORS ||= [] + $CORE_EX_VENDORS << vendor + file = vendor + 'uttk' + 'lib' + 'uttk.rb' + if file.exist? + require file.to_s + else + require 'rubygems' + require_gem 'uttk' + require 'uttk' + end +end +Uttk.import! # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') @@ -67,7 +67,7 @@ # Include your application configuration below -Dependencies.mechanism = :require +# Dependencies.mechanism = :require ActionMailer::Base.server_settings = { :address => "smtp.feydakins.org", :port => 25, @@ -98,34 +98,31 @@ # end # p URI.parse('/admin') # Object.const_set :URI, VerboseObject.new(URI) -# class XHtml < TTK::Dumpers::Html::XmlMarkup - # class Helpers - # include ActionView::Helpers::TagHelper - # include ActionView::Helpers::UrlHelper - # include ActionView::Helpers::FormHelper - # include ActionView::Helpers::FormTagHelper - # def initialize ( controller ) - # @controller = controller - # end - # end - # def initialize ( opts ) - # opts[:indent] ||= 2 - # @helpers = Helpers.new(opts[:controller]) - # super(opts) - # end - # def form_tag ( *a, &b ) - # start_form_tag(*a) - # _nested_structures(b) unless b.nil? - # end_form_tag - # end - # def method_missing ( m, *a, &b ) - # if @helpers.respond_to? m - # ihtml! @helpers.send(m, *a, &b) - # else - # super - # end - # end -# end -# TTK::Strategies::Cmd.to_form(XHtml.new(:target => STDERR, :controller => AutoObject.new)) -# STDERR.puts -# exit +class XHtml < Uttk::Dumpers::Html::XmlMarkup + class Helpers + include ActionView::Helpers::TagHelper + include ActionView::Helpers::UrlHelper + include ActionView::Helpers::FormHelper + include ActionView::Helpers::FormTagHelper + def initialize ( controller ) + @controller = controller + end + end + def initialize ( opts ) + opts[:indent] ||= 2 + @helpers = Helpers.new(opts[:controller]) + super(opts) + end + def form_tag ( *a, &b ) + start_form_tag(*a) + _nested_structures(b) unless b.nil? + end_form_tag + end + def method_missing ( m, *a, &b ) + if @helpers.respond_to? m + ihtml! @helpers.send(m, *a, &b) + else + super + end + end +end -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051023/6c92987d/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Tue Oct 25 20:05:57 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Wed, 26 Oct 2005 02:05:57 +0200 (CEST) Subject: [Uttk-Patches] 763: Update generators. Message-ID: <20051026000557.3B50858C19@smtp.feydakins.org> svn://svn.feydakins.org/uttk/trunk You can also view this changeset here: http://dev.uttk.org/repository/changesets/763 Index: ChangeLog from Nicolas Pouillard * lib/uttk/generators/dumper_generator.rb, * lib/uttk/generators/generator.rb, * lib/uttk/generators/strategy_generator.rb, * lib/uttk/generators/filter_generator.rb, * lib/uttk/generators/templates/generator.rb, * lib/uttk/generators/loader_generator.rb, * lib/uttk/generators/templates/filter.rb: Rename runit to unit. * lib/uttk/generators/templates/dumper.rb: Likewise. emove the update method for these templates. dumper_generator.rb | 4 ++-- filter_generator.rb | 4 ++-- generator.rb | 6 +----- loader_generator.rb | 4 ++-- strategy_generator.rb | 2 +- templates/dumper.rb | 7 ------- templates/filter.rb | 7 ------- templates/generator.rb | 4 ++-- 8 files changed, 10 insertions(+), 28 deletions(-) Index: lib/uttk/generators/dumper_generator.rb --- lib/uttk/generators/dumper_generator.rb (revision 762) +++ lib/uttk/generators/dumper_generator.rb (working copy) @@ -13,11 +13,11 @@ # Source and test directories. m.directory root/lib/uttk/dumpers - m.directory root/test/runit/dumpers + m.directory root/test/unit/dumpers # Source and test templates. m.template 'dumper.rb', root/lib/uttk/dumpers/"#{class_name}.rb" - m.template 'unit_test.rb', root/test/runit/dumpers/"#{file_name}_test.rb" + m.template 'unit_test.rb', root/test/unit/dumpers/"#{file_name}_test.rb" end end Index: lib/uttk/generators/generator.rb --- lib/uttk/generators/generator.rb (revision 762) +++ lib/uttk/generators/generator.rb (working copy) @@ -34,15 +34,11 @@ @root = '.'.to_path end - %w[ lib uttk test runit + %w[ lib uttk test unit functional strategies loaders filters dumpers generators ].each do |name| define_method(name) { name } end - def functional - 'functional' - end - attr_reader :root, :fullname, :email, :year def dir_name Index: lib/uttk/generators/strategy_generator.rb --- lib/uttk/generators/strategy_generator.rb (revision 762) +++ lib/uttk/generators/strategy_generator.rb (working copy) @@ -13,7 +13,7 @@ # Source and test directories. m.directory root/lib/uttk/strategies - m.directory root/test/runit/strategies + m.directory root/test/unit/strategies # Source and test templates. m.template 'strategy.rb', root/lib/uttk/strategies/"#{class_name}.rb" Index: lib/uttk/generators/filter_generator.rb --- lib/uttk/generators/filter_generator.rb (revision 762) +++ lib/uttk/generators/filter_generator.rb (working copy) @@ -13,11 +13,11 @@ # Source and test directories. m.directory root/lib/uttk/filters - m.directory root/test/runit/filters + m.directory root/test/unit/filters # Source and test templates. m.template 'filter.rb', root/lib/uttk/filters/"#{class_name}.rb" - m.template 'unit_test.rb', root/test/runit/filters/"#{file_name}_test.rb" + m.template 'unit_test.rb', root/test/unit/filters/"#{file_name}_test.rb" end end Index: lib/uttk/generators/templates/filter.rb --- lib/uttk/generators/templates/filter.rb (revision 762) +++ lib/uttk/generators/templates/filter.rb (working copy) @@ -43,13 +43,6 @@ end protected :close - - def update ( *a, &b ) - # ... - super - # ... - end - end # class <%= class_name %> end # module Filters Index: lib/uttk/generators/templates/generator.rb --- lib/uttk/generators/templates/generator.rb (revision 762) +++ lib/uttk/generators/templates/generator.rb (working copy) @@ -13,11 +13,11 @@ # Source and test directories. m.directory root/lib/uttk/<%= dir_name %> - m.directory root/test/runit/<%= dir_name %> + m.directory root/test/unit/<%= dir_name %> # Source and test templates. m.template '<%= file_name %>.rb', root/lib/uttk/<%= dir_name %>/"#{class_name}.rb" - m.template 'unit_test.rb', root/test/runit/<%= dir_name %>/"#{file_name}_test.rb" + m.template 'unit_test.rb', root/test/unit/<%= dir_name %>/"#{file_name}_test.rb" end end Index: lib/uttk/generators/templates/dumper.rb --- lib/uttk/generators/templates/dumper.rb (revision 762) +++ lib/uttk/generators/templates/dumper.rb (working copy) @@ -43,13 +43,6 @@ end protected :close - - def update ( *a, &b ) - # ... - super - # ... - end - end # class <%= class_name %> end # module Dumpers Index: lib/uttk/generators/loader_generator.rb --- lib/uttk/generators/loader_generator.rb (revision 762) +++ lib/uttk/generators/loader_generator.rb (working copy) @@ -13,11 +13,11 @@ # Source and test directories. m.directory root/lib/uttk/loaders - m.directory root/test/runit/loaders + m.directory root/test/unit/loaders # Source and test templates. m.template 'loader.rb', root/lib/uttk/loaders/"#{class_name}.rb" - m.template 'unit_test.rb', root/test/runit/loaders/"#{file_name}_test.rb" + m.template 'unit_test.rb', root/test/unit/loaders/"#{file_name}_test.rb" end end -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051026/77074e0c/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Tue Oct 25 20:39:00 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Wed, 26 Oct 2005 02:39:00 +0200 (CEST) Subject: [Uttk-Patches] 764: Improve the --include (-I) behavior. Message-ID: <20051026003900.DE043948C4@smtp.feydakins.org> svn://svn.feydakins.org/uttk/trunk You can also view this changeset here: http://dev.uttk.org/repository/changesets/764 Index: ChangeLog from Nicolas Pouillard * bin/getopts/uttk.rb: With -I you now specify another root for Uttk with modules directories (strategies, filters, dumpers...). * lib/uttk.rb: Adapt uttk_module. * lib/js, lib/uttk/uttk: Remove. Empty and useless. * vcs/uttk.rb: Fix the COLLABOA constant. bin/getopts/uttk.rb | 20 ++++++++------------ lib/uttk.rb | 18 ++++++++++++------ vcs/uttk.rb | 2 +- 3 files changed, 21 insertions(+), 19 deletions(-) Index: bin/getopts/uttk.rb --- bin/getopts/uttk.rb (revision 763) +++ bin/getopts/uttk.rb (working copy) @@ -71,23 +71,19 @@ end end + optparser.on('-I', + '--include PATH', + 'Add PATH to root path (PATH/strategies, ' + + 'PATH/filters...)') do |aPath| + ::Uttk.load_path += aPath.split(':').map { |x| x.to_path } + ::Uttk::Strategies.setup_autoload + end + ### Strategy options optparser.separator '' optparser.separator 'Strategy options:' - optparser.on('-I', - '--include PATH', - 'Set PATH for test strategy classes') do |aPath| - Strategies.module_eval do - aPath.split(':').each do |aPath| - autoload_tree(aPath, false) do |p| - ::Uttk.pathname_to_class(p) - end - end - end - end - optparser.on('--strategy-list', 'List all test strategy classes') do pp_class_hierarchy('Strategies::Strategy') exit Index: lib/uttk.rb --- lib/uttk.rb (revision 763) +++ lib/uttk.rb (working copy) @@ -40,8 +40,9 @@ $LOADED_FEATURES << 'uttk.rb' lib.load_path! RubyEx.import! - mattr_accessor :dir + mattr_accessor :dir, :load_path self.dir = lib + 'uttk' + self.load_path = [dir] suppress(LoadError) { silence_warnings { core_ex_require 'action_view', 'actionpack' } } @@ -96,18 +97,23 @@ class ::Module def uttk_module module_eval do - def self.module_dir - @@module_dir ||= {} - @@module_dir[self] ||= Uttk.dir + name.split(/::/).last.downcase + def self.module_dirs + mod = name.demodulize.underscore + Uttk.load_path.map { |path| path/mod } end + def self.setup_autoload + module_dirs.each do |module_dir| autoload_tree(module_dir, false) do |p| Uttk.pathname_to_class(p) end + end + end + setup_autoload def self.each_module_name ( &block ) - Pathname.glob(module_dir + '**/*.rb') do |path| - block[path.basename.extsplit.first.to_s.to_sym] + Pathname.glob('{' + module_dirs.join(',') + '}/**/*.rb') do |path| + block[path.basename.ext.to_s.to_sym] end end Index: vcs/uttk.rb --- vcs/uttk.rb (revision 763) +++ vcs/uttk.rb (working copy) @@ -3,7 +3,7 @@ # See http://rubyforge.org/projects/vcs # and http://vcs.rubyforge.org - COLLABOA = 'http://dev.uttk.org' + COLLABOA = 'dev.uttk.org' protocol_version '0.1' -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051026/30aebc85/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From nicolas.despres at gmail.com Wed Oct 26 02:15:02 2005 From: nicolas.despres at gmail.com (=?ISO-8859-1?Q?Nicolas_Despr=E8s?=) Date: Wed, 26 Oct 2005 08:15:02 +0200 Subject: [Uttk-Patches] 763: Update generators. In-Reply-To: <20051026000557.3B50858C19@smtp.feydakins.org> References: <20051026000557.3B50858C19@smtp.feydakins.org> Message-ID: <840b875c0510252315o37185919kc88f6a4b564c5ec8@mail.gmail.com> On 10/26/05, Nicolas Pouillard wrote: > > svn://svn.feydakins.org/uttk/trunk > > You can also view this changeset here: > > http://dev.uttk.org/repository/changesets/763 > > Index: ChangeLog > from Nicolas Pouillard > > * lib/uttk/generators/dumper_generator.rb, > * lib/uttk/generators/generator.rb, > * lib/uttk/generators/strategy_generator.rb, > * lib/uttk/generators/filter_generator.rb, > * lib/uttk/generators/templates/generator.rb, > * lib/uttk/generators/loader_generator.rb, > * lib/uttk/generators/templates/filter.rb: Rename runit to unit. > > * lib/uttk/generators/templates/dumper.rb: Likewise. > emove the update method for these templates. > Ok. -- Nicolas Despr?s _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From nicolas.despres at gmail.com Wed Oct 26 02:16:05 2005 From: nicolas.despres at gmail.com (=?ISO-8859-1?Q?Nicolas_Despr=E8s?=) Date: Wed, 26 Oct 2005 08:16:05 +0200 Subject: [Uttk-Patches] 764: Improve the --include (-I) behavior. In-Reply-To: <20051026003900.DE043948C4@smtp.feydakins.org> References: <20051026003900.DE043948C4@smtp.feydakins.org> Message-ID: <840b875c0510252316x4ce03741ha552e1745b0dabdd@mail.gmail.com> On 10/26/05, Nicolas Pouillard wrote: > > svn://svn.feydakins.org/uttk/trunk > > You can also view this changeset here: > > http://dev.uttk.org/repository/changesets/764 > > Index: ChangeLog > from Nicolas Pouillard > > * bin/getopts/uttk.rb: With -I you now specify another root for Uttk > with modules directories (strategies, filters, dumpers...). > * lib/uttk.rb: Adapt uttk_module. > * lib/js, lib/uttk/uttk: Remove. Empty and useless. > * vcs/uttk.rb: Fix the COLLABOA constant. > Ok. -- Nicolas Despr?s _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Wed Oct 26 08:35:45 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Wed, 26 Oct 2005 14:35:45 +0200 (CEST) Subject: [Uttk-Patches] [core_ex] 409: Add Proc#instance_call. Message-ID: <20051026123545.BE01252293@smtp.feydakins.org> svn://svn.feydakins.org/ruby_ex/trunk/core_ex Index: ChangeLog from Nicolas Pouillard * lib/core_ex/proc.rb: Add instance_call, a magic version of call that use instance_eval(_with_args) when arguments are ok for this. Add a bunch of unit tests. * lib/dumpable_proc.rb: Remove this silly, because unefficient and wrong verification. * lib/core_ex/string.rb: Add to_proc, and to_uri. core_ex/proc.rb | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ core_ex/string.rb | 9 ++++++ dumpable_proc.rb | 9 ------ 3 files changed, 88 insertions(+), 9 deletions(-) Index: lib/dumpable_proc.rb --- lib/dumpable_proc.rb (revision 408) +++ lib/dumpable_proc.rb (working copy) @@ -7,15 +7,6 @@ class DumpableProc < Proc def self.new ( str ) - # FIXME imporve prevent from ruby injections - if str =~ /[{}]/ - str = str.gsub(/[^{}]/, '') - while str.gsub!(/\{\}/, '') - end - unless str.empty? - raise ArgumentError, "Bad block: bad `{' `}' equilibration" - end - end pr = super(&eval("proc { #{str} }")) pr.instance_eval { @str = str.freeze } pr Index: lib/core_ex/proc.rb --- lib/core_ex/proc.rb (revision 408) +++ lib/core_ex/proc.rb (working copy) @@ -8,6 +8,12 @@ module Proc + class ArityError < ArgumentError + def initialize + super("Bad number of arguments") + end + end # class ArityError + setup do have YamlExtension end @@ -28,6 +34,27 @@ to_s end + def to_proc + self + end + + def instance_call ( anObject, *args, &block ) + argc = args.size + case arity + when 1 + argc + call(anObject, *args, &block) + when argc, -1 + raise ArgumentError, "No block needed" if block + anObject.instance_eval_with_args(*args, &self) + else + if arity < 0 and argc >= arity.abs - 2 + call(anObject, *args, &block) + else + raise ArityError + end + end + end + module ClassMethods def yaml_load ( val ) DumpableProc.new(val.to_s) @@ -47,6 +74,15 @@ method(:teardown).to_proc => __LINE__, TestProc.instance_method(:setup).bind(self).to_proc => __LINE__ } + mock_args = @mock_args = [] + @m_ = proc { mock_args << [:_, object_id] } + @m_0 = proc { || mock_args << [:'0', object_id] } + @m_as = proc { |*a| mock_args << [:as, a, object_id] } + @m_a_bs = proc { |a, *b| mock_args << [:a_bs, a, b, object_id] } + @m_a = proc { |a| mock_args << [:a, a, object_id] } + @m_a_b = proc { |a, b| mock_args << [:a_b, a, b, object_id] } + @m_a_b_c = proc { |a, b, c| mock_args << [:a_b_c, a, b, c, object_id] } + @m_procs = [@m_, @m_0, @m_as, @m_a_bs, @m_a, @m_a_b, @m_a_b_c] end def teardown @@ -70,6 +106,49 @@ assert_equal(10, @val[]) end + def assert_instance_call ( ref, proc, args ) + assert_nothing_raised do + begin + proc.instance_call(*args) + rescue Proc::ArityError => ex + assert_equal :ArityError, ref + assert_equal [], @mock_args + return + end + end + assert_equal ref, @mock_args.shift + assert_equal [], @mock_args + end + + def test_instance_call + a, b, c = 'a', 'b', 'c' + ai, bi, ci, si = a.object_id, b.object_id, c.object_id, object_id + + assert_instance_call [:_, ai], @m_, [a] + assert_instance_call [:'0', ai], @m_0, [a] + assert_instance_call [:as, [], ai], @m_as, [a] + assert_instance_call [:a_bs, a, [], si], @m_a_bs, [a] + assert_instance_call [:a, a, si], @m_a, [a] + assert_instance_call :ArityError, @m_a_b, [a] + assert_instance_call :ArityError, @m_a_b_c, [a] + + assert_instance_call [:_, ai], @m_, [a, b] + assert_instance_call :ArityError, @m_0, [a, b] + assert_instance_call [:as, [b], ai], @m_as, [a, b] + assert_instance_call [:a_bs, a, [b], si], @m_a_bs, [a, b] + assert_instance_call [:a, b, ai], @m_a, [a, b] + assert_instance_call [:a_b, a, b, si], @m_a_b, [a, b] + assert_instance_call :ArityError, @m_a_b_c, [a, b] + + assert_instance_call [:_, ai], @m_, [a, b, c] + assert_instance_call :ArityError, @m_0, [a, b, c] + assert_instance_call [:as, [b, c], ai], @m_as, [a, b, c] + assert_instance_call [:a_bs, a, [b, c], si], @m_a_bs, [a, b, c] + assert_instance_call :ArityError, @m_a, [a, b, c] + assert_instance_call [:a_b, b, c, ai], @m_a_b, [a, b, c] + assert_instance_call [:a_b_c, a, b, c, si], @m_a_b_c, [a, b, c] + end + end # class TestProc end Index: lib/core_ex/string.rb --- lib/core_ex/string.rb (revision 408) +++ lib/core_ex/string.rb (working copy) @@ -34,6 +34,15 @@ ::Pathname.new(self) end + def to_uri + URI.parse(self) + end + alias_method :to_url, :to_uri + + def to_proc + DumpableProc.new(self) + end + def rec_fold ( init, &block ) if include? "\n" super -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051026/43630d88/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Wed Oct 26 14:10:26 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Wed, 26 Oct 2005 20:10:26 +0200 (CEST) Subject: [Uttk-Patches] [core_ex] 410: Add YAML.load_from_io a stream based YAML loader. Message-ID: <20051026181026.C49B1952DE@smtp.feydakins.org> svn://svn.feydakins.org/ruby_ex/trunk/core_ex Index: ChangeLog from Nicolas Pouillard * lib/core_ex/yaml.rb: It reads the IO with each_line and call the block with each document. yaml.rb | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+) Index: lib/core_ex/yaml.rb --- lib/core_ex/yaml.rb (revision 409) +++ lib/core_ex/yaml.rb (working copy) @@ -11,6 +11,26 @@ end # module CoreEx + +module YAML + + module_function + + def load_from_io ( io, &block ) + buffer = '' + io.each_line do |line| + if not buffer.empty? and line =~ /^---/ + block[YAML.load(buffer)] + buffer = '' + else + buffer += line + end + end + end + +end # module YAML + + class Regexp have YamlExtension, :re -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051026/2eb044ac/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Wed Oct 26 14:58:04 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Wed, 26 Oct 2005 20:58:04 +0200 (CEST) Subject: [Uttk-Patches] [ruby_ex] 411: Add triggers to Symbol Tables. Message-ID: <20051026185804.2635294238@smtp.feydakins.org> svn://svn.feydakins.org/ruby_ex/trunk Index: ChangeLog from Nicolas Pouillard * lib/sym_tbl.rb: You can now but trigger block in the symtbl, when corresponding key will be access it will class the trigger. sym_tbl.rb | 6 ++++++ 1 files changed, 6 insertions(+) Index: lib/sym_tbl.rb --- lib/sym_tbl.rb (revision 410) +++ lib/sym_tbl.rb (working copy) @@ -31,6 +31,7 @@ def [] ( aKey ) return nil if aKey == '' aKey = key_convert(aKey) + result = if @local.has_key? aKey @local[aKey] elsif @father.nil? @@ -38,6 +39,8 @@ else @father[aKey] end + result = result[] if result.is_a? Trigger + result end def []= ( aKey, aValue ) @@ -110,6 +113,9 @@ self.class.new(self) end + class Trigger < Proc + end # class Trigger + end # class SymTbl -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051026/92ce3acc/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Wed Oct 26 19:01:37 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Thu, 27 Oct 2005 01:01:37 +0200 (CEST) Subject: [Uttk-Patches] [ruby_ex] 412: Check the argument of do_symtbl_gsub. Message-ID: <20051026230137.304DF954BC@smtp.feydakins.org> svn://svn.feydakins.org/ruby_ex/trunk Index: ChangeLog from Nicolas Pouillard * lib/sym_tbl_gsub.rb: Update. sym_tbl_gsub.rb | 3 +++ 1 files changed, 3 insertions(+) Index: lib/sym_tbl_gsub.rb --- lib/sym_tbl_gsub.rb (revision 411) +++ lib/sym_tbl_gsub.rb (working copy) @@ -12,6 +12,9 @@ end def do_symtbl_gsub ( symtbl ) + unless symtbl.is_a? SymTbl + raise ArgumentError, "need a SymTbl not: #{symtbl.inspect}" + end result = symtbl_gsub(symtbl) return (result.nil?)? self : result end -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051027/af88aad8/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From nicolas.despres at gmail.com Thu Oct 27 10:33:13 2005 From: nicolas.despres at gmail.com (Nicolas Despr�s) Date: Thu, 27 Oct 2005 16:33:13 +0200 (MEST) Subject: [Uttk-Patches] 765: Fix a bug with -S. Message-ID: <20051027143313.C81F2268B0@pm-mx2.mx.noos.fr> svn://svn.feydakins.org/ttk/trunk You can also view this changeset here: http://dev.uttk.org/repository/changesets/765 Index: ChangeLog from Nicolas Despr�s Fix a bug with -S. * bin/getopts/uttk.rb: Do not use a Uttk loader to load attributes and symbols since they are not strategies. * test/pkg/cmdline.yml: Test this issue. bin/getopts/uttk.rb | 4 ++-- test/pkg/cmdline.yml | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) Index: bin/getopts/uttk.rb --- bin/getopts/uttk.rb (revision 764) +++ bin/getopts/uttk.rb (working copy) @@ -253,14 +253,14 @@ optparser.on('-S', '--symbols symbols', 'Add a hash of symbols to the root test suite') do |str| - opts[:symbols] = opts[:loader].new.load(str) + opts[:symbols] = YAML.load(str) end optparser.on('-A', '--attributes attributes', 'Add a hash of attributes to ' + 'the root test suite') do |aString| - opts[:attributes] = opts[:loader].new.load(aString) + opts[:attributes] = YAML.load(aString) end optparser.on('-C', '--[no-]cache', 'Keep the test in cache') do |c| Index: test/pkg/cmdline.yml --- test/pkg/cmdline.yml (revision 764) +++ test/pkg/cmdline.yml (working copy) @@ -60,3 +60,21 @@ output: !re | ^Uttk::Filters classes hierarchy: /Filter/ + + - Symbol option: + args: | + -L Ruby -F Yaml -S '{ foo: bar }' + input: | + S::Stub.new("stub") do + returned_value({ :foo => "<>" }) + end + output: | + --- + root: !S::Suite + symbols: + foo: bar + contents: + - stub: !S::Stub + foo: bar + status: PASS + status: PASS -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051027/c821d174/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Sat Oct 29 14:09:34 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Sat, 29 Oct 2005 20:09:34 +0200 (CEST) Subject: [Uttk-Patches] [ruby_ex] 413: Generalize the header system. Message-ID: <20051029180934.C8ACE955FB@smtp.feydakins.org> svn://svn.feydakins.org/ruby_ex/trunk Index: ChangeLog from Nicolas Pouillard Generalize the header system. * lib/sendmail.rb: All headers given as argument are now merged. Fields like To, From, Subject, etc. are now picked from the header table. This allow a more customizable mail generation. sendmail.rb | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) Index: lib/sendmail.rb --- lib/sendmail.rb (revision 412) +++ lib/sendmail.rb (working copy) @@ -19,18 +19,24 @@ full_name = (defined? FULLNAME)? FULLNAME : ENV['FULLNAME'] full_email = (defined? FULL_EMAIL)? FULL_EMAIL : "#{full_name} <#{email}>" options = OpenStruct.new( - :from_name => full_email, :from => email, :to => [], :server => ENV['SMTPSERVER'] || 'localhost:25', - :header => {}, + :header => { :From => full_email }, :body => STDIN ) string_args, hash_args = args.partition { |x| x.is_a?(String) } hash_args.each do |hash| raise ArgumentError, "Bad argument #{hash}" unless hash.is_a?(Hash) + hash[:header] = YAML.load(hash[:header]) if hash[:header].is_a? String + options.header[:Subject] = hash[:subject] if hash[:subject] hash.each do |k,v| - options.send("#{k}=", v) + x = options.send(k) + case x + when Hash then x.merge! v + when Array then x.concat v + else options.send("#{k}=", v) + end end end OptionParser.new do |opts| @@ -46,7 +52,7 @@ options.port ||= 25 end opts.on('-S', '--subject NAME', 'Choose your mail subject') do |aString| - options.subject = aString.sub(/\.?$/, '.') + options.header[:Subject] = aString.sub(/\.?$/, '.') end opts.on('--[no-]sign', 'Sign the message with gpg') do |signed| options.signed = signed @@ -61,7 +67,7 @@ options.comment = aComment end opts.on('--header STRING', 'Add some header fields (Yaml syntax)') do |s| - options.header = YAML.load(s) + options.header.merge! YAML.load(s) end opts.on('-m', '--[no-]mime', 'Choose the mime protocole') do |mime| options.mime = mime @@ -71,6 +77,7 @@ exit end end.parse!(string_args) + options.header[:To] = options.to.join(', ') check_mail_options(options) options end @@ -79,7 +86,7 @@ def check_mail_options ( options ) raise ArgumentError, 'No recipents' if options.to.empty? raise ArgumentError, 'No mail server' if options.server.nil? - raise ArgumentError, 'No mail subject' if options.subject.nil? + raise ArgumentError, 'No mail subject' if options.header[:Subject].nil? end # @@ -108,9 +115,9 @@ if opts.confirm raise 'HighLine is unavailable' unless defined? HighLine question = %Q[ - |Send a mail, with this subject: #{opts.subject} - | to #{opts.to.join(', ')} - | from #{opts.from_name} + |Send a mail, with this subject: #{opts.header[:Subject]} + | to #{opts.header[:To]} + | from #{opts.header[:From]} | #{(opts.signed)? 'signed by ' + opts.from : 'not signed !'} |Are you sure? (y/n)].head_cut! raise 'Aborting' unless HighLine.new.agree question, true @@ -119,9 +126,6 @@ require 'net/smtp' Net::SMTP.start(server, port) do |smtp| smtp.open_message_stream(opts.from, opts.to) do |f| - f.print %Q[From: #{opts.from_name} - |Subject: #{opts.subject} - |To: #{opts.to.join(', ')}\n].head_cut! opts.header.each do |k, v| f.puts "#{k}: #{v}" end -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051029/88ba316f/signature-0001.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From ertai at lrde.epita.fr Sat Oct 29 14:15:14 2005 From: ertai at lrde.epita.fr (Nicolas Pouillard) Date: Sat, 29 Oct 2005 20:15:14 +0200 (CEST) Subject: [Uttk-Patches] [ruby_ex][SimulatedAnnealing] 414: Add argmin. Message-ID: <20051029181514.145AE955FB@smtp.feydakins.org> svn://svn.feydakins.org/ruby_ex/trunk Index: ChangeLog from Nicolas Pouillard Add argmin. * lib/algorithms/simulated_annealing.rb: This add a nice way to catch the better argmin at any time. simulated_annealing.rb | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+) Index: lib/algorithms/simulated_annealing.rb --- lib/algorithms/simulated_annealing.rb (revision 413) +++ lib/algorithms/simulated_annealing.rb (working copy) @@ -9,6 +9,12 @@ class SimulatedAnnealing + attr_reader :support, :global_thresold, :step_multiplicator, + :initial_temperature, :initial_cost, :output, + :iteration_modulus, :step_modulus, :generator, + :diff_cost, :iteration, :probability_threshold, :argmin + alias_method :best, :argmin + # Example: # # obj = MySimulatedAnnealingObject.new @@ -37,6 +43,8 @@ @diff_cost = 0 @iteration = 0 @probability_threshold = 0 + @argmin = nil + @min = @cur_cost end @@zeros = [0.0] * 8 @@ -89,6 +97,10 @@ @support.apply_transition(@transition) @cur_cost += @diff_cost + if @cur_cost < @min + @min = @cur_cost + @argmin = @support.copy_of_the_current_solution + end end end @@ -152,6 +164,14 @@ raise NotImplementedError end + # + # This method should return the copy of the current solution + # it will be called to save the best solution (argmin). + # + def copy_of_the_current_solution + raise NotImplementedError + end + end end -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 186 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051029/470d771f/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From nicolas.despres at gmail.com Sat Oct 29 14:18:47 2005 From: nicolas.despres at gmail.com (Nicolas Despr�s) Date: Sat, 29 Oct 2005 20:18:47 +0200 (MEST) Subject: [Uttk-Patches] 766: Cmd do not handle sigsegv properly. Message-ID: <20051029181847.A254C27B49@pm-mx5.mx.noos.fr> svn://svn.feydakins.org/ttk/trunk You can also view this changeset here: http://dev.uttk.org/repository/changesets/766 Index: ChangeLog from Nicolas Despr�s Cmd do not handle sigsegv properly. * test/functional/cmd.yml: New. Show off the bug. * test/fixtures/binaries, test/fixtures/binaries/segv, * test/fixtures/binaries/segv.c, test/fixtures/binaries/segv.rb, * test/fixtures/binaries/segv, test/fixtures/binaries/segv.c, * test/fixtures/binaries/segv.rb: New. Fixtured a prog which auto-segv. Ruby segfault status is different than a c program. fixtures/binaries/segv | 10 ++++++++++ fixtures/binaries/segv.rb | 2 ++ functional/cmd.yml | 15 +++++++++++++++ 3 files changed, 27 insertions(+) Index: test/functional/cmd.yml --- test/functional/cmd.yml (revision 0) +++ test/functional/cmd.yml (revision 0) @@ -0,0 +1,15 @@ +--- + +Test suite for the Cmd strategy: !S::Suite + + contents: + + - segfault ruby: !S::Cmd + command: ruby + args: <>/../fixtures/binaries/segv.rb + exit: 134 + + - segfault C: !S::Cmd + command: ruby + args: <>/../fixtures/binaries/segv + exit: 139 Index: test/fixtures/binaries/segv Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: test/fixtures/binaries/segv ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Index: test/fixtures/binaries/segv.c --- test/fixtures/binaries/segv.c (revision 0) +++ test/fixtures/binaries/segv.c (revision 0) @@ -0,0 +1,10 @@ + +#include +#include +#include + +int main(void) +{ + kill(getpid(), SIGSEGV); + return 0; +} Index: test/fixtures/binaries/segv.rb --- test/fixtures/binaries/segv.rb (revision 0) +++ test/fixtures/binaries/segv.rb (revision 0) @@ -0,0 +1,2 @@ +Process.kill("SEGV", $$) + -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051029/d86b91f0/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From nicolas.despres at gmail.com Sat Oct 29 14:20:40 2005 From: nicolas.despres at gmail.com (=?ISO-8859-1?Q?Nicolas_Despr=E8s?=) Date: Sat, 29 Oct 2005 20:20:40 +0200 Subject: [Uttk-Patches] 766: Cmd do not handle sigsegv properly. In-Reply-To: <20051029181847.A254C27B49@pm-mx5.mx.noos.fr> References: <20051029181847.A254C27B49@pm-mx5.mx.noos.fr> Message-ID: <840b875c0510291120g583a7327yc825d8794451e428@mail.gmail.com> On 10/29/05, Nicolas Despr?s wrote: > + > + - segfault C: !S::Cmd > + command: ruby > + args: <>/../fixtures/binaries/segv > + exit: 139 That's a mistake. I fix it right now. [...] Sorry, but I don't have time now to address this bug. -- Nicolas Despr?s _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From nicolas.despres at gmail.com Sat Oct 29 14:22:01 2005 From: nicolas.despres at gmail.com (Nicolas Despr�s) Date: Sat, 29 Oct 2005 20:22:01 +0200 (MEST) Subject: [Uttk-Patches] 767: Fix mistakes from previous patch. Message-ID: <20051029182201.A77EF27195@pm-mx5.mx.noos.fr> svn://svn.feydakins.org/ttk/trunk You can also view this changeset here: http://dev.uttk.org/repository/changesets/767 Index: ChangeLog from Nicolas Despr�s Fix mistakes from previous patch. * test/functional/cmd.yml: Do not run ruby on a binary file. cmd.yml | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) Index: test/functional/cmd.yml --- test/functional/cmd.yml (revision 766) +++ test/functional/cmd.yml (working copy) @@ -10,6 +10,5 @@ exit: 134 - segfault C: !S::Cmd - command: ruby - args: <>/../fixtures/binaries/segv + command: <>/../fixtures/binaries/segv exit: 139 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051029/32dbd105/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From nicolas.despres at gmail.com Sat Oct 29 17:20:49 2005 From: nicolas.despres at gmail.com (Nicolas Despr�s) Date: Sat, 29 Oct 2005 23:20:49 +0200 (MEST) Subject: [Uttk-Patches] 768: Remove useless directory. Message-ID: <20051029212049.7315827FC6@pm-mx6.mx.noos.fr> svn://svn.feydakins.org/ttk/trunk You can also view this changeset here: http://dev.uttk.org/repository/changesets/768 Index: ChangeLog from Nicolas Despr�s Remove useless directory. * lib/uttk/strategies/Cmd: Remove because it is empty. 0 files changed -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051029/93c55865/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From nicolas.despres at gmail.com Mon Oct 31 11:05:31 2005 From: nicolas.despres at gmail.com (Nicolas Despr�s) Date: Mon, 31 Oct 2005 17:05:31 +0100 (MET) Subject: [Uttk-Patches] 769: A Diff with hexdump -C. Message-ID: <20051031160531.6FE5026D38@pm-mx5.mx.noos.fr> svn://svn.feydakins.org/ttk/trunk You can also view this changeset here: http://dev.uttk.org/repository/changesets/769 Index: ChangeLog from Nicolas Despr�s A Diff with hexdump -C. * test/functional/hexa-diff.yml: New. Tests it. * lib/uttk/streams/HexaDiff.rb: New. Implements it. lib/uttk/streams/HexaDiff.rb | 35 +++++++++++++++++++++++++++++++++++ test/functional/hexa-diff.yml | 25 +++++++++++++++++++++++++ 2 files changed, 60 insertions(+) Index: test/functional/hexa-diff.yml --- test/functional/hexa-diff.yml (revision 0) +++ test/functional/hexa-diff.yml (revision 0) @@ -0,0 +1,25 @@ +--- + +Test Cmd with StreamHexaDiff: !S::Suite + attributes: !S::Cmd + stream_class: HexaDiff + command: cat + contents: + + - simple valid: + input: | + foo + bar bar + fuu + output: | + foo + bar bar + fuu + + - simple invalid: + weight: -1 + input: | + foo + bar bar + fuu + output: !path <>/../fixtures/text/1.txt Property changes on: test/functional/hexa-diff.yml ___________________________________________________________________ Name: sv:keywords + Id Index: lib/uttk/streams/HexaDiff.rb --- lib/uttk/streams/HexaDiff.rb (revision 0) +++ lib/uttk/streams/HexaDiff.rb (revision 0) @@ -0,0 +1,35 @@ +# Author:: Nicolas Despr�s . +# Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved. +# License:: LGPL +# $Id: Diff.rb 720 2005-09-26 04:34:48Z ertai $ + + +module Uttk + + module Streams + + class HexaDiff < Diff + + #FIXME: manage only !path :-( + def to_uttk_log ( log ) + if @name == "output" + if @ref.can_diff? + TempPath.new('hexa-diff-output') do |hexa_my| + system "hexdump -C #@my > #{hexa_my}" + TempPath.new('hexa-diff-output') do |hexa_ref| + system "hexdump -C #@ref > #{hexa_ref}" + log["hexa_diff_#@name"] = hexa_ref.to_diff_for_uttk_log(hexa_my) + end + end + end + else + super + end + end + + end # HexaDiff + + end # module Streams + +end # module Uttk + Property changes on: lib/uttk/streams/HexaDiff.rb ___________________________________________________________________ Name: sv:keywords + Id -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: OpenPGP digital signature Url : http://rubyforge.org/pipermail/ttk-patches/attachments/20051031/2857d05c/signature.bin -------------- next part -------------- _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches From nicolas.despres at gmail.com Mon Oct 31 13:14:09 2005 From: nicolas.despres at gmail.com (=?ISO-8859-1?Q?Nicolas_Despr=E8s?=) Date: Mon, 31 Oct 2005 19:14:09 +0100 Subject: [Uttk-Patches] 769: A Diff with hexdump -C. In-Reply-To: References: <20051031160531.6FE5026D38@pm-mx5.mx.noos.fr> Message-ID: <840b875c0510311014s7f134140m4836112a0aba4d94@mail.gmail.com> On 10/31/05, Nicolas Pouillard wrote: > On 10/31/05, Nicolas Despr?s wrote: > > > > svn://svn.feydakins.org/ttk/trunk > > > > You can also view this changeset here: > > > > http://dev.uttk.org/repository/changesets/769 > > > > Index: ChangeLog > > from Nicolas Despr?s > > > > A Diff with hexdump -C. > > > > * test/functional/hexa-diff.yml: New. Tests it. > > * lib/uttk/streams/HexaDiff.rb: New. Implements it. > > > > lib/uttk/streams/HexaDiff.rb | 35 +++++++++++++++++++++++++++++++++++ > > test/functional/hexa-diff.yml | 25 +++++++++++++++++++++++++ > > 2 files changed, 60 insertions(+) > > > > [...] > > > + > > + #FIXME: manage only !path :-( > > To manage them you just can convert anything to a string and strings > to a temporary file. > > But it would be simpler with Commands. > > hexadump = 'hexadump'.to_cmd > hexadump['-C'] < 'a string' > OR > hexadump['-C'] < 'a-file'.to_path > That's what I thought and that's why I left it like that since it is usable as is. -- Nicolas Despr?s _______________________________________________ Uttk-Patches mailing list Uttk-Patches at lists.feydakins.org http://mailman.feydakins.org/mailman/listinfo/uttk-patches