October 2005 - Projects

Re: [Projects] [VCS] warning ruby_ex: insecure dir
by olivier 24 Oct '05

24 Oct '05

Nicolas Desprès <nicolas.despres(a)gmail.com> disait le 10/24/05 : > On 10/24/05, olivier <olivier.gournet(a)lrde.epita.fr> wrote: >> Yop, >> >> J'ai un warning bizarre avec vcs depuis aujourd'hui, qui se repete >> assez souvent: >> >> /usr/lib/ruby/gems/1.8/gems/ruby_ex-0.3.0/lib/commands/runners/exec.rb:16: >> warning: Insecure world writable dir /work, mode 041777 >> > > Peut-être devrais-tu adopter la même politique de droit que /tmp. ? C'est la meme, et c'est fait pour !

2 1

[VCS] warning ruby_ex: insecure dir
by olivier 24 Oct '05

24 Oct '05

Yop, J'ai un warning bizarre avec vcs depuis aujourd'hui, qui se repete assez souvent: /usr/lib/ruby/gems/1.8/gems/ruby_ex-0.3.0/lib/commands/runners/exec.rb:16: warning: Insecure world writable dir /work, mode 041777 Oui, ben oui, /work est en 1777, c'est pas nouveau et c'est tant mieux.

2 1

[nolimips: 195] Reduce includes' dependencies.
by Noe 24 Oct '05

24 Oct '05

