vcs 0.3.0 → 0.4.0

data/lib/vcs/junk.rb

@@ -0,0 +1,26 @@
+# Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: junk.rb 257 2005-09-30 16:43:57Z pouill_n $
+
+
+class Vcs
+
+  # This command removes all junk files (by default all files begining with `,').
+  # Warning: this command removes some files that may contains some important
+  # information. For example during a commit the information that you type is
+  # stored in one of these `,files'. So be careful using this command.
+  # See the user configuration to customize what is considered a junk file.
+  def junk! ( files=[], options={} )
+    list!(files, options.merge(:junk => true)) do |path_list|
+      path_list.each { |path| logger.info { "Remove #{path}" } }
+      if @h.agree('Are you sure? (y/n)', true)
+        path_list.each do |path|
+          logger.info { "Removing #{path}..." }
+          path.rm_f
+        end
+      end
+    end
+  end
+
+end # class Vcs

data/lib/vcs/last_changed_date.rb

@@ -1,16 +1,14 @@
-# Author:: Nicolas Pouillard  <ertai@lrde.epita.fr>.
-# Copyright:: Copyright (c) 2004 LRDE. All rights reserved.
-# License:: GNU General Public License (GPL).
-# $Id$
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2004, 2005 LRDE. All rights reserved.
+# License::   GNU General Public License (GPL).
+# Revision::  $Id$
 
-require 'vcs/svn'
-
-class Svn
+class Vcs
 
   def last_changed_date! ( *args )
-    puts info.read[/^Last Changed Date:.*?\(([^)]*)\).*$/, 1]
+    puts info(*args).read[/^Last Changed Date:.*?\(([^)]*)\).*$/, 1]
   end
 
   alias_command :date, :last_changed_date
 
-end # class Svn
+end # class Vcs

data/lib/vcs/list.rb

@@ -0,0 +1,71 @@
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2005  LRDE. All rights reserved.
+# License::   Gnu General Public License.
+# Revision::  $Id: list.rb 264 2005-10-03 12:32:51Z pouill_n $
+
+require 'vcs/svn'
+
+class Svn
+
+  specific_options << '--do ACTION'
+  Vcs.categories.each do |name|
+    specific_options << "--#{name}"
+  end
+
+  def list! ( files=[], options={}, &block )
+    if options.has_key?(:do) or block \
+        or Vcs.categories.any? { |cat| options.has_key?(cat) }
+
+      action = options[:do]
+      options.delete(:do)
+      categories = []
+      Vcs.categories.each do |cat|
+        if options.has_key? cat
+          categories << cat
+          options.delete(cat)
+        end
+      end
+      inside_versioned = []
+      outside_versioned = []
+      if categories.empty?
+        list_(files, options).output.read.each do |line|
+          inside_versioned << line.chomp
+        end
+      else
+        files << '.' if files.empty?
+        files.each do |file|
+          file.to_path.find do |path|
+            Find.prune if path.to_s =~ /(\/|^)\.svn$/
+            if path.directory?
+              if (path/'.svn').exist?
+                inside_versioned << path
+              else
+                outside_versioned << path
+                Find.prune
+              end
+            else
+              outside_versioned << path
+            end
+          end
+        end
+      end
+      path_list = PathList.new
+      status(inside_versioned) do |se|
+        path_list << se.file if categories.include? se.category
+      end
+      outside_versioned.each do |path|
+        path_list << path if categories.include? Vcs.classify(path)
+      end
+      if action
+        system "#{action} #{path_list}"
+      elsif block
+        block[path_list]
+      else
+        puts path_list
+      end
+    else
+      list_!(files, options)
+    end
+  end
+
+end # class Svn

data/lib/vcs/mail.rb

@@ -1,5 +1,5 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
-# Copyright:: Copyright (c) 2004 LRDE. All rights reserved.
+# Copyright:: Copyright (c) 2004, 2005 LRDE. All rights reserved.
 # License::   GNU General Public License (GPL).
 # Revision::  $Id: header 98 2004-09-29 12:07:43Z ertai $
 
@@ -8,41 +8,46 @@ require 'sendmail'
 
 class Vcs
 
-  MAIL = Sendmail::MAIL_FILE
-  MAILER = Sendmail.new
-  DEFAULT_OPTIONS = %w[ --confirm --sign --mime ]
+  MAIL = Sendmail::MAIL_FILE unless defined? MAIL
+  @@mailer ||= Sendmail.new
+  @@default_options ||= { :confirm => true, :mime => true,
+                          :header => "X-Mailer: Vcs.mail (#{Vcs.version})" }
 
   #
   # Mail.
   #
-  def mail! ( *args )
+  # FIXME handle options properly.
+  # Delegate the option parsing to Sendmail.
+  def mail! ( files=[], options={} )
+
+    # Backward compatiblity
+    files, options = [], files if files.is_a? Hash
+
     error_handling :mail_failed
     unless MAIL.exist?
