vcs 0.4.1 → 0.5.2.4

data/lib/vcs/script.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 LRDE. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: script.rb 261 2005-10-03 00:45:53Z pouill_n $
+# Revision::  $Id: /lrde/tools/trunk/vcs/lib/vcs/script.rb 9102 2005-10-03T00:45:53.019651Z pouill_n  $
 
 require 'vcs/vcs'
 

data/lib/vcs/status.rb

@@ -5,7 +5,7 @@
 
 require 'vcs/svn'
 
-class Svn
+class Vcs
 
   class StatusEntry
     attr_accessor :line, :file_st, :prop_st, :cpy, :file, :category, :comment
@@ -51,24 +51,11 @@ class Svn
         ?R  => [:MAGENTA],
         ?~  => [:RED],
         ?!  => [:RED],
-        ??  => [:BLINK, :RED],
-        ?C  => [:BLINK, :RED],
+        ??  => [:BOLD, :RED],
+        ?C  => [:BOLD, :RED],
       }
   end # class StatusEntry
 
-  def status ( *args, &block )
-    return status_(*args) if block.nil?
-    result = PathList.new
-    status_(*args).each_line do |line|
-      next unless line =~ /^.{5} /
-      status_entry = StatusEntry.new(@h, line)
-      next if status_entry.category == :exclude
-      result << status_entry
-    end
-    result.sort_with_regex_list! Vcs.regex_list
-    result.each(&block)
-  end
-
   def color_status! ( *args )
     status(*args) do |status_entry|
       status_entry.colorize!
@@ -86,4 +73,41 @@ class Svn
     end
   end
 
+  def spawn_status_entries ( status_data, &block )
+    result = PathList.new
+    status_data.each_line do |line|
+      next unless line =~ /^.{5} /
+      status_entry = StatusEntry.new(@h, line)
+      next if status_entry.category == :exclude
+      result << status_entry
+    end
+    result.sort_with_regex_list! Vcs.regex_list
+    result.each(&block)
+  end
+
+end # class Vcs
+
+
+class Svn
+
+  def status ( *args, &block )
+    return status_(*args) if block.nil?
+    spawn_status_entries(status_(*args), &block)
+  end
+
 end # class Svn
+
+
+
+class Cvs
+
+  def status ( files=[], options={}, &block )
+    return status_(*args) if block.nil?
+    opts = options.merge :q => true, :n => true
+    output = update_(files, opts).output.read
+    output.gsub!(/^(\w) (\w)/, '\1     \2')
+    spawn_status_entries(output, &block)
+  end
+
+end # class Cvs
+

data/lib/vcs/svn.rb

@@ -66,4 +66,12 @@ class Svn < Vcs
     --xml
   "
 
+  @@standard_options ||=
+    %w[ non_recursive username password no_auth_cache
+        non_interactive config_dir ].map { |x| x.to_sym }
+
+  def standard_option? ( option_name )
+    @@standard_options.include? option_name.to_sym
+  end
+
 end # class Svn

data/lib/vcs/url.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004 LRDE. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: url.rb 236 2005-09-26 13:08:22Z pouill_n $
+# Revision::  $Id: /lrde/tools/trunk/vcs/lib/vcs/url.rb 9077 2005-09-26T13:08:22.140977Z pouill_n  $
 
 class Vcs
 

data/lib/vcs/vcs.rb

@@ -27,7 +27,7 @@ require 'logger'
 require 'optparse'
 require 'etc'
 require 'ostruct'
-ENV['LC_ALL'] = 'C'
+ENV['LC_ALL'] = 'en_US'
 
 unless defined? Vcs
 
@@ -44,7 +44,7 @@ unless defined? Vcs
 # checkout_!
 # 
 class Vcs
-  @@version ||= '0.4.0'
+  require 'vcs/version'
   @@user_conf ||= OpenStruct.new(
     :exclude     => [/^-/],
     :unmask      => [/^\\/],
@@ -52,7 +52,10 @@ class Vcs
     :precious    => [/^(\+|\.vcs)/],
     :color       => :auto,
     :sorting     => [],
-    :sign        => true
+    :sign        => true,
+    :log_mode    => :change_log,
+    :interactive => true,
+    :new_user    => true
   )
   @@output_io_methods ||= %w[ print puts putc ] # FIXME and so ...
   @@specific_options ||= Set.new
@@ -76,7 +79,6 @@ class Vcs
   @@categories ||= @@user_defined_categories + @@symbol_category.values
 
 
-  cattr_accessor :version
   cattr_accessor :default
   cattr_accessor :user_conf
   cattr_accessor :output_io_methods
@@ -85,12 +87,13 @@ class Vcs
   cattr_accessor :user_defined_categories
   cattr_accessor :symbol_category
   cattr_accessor :categories
+  cattr_accessor :log_mode
   class_inheritable_accessor :option_controller
 
 
   class Logger < ::Logger
 
-    attr_accessor :color
+    attr_reader :color
 
     def initialize ( *a, &b )
       super
@@ -98,9 +101,14 @@ class Vcs
       @color = false
     end
 