https://svn.lrde.epita.fr/svn/nolimips/trunk ChangeLog | 18 ++++++++++++++++++ src/inst/data_section.hh | 9 +++++++-- src/inst/exp.hh | 2 +- src/inst/inst.hh | 2 +- src/inst/label.hh | 3 +-- src/inst/label_exp.hh | 2 ++ src/inst/nodes.gen.py | 15 ++++++++++----- src/inst/op_exp.hh | 2 ++ src/inst/program.hh | 2 +- src/inst/register.hh | 4 +--- src/inst/section.hh | 1 + src/parse/asm-parse.yy.gen.py | 3 --- src/parse/asm-scan.ll.gen.py | 2 ++ src/vm/cpu.cc | 2 -- src/vm/cpu.hh | 6 ++++-- src/vm/virtual_machine.cc | 1 + src/vm/virtual_machine.hh | 6 +++--- 17 files changed, 55 insertions(+), 25 deletions(-) Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> Reduce includes' dependencies. * src/vm/cpu.hh, src/vm/cpu.cc * src/vm/virtual_machine.hh, src/vm/virtual_machine.cc * src/parse/asm-parse.yy.gen.py, src/parse/asm-scan.ll.gen.py, * src/inst/register.hh, * src/inst/op_exp.hh, * src/inst/label_exp.hh, * src/inst/exp.hh, * src/inst/section.hh, src/inst/data_section.hh, * src/inst/program.hh * src/inst/nodes.gen.py * src/inst/inst.hh * src/inst/label.hh: Remove unused includes, forward-declare classes. Index: src/vm/cpu.hh --- src/vm/cpu.hh (revision 194) +++ src/vm/cpu.hh (revision 195) @@ -25,13 +25,15 @@ # include <stdint.h> -# include <stack> +# include <vector> + +# include "common.hh" # include "misc/table.hh" +# include "inst/inst.hh" # include "inst/visitor.hh" # include "inst/register.hh" -# include "inst/program.hh" # include "vm/mmu.hh" Index: src/vm/virtual_machine.hh --- src/vm/virtual_machine.hh (revision 194) +++ src/vm/virtual_machine.hh (revision 195) @@ -21,19 +21,19 @@ #ifndef VM_VIRTUAL_MACHINE_HH # define VM_VIRTUAL_MACHINE_HH -# include <iostream> +# include <ostream> # include "misc/contract.hh" # include "misc/has.hh" # include "common.hh" -# include "inst/program.hh" - # include "vm/memory.hh" # include "vm/mmu.hh" # include "vm/cp0.hh" # include "vm/cpu.hh" +namespace inst { class Program; } + namespace vm { class SystemLibrary; Index: src/vm/cpu.cc --- src/vm/cpu.cc (revision 194) +++ src/vm/cpu.cc (revision 195) @@ -18,8 +18,6 @@ // #include <iomanip> -#include "common.hh" - #include "vm/cpu.hh" #include "vm/system_library.hh" Index: src/vm/virtual_machine.cc --- src/vm/virtual_machine.cc (revision 194) +++ src/vm/virtual_machine.cc (revision 195) @@ -17,6 +17,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // #include "vm/virtual_machine.hh" +#include "inst/program.hh" namespace vm { Index: src/parse/asm-scan.ll.gen.py --- src/parse/asm-scan.ll.gen.py (revision 194) +++ src/parse/asm-scan.ll.gen.py (revision 195) @@ -284,6 +284,8 @@ } #endif +#include <stack> + namespace parse { Index: src/parse/asm-parse.yy.gen.py --- src/parse/asm-parse.yy.gen.py (revision 194) +++ src/parse/asm-parse.yy.gen.py (revision 195) @@ -50,12 +50,9 @@ #include \"inst/register.hh\" #include \"inst/all.hh\" -#include \"vm/cpu.hh\" - #include \"parse/libparse.hh\" using namespace inst; -using vm::Cpu; %} %error-verbose Index: src/inst/register.hh --- src/inst/register.hh (revision 194) +++ src/inst/register.hh (revision 195) @@ -19,9 +19,7 @@ #ifndef INST_REGISTER_HH # define INST_REGISTER_HH -# include <iostream> - -# include "misc/contract.hh" +# include <ostream> namespace inst { Index: src/inst/op_exp.hh --- src/inst/op_exp.hh (revision 194) +++ src/inst/op_exp.hh (revision 195) @@ -19,6 +19,8 @@ #ifndef INST_OP_EXP_HH # define INST_OP_EXP_HH +# include <ostream> + # include "inst/exp.hh" namespace inst Index: src/inst/label_exp.hh --- src/inst/label_exp.hh (revision 194) +++ src/inst/label_exp.hh (revision 195) @@ -19,6 +19,8 @@ #ifndef INST_LABEL_EXP_HH # define INST_LABEL_EXP_HH +# include <ostream> + # include "misc/unique_string.hh" # include "inst/exp.hh" Index: src/inst/exp.hh --- src/inst/exp.hh (revision 194) +++ src/inst/exp.hh (revision 195) @@ -19,7 +19,7 @@ #ifndef INST_EXP_HH # define INST_EXP_HH -# include <iostream> +# include <ostream> # include "misc/contract.hh" # include "misc/lockable.hh" Index: src/inst/data_section.hh --- src/inst/data_section.hh (revision 194) +++ src/inst/data_section.hh (revision 195) @@ -23,15 +23,20 @@ # include <stdint.h> -# include <iostream> +# include <ostream> # include <vector> +# include <string> + +# include "misc/contract.hh" +# include "misc/unique_string.hh" # include "inst/section.hh" -# include "inst/inst.hh" namespace inst { + class Label; + /// Abstract an assembly data section class DataSection: public Section Index: src/inst/section.hh --- src/inst/section.hh (revision 194) +++ src/inst/section.hh (revision 195) @@ -19,6 +19,7 @@ #ifndef INST_SECTION_HH # define INST_SECTION_HH +# include <ostream> # include <set> # include "misc/contract.hh" Index: src/inst/program.hh --- src/inst/program.hh (revision 194) +++ src/inst/program.hh (revision 195) @@ -19,7 +19,7 @@ #ifndef INST_PROGRAM_HH # define INST_PROGRAM_HH -# include <iostream> +# include <ostream> # include "inst/text_section.hh" # include "inst/data_section.hh" Index: src/inst/nodes.gen.py --- src/inst/nodes.gen.py (revision 194) +++ src/inst/nodes.gen.py (revision 195) @@ -68,17 +68,22 @@ print """ # include \"inst/register.hh\" # include \"inst/exp.hh\" -# include \"inst/inst.hh\" -# include \"inst/visitor.hh\" -""" +# include \"inst/inst.hh\"""" + + sys.stdout = impl + print "#include \"inst/visitor.hh\"" + for f in [inline, impl]: sys.stdout = f print "#include \"inst/" + file_id + ".hh\"" + # Open namespace for f in [header, inline, impl]: sys.stdout = f - print "\nnamespace inst\n{\n" - + print """ +namespace inst +{ +""" ## Declare class sys.stdout = header Index: src/inst/inst.hh --- src/inst/inst.hh (revision 194) +++ src/inst/inst.hh (revision 195) @@ -19,7 +19,7 @@ #ifndef INST_INST_HH # define INST_INST_HH -# include <iostream> +# include <ostream> # include "inst/visitor.hh" Index: src/inst/label.hh --- src/inst/label.hh (revision 194) +++ src/inst/label.hh (revision 195) @@ -19,9 +19,8 @@ #ifndef INST_LABEL_HH # define INST_LABEL_HH -# include <set> # include <string> -# include <iostream> +# include <ostream> # include "misc/contract.hh" # include "misc/lockable.hh"

