jro_apps/redmine Commit - r9352:cb16661d365c

Removes the XML declaration that breaks the parser with JRuby....

Jean-Philippe Lang -

r9352:cb16661d365c

parent child

Context file:

r9352:cb16661d365c

Collapse all files

lib/redmine/scm/adapters/abstract_adapter.rb +7 0

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'cgi'
             module Redmine
               module Scm
                 module Adapters
                   class CommandFailed < StandardError #:nodoc:
                   end
                   class AbstractAdapter #:nodoc:
                     # raised if scm command exited with error, e.g. unknown revision.
                     class ScmCommandAborted < CommandFailed; end
                     class << self
                       def client_command
                         ""
                       end
                       def shell_quote_command
                         if Redmine::Platform.mswin? && RUBY_PLATFORM == 'java'
                           client_command
                         else
                           shell_quote(client_command)
                         end
                       end
                       # Returns the version of the scm client
                       # Eg: [1, 5, 0] or [] if unknown
                       def client_version
                         []
                       end
                       # Returns the version string of the scm client
                       # Eg: '1.5.0' or 'Unknown version' if unknown
                       def client_version_string
                         v = client_version || 'Unknown version'
                         v.is_a?(Array) ? v.join('.') : v.to_s
                       end
                       # Returns true if the current client version is above
                       # or equals the given one
                       # If option is :unknown is set to true, it will return
                       # true if the client version is unknown
                       def client_version_above?(v, options={})
                         ((client_version <=> v) >= 0) || (client_version.empty? && options[:unknown])
                       end
                       def client_available
                         true
                       end
                       def shell_quote(str)
                         if Redmine::Platform.mswin?
                           '"' + str.gsub(/"/, '\\"') + '"'
                         else
                           "'" + str.gsub(/'/, "'\"'\"'") + "'"
                         end
                       end
                     end
                     def initialize(url, root_url=nil, login=nil, password=nil,
                                    path_encoding=nil)
                       @url = url
                       @login = login if login && !login.empty?
                       @password = (password || "") if @login
                       @root_url = root_url.blank? ? retrieve_root_url : root_url
                     end
                     def adapter_name
                       'Abstract'
                     end
                     def supports_cat?
                       true
                     end
                     def supports_annotate?
                       respond_to?('annotate')
                     end
                     def root_url
                       @root_url
                     end
                     def url
                       @url
                     end
                     def path_encoding
                       nil
                     end
                     # get info about the svn repository
                     def info
                       return nil
                     end
                     # Returns the entry identified by path and revision identifier
                     # or nil if entry doesn't exist in the repository
                     def entry(path=nil, identifier=nil)
                       parts = path.to_s.split(%r{[\/\\]}).select {|n| !n.blank?}
                       search_path = parts[0..-2].join('/')
                       search_name = parts[-1]
                       if search_path.blank? && search_name.blank?
                         # Root entry
                         Entry.new(:path => '', :kind => 'dir')
                       else
                         # Search for the entry in the parent directory
                         es = entries(search_path, identifier)
                         es ? es.detect {|e| e.name == search_name} : nil
                       end
                     end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil, options={})
                       return nil
                     end
                     def branches
                       return nil
                     end
                     def tags
                       return nil
                     end
                     def default_branch
                       return nil
                     end
                     def properties(path, identifier=nil)
                       return nil
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       return nil
                     end
                     def diff(path, identifier_from, identifier_to=nil)
                       return nil
                     end
                     def cat(path, identifier=nil)
                       return nil
                     end
                     def with_leading_slash(path)
                       path ||= ''
                       (path[0,1]!="/") ? "/#{path}" : path
                     end
                     def with_trailling_slash(path)
                       path ||= ''
                       (path[-1,1] == "/") ? path : "#{path}/"
                     end
                     def without_leading_slash(path)
                       path ||= ''
                       path.gsub(%r{^/+}, '')
                     end
                     def without_trailling_slash(path)
                       path ||= ''
                       (path[-1,1] == "/") ? path[0..-2] : path
                      end
                     def shell_quote(str)
                       self.class.shell_quote(str)
                     end
                   private
                     def retrieve_root_url
                       info = self.info
                       info ? info.root_url : nil
                     end
                     def target(path, sq=true)
                       path ||= ''
                       base = path.match(/^\//) ? root_url : url
                       str = "#{base}/#{path}".gsub(/[?<>\*]/, '')
                       if sq
                         str = shell_quote(str)
                       end
                       str
                     end
                     def logger
                       self.class.logger
                     end
                     def shellout(cmd, options = {}, &block)
                       self.class.shellout(cmd, options, &block)
                     end
                     def self.logger
                       Rails.logger
                     end
                     def self.shellout(cmd, options = {}, &block)
                       if logger && logger.debug?
                         logger.debug "Shelling out: #{strip_credential(cmd)}"
                       end
                       if Rails.env == 'development'
                         # Capture stderr when running in dev environment
                         cmd = "#{cmd} 2>>#{shell_quote(Rails.root.join('log/scm.stderr.log').to_s)}"
                       end
                       begin
                         mode = "r+"
                         IO.popen(cmd, mode) do |io|
                           io.set_encoding("ASCII-8BIT") if io.respond_to?(:set_encoding)
                           io.close_write unless options[:write_stdin]
                           block.call(io) if block_given?
                         end
                       ## If scm command does not exist,
                       ## Linux JRuby 1.6.2 (ruby-1.8.7-p330) raises java.io.IOException
                       ## in production environment.
                       # rescue Errno::ENOENT => e
                       rescue Exception => e
                         msg = strip_credential(e.message)
                         # The command failed, log it and re-raise
                         logmsg = "SCM command failed, "
                         logmsg += "make sure that your SCM command (e.g. svn) is "
                         logmsg += "in PATH (#{ENV['PATH']})\n"
                         logmsg += "You can configure your scm commands in config/configuration.yml.\n"
                         logmsg += "#{strip_credential(cmd)}\n"
                         logmsg += "with: #{msg}"
                         logger.error(logmsg)
                         raise CommandFailed.new(msg)
                       end
                     end
                     # Hides username/password in a given command
                     def self.strip_credential(cmd)
                       q = (Redmine::Platform.mswin? ? '"' : "'")
                       cmd.to_s.gsub(/(\-\-(password|username))\s+(#{q}[^#{q}]+#{q}|[^#{q}]\S+)/, '\\1 xxxx')
                     end
                     def strip_credential(cmd)
                       self.class.strip_credential(cmd)
                     end
                     def scm_iconv(to, from, str)
                       return nil if str.nil?
                       return str if to == from
                       begin
                         Iconv.conv(to, from, str)
                       rescue Iconv::Failure => err
                         logger.error("failed to convert from #{from} to #{to}. #{err}")
                         nil
                       end
                     end
+                    def parse_xml(xml)
+                      if RUBY_PLATFORM == 'java'
+                        xml = xml.sub(%r{<\?xml[^>]*\?>}, '')
+                      end
+                      ActiveSupport::XmlMini.parse(xml)
+                    end
                   end
                   class Entries < Array
                     def sort_by_name
                       sort {|x,y|
                         if x.kind == y.kind
                           x.name.to_s <=> y.name.to_s
                         else
                           x.kind <=> y.kind
                         end
                       }
                     end
                     def revisions
                       revisions ||= Revisions.new(collect{|entry| entry.lastrev}.compact)
                     end
                   end
                   class Info
                     attr_accessor :root_url, :lastrev
                     def initialize(attributes={})
                       self.root_url = attributes[:root_url] if attributes[:root_url]
                       self.lastrev = attributes[:lastrev]
                     end
                   end
                   class Entry
                     attr_accessor :name, :path, :kind, :size, :lastrev
                     def initialize(attributes={})
                       self.name = attributes[:name] if attributes[:name]
                       self.path = attributes[:path] if attributes[:path]
                       self.kind = attributes[:kind] if attributes[:kind]
                       self.size = attributes[:size].to_i if attributes[:size]
                       self.lastrev = attributes[:lastrev]
                     end
                     def is_file?
                       'file' == self.kind
                     end
                     def is_dir?
                       'dir' == self.kind
                     end
                     def is_text?
                       Redmine::MimeType.is_type?('text', name)
                     end
                   end
                   class Revisions < Array
                     def latest
                       sort {|x,y|
                         unless x.time.nil? or y.time.nil?
                           x.time <=> y.time
                         else
                         end
                       }.last
                     end
                   end
                   class Revision
                     attr_accessor :scmid, :name, :author, :time, :message,
                                   :paths, :revision, :branch, :identifier,
                                   :parents
                     def initialize(attributes={})
                       self.identifier = attributes[:identifier]
                       self.scmid      = attributes[:scmid]
                       self.name       = attributes[:name] || self.identifier
                       self.author     = attributes[:author]
                       self.time       = attributes[:time]
                       self.message    = attributes[:message] || ""
                       self.paths      = attributes[:paths]
                       self.revision   = attributes[:revision]
                       self.branch     = attributes[:branch]
                       self.parents    = attributes[:parents]
                     end
                     # Returns the readable identifier.
                     def format_identifier
                       self.identifier.to_s
                     end
                   end
                   class Annotate
                     attr_reader :lines, :revisions
                     def initialize
                       @lines = []
                       @revisions = []
                     end
                     def add_line(line, revision)
                       @lines << line
                       @revisions << revision
                     end
                     def content
                       content = lines.join("\n")
                     end
                     def empty?
                       lines.empty?
                     end
                   end
                   class Branch < String
                     attr_accessor :revision, :scmid
                   end
                 end
               end
             end

lib/redmine/scm/adapters/mercurial_adapter.rb +3 -3

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'redmine/scm/adapters/abstract_adapter'
             require 'cgi'
             module Redmine
               module Scm
                 module Adapters
                   class MercurialAdapter < AbstractAdapter
                     # Mercurial executable name
                     HG_BIN = Redmine::Configuration['scm_mercurial_command'] || "hg"
                     HELPERS_DIR = File.dirname(__FILE__) + "/mercurial"
                     HG_HELPER_EXT = "#{HELPERS_DIR}/redminehelper.py"
                     TEMPLATE_NAME = "hg-template"
                     TEMPLATE_EXTENSION = "tmpl"
                     # raised if hg command exited with error, e.g. unknown revision.
                     class HgCommandAborted < CommandFailed; end
                     class << self
                       def client_command
                         @@bin    ||= HG_BIN
                       end
                       def sq_bin
                         @@sq_bin ||= shell_quote_command
                       end
                       def client_version
                         @@client_version ||= (hgversion || [])
                       end
                       def client_available
                         client_version_above?([1, 2])
                       end
                       def hgversion
                         # The hg version is expressed either as a
                         # release number (eg 0.9.5 or 1.0) or as a revision
                         # id composed of 12 hexa characters.
                         theversion = hgversion_from_command_line.dup
                         if theversion.respond_to?(:force_encoding)
                           theversion.force_encoding('ASCII-8BIT')
                         end
                         if m = theversion.match(%r{\A(.*?)((\d+\.)+\d+)})
                           m[2].scan(%r{\d+}).collect(&:to_i)
                         end
                       end
                       def hgversion_from_command_line
                         shellout("#{sq_bin} --version") { |io| io.read }.to_s
                       end
                       def template_path
                         @@template_path ||= template_path_for(client_version)
                       end
                       def template_path_for(version)
                         "#{HELPERS_DIR}/#{TEMPLATE_NAME}-1.0.#{TEMPLATE_EXTENSION}"
                       end
                     end
                     def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil)
                       super
                       @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
                     end
                     def path_encoding
                       @path_encoding
                     end
                     def info
                       tip = summary['repository']['tip']
                       Info.new(:root_url => CGI.unescape(summary['repository']['root']),
                                :lastrev => Revision.new(:revision => tip['revision'],
                                                         :scmid => tip['node']))
                     # rescue HgCommandAborted
                     rescue Exception => e
                       logger.error "hg: error during getting info: #{e.message}"
                       nil
                     end
                     def tags
                       as_ary(summary['repository']['tag']).map { |e| e['name'] }
                     end
                     # Returns map of {'tag' => 'nodeid', ...}
                     def tagmap
                       alist = as_ary(summary['repository']['tag']).map do |e|
                         e.values_at('name', 'node')
                       end
                       Hash[*alist.flatten]
                     end
                     def branches
                       brs = []
                       as_ary(summary['repository']['branch']).each do |e|
                         br = Branch.new(e['name'])
                         br.revision =  e['revision']
                         br.scmid    =  e['node']
                         brs << br
                       end
                       brs
                     end
                     # Returns map of {'branch' => 'nodeid', ...}
                     def branchmap
                       alist = as_ary(summary['repository']['branch']).map do |e|
                         e.values_at('name', 'node')
                       end
                       Hash[*alist.flatten]
                     end
                     def summary
                       return @summary if @summary
                       hg 'rhsummary' do |io|
                         output = io.read
                         if output.respond_to?(:force_encoding)
                           output.force_encoding('UTF-8')
                         end
                         begin
-                          @summary = ActiveSupport::XmlMini.parse(output)['rhsummary']
+                          @summary = parse_xml(output)['rhsummary']
                         rescue
                         end
                       end
                     end
                     private :summary
                     def entries(path=nil, identifier=nil, options={})
                       p1 = scm_iconv(@path_encoding, 'UTF-8', path)
                       manifest = hg('rhmanifest', '-r', CGI.escape(hgrev(identifier)),
                                     CGI.escape(without_leading_slash(p1.to_s))) do |io|
                         output = io.read
                         if output.respond_to?(:force_encoding)
                           output.force_encoding('UTF-8')
                         end
                         begin
-                          ActiveSupport::XmlMini.parse(output)['rhmanifest']['repository']['manifest']
+                          parse_xml(output)['rhmanifest']['repository']['manifest']
                         rescue
                         end
                       end
                       path_prefix = path.blank? ? '' : with_trailling_slash(path)
                       entries = Entries.new
                       as_ary(manifest['dir']).each do |e|
                         n = scm_iconv('UTF-8', @path_encoding, CGI.unescape(e['name']))
                         p = "#{path_prefix}#{n}"
                         entries << Entry.new(:name => n, :path => p, :kind => 'dir')
                       end
                       as_ary(manifest['file']).each do |e|
                         n = scm_iconv('UTF-8', @path_encoding, CGI.unescape(e['name']))
                         p = "#{path_prefix}#{n}"
                         lr = Revision.new(:revision => e['revision'], :scmid => e['node'],
                                           :identifier => e['node'],
                                           :time => Time.at(e['time'].to_i))
                         entries << Entry.new(:name => n, :path => p, :kind => 'file',
                                              :size => e['size'].to_i, :lastrev => lr)
                       end
                       entries
                     rescue HgCommandAborted
                       nil  # means not found
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       revs = Revisions.new
                       each_revision(path, identifier_from, identifier_to, options) { |e| revs << e }
                       revs
                     end
                     # Iterates the revisions by using a template file that
                     # makes Mercurial produce a xml output.
                     def each_revision(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       hg_args = ['log', '--debug', '-C', '--style', self.class.template_path]
                       hg_args << '-r' << "#{hgrev(identifier_from)}:#{hgrev(identifier_to)}"
                       hg_args << '--limit' << options[:limit] if options[:limit]
                       hg_args << hgtarget(path) unless path.blank?
                       log = hg(*hg_args) do |io|
                         output = io.read
                         if output.respond_to?(:force_encoding)
                           output.force_encoding('UTF-8')
                         end
                         begin
                           # Mercurial < 1.5 does not support footer template for '</log>'
-                          ActiveSupport::XmlMini.parse("#{output}</log>")['log']
+                          parse_xml("#{output}</log>")['log']
                         rescue
                         end
                       end
                       as_ary(log['logentry']).each do |le|
                         cpalist = as_ary(le['paths']['path-copied']).map do |e|
                           [e['__content__'], e['copyfrom-path']].map do |s|
                             scm_iconv('UTF-8', @path_encoding, CGI.unescape(s))
                           end
                         end
                         cpmap = Hash[*cpalist.flatten]
                         paths = as_ary(le['paths']['path']).map do |e|
                           p = scm_iconv('UTF-8', @path_encoding, CGI.unescape(e['__content__']) )
                           {:action        => e['action'],
                            :path          => with_leading_slash(p),
                            :from_path     => (cpmap.member?(p) ? with_leading_slash(cpmap[p]) : nil),
                            :from_revision => (cpmap.member?(p) ? le['node'] : nil)}
                         end.sort { |a, b| a[:path] <=> b[:path] }
                         parents_ary = []
                         as_ary(le['parents']['parent']).map do |par|
                           parents_ary << par['__content__'] if par['__content__'] != "000000000000"
                         end
                         yield Revision.new(:revision => le['revision'],
                                            :scmid    => le['node'],
                                            :author   => (le['author']['__content__'] rescue ''),
                                            :time     => Time.parse(le['date']['__content__']),
                                            :message  => le['msg']['__content__'],
                                            :paths    => paths,
                                            :parents  => parents_ary)
                       end
                       self
                     end
                     # Returns list of nodes in the specified branch
                     def nodes_in_branch(branch, options={})
                       hg_args = ['rhlog', '--template', '{node|short}\n', '--rhbranch', CGI.escape(branch)]
                       hg_args << '--from' << CGI.escape(branch)
                       hg_args << '--to'   << '0'
                       hg_args << '--limit' << options[:limit] if options[:limit]
                       hg(*hg_args) { |io| io.readlines.map { |e| e.chomp } }
                     end
                     def diff(path, identifier_from, identifier_to=nil)
                       hg_args = %w|rhdiff|
                       if identifier_to
                         hg_args << '-r' << hgrev(identifier_to) << '-r' << hgrev(identifier_from)
                       else
                         hg_args << '-c' << hgrev(identifier_from)
                       end
                       unless path.blank?
                         p = scm_iconv(@path_encoding, 'UTF-8', path)
                         hg_args << CGI.escape(hgtarget(p))
                       end
                       diff = []
                       hg *hg_args do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       diff
                     rescue HgCommandAborted
                       nil  # means not found
                     end
                     def cat(path, identifier=nil)
                       p = CGI.escape(scm_iconv(@path_encoding, 'UTF-8', path))
                       hg 'rhcat', '-r', CGI.escape(hgrev(identifier)), hgtarget(p) do |io|
                         io.binmode
                         io.read
                       end
                     rescue HgCommandAborted
                       nil  # means not found
                     end
                     def annotate(path, identifier=nil)
                       p = CGI.escape(scm_iconv(@path_encoding, 'UTF-8', path))
                       blame = Annotate.new
                       hg 'rhannotate', '-ncu', '-r', CGI.escape(hgrev(identifier)), hgtarget(p) do |io|
                         io.each_line do |line|
                           line.force_encoding('ASCII-8BIT') if line.respond_to?(:force_encoding)
                           next unless line =~ %r{^([^:]+)\s(\d+)\s([0-9a-f]+):\s(.*)$}
                           r = Revision.new(:author => $1.strip, :revision => $2, :scmid => $3,
                                            :identifier => $3)
                           blame.add_line($4.rstrip, r)
                         end
                       end
                       blame
                     rescue HgCommandAborted
                       # means not found or cannot be annotated
                       Annotate.new
                     end
                     class Revision < Redmine::Scm::Adapters::Revision
                       # Returns the readable identifier
                       def format_identifier
                         "#{revision}:#{scmid}"
                       end
                     end
                     # Runs 'hg' command with the given args
                     def hg(*args, &block)
                       repo_path = root_url || url
                       full_args = ['-R', repo_path, '--encoding', 'utf-8']
                       full_args << '--config' << "extensions.redminehelper=#{HG_HELPER_EXT}"
                       full_args << '--config' << 'diff.git=false'
                       full_args += args
                       ret = shellout(
                                self.class.sq_bin + ' ' + full_args.map { |e| shell_quote e.to_s }.join(' '),
                                &block
                                )
                       if $? && $?.exitstatus != 0
                         raise HgCommandAborted, "hg exited with non-zero status: #{$?.exitstatus}"
                       end
                       ret
                     end
                     private :hg
                     # Returns correct revision identifier
                     def hgrev(identifier, sq=false)
                       rev = identifier.blank? ? 'tip' : identifier.to_s
                       rev = shell_quote(rev) if sq
                       rev
                     end
                     private :hgrev
                     def hgtarget(path)
                       path ||= ''
                       root_url + '/' + without_leading_slash(path)
                     end
                     private :hgtarget
                     def as_ary(o)
                       return [] unless o
                       o.is_a?(Array) ? o : Array[o]
                     end
                     private :as_ary
                   end
                 end
               end
             end

lib/redmine/scm/adapters/subversion_adapter.rb +4 -4

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'redmine/scm/adapters/abstract_adapter'
             require 'uri'
             module Redmine
               module Scm
                 module Adapters
                   class SubversionAdapter < AbstractAdapter
                     # SVN executable name
                     SVN_BIN = Redmine::Configuration['scm_subversion_command'] || "svn"
                     class << self
                       def client_command
                         @@bin    ||= SVN_BIN
                       end
                       def sq_bin
                         @@sq_bin ||= shell_quote_command
                       end
                       def client_version
                         @@client_version ||= (svn_binary_version || [])
                       end
                       def client_available
                         # --xml options are introduced in 1.3.
                         # http://subversion.apache.org/docs/release-notes/1.3.html
                         client_version_above?([1, 3])
                       end
                       def svn_binary_version
                         scm_version = scm_version_from_command_line.dup
                         if scm_version.respond_to?(:force_encoding)
                           scm_version.force_encoding('ASCII-8BIT')
                         end
                         if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)})
                           m[2].scan(%r{\d+}).collect(&:to_i)
                         end
                       end
                       def scm_version_from_command_line
                         shellout("#{sq_bin} --version") { |io| io.read }.to_s
                       end
                     end
                     # Get info about the svn repository
                     def info
                       cmd = "#{self.class.sq_bin} info --xml #{target}"
                       cmd << credentials_string
                       info = nil
                       shellout(cmd) do |io|
                         output = io.read
                         if output.respond_to?(:force_encoding)
                           output.force_encoding('UTF-8')
                         end
                         begin