+    def color= ( aColor )
+      @color = aColor
+      @@headers.clear
+    end
+
     def header ( progname, severity )
       @@headers[[progname, severity]] ||= [
-        '[', 'vcs', ']', ' ', progname, severity, ':', ' '
+        'vcs', ': ', progname, severity, ': '
       ].compact.map { |x| stylize x }.join
     end
 
@@ -122,20 +130,20 @@ class Vcs
     end
 
     @@headers ||= {}
-
-    @@style =
+    @@style ||=
     {
-      :vcs   => [:cyan],
-      :debug => [:magenta],
-      :info  => [:green],
       :warn  => [:yellow],
-      :error => [:red],
-      :fatal => [:red, :blink],
-      :'['   => [:blue],
-      :']'   => [:blue],
-      :':'   => [:red],
+      :error => [:red, :bold],
+      :fatal => [:red, :underline, :bold],
     }
 
+    def self.enable_xmas_tree_colors
+      @@style.merge! :vcs   => [:cyan],
+                     :debug => [:magenta],
+                     :info  => [:green],
+                     :': '  => [:blue]
+    end
+
     def stylize ( aString )
       aString = aString.downcase
       if @color
@@ -192,44 +200,56 @@ class Vcs
 
 
   class Switch
-    cattr_reader :shortcuts
-    attr_reader :name, :shortcuts, :argument
+    cattr_reader :aliases
+    attr_reader :main, :aliases, :argument, :comment
 
+    switch = '[\w?-]+'
     @@re ||=
       /^
         \s*