3 3

[havm]: 154: Fix debian build.
by olivier 18 Oct '05

18 Oct '05

2005-10-19 Olivier Gournet <gourne_o(a)lrde.epita.fr> * debian/Makefile.am: Fix deb build for srcdir != builddir. Index: debian/Makefile.am =================================================================== --- debian/Makefile.am (revision 153) +++ debian/Makefile.am (working copy) @@ -15,11 +15,11 @@ $(DIST_ARCHIVE) \ $(PACKAGE)_$(VERSION)*.{changes,deb,dsc,tar.gz} -$(top_srcdir)/$(DIST_ARCHIVE): - $(MAKE) -C $(top_srcdir) dist +$(top_builddir)/$(DIST_ARCHIVE): + $(MAKE) -C $(top_builddir) dist -deb: $(top_srcdir)/$(DIST_ARCHIVE) - rm -rf $(distdir) && tar xvzf $(top_srcdir)/$(DIST_ARCHIVE) +deb: $(top_builddir)/$(DIST_ARCHIVE) + rm -rf $(distdir) && tar xvzf $< mv $(distdir)/debian/changelog-deb $(distdir)/debian/changelog V=`echo '$(DEB_VERSION)' | sed 's/$$Rev: $[0-9]*$ /\1/'` && \ sed -i "s/^$(PACKAGE) (.*) unstable;/$(PACKAGE) ($$V) unstable;/" \

1 0

[nolimips: 199] Provide --system-library option
by Noe 15 Oct '05

15 Oct '05

