vcs 0.1 → 0.2.148

data/ruby_ex/yaml/yregexpath.rb

@@ -0,0 +1,76 @@
+# Author:: Marco Tessari  <marco.tessari@epita.fr>.
+# Copyright:: Copyright (c) 2004 TTK Team. All rights reserved.
+# License:: Ruby license.
+
+# $LastChangedBy: polrop $
+# $Id: yregexpath.rb 159 2005-02-18 12:07:23Z polrop $
+
+module YAML
+
+  class YRegexPath
+    attr_reader :segments, :root, :wanted_node_index
+
+    def initialize ( str )
+      raise ArgumentError, 'Argument must be a string' unless str.is_a?(String)
+      @segments = []
+      @wanted_node_index = nil
+      @root = (str[0] == ?/)
+      while str =~ /^(\/|#)?((?:(?:\\.)|[^\\=\/#])+)(?:=((?:(?:\\.)|[^\\\/#])*))?/
+        if ($1 == "#")
+          if (@wanted_node_index.nil?)
+            @wanted_node_index = @segments.length 
+          else
+            raise ArgumentError, 'More than a "#" given.'
+          end
+        end
+        if ($3.nil?)
+          @segments << Regexp.new($2)
+        else
+          @segments << [ Regexp.new($2), Regexp.new($3) ]
+        end
+        str = $'
+      end
+      @wanted_node_index = @segments.length if @wanted_node_index.nil?
+    end
+  end
+
+end # module YAML
+
+if defined? TEST_MODE or $0 == __FILE__
+
+  require 'test/unit'
+  
+  class YRegexPathTest < Test::Unit::TestCase
+    def compare(str, tab)
+      tab.collect! do |e|
+        if (e.is_a?(Array))
+          e.collect! { |s| Regexp.new(s) unless s.nil? }
+        else
+          Regexp.new(e)
+        end
+      end
+      desc = "Compare #{str} with #{tab}."
+      assert_equal(tab, YAML::YRegexPath.new(str).segments, desc)
+    end
+    
+    def testit
+      compare('mho', [ 'mho' ])
+      compare('mho\\', [ 'mho' ])
+      compare('/mho', [ 'mho' ])
+      compare('/mho=42', [ [ 'mho', '42'] ])
+      compare('/mho=[0-9]+', [ [ 'mho', '[0-9]+' ] ])
+      compare('m\/ho', [ 'm\/ho' ])
+      compare('mho/foo', [ 'mho', 'foo' ])
+      compare('mho=35/foo=test', [ [ 'mho' , '35' ], [ 'foo' , 'test' ] ])
+      compare('test#status=PASS', [ 'test' , [ 'status' , 'PASS' ] ])
+      compare('mho#', [ 'mho' ])
+    end
+    
+    def test_errors
+      # Build with something else than a String.
+      assert_raise(ArgumentError) { YAML::YRegexPath.new(42) }
+      # Two '#'.
+      assert_raise(ArgumentError) { YAML::YRegexPath.new('1#2#3') }
+    end
+  end
+end

data/src/changelog.rb

@@ -14,8 +14,8 @@ class Svn
   {
     'A' => 'New',
     'D' => 'Remove',
-    'M' => ''
   }
+  @@file_st.default = ''
 
   @@prop_st =
   {
@@ -24,16 +24,13 @@ class Svn
 
   def mkchangelog_from_status ( *args )
     result = []
-    status(*args).each do |line|
-      next unless line =~ /^.{5} /
-      line =~ /^(.)(.).(.).\s*(.*)$/
-      if $1 != '?'
-	file_st, prop_st, copy_st, file = @@file_st[$1], @@prop_st[$2], $3, $4
-	str = ''
-	str += file_st if file_st
-	str += (file_st.nil?) ? prop_st : (', ' + prop_st.downcase) if prop_st
-	result << [file, str]
-      end
+    from_status(*args) do |line, file_st, prop_st, copy_st, file|
+      next if file_st =~ /[?X]/
+      next if file == 'ChangeLog'
+      ls = []
+      ls << @@file_st[file_st] if @@file_st.has_key? file_st
+      ls << @@prop_st[prop_st].downcase if @@prop_st.has_key? prop_st
+      result << [file, ls.join(', ')]
     end
     raise Failure, 'No changes, so no ChangeLog entry.' if result.empty?
     result
@@ -54,6 +51,8 @@ class Vcs
   end
 
   def mkchangelog ( *args )
+    error_handling :changelog_failed
+
     cl = ADD_CL
 
     if cl.exist?
@@ -68,7 +67,7 @@ class Vcs
       LOG.warn "Creating a new `#{cl}' file"
       cl.open('w') do |f|
 	f.puts '=== Fill this file correctly and remove this line ==='
-	f.puts `date +"%Y-%m-%d  #{FULL_EMAIL}"`
+	f.puts Time.now.strftime("%Y-%m-%d  #{FULL_EMAIL}")
 	f.puts
 	cl_add.each do |file, str|
 	  f.puts "\t* #{file}: #{str}."
@@ -79,29 +78,40 @@ class Vcs
     raise MustBeFilled, cl
   end
 
-  def changelog! ( *args )
+  def concat_changelog! ( *args )
+    error_handling :changelog_failed
+
     unless CL.exist?
-      raise Failure, 'No ChangeLog, you are probably not in a valid directory.'
+      raise Failure, "No `#{CL}', you are probably not in a valid directory."
     end
 
     if cl = mkchangelog(*args)
 
       unless TMP_CL.exist?
-	LOG.warn "Moving #{CL} to `#{TMP_CL}'"
+	LOG.info "Moving `#{CL}' to `#{TMP_CL}' ..."
 	CL.rename(TMP_CL)
       end
 
       CL.open('w') do |file|
-	cl.each { |line| file.print line }
+	LOG.info "Prepending `#{ADD_CL}' to `#{CL}' ..."
+	file.print cl.read
 	file.puts
-	IO.foreach(TMP_CL) { |line| file.print line }
+        file.print TMP_CL.read
       end
 
     end
   end
 
+  def changelog_failed
+    if TMP_CL.exist?
+      LOG.info "Restoring `#{CL}' from `#{TMP_CL}' ..."
+      TMP_CL.rename(CL)
+    end
+    LOG.info "#{ADD_CL}: Contains your ChangeLog entry" if ADD_CL.exist?
+  end
+
   alias_command :mkcl, :mkchangelog
-  alias_command :cl, :changelog
+  alias_command :ctcl, :concat_changelog
 
 end # class Vcs
 

data/src/conflict.rb

@@ -0,0 +1,20 @@
+class Vcs
+
+  def mk_conflicts_list
+    status.grep(/^C/).each { |s| s.sub!(/^C\s+(.*)\n/, '\1') }
+  end
+
+  def edit_conflicts
+    system("#{EDITOR} #{mk_conflicts_list}")
+  end
+
+  def resolve_conflicts
+    conflicts = mk_conflicts_list
+    question = "Resolve these conflicts: \n  - #{conflicts.join("\n  - ")}\n"
+    if ask(question, :n) == :y
+      return resolved(conflicts)
+    end
+    []
+  end
+
+end # class Vcs

data/src/diff.rb

@@ -0,0 +1,18 @@
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2004 LRDE. All rights reserved.
+# License::   GNU General Public License (GPL).
+# Revision::  $Id$
+
+class Svn
+
+  def diffw_from_status ( *args )
+    files = Set.new
+    from_status(*args) do |line, file_st, prop_st, cpy, file|
+      next if file_st =~ /[?X]/
+      next if file == 'ChangeLog'
+      files << Pathname.new(file)
+    end
+    diffw(*files.delete_if { |f| f.directory? })
+  end
+
+end # class Svn

data/src/diffstat.rb

@@ -12,9 +12,7 @@ class Vcs
   # Use the diffstat command to 
   # display statitics on your patch.
   def diffstat ( *a )
-    unless `diffstat -V` =~ /diffstat version/
-      raise ArgumentError, 'The `diffstat\' tool is needed by Vcs.diffstat' 
-    end
+    check_diffstat
     patch = diff(*a)
     rd, wr = IO.pipe
     pid = fork do
@@ -32,5 +30,13 @@ class Vcs
   end
   alias_command :ds, :diffstat
 
+  def check_diffstat
+    unless `diffstat -V` =~ /diffstat version/
+      raise ArgumentError, 'The `diffstat\' tool is needed by Vcs.diffstat' 
+    end
+  end
+
+  add_conf_checker :check_diffstat
+
 end # class Vcs
 

data/src/last_changed_date.rb

@@ -0,0 +1,18 @@
+# Author:: Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2004 LRDE. All rights reserved.
+# License:: GNU General Public License (GPL).
+# $Id$
+
+require 'svn'
+require 'stringio'
+
+class Svn
+
+  def last_changed_date ( *args )
+    re = /^Last Changed Date:.*?\(([^)]*)\).*$/
+    StringIO.new(info.readlines.grep(/^Last Changed Date:/).first.sub(re, '\1'))
+  end
+
+  alias_command :date, :last_changed_date
+
+end # class Svn

data/src/mail.rb

@@ -1,83 +1,51 @@
-# Author:: Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# 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 $
+# License::   GNU General Public License (GPL).
+# Revision::  $Id: header 98 2004-09-29 12:07:43Z ertai $
 
 require 'vcs'
-require 'tools'
+require 'sendmail'
 
 class Vcs
 
-  MAIL = Pathname.new(',mail')
-    
-  def parse_mail_options ( *args )
-    require 'optparse'
-    result =
-    {
-      :from => FULL_EMAIL,
-      :to => [],
-      :server => ENV['SMTPSERVER'] || 'localhost',
-    }
-    if !args.nil? and !args.empty? and args[0].is_a?(Hash)
-      args[0].each do |k,v|
-	result[k] = v
-      end
-      return result
-    end
-    OptionParser.new do |opts|
-      opts.separator ''
-      opts.on('-t', '--mail-to NAME', 'Choose a recipient') do |aString|
-	result[:to] << aString
-      end
-      opts.on('-s', '--server NAME', 'Choose a mail server') do |aString|
-	result[:server] = aString
-      end
-      opts.on('-S', '--subject NAME', 'Choose your mail subject') do |aString|
-	result[:subject] = aString.sub(/\.?$/, '.')
-      end
-      opts.on_tail('-h', '--help', 'Show this message') do
-	puts opts
-	exit
-      end
-    end.parse!(args)
-    raise Failure, 'No recipents' if result[:to].empty?
-    raise Failure, 'No mail server' if result[:server].nil?
-    raise Failure, 'No mail subject' if result[:subject].nil?
-    result
-  end
-  protected :parse_mail_options
+  MAIL = Sendmail::MAIL_FILE
+  MAILER = Sendmail.new
+  DEFAULT_OPTIONS = %w[ --ask --sign --mime ]
 
   #
   # Mail.
   #
   def mail ( *args )
+    error_handling :mail_failed
+    unless MAIL.exist?
+      print_body(MAIL, MAILER.parse_mail_options(*(DEFAULT_OPTIONS + args)))
+    end
+    MAILER.sendmail
+    MAIL.delete
+    StringIO.new('Mail: Sent.')
+  end
 
-    print_body(MAIL, parse_mail_options(*args)) unless MAIL.exist?
+  def mail_failed
+    if defined? MAIL and MAIL.exist?
+      LOG.info "#{MAIL}: Contains the generated mail " +
+               "(generated from #{@@message})"
+    end
+  end
 
-    MAIL.open('r') do |file|
-      opt = YAML::chop_header(file)
-      STDERR.puts "Smtp Server: #{opt[:server]}"
-      if ask("Send a mail, with this subject: #{opt[:subject]}\n" +
-             "  to #{opt[:to].join(', ')}\n  from #{opt[:from]}\n" +
-             'Are you sure?', :y) == :n
-        LOG.error 'Aborting'
-        exit
-      end
-      require 'net/smtp'
-      Net::SMTP.start(opt[:server], 25) do |smtp|
-	smtp.open_message_stream(EMAIL, opt[:to]) do |f|
-	  f.print "From: #{opt[:from]}\n"
-	  f.print "Subject: #{opt[:subject]}\n"
-	  f.print "To: #{opt[:to].join(', ')}\n"
-	  f.print "\n"
-	  file.each { |line| f.print line }
-	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"
       end
     end
-    MAIL.delete
-    StringIO.new('Mail: Sent.')
+    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
 
+  add_conf_checker :mail_conf_checker
+
 end # class Vcs

data/src/message.rb

@@ -30,24 +30,23 @@ class Vcs
       f.puts options.to_yaml
       f.puts '---'
       f.puts
-      message.each do |line|
-	f.print line
-      end
+      f.print message.read
     end
   end
   private :print_body
 
   def message ( *args )
+    error_handling :message_failed
+
     unless @@message.exist?
       cl = mkchangelog(*args)
       @@message.open('w') do |f|
-	f.puts 'Index: ChangeLog'
-	cl.each { |line| f.print line.sub(/^\d+-\d+-\d+/, 'from') }
-	f.puts
-	# FIXME: need to remove the ChangeLog entry in diff.
-	diffstat(*args).each { |line| f.print line }
+        f.puts 'Index: ChangeLog'
+        f.print cl.read.sub(/^\d+-\d+-\d+/, 'from')
+        f.puts
+        f.print diffstat(*args).read
         f.puts
-	diff(*args).each { |line| f.print line unless line =~ /^=+$/ }
+        diffw_from_status(*args).each { |line| f.print line if line !~ /^=+$/ }
       end
     end
     @@message.open('r')
@@ -55,4 +54,11 @@ class Vcs
 
   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/src/mycommit.rb

@@ -10,8 +10,10 @@ require 'ask'
 
 class Vcs
 
+  COMMITED = Pathname.new(',commited')
+
   def edit! ( *files )
-    system(ENV['EDITOR'], *files.map { |x| x.to_s })
+    system(EDITOR, *files.map { |x| x.to_s })
   end
 
   def common_commit! ( *args, &block )
@@ -20,7 +22,7 @@ class Vcs
 
     update!
 
-    unless @@message.exist?
+    unless COMMITED.exist?
 
       begin
         mkchangelog(*args)
@@ -32,44 +34,57 @@ class Vcs
 
       edit! @@message
 
-      changelog!(*args)
+      if ask('Committing, are you sure?', :y) == :n
+        commit_failed
+      end
+
+      concat_changelog!(*args)
 
       #pager! diff
       #pager! status
 
       args << 'ChangeLog' unless args.grep(/^[^-]/).empty?
 
-      if ask('Committing, are you sure?', :y) == :n
-        @@message.unlink
-        LOG.error 'Aborting'
-        exit
-      end
-
       if commit!('-F', ADD_CL, *(opts + args))
-        LOG.info 'Deleting junk files...'
-        ADD_CL.delete
+        ADD_CL.rename(COMMITED)
         TMP_CL.delete if TMP_CL.exist?
       else
-        @@message.unlink
-        raise Failure, 'commit failed'
+        commit_failed
       end
 
       update!
 
+    else
+
+      message(*args)
+      edit! @@message
+
     end
 
+
     rev = self.revision.readline.chomp.to_i
 
     block.call(rev) if block_given?
 
+    LOG.info 'Deleting junk files...'
+    TMP_CL.delete if TMP_CL.exist?
+    ADD_CL.delete if ADD_CL.exist?
+    COMMITED.delete if COMMITED.exist?
     messages = Pathname.new(',messages')
     messages.mkpath unless messages.directory?
     message_rev = messages + "#{@@message}.#{rev}"
     LOG.info "Moving `#{@@message}' to `#{message_rev}'..."
     @@message.rename(message_rev)
-    LOG.info "Remove `#{message_rev}' if everything is ok."
+    LOG.info "You can remove `#{message_rev}' if everything is ok."
 
   end
   alias_command :cci, :common_commit
 
+  def commit_failed
+    LOG.info "#{COMMITED}: Contains your ChangeLog entry" if COMMITED.exist?
+    LOG.error 'Aborting'
+    LOG.info 'You can rerun the same command to continue the commit'
+    raise 'Commit failed'
+  end
+
 end # class Vcs