cerberus 0.3.1 → 0.3.2

data/CHANGES

@@ -1,5 +1,9 @@
 = Cerberus Changelog
 
+== Version 0.3.2
+Added Perforce SCM support
+
+* Added support of Perforce
 
 == Version 0.3.1
 Added BJam builder support

data/Rakefile

@@ -65,9 +65,7 @@ GEM_SPEC = Gem::Specification.new do |s|
 
   s.require_path = 'lib'
 
-  s.has_rdoc = true
-  s.extra_rdoc_files = [ "README" ]
-  s.rdoc_options = [ "--main", "README" ]
+  s.has_rdoc = false
 
   s.test_suite_file = "test/integration_test.rb"
 

data/lib/cerberus/constants.rb

@@ -4,5 +4,5 @@ module Cerberus
 
   LOCK_WAIT = 30 * 60 #30 minutes
 
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/cerberus/manager.rb

@@ -71,6 +71,7 @@ module Cerberus
 
       scm_type = @config[:scm, :type]
       @scm = SCM.get(scm_type).new(@config[:application_root], @config)
+      say "Client for SCM '#{scm_type}' does not installed" unless @scm.installed?
 
       builder_type = get_configuration_option(@config[:builder], :type, :rake)
       @builder = Builder.get(builder_type).new(@config)
@@ -180,7 +181,7 @@ module Cerberus
       if projects.empty?
         puts "There are no any active projects" 
       else