-        --([\w-]+)                              # The option (--foo)
+        ((?:\*PRE\*)?)                          # Is the switch must be before
+                                                # the sub command
+        \s*
+        (#{switch})                             # The option (--foo)
         \s*
         (?: \(
-                (-\w)                           # A shortcut (-f)
-                (?:\sor\s(-(?:\?|\w)))?         # Another one (-f or -o)
+                (#{switch})                     # An alias (-f)
+                (?:\sor\s(#{switch}))?          # Another one (-f or -o)
             \)
         )?
         \s*
         (.*?)                                   # 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]
+      @pre = match[1] == '*PRE*'
+      @main = match[2]
+      @argument, @type, @comment = match[5..7]
       @type = eval(@type) unless @type.nil?
-      @shortcuts = match[2..3].compact
+      @aliases = match[3..4].compact
     end
 
     def to_s
-      '--' + @name
+      @main
     end
 
     def to_a_for_option_parser
       argument = (@argument.nil? || @argument.empty?)? '' : ' ' + @argument
-      @shortcuts + ["--#@name#{argument}", @type].compact
+      @aliases + ["#@main#{argument}", @type].compact
     end
 
     def to_sym
-      @name.gsub('-', '_').to_sym
+      @main.gsub(/^-+/, '').gsub('-', '_').sub(/^no_/, '').to_sym
+    end
+
+    def pre?
+      @pre
     end
 
   end # class Switch
@@ -238,19 +258,22 @@ class Vcs
 
   class OptionController
 
-    attr_reader :switches, :shortcuts, :vcs_name, :option_parser, :options
+    attr_reader :switches, :vcs_name, :option_parser, :options
     protected :options
+    cattr_accessor :logger
+    self.logger = Vcs.logger
 
     def initialize ( aVcsClass, aString )
       Vcs.logger.debug { "Creating an option_controller for #{aVcsClass}..." }
       @switches = []
-      @shortcuts = {}
+      @switches_finder = {}
       aString.each_line do |line|
         next if line.blank?
         switch = Switch.new(line)
         @switches << switch
-        switch.shortcuts.each do |shortcut|
-          @shortcuts[shortcut] = switch.name
+        @switches_finder[switch.main] = switch
+        switch.aliases.each do |al|
+          @switches_finder[al] = switch
         end
       end
       @option_parser = OptionParser.new do |o|
@@ -271,18 +294,22 @@ class Vcs
       [@options, @option_parser.parse(argv)]
     end
 
-    def short_to_long ( short_option )
-      @shortcuts[short_option]
+    def find ( anObject )
+      @switches_finder[anObject.to_s]
     end
 
     def to_strings ( options )
-      result = []
+      pre, post = [], []
       options.each do |k, v|
-        raise if v == false
-        result << '--' + k.to_s.gsub('_', '-')
-        result << v.to_s if v != true
+        sw = (k.to_s.size == 1)? "-#{k}" : ('--' + k.to_s.gsub('_', '-'))
+        sw.gsub!(/^--/, '--no-') if v == false
+        switch = find sw
+        logger.warn { "Unknown switch: #{sw}" } if switch.nil?
+        result = (switch and switch.pre?)? pre : post
+        result << (switch || sw).to_s
+        result << v.to_s if (v != true) and (v != false)
       end
-      result
+      [pre, post]
     end
 
   end # class OptionController
@@ -294,12 +321,25 @@ class Vcs
     @h = HighLine.new
     self.cmd_data_factory = VcsCmdDataFactory.new(:output => STDOUT, :error => STDERR)
 
-    @runner.subscribe_hook(:failure) do |data|
-      if data.output == STDOUT
-        logger.debug { raise data.to_yaml }
-        exit((data.status)? data.status.exitstatus : 1)
-      else
-        raise data.to_yaml
+    unless is_a? Cvs
+      @runner.subscribe_hook(:failure) do |command, data|
+        data = command if data.nil? # Backward compatiblity
+        logger.error { 'command: ' + command.to_s.gsub('"', '') }
+        logger.error { "exit: #{data.status.exitstatus}" }
+        suppress(IOError) do
+          o = data.output.read
+          logger.error { o.gsub!(/^/, 'stdout: ') ; o } unless o.empty?
+        end
+        suppress(IOError) do
+          o = data.error.read
+          logger.error { o.gsub!(/^/, 'stderr: ') ; o } unless o.empty?
+        end
+        # logger.error { 'data: ' + data.to_yaml }
+        if data.output == STDOUT
+          exit((data.status)? data.status.exitstatus : 1)
+        else
+          raise 'command failed'
+        end
       end
     end
     @runner.subscribe_hook(:display_command) do |cmd|
@@ -378,12 +418,12 @@ class Vcs
 
   def run! ( command, files=[], options={} )
     flush
-    cmd_options = option_controller.to_strings(options)
-    (@cmd + command + cmd_options + '--' + files).run(@runner)
+    pre_cmd_options, cmd_options = option_controller.to_strings(options)
+    (@cmd + pre_cmd_options + command + cmd_options + '--' + files).run(@runner)
   end
 
-  def sub_vcs ( out, err, &block )
-    copy = self.class.new(@cmd)
+  def sub_vcs ( out, err, vcs_class=nil, &block )
+    copy = (vcs_class || self.class).new(@cmd)
     copy.cmd_data_factory = VcsCmdDataFactory.new(:output => out, :error => err)
     if block.nil?
       copy
@@ -392,13 +432,14 @@ class Vcs
     end
   end
 
-  def sub_vcs_with_name ( name, &block )
-    sub_vcs(TempPath.new("#{name}-out"), TempPath.new("#{name}-err"), &block)
+  def sub_vcs_with_name ( name, vcs_class=nil, &block )
+    sub_vcs(TempPath.new("#{name}-out"), TempPath.new("#{name}-err"),
+            vcs_class, &block)
   end
 
-  def with ( io, &block )
+  def with ( io, vcs_class=nil, &block )
     io.flush if io.respond_to? :flush
-    sub_vcs(io, io, &block)
+    sub_vcs(io, io, vcs_class, &block)
   end
 
   def output
@@ -416,8 +457,10 @@ class Vcs
   def run_missing! ( name, orig, *args )
     if name =~ /^(.*)_$/
       run!($1, *args)
+    elsif name =~ /^--/
+      run!(name, *args)
     else
-      logger.warn { "unknown method #{orig}" }
+      logger.warn { "Unknown command: '#{orig.gsub('!', '')}'" }
       run!(name, *args)
     end
   end
@@ -425,9 +468,17 @@ class Vcs
 
   def run_argv ( argv )
     options, files = option_controller.parse(argv)
-    if files.empty?
-      options.delete(:help)
+    if options[:help]
       meth = :help!
+      options.delete(:help)
+    elsif files.empty?
+      if options[:version]
+        meth = '--version'
+        options.delete(:version)
+      else
+        options.delete(:help)
+        meth = :help!
+      end
     else
       meth = files.shift.dup
       meth.sub!(/([^!])$/, '\1!') if meth != 'script'
@@ -478,10 +529,10 @@ class Vcs
       return path.read
     end
     begin
-      logger.info "Creating a new `#{path}' file ..."
+      logger.info "Creating a new `#{path}' file..."
       path.open('w') { |f| result = with(f, &block) }
     rescue Exception => ex
-      logger.error "Removing `#{path}' ..."
+      logger.error "Removing `#{path}'..."
       path.unlink
       raise ex
     end
@@ -536,6 +587,18 @@ class Vcs
     end
   end
 
+  def standard_option? ( option_name )
+    false
+  end
+
+  def just_standard_options ( options )
+    result = {}
+    options.each do |k, v|
+      result[k] = v if standard_option? k
+    end
+    result
+  end
+
   CL = Pathname.new('ChangeLog') unless defined? CL
   TMP_CL = Pathname.new(',,ChangeLog') unless defined? TMP_CL
 
@@ -598,7 +661,7 @@ class Vcs
   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 )
@@ -624,12 +687,21 @@ class Vcs
     def color? ( &auto_block )
       case color = Vcs.user_conf.color
         when :never  then return false
-        when :auto   then return (auto_block.nil?)? false : auto_block[]
+        when :auto, :xmas_tree
+          return (auto_block.nil?)? false : auto_block[]
         when :always then return true
         else raise ArgumentError, "Bad value for `color' (#{color})"
       end
     end
 
+    def interactive?
+      user_conf.interactive
+    end
+
+    def xmas_tree_colors?
+      Vcs.user_conf.color == :xmas_tree
+    end
+
     def regex_list
       @@regex_list ||= RegexList.new(user_conf.sorting)
     end