-      print_body(MAIL, MAILER.parse_mail_options(*(DEFAULT_OPTIONS + args)))
+      options = @@default_options.merge(options)
+      options[:signed] = Vcs.user_conf.sign
+      print_body(MAIL, @@mailer.parse_mail_options(options), files)
     end
-    MAILER.sendmail
-    MAIL.delete
+    @@mailer.sendmail
     puts 'Mail: Sent.'
   end
 
   def mail_failed
-    if defined? MAIL and MAIL.exist?
-      LOG.info "#{MAIL}: Contains the generated mail " +
-               "(generated from #{@@message})"
+    if defined? @@mail and @@mail.exist?
+      logger.info { "#{MAIL}: Contains the generated mail" }
+      logger.info { "       AND information to send it (smtpserver, port...)" }
     end
   end
 
   def mail_conf_checker
-    %w[ EMAIL FULLNAME SMTPSERVER ].each do |var|
-      if ENV[var].nil? or ENV[var].empty?
-        LOG.error "environment variable `#{var}' not set"
+    if Vcs.user_conf.sign
+      unless `gpg --version` =~ /^gpg \(GnuPG\)/
+        logger.error 'mail: gunpg is required'
+      end
+      unless File.exist?("#{ENV['HOME']}/.gnupg/secring.gpg")
+        logger.error 'no private key: in your ~/.gnupg'
       end
-    end
-    unless `gpg --version` =~ /^gpg \(GnuPG\)/
-      LOG.error 'command not found: gpg'
-    end
-    unless File.exist?("#{ENV['HOME']}/.gnupg/secring.gpg")
-      LOG.error 'no private key: in your ~/.gnupg'
     end
   end
 

data/lib/vcs/message.rb

@@ -1,79 +1,49 @@
-# Author:: Nicolas Pouillard  <ertai@lrde.epita.fr>.
-# Copyright:: Copyright (c) 2004 LRDE. All rights reserved.
-# License:: GNU General Public License (GPL).
-
-# $LastChangedBy: ertai $
-# $Id: header 98 2004-09-29 12:07:43Z ertai $
-
-require 'vcs/vcs'
-require 'vcs/changelog'
-
-class Vcs
-  def diffw! ( *args )
-    diff!(*args)
-  end
-end
-
-class Svn
-  def diffw! ( *args )
-    diff! '--diff-cmd', 'diff', '-x', '-NPbuw', *args
-  end
-end
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2004, 2005 LRDE. All rights reserved.
+# License::   GNU General Public License (GPL).
+# Revision::  $Id: header 98 2004-09-29 12:07:43Z ertai $
 
 class Vcs
 
-  @@message = Pathname.new(',message')
-
-  def print_body ( file, options )
-    LOG.info "Creating a new `#{file}' file"
+  def print_body ( file, options, files=[] )
+    logger.info "Creating a new `#{file}' file"
     file.open('w') do |f|
-      f.puts options.to_yaml
+      f.puts '---'
+      f.puts options.to_yaml.gsub(/---\s*/, '')
       f.puts '---'
       f.puts
-      f.print message.read
+      with(f).mk_message!(files)
     end
   end
   private :print_body
 
-  def message ( *args )
-    error_handling :message_failed
 
-    unless @@message.exist?
-      cl_entry = mkchangelog(*args)
-      TempPath.new('message') do |tmp|
-        tmp.open('w') do |f|
-          with(f).url!
-          if defined? COLLABOA
-            f.puts
-            f.puts 'You can also view this changeset here:'
-            f.puts
-            next_rev = rev.output.read.to_i
-            next_rev += 1 unless ',commited'.to_path.exist?
-            f.puts "http://#{COLLABOA}/repository/changesets/#{next_rev}"
-          end
-          f.puts
-          f.puts 'Index: ChangeLog'
-          f.print cl_entry.sub(/^\d+-\d+-\d+/, 'from')
-          f.puts
-          with(f).diffstat!(*args)
-          f.puts
-          diffw_from_status(*args).each_line do |line|
-            f.print line if line !~ /^=+$/
-          end
-        end
-        tmp.mv(@@message)
+  def mk_message! ( files=[], options={} )
+    with_cache! Message, 'generated message (ChangeLog, diffstat, diff)' do
+      url!
+      if defined? COLLABOA
+        puts
+        puts 'You can also view this changeset here:'
+        puts
+        next_rev = rev.output.read.to_i
+        next_rev += 1 unless commited?
+        puts "http://#{COLLABOA}/repository/changesets/#{next_rev}"
+      end
+      puts
+      flush
+      mk_message_entry!(files)
+      puts
+      flush
+      diffstat!(files)
+      puts
+      flush
+      diffw(files).each_line do |line|
+        print line if line !~ /^=+$/
       end
     end
-    @@message.open('r')
   end
+  alias_command :msg, :mk_message
+  Message = ',message'.to_path unless defined? Message
 
-  alias_command :msg, :message
-
-  def message_failed
-    if @@message.exist?
-      LOG.info "#{@@message}: Contains the generated message"
-      LOG.info '              (the ChangeLog entry, the diffstat, the diff)'
-    end
-  end
 
 end # class Vcs