-        puts "List of active applications:"
+        puts "List of active projects:"
 
         projects.each do |fn|
           fn =~ %r{#{HOME}/config/(.*).yml}
@@ -214,7 +215,8 @@ module Cerberus
   module SCM
     TYPES = {
       :svn => 'SVN', #Cerberus::SCM
-      :darcs => 'Darcs'
+      :darcs => 'Darcs',
+      :perforce => 'Perforce'
     }
 
     def self.get(type)
@@ -257,4 +259,4 @@ module Cerberus
        const_get(class_name)
     end
   end
-end
+end

data/lib/cerberus/scm/cvs.rb

@@ -1,4 +1,8 @@
+require 'cerberus/utils'
+
 class Cerberus::SCM::CVS
+  include Cerberus::Utils
+  
   def initialize(path, config = {})
     raise "Path can't be nil" unless path
 
@@ -6,6 +10,10 @@ class Cerberus::SCM::CVS
     @encoded_path = (@path.include?(' ') ? "\"#{@path}\"" : @path)
   end
 
+  def installed?
+    exec_successful? "#{@config[:bin_path]}cvs --version"
+  end
+
   def update!
     if test(?d, @path + '/CVS')
       @status = execute("update")
@@ -16,33 +24,27 @@ class Cerberus::SCM::CVS
   end
 
   def has_changes?
-    @status =~ /[A-Z]\s+[\w\/]+/
+    @status =~ /^[U|P|C] (.*)/
   end
 
   def current_revision
-    info['Revision'].to_i
+    raise NotImplementedError
   end
 
   def url
-    info['URL']
+    raise NotImplementedError
   end
 
   def last_commit_message
-    message = execute("log", "--limit 1 -v")
-    #strip first line that contains command line itself (svn log --limit ...)
-    if ((idx = message.index('-'*72)) != 0 )
-      message[idx..-1]
-    else
-      message
-    end
+    raise NotImplementedError
   end
 
   def last_author
-    info['Last Changed Author']
+    raise NotImplementedError
   end
 
   private
   def execute(command, parameters = nil, pre_parameters = nil)
     `#{@config[:bin_path]}cvs #{command} #{pre_parameters} #{@encoded_path} #{parameters}`
   end
-end
+end

data/lib/cerberus/scm/darcs.rb

@@ -1,4 +1,8 @@
+require 'cerberus/utils'
+
 class Cerberus::SCM::Darcs
+  include Cerberus::Utils
+  
   def initialize(path, config = {})
     raise "Path can't be nil" unless path
 
@@ -6,6 +10,10 @@ class Cerberus::SCM::Darcs
     @encoded_path = (@path.include?(' ') ? "\"#{@path}\"" : @path)
   end
 
+  def installed?
+    exec_successful? "#{@config[:bin_path]}darcs --version"
+  end
+
   def update!
     if test(?d, @path + '/_darcs')
       @status = execute('pull', '-v -a')
@@ -46,6 +54,7 @@ class Cerberus::SCM::Darcs
   def output
     @status
   end
+
   private
   def execute(command, parameters = nil, with_path = true)
     cmd = "#{@config[:bin_path]}darcs #{command} #{parameters} --repodir=#{@encoded_path}"
@@ -60,4 +69,4 @@ class Cerberus::SCM::Darcs
     @date = xml.elements["changelog/patch/@date"].value
     @message = xml.elements["changelog/patch/name"].get_text.value
   end
-end
+end

data/lib/cerberus/scm/perforce.rb

@@ -0,0 +1,83 @@
+require 'cerberus/utils'
+
+class Cerberus::SCM::Perforce
+  include Cerberus::Utils
+  CHANGES_LOG_REGEXP = /^Change (\d+) on (.*) by (.*)\n\n(.*)/m
+
+  def initialize(path, config = {})
+    @config = config
+    @path = path.strip
+
+    @p4_view = @config[:scm, :view]
+    @client_name = Socket.gethostname + ":" + @path.gsub(' ', ':')
+  end
+
+  def installed?
+    exec_successful? "#{@config[:bin_path]}p4 info"
+  end
+
+  def update!
+    FileUtils.mkpath(@path) unless test(?d,@path)
+    create_client
+
+    @status = execute("sync")
+  end
+
+  def has_changes?
+    !@status.include?('file(s) up-to-date.')
+  end
+
+  def url
+    @view
+  end
+
+  attr_reader :current_revision
+  attr_reader :last_author
+  attr_reader :last_commit_message
+
+  private
+  def last_revision
+    unless @calculated
+      msg = execute("changes -m 1 -l")
+      msg =~ CHANGES_LOG_REGEXP
+      
+      @current_revision = $1
+      #date = $2
+      @last_author = $3
+      @last_commit_message = $4.strip
+
+      @calculated = true
+    end
+  end
+
+  def execute(command)
+    `#{@config[:bin_path]}p4 #{p4_opts()} #{command} #{@p4_view} 2>&1`
+  end
+
+  def p4_opts
+    user_opt = @config[:scm, :user_name].to_s.empty? ? "" : "-u #{@config[:scm, :user_name]}"
+    password_opt = @config[:scm, :password].to_s.empty? ? "" : "-P #{@config[:scm, :password]}"
+    client_opt = "-c #{@client_name}"
+    "#{user_opt} #{password_opt} #{client_opt}"
+  end
+
+  def create_client
+    IO.popen("p4 #{p4_opts} client -i", "w+") do |io|
+      io.puts(client_spec)
+      io.close_write
+    end
+  end
+
+  def client_spec
+    <<-EOF
+Client: #{@client_name}
+Owner: #{@config[:scm, :user_name]}
+Host: #{Socket.gethostname}
+Description: Cerberus client
+Root: #{@path}
+Options: noallwrite noclobber nocompress unlocked nomodtime normdir
+LineEnd: local
+View: #{@p4_view} //#{@client_name}/...
+EOF
+  end
+end

data/lib/cerberus/scm/svn.rb

@@ -10,6 +10,10 @@ class Cerberus::SCM::SVN
     @encoded_path = (@path.include?(' ') ? "\"#{@path}\"" : @path)
   end
 
+  def installed?
+    exec_successful? "#{@config[:bin_path]}svn --version"
+  end
+
   def update!
     if test(?d, @path + '/.svn') #check first that it was not locked 
       execute("cleanup") if locked?
@@ -60,7 +64,7 @@ class Cerberus::SCM::SVN
       output = execute("info")
       @info = YAML.load(output)
 
-      if not @info.is_a?(Hash) or @info['Repository Root'].nil? #.size > 8
+      if not @info.is_a?(Hash) or @info['Repository UUID'].nil? #.size > 8
         say "Could not parse svn output. Seems source directory #{@encoded_path} is corrupted.\n#{output}"
       end
     end
@@ -78,4 +82,4 @@ class Cerberus::SCM::SVN
 
     auth.join(' ')
   end
-end
+end

data/lib/cerberus/utils.rb

@@ -35,6 +35,15 @@ module Cerberus
     ensure
       stream.reopen(old_stream)
     end
+
+    def exec_successful?(cmd)
+      begin
+        `#{cmd}`
+        return true
+      rescue
+        return false
+      end
+    end
   end
 end
 
@@ -129,4 +138,4 @@ class IO
   def self.write(filename, str)
     File.open(filename, 'w'){|f| f.write str}
   end
-end
+end

data/test/perforce_scm_test.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+require 'cerberus/cli'
+require 'cerberus/scm/perforce'
+
+class PerforceSCMTest < Test::Unit::TestCase
+  def test_log_parser
+    MSG =~ Cerberus::SCM::Perforce::CHANGES_LOG_REGEXP
+
+    assert_equal '264179', $1
+    assert_equal '2006/11/29', $2
+    assert_equal 'someuser@someuser_SOMEUSER', $3
+    assert_equal "dbcis-2356\njust test", $4.strip
+  end
+
+  MSG =<<END
+Change 264179 on 2006/11/29 by someuser@someuser_SOMEUSER
+
+        dbcis-2356
+just test
+END
+end

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-$:.unshift File.dirname(__FILE__) + '/../lib'
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'test/unit'
 require 'fileutils'
@@ -90,4 +90,4 @@ end"
   end
 end
 
-require 'cerberus/config'
+require 'cerberus/config'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0.4
 specification_version: 1
 name: cerberus
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2006-11-24 00:00:00 +03:00
+  version: 0.3.2
+date: 2006-12-04 00:00:00 +03:00
 summary: Cerberus is a Continuous Integration tool that could be easily run from Cron.
 require_paths: 
 - lib
@@ -15,7 +15,7 @@ description: Cerberus is a Continuous Integration software for Ruby projects. CI
 autorequire: 
 default_executable: cerberus
 bindir: bin
-has_rdoc: true
+has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
   - - ">="
@@ -59,6 +59,7 @@ files:
 - lib/cerberus/publisher/rss.rb
 - lib/cerberus/scm/cvs.rb
 - lib/cerberus/scm/darcs.rb
+- lib/cerberus/scm/perforce.rb
 - lib/cerberus/scm/svn.rb
 - test/bjam_builder_test.rb
 - test/config_test.rb
@@ -70,6 +71,7 @@ files:
 - test/mail_publisher_test.rb
 - test/maven2_builer_test.rb
 - test/mock
+- test/perforce_scm_test.rb
 - test/rss_publisher_test.rb
 - test/test_helper.rb
 - test/data/darcs.zip
@@ -85,11 +87,10 @@ files:
 - doc/site
 test_files: 
 - test/integration_test.rb
-rdoc_options: 
-- --main
-- README
-extra_rdoc_files: 
-- README
+rdoc_options: []
+
+extra_rdoc_files: []
+
 executables: 
 - cerberus
 extensions: []