ChangeLog | 13 ++++++++++++ NEWS | 6 +++++ src/task/Makefile.am | 1 src/task/libtask.hh | 11 +++++++++- src/task/string_task.cc | 47 +++++++++++++++++++++++++++++++++++++++++++++ src/task/string_task.hh | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ src/vm-tasks.cc | 36 ++++++++++++++++++++++++++++++++-- src/vm-tasks.hh | 11 +++++++++- 8 files changed, 171 insertions(+), 4 deletions(-) Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> Provide --system-library option. * src/task/string_task.hh, src/task/string_task.cc: New. * src/task/libtask.hh, src/task/Makefile.am: Distribute them. * src/vm-tasks.hh, src/vm-tasks.hh: (select_system_library): Implement builtin system library selection. * NEWS: Update. Index: src/vm-tasks.cc --- src/vm-tasks.cc (révision 198) +++ src/vm-tasks.cc (révision 199) @@ -21,6 +21,7 @@ #include "inst/program.hh" #include "vm/spim_system_library.hh" +#include "vm/nolimips_system_library.hh" #include "vm/virtual_machine.hh" #include "parse-tasks.hh" @@ -33,14 +34,45 @@ namespace tasks { + // Default system library + static vm::SystemLibrary *system_library = + new vm::SpimSystemLibrary(std::cin, std::cout); + + void + select_system_library(const std::string &library_name) + { + if (library_name == "nolimips") + { + delete system_library; + system_library = new vm::NolimipsSystemLibrary(std::cin, + std::cout, std::cerr); + } + else if (library_name == "spim") + { +// delete system_library; +// system_library = new vm::SpimSystemLibrary(std::cin, std::cout); + } + else if (library_name == "none") + { + delete system_library; + system_library = 0; + } + else + { + std::cerr << program_name + << ": `" << library_name << "': no such system library" + << std::endl; + exit_set (exit_failure); + } + } + void execute () { - vm::SpimSystemLibrary l(std::cin, std::cout); vm::VirtualMachine vm; vm.get_cpu().set_check_callee_save(check_callee_save_p); vm.get_cpu().set_trace(trace_exec_p); - vm.set_system_library(&l); + vm.set_system_library(system_library); vm.load_program(* parse::tasks::program); if (exit_status != exit_success) exit(exit_status); Index: src/task/string_task.hh --- src/task/string_task.hh (révision 0) +++ src/task/string_task.hh (révision 199) @@ -0,0 +1,50 @@ +// +// This file is part of Nolimips, a MIPS simulator with unlimited registers +// Copyright (C) 2005 Akim Demaille <akim(a)epita.fr> and +// Benoit Perrot <benoit(a)lrde.epita.fr> +// +// Nolimips is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Nolimips is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +#ifndef TASK_STRING_TASK_HH +# define TASK_STRING_TASK_HH + +# include <string> + +# include "task/task.hh" + +namespace task +{ + + class StringTask: public Task + { + public: + StringTask(void (*execute) (const std::string &), + const std::string &option, const std::string &module_name, + const std::string &desc, const std::string &deps = ""); + + public: + virtual bool set_value(const std::string &value) const; + + virtual void execute() const; + + private: + void (*execute_) (const std::string &); + + mutable std::string s_; + }; + +} // namespace task + +#endif // !TASK_STRING_TASK_HH Index: src/task/libtask.hh --- src/task/libtask.hh (révision 198) +++ src/task/libtask.hh (révision 199) @@ -1,6 +1,6 @@ // // This file is part of Nolimips, a MIPS simulator with unlimited registers -// Copyright (C) 2004 Akim Demaille <akim(a)epita.fr> and +// Copyright (C) 2004, 2005 Akim Demaille <akim(a)epita.fr> and // Benoit Perrot <benoit(a)lrde.epita.fr> // // Nolimips is free software; you can redistribute it and/or modify @@ -24,6 +24,7 @@ # include "task/function_task.hh" # include "task/boolean_task.hh" # include "task/int_task.hh" +# include "task/string_task.hh" # ifdef NOLIMIPS_CC_ @@ -48,6 +49,12 @@ Option, module_name, \ Desc, Deps) +# define STRING_TASK_DECLARE(Option, Desc, Routine, Default, Deps) \ + extern void (Routine) (const std::string &); \ + static task::StringTask task_##Routine(Routine, \ + Option, module_name, \ + Desc, Deps) + # else // !NOLIMIPS_CC_ @@ -58,6 +65,8 @@ extern bool Flag # define INT_TASK_DECLARE(Option, Desc, Var, Default, Min, Max, Deps) \ extern int Var +# define STRING_TASK_DECLARE(Option, Desc, Routine, Default, Deps) \ + extern void (Routine) (const std::string &) # endif // NOLIMIPS_CC_ Index: src/task/Makefile.am --- src/task/Makefile.am (révision 198) +++ src/task/Makefile.am (révision 199) @@ -6,5 +6,6 @@ function_task.hh function_task.cc \ boolean_task.hh boolean_task.cc \ int_task.hh int_task.cc \ + string_task.hh string_task.cc \ task_register.hh task_register.cc \ libtask.hh Index: src/task/string_task.cc --- src/task/string_task.cc (révision 0) +++ src/task/string_task.cc (révision 199) @@ -0,0 +1,47 @@ +// +// This file is part of Nolimips, a MIPS simulator with unlimited registers +// Copyright (C) 2004 Akim Demaille <akim(a)epita.fr> and +// Benoit Perrot <benoit(a)lrde.epita.fr> +// +// Nolimips is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Nolimips is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +#include "task/string_task.hh" + +namespace task +{ + + StringTask::StringTask(void (*execute) (const std::string &), + const std::string &option, + const std::string &module_name, + const std::string &desc, + const std::string &deps): + Task(option, module_name, desc, deps, true), + execute_(execute) + {} + + bool + StringTask::set_value(const std::string &value) const + { + s_ = value; + return true; + } + + void + StringTask::execute() const + { + execute_(s_); + } + +} //namespace task Index: src/vm-tasks.hh --- src/vm-tasks.hh (révision 198) +++ src/vm-tasks.hh (révision 199) @@ -1,6 +1,6 @@ // // This file is part of Nolimips, a MIPS simulator with unlimited registers -// Copyright (C) 2003, 2004 Benoit Perrot <benoit(a)lrde.epita.fr> +// Copyright (C) 2003, 2004, 2005 Benoit Perrot <benoit(a)lrde.epita.fr> // // Nolimips is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -37,6 +37,15 @@ BOOLEAN_TASK_DECLARE ("profile", "Enable program profiling", profile_p, ""); + STRING_TASK_DECLARE ("l|system-library", + "\n" + "\t\t\tSpecify the builtin system library to use;\n" + "\t\t\tvalid library names are: `spim' (default), " + "`nolimips', \n" + "\t\t\tand `none'\n", + select_system_library, "spim", + ""); + BOOLEAN_TASK_DECLARE ("E|trace-exec", "Trace the execution", trace_exec_p, ""); TASK_DECLARE ("e|execute", "Execute the program on virtual machine", Index: NEWS --- NEWS (révision 198) +++ NEWS (révision 199) @@ -1,3 +1,9 @@ +New in 0.8a: +* `--system-library' option provides builtin system library selection, + so the user can use a spim-like or the nolimips-original syscall set. + +* `--argument-registers' is the new name of `--args'. + New in 0.8, 2005-07-11: * The shell now has (some) completion.

