jro_apps/redmine Commit - r1613:12fbd06c02d4

test/unit/subversion_adapter_test.rb created 644 +33 0

			@@ -0,0 +1,33
		1	# redMine - project management software
		2	# Copyright (C) 2006-2008 Jean-Philippe Lang
		3	#
		4	# This program is free software; you can redistribute it and/or
		5	# modify it under the terms of the GNU General Public License
		6	# as published by the Free Software Foundation; either version 2
		7	# of the License, or (at your option) any later version.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU General Public License
		15	# along with this program; if not, write to the Free Software
		16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		17
		18	require 'mkmf'
		19
		20	require File.dirname(__FILE__) + '/../test_helper'
		21
		22	class SubversionAdapterTest < Test::Unit::TestCase
		23
		24	if find_executable0('svn')
		25	def test_client_version
		26	v = Redmine::Scm::Adapters::SubversionAdapter.client_version
		27	assert v.is_a?(Array)
		28	end
		29	else
		30	puts "Subversion binary NOT FOUND. Skipping unit tests !!!"
		31	def test_fake; assert true end
		32	end
		33	end

app/controllers/repositories_controller.rb +3 -1

                    @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
                  else
                    show_error_not_found and return unless @entries
+                   @properties = @repository.properties(@path, @rev)
                    render :action => 'browse'
                  end
                end
                  @entry = @repository.entry(@path, @rev)
                  show_error_not_found and return unless @entry
                  @changesets = @repository.changesets_for_path(@path)
+                 @properties = @repository.properties(@path, @rev)
                end
                def revisions
                  else
                    # Prevent empty lines when displaying a file with Windows style eol
                    @content.gsub!("\r\n", "\n")
-                 end
+                end
                end
                def annotate

app/helpers/repositories_helper.rb +10 0

                  txt.to_s[0,8]
                end
+               def render_properties(properties)
+                 unless properties.nil? || properties.empty?
+                   content = ''
+                   properties.keys.sort.each do |property|
+                     content << content_tag('li', "<b>#{h property}</b>: <span>#{h properties[property]}</span>")
+                   end
+                   content_tag('ul', content, :class => 'properties')
+                 end
+               end
                def to_path_param(path)
                  path.to_s.split(%r{[/\\]}).select {|p| !p.blank?}
                end

app/models/repository.rb +4 0

                  scm.entries(path, identifier)
                end
+               def properties(path, identifier=nil)
+                 scm.properties(path, identifier)
+               end
                def cat(path, identifier=nil)
                  scm.cat(path, identifier)
                end

app/views/repositories/browse.rhtml +1 0

              <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
              <%= render :partial => 'dir_list' %>
+             <%= render_properties(@properties) %>
              <% content_for :header_tags do %>
              <%= stylesheet_link_tag "scm" %>

app/views/repositories/changes.rhtml +2 -2

              <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %></h2>
-             <h3><%=h @entry.name %></h3>
              <p>
              <% if @repository.supports_cat? %>
                  <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
              <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
              </p>
+             <%= render_properties(@properties) %>
              <%= render(:partial => 'revisions',
                         :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }) unless @changesets.empty? %>

lib/redmine/scm/adapters/abstract_adapter.rb +27 -1

                    end
                    class AbstractAdapter #:nodoc:
+                     class << self
+                       # Returns the version of the scm client
+                       # Eg: [1, 5, 0]
+                       def client_version
+                         'Unknown version'
+                       end
+                       # Returns the version string of the scm client
+                       # Eg: '1.5.0'
+                       def client_version_string
+                         client_version.is_a?(Array) ? client_version.join('.') : client_version.to_s
+                       end
+                     end
                      def initialize(url, root_url=nil, login=nil, password=nil)
                        @url = url
                        @login = login if login && !login.empty?
                      def entries(path=nil, identifier=nil)
                        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 logger
-                       RAILS_DEFAULT_LOGGER
+                       self.class.logger
                      end
                      def shellout(cmd, &block)
+                       self.class.shellout(cmd, &block)
+                     end
+                     def self.logger
+                       RAILS_DEFAULT_LOGGER
+                     end
+                     def self.shellout(cmd, &block)
                        logger.debug "Shelling out: #{cmd}" if logger && logger.debug?
                        begin
                          IO.popen(cmd, "r+") do |io|

lib/redmine/scm/adapters/subversion_adapter.rb +42 -1

		@@ -26,6 +26,25 module Redmine
26	26	# SVN executable name
27	27	SVN_BIN = "svn"
28	28
	29	class << self
	30	def client_version
	31	@@client_version \|\|= (svn_binary_version \|\| 'Unknown version')
	32	end
	33
	34	def svn_binary_version
	35	cmd = "#{SVN_BIN} --version"
	36	version = nil
	37	shellout(cmd) do \|io\|
	38	# Read svn version in first returned line
	39	if m = io.gets.match(%r{((\d+\.)+\d+)})
	40	version = m[0].scan(%r{\d+}).collect(&:to_i)
	41	end
	42	end
	43	return nil if $? && $?.exitstatus != 0
	44	version
	45	end
	46	end
	47
29	48	# Get info about the svn repository
30	49	def info
31	50	cmd = "#{SVN_BIN} info --xml #{target('')}"
		@@ -87,7 +106,29 module Redmine
87	106	logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
88	107	entries.sort_by_name
89	108	end
90
	109
	110	def properties(path, identifier=nil)
	111	# proplist xml output supported in svn 1.5.0 and higher
	112	return nil if (self.class.client_version <=> [1, 5, 0]) < 0
	113
	114	identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
	115	cmd = "#{SVN_BIN} proplist --verbose --xml #{target(path)}@#{identifier}"
	116	cmd << credentials_string
	117	properties = {}
	118	shellout(cmd) do \|io\|
	119	output = io.read
	120	begin
	121	doc = REXML::Document.new(output)
	122	doc.elements.each("properties/target/property") do \|property\|
	123	properties[ property.attributes['name'] ] = property.text
	124	end
	125	rescue
	126	end
	127	end
	128	return nil if $? && $?.exitstatus != 0
	129	properties
	130	end
	131
91	132	def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
92	133	path \|\|= ''
93	134	identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD"

public/stylesheets/application.css +4 0

              table#time-report tbody tr.total { font-style: normal; font-weight: bold; color: #555; background-color:#EEEEEE; }
              table#time-report .hours-dec { font-size: 0.9em; }
+             ul.properties {padding:0; font-size: 0.9em; color: #777;}
+             ul.properties li {list-style-type:none;}
+             ul.properties li span {font-style:italic;}
              .total-hours { font-size: 110%; font-weight: bold; }
              .total-hours span.hours-int { font-size: 120%; }

test/functional/repositories_subversion_controller_test.rb +13 0

                    assert_not_nil assigns(:entries)
                    assert_equal ['folder', '.project', 'helloworld.c', 'helloworld.rb', 'textfile.txt'], assigns(:entries).collect(&:name)
                  end
+                 def test_changes
+                   get :changes, :id => 1, :path => ['subversion_test', 'folder', 'helloworld.rb' ]
+                   assert_response :success
+                   assert_template 'changes'
+                   # svn properties
+                   assert_not_nil assigns(:properties)
+                   assert_equal 'native', assigns(:properties)['svn:eol-style']
+                   assert_tag :ul,
+                              :child => { :tag => 'li',
+                                          :child => { :tag => 'b', :content => 'svn:eol-style' },
+                                          :child => { :tag => 'span', :content => 'native' } }
+                 end
                  def test_entry
                    get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c']

	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