data/lib/vcs/news.rb

@@ -5,20 +5,19 @@
 # $LastChangedBy: ertai $
 # $Id: header 98 2004-09-29 12:07:43Z ertai $
 
-require 'vcs/tools'
 require 'vcs/message'
 
 class Vcs
 
-  NEWS = Pathname.new(',news')
+  NEWS = ',news'.to_path unless defined? NEWS
 
   def parse_news_options ( *args )
     require 'optparse'
     result =
     {
-      :from => FULL_EMAIL,
+      :from => Vcs.full_email,
       :groups => [],
-      :server => ENV['NNTPSERVER'],
+      :server => Vcs.nntpserver,
     }
     if !args.nil? and !args.empty? and args[0].is_a?(Hash)
       return result.merge!(args[0])
@@ -48,9 +47,9 @@ class Vcs
 
   def check_line ( anIO, aRegex )
     line = anIO.readline.chomp!
-    LOG.debug('news') { "Server: #{line}" }
+    logger.debug('news') { "Server: #{line}" }
     unless line =~ aRegex
-      LOG.error('news') { "Bad answer: #{line}" }
+      logger.error('news') { "Bad answer: #{line}" }
       @news_status = 'Error.'
     end
   end
@@ -69,11 +68,11 @@ class Vcs
       opt = YAML::chop_header(file)
       server, port = opt[:server].split(/:/)
       port ||= 119
-      LOG.info('news') { "Nntp Server: #{server}:#{port}" }
+      logger.info('news') { "Nntp Server: #{server}:#{port}" }
       unless @h.agree("Post a news, with this subject: #{opt[:subject]}\n" +
              "  to #{opt[:groups].join(', ')}\n  from #{opt[:from]}\n" +
              'Are you sure? (y/n)', true)
-        LOG.error('news') { 'Aborting' }
+        logger.error('news') { 'Aborting' }
         exit
       end
       require 'socket'
@@ -100,7 +99,7 @@ class Vcs
 
   def news_failed
     if defined? NEWS and NEWS.exist?
-      LOG.info "#{NEWS}: Contains the generated news" +
+      logger.info "#{NEWS}: Contains the generated news" +
                "(generated from #{@@message})"
     end
   end
@@ -108,7 +107,7 @@ class Vcs
   def news_conf_checker
     %w[ NNTPSERVER ].each do |var|
       if ENV[var].nil? or ENV[var].empty?
-        LOG.error "environment variable `#{var}' not set"
+        logger.error "environment variable `#{var}' not set"
       end
     end
   end

data/lib/vcs/opt_parse.rb

@@ -0,0 +1,82 @@
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2005 LRDE. All rights reserved.
+# License::   GNU General Public License (GPL).
+# Revision::  $Id: opt_parse.rb 242 2005-09-28 14:19:47Z pouill_n $
+
+
+class Vcs
+
+  class OptParse
+
+    attr_reader :option_parser
+
+    def initialize
+      @option_parser = @@option_parser.dup
+    end
+
+    def parse! ( argv )
+      @option_parser.parse! argv
+    end
+
+    def parse ( argv )
+      @option_parser.parse argv
+    end
+
+    def to_s
+      @option_parser.to_s
+    end
+
+    @@option_parser = OptionParser.new do |o|
+
+      o.banner = "Usage: vcs [options] <file>*"
+      o.separator ''
+
+      o.on('-c', '--vcs TYPE', VcsApp.all_vcs, 'Set your vcs') do |aVcs|
+        Vcs.default = aVcs
+      end
+
+      o.on('-l', '--vcs-list', 'List all vcs') do |aVcs|
+        STDERR.puts 'Vcs list:'
+        VcsApp.all_vcs.each { |n| STDERR.puts "  - #{n}" }
+        exit
+      end
+
+      o.on('--mk-alias', 'Put the result of this command in your .zshrc or .bashrc') do
+        VcsApp.all_vcs.each do |n|
+          n = n.to_s.downcase
+          if VcsApp.path.executable?
+            puts "alias #{n}=#{VcsApp.path}-#{n} ;"
+          else
+            puts "alias #{n}=vcs-#{n} ;"
+          end
+        end
+        exit
+      end
+
+      o.on('-C', '--[no-]check', 'Check your vcs configuration') do |check|
+        if check
+          Vcs.new('vcs').call_conf_checkers
+          exit
+        end
+      end
+
+      o.on('-d', '--debug LEVEL', 'Set debug level') do |severity|
+        logger.level = Logger.const_get(severity.upcase)
+      end
+
+      o.on_tail('-h', '--help', 'Show this message') do |test|
+        STDERR.puts o
+        STDERR.puts "\n\nReport bugs to <ertai@lrde.epita.fr>."
+        exit
+      end
+
+      o.on_tail('--version', 'Show version') do
+        STDOUT.puts "Vcs version: #{Vcs.version}"
+        exit
+      end
+
+    end
+
+  end # class OptParse
+
+end # class Vcs