1 0

[LrdeTools] 273: Add --force to common_commit.
by Nicolas Pouillard 14 Oct '05

14 Oct '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Add --force to common_commit. * vcs/lib/vcs/common_commit.rb: The --force option bypass the rule with unrecognized files. Inform the user that an update is done. Make the message for +commited files shorter. common_commit.rb | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) Index: vcs/lib/vcs/common_commit.rb --- vcs/lib/vcs/common_commit.rb (revision 272) +++ vcs/lib/vcs/common_commit.rb (working copy) @@ -11,8 +11,12 @@ raise Failure, "No `#{CL}', you are probably not in a valid directory." end + force = opts[:force] + opts.delete :force + @@subject_format = subject_format + logger.info { 'Updating your working copy...' } update! have_unrecognized_files = false @@ -24,7 +28,7 @@ end end if have_unrecognized_files - raise Failure, " + message = " |You have unrecognized files in your working copy! |This meant that these files won't be commited! |You have some solutions to comply with the rule: @@ -43,9 +47,15 @@ | ------------ .vcs ------------ |- You can also perform a partial commit and specify which files | and directories commit. For example this command: - | #{@command} commit foo.c bar/ + | #{(a)cmd.command} commit foo.c bar/ | - |Commit failed".head_cut! + |".head_cut! + if force + logger.warn { message } + else + logger.error { message } + commit_failed + end end Vcs.commited = edit_form!(files) @@ -82,23 +92,25 @@ block[iform['subject']] if block_given? - logger.info 'Deleting junk files...' + logger.info { 'Deleting junk files...' } TMP_CL.delete if TMP_CL.exist? destdir = '+commited'.to_path/iform['revision'].to_s destdir.mkpath unless destdir.directory? + moved = PathList.new [LogEntry, Form, IForm, Message, MAIL, NEWS].each do |path| next unless path.exist? dest = destdir/path - logger.info "Moving `#{path}' to `#{dest}'..." + moved << path path.rename(dest) end + logger.info { "Moving `#{moved.join('\', `')}' to `#{destdir}'..." } end protected :common_commit! def commit_failed ( ex=nil ) - logger.error "Aborting #{ex}" - logger.info 'You can rerun the same command to resume the commit' + logger.error { "Aborting #{ex}" } + logger.info { 'You can rerun the same command to resume the commit' } raise 'Commit failed' end

2 1

[LrdeTools] 274: Fix vcs *conflicts.
by Nicolas Pouillard 14 Oct '05

14 Oct '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Fix vcs *conflicts. * vcs/lib/vcs/conflict.rb: Use the block based status. conflict.rb | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) Index: vcs/lib/vcs/conflict.rb --- vcs/lib/vcs/conflict.rb (revision 273) +++ vcs/lib/vcs/conflict.rb (working copy) @@ -5,19 +5,22 @@ class Vcs - def mk_conflicts_list ( files, options={} ) - ls = status.output.readlines.grep(/^C/).map! { |s| s[/^C\s+(.*)/, 1] } - raise "no conflicts" if ls.empty? - ls + def mk_conflicts_list ( files=[], options={} ) + conflicts = [] + status(files, options) do |se| + conflicts << se.file if se.category == :conflict + end + raise "no conflicts" if conflicts.empty? + conflicts end protected :mk_conflicts_list - def edit_conflicts! ( files, options={} ) - edit! mk_conflicts_list + def edit_conflicts! ( files=[], options={} ) + edit! mk_conflicts_list(files, options) end - def resolve_conflicts! ( files, options={} ) - conflicts = mk_conflicts_list + def resolve_conflicts! ( files=[], options={} ) + conflicts = mk_conflicts_list(files, options) question = "Resolve these conflicts?: \n - #{conflicts.join("\n - ")}\n(y/n)" if @h.agree question, true return resolved(conflicts)

1 0

[LrdeTools] 272: Some fixes.
by Nicolas Pouillard 14 Oct '05

14 Oct '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Some fixes. * vcs/lib/vcs/vcs.rb: Make the errors standards. Switch now supports a comment attribute. Clean up the failure hook. Fix vcs --check. vcs.rb | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 271) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -100,7 +100,7 @@ def header ( progname, severity ) @@headers[[progname, severity]] ||= [ - '[', 'vcs', ']', ' ', progname, severity, ':', ' ' + 'vcs', ': ', progname, severity, ':', ' ' ].compact.map { |x| stylize x }.join end @@ -131,9 +131,8 @@ :warn => [:yellow], :error => [:red], :fatal => [:red, :blink], - :'[' => [:blue], - :']' => [:blue], :':' => [:red], + :': ' => [:blue], } def stylize ( aString ) @@ -193,7 +192,7 @@ class Switch cattr_reader :shortcuts - attr_reader :name, :shortcuts, :argument + attr_reader :name, :shortcuts, :argument, :comment @@re ||= /^ @@ -209,12 +208,15 @@ (.*?) # An argument (--foo NUM) \s* (?:\{(.*)\})? # A type (--foo NUM {Integer}) + \s* + (?:$\(.*$\))? # A comment (--foo ((Usage...))) $/x def initialize ( aString ) match = @@re.match(aString) raise "Cannot parse switch: `#{aString}'" if match.nil? - @name, @argument, @type = match[1], match[4], match[5] + @name = match[1] + @argument, @type, @comment = match[4..6] @type = eval(@type) unless @type.nil? @shortcuts = match[2..3].compact end @@ -279,7 +281,11 @@ result = [] options.each do |k, v| raise if v == false + if k.to_s.size == 1 + result << "-#{k}" + else result << '--' + k.to_s.gsub('_', '-') + end result << v.to_s if v != true end result @@ -294,12 +300,14 @@ @h = HighLine.new self.cmd_data_factory = VcsCmdDataFactory.new(:output => STDOUT, :error => STDERR) - @runner.subscribe_hook(:failure) do |data| + @runner.subscribe_hook(:failure) do |command, data| + data = command if data.nil? # Backward compatiblity + msg = { 'command' => command.to_s.gsub(/"/, ''), 'data' => data }.to_yaml if data.output == STDOUT - logger.debug { raise data.to_yaml } + logger.debug { raise msg } exit((data.status)? data.status.exitstatus : 1) else - raise data.to_yaml + raise msg end end @runner.subscribe_hook(:display_command) do |cmd| @@ -598,7 +606,7 @@ class << self def add_conf_checker ( meth=nil, &block ) - @@checkers << (block.nil?)? meth : block + @@checkers << ((block.nil?)? meth : block) end def user_conf_match ( sym, file )

1 0

[LrdeTools] 271: No more confirmation before sending a mail.
by Nicolas Pouillard 14 Oct '05

14 Oct '05

Just one question (y/n) left. I think it's ok. https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> No more confirmation before sending a mail. * vcs/lib/vcs/mail.rb: Remove the :confirm option. mail.rb | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: vcs/lib/vcs/mail.rb --- vcs/lib/vcs/mail.rb (revision 270) +++ vcs/lib/vcs/mail.rb (working copy) @@ -10,7 +10,7 @@ MAIL = Sendmail::MAIL_FILE unless defined? MAIL @@mailer ||= Sendmail.new - @@default_options ||= { :confirm => true, :mime => true, + @@default_options ||= { :mime => true, :header => "X-Mailer: Vcs.mail (#{Vcs.version})" } #

1 0

[LrdeTools] 270: Fix the CVS wrapper.
by Nicolas Pouillard 10 Oct '05

10 Oct '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Fix the CVS wrapper. * vcs/lib/vcs/cvs.rb: Add an empty option controller. * vcs/lib/vcs/vcs.rb: Fix a bug with status and files with properties changed. cvs.rb | 6 ++++++ vcs.rb | 1 + 2 files changed, 7 insertions(+) Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 269) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -71,6 +71,7 @@ ?? => :unrecognize, ?! => :missing, ?~ => :obstruct, + ' '[0] => :normal, } @@categories ||= @@user_defined_categories + @@symbol_category.values Index: vcs/lib/vcs/cvs.rb --- vcs/lib/vcs/cvs.rb (revision 269) +++ vcs/lib/vcs/cvs.rb (working copy) @@ -9,10 +9,16 @@ def initialize ( aCmd='cvs' ) super + @@cvs_option_controller ||= + OptionController.new(Cvs, @@options_specification + + Vcs.specific_options.to_a.join("\n")) + self.option_controller = @@cvs_option_controller end %w[ rdiff rtag tag ].each do |m| add_basic_method(m) end + @@options_specification ||= "" + end # class Cvs

1 0