-                          doc = ActiveSupport::XmlMini.parse(output)
+                          doc = parse_xml(output)
                           # root_url = doc.elements["info/entry/repository/root"].text
                           info = Info.new({:root_url => doc['info']['entry']['repository']['root']['__content__'],
                                            :lastrev => Revision.new({
                                              :identifier => doc['info']['entry']['commit']['revision'],
                                              :time => Time.parse(doc['info']['entry']['commit']['date']['__content__']).localtime,
                                              :author => (doc['info']['entry']['commit']['author'] ? doc['info']['entry']['commit']['author']['__content__'] : "")
                                            })
                                          })
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       info
                     rescue CommandFailed
                       return nil
                     end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil, options={})
                       path ||= ''
                       identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                       entries = Entries.new
                       cmd = "#{self.class.sq_bin} list --xml #{target(path)}@#{identifier}"
                       cmd << credentials_string
                       shellout(cmd) do |io|
                         output = io.read
                         if output.respond_to?(:force_encoding)
                           output.force_encoding('UTF-8')
                         end
                         begin
-                          doc = ActiveSupport::XmlMini.parse(output)
+                          doc = parse_xml(output)
                           each_xml_element(doc['lists']['list'], 'entry') do |entry|
                             commit = entry['commit']
                             commit_date = commit['date']
                             # Skip directory if there is no commit date (usually that
                             # means that we don't have read access to it)
                             next if entry['kind'] == 'dir' && commit_date.nil?
                             name = entry['name']['__content__']
                             entries << Entry.new({:name => URI.unescape(name),
                                         :path => ((path.empty? ? "" : "#{path}/") + name),
                                         :kind => entry['kind'],
                                         :size => ((s = entry['size']) ? s['__content__'].to_i : nil),
                                         :lastrev => Revision.new({
                                           :identifier => commit['revision'],
                                           :time => Time.parse(commit_date['__content__'].to_s).localtime,
                                           :author => ((a = commit['author']) ? a['__content__'] : nil)
                                           })
                                         })
                           end
                         rescue Exception => e
                           logger.error("Error parsing svn output: #{e.message}")
                           logger.error("Output was:\n #{output}")
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
                       entries.sort_by_name
                     end
                     def properties(path, identifier=nil)
                       # proplist xml output supported in svn 1.5.0 and higher
                       return nil unless self.class.client_version_above?([1, 5, 0])
                       identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                       cmd = "#{self.class.sq_bin} proplist --verbose --xml #{target(path)}@#{identifier}"
                       cmd << credentials_string
                       properties = {}
                       shellout(cmd) do |io|
                         output = io.read
                         if output.respond_to?(:force_encoding)
                           output.force_encoding('UTF-8')
                         end
                         begin
-                          doc = ActiveSupport::XmlMini.parse(output)
+                          doc = parse_xml(output)
                           each_xml_element(doc['properties']['target'], 'property') do |property|
                             properties[ property['name'] ] = property['__content__'].to_s
                           end
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       properties
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       path ||= ''
                       identifier_from = (identifier_from && identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD"
                       identifier_to = (identifier_to && identifier_to.to_i > 0) ? identifier_to.to_i : 1
                       revisions = Revisions.new
                       cmd = "#{self.class.sq_bin} log --xml -r #{identifier_from}:#{identifier_to}"
                       cmd << credentials_string
                       cmd << " --verbose " if  options[:with_paths]
                       cmd << " --limit #{options[:limit].to_i}" if options[:limit]
                       cmd << ' ' + target(path)
                       shellout(cmd) do |io|
                         output = io.read
                         if output.respond_to?(:force_encoding)
                           output.force_encoding('UTF-8')
                         end
                         begin
-                          doc = ActiveSupport::XmlMini.parse(output)
+                          doc = parse_xml(output)
                           each_xml_element(doc['log'], 'logentry') do |logentry|
                             paths = []
                             each_xml_element(logentry['paths'], 'path') do |path|
                               paths << {:action => path['action'],
                                         :path => path['__content__'],
                                         :from_path => path['copyfrom-path'],
                                         :from_revision => path['copyfrom-rev']
                                         }
                             end if logentry['paths'] && logentry['paths']['path']
                             paths.sort! { |x,y| x[:path] <=> y[:path] }
                             revisions << Revision.new({:identifier => logentry['revision'],
                                           :author => (logentry['author'] ? logentry['author']['__content__'] : ""),
                                           :time => Time.parse(logentry['date']['__content__'].to_s).localtime,
                                           :message => logentry['msg']['__content__'],
                                           :paths => paths
                                         })
                           end
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
                     def diff(path, identifier_from, identifier_to=nil)
                       path ||= ''
                       identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : ''
                       identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : (identifier_from.to_i - 1)
                       cmd = "#{self.class.sq_bin} diff -r "
                       cmd << "#{identifier_to}:"
                       cmd << "#{identifier_from}"
                       cmd << " #{target(path)}@#{identifier_from}"
                       cmd << credentials_string
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       diff
                     end
                     def cat(path, identifier=nil)
                       identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                       cmd = "#{self.class.sq_bin} cat #{target(path)}@#{identifier}"
                       cmd << credentials_string
                       cat = nil
                       shellout(cmd) do |io|
                         io.binmode
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                     def annotate(path, identifier=nil)
                       identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                       cmd = "#{self.class.sq_bin} blame #{target(path)}@#{identifier}"
                       cmd << credentials_string
                       blame = Annotate.new
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$}
                           rev = $1
                           blame.add_line($3.rstrip,
                                Revision.new(
                                   :identifier => rev,
                                   :revision   => rev,
                                   :author     => $2.strip
                                   ))
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       blame
                     end
                     private
                     def credentials_string
                       str = ''
                       str << " --username #{shell_quote(@login)}" unless @login.blank?
                       str << " --password #{shell_quote(@password)}" unless @login.blank? || @password.blank?
                       str << " --no-auth-cache --non-interactive"
                       str
                     end
                     # Helper that iterates over the child elements of a xml node
                     # MiniXml returns a hash when a single child is found
                     # or an array of hashes for multiple children
                     def each_xml_element(node, name)
                       if node && node[name]
                         if node[name].is_a?(Hash)
                           yield node[name]
                         else
                           node[name].each do |element|
                             yield element
                           end
                         end
                       end
                     end
                     def target(path = '')
                       base = path.match(/^\//) ? root_url : url
                       uri = "#{base}/#{path}"
                       uri = URI.escape(URI.escape(uri), '[]')
                       shell_quote(uri.gsub(/[?<>\*]/, ''))
                     end
                   end
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages