jro_apps/redmine Commit - r1752:116091a1d2ea

Fixes platform determination under JRuby (#1804)....

Jean-Philippe Lang -

r1752:116091a1d2ea

parent child

Context file:

r1752:116091a1d2ea

lib/redmine/platform.rb created 644 +26 0

@@ -0,0 +1,26
	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	module Redmine
	19	module Platform
	20	class << self
	21	def mswin?
	22	(RUBY_PLATFORM =~ /(:?mswin\|mingw)/) \|\| (RUBY_PLATFORM == 'java' && (ENV['OS'] \|\| ENV['os']) =~ /windows/i)
	23	end
	24	end
	25	end
	26	end

lib/redmine/scm/adapters/abstract_adapter.rb +2 -2

                      end
                     def shell_quote(str)
-                      if RUBY_PLATFORM =~ /mswin/
+                      if Redmine::Platform.mswin?
                         '"' + str.gsub(/"/, '\\"') + '"'
                       else
                         "'" + str.gsub(/'/, "'\"'\"'") + "'"
                     # Hides username/password in a given command
                     def self.hide_credential(cmd)
-                      q = (RUBY_PLATFORM =~ /mswin/ ? '"' : "'")
+                      q = (Redmine::Platform.mswin? ? '"' : "'")
                       cmd.to_s.gsub(/(\-\-(password|username))\s+(#{q}[^#{q}]+#{q}|[^#{q}]\S+)/, '\\1 xxxx')
                     end

test/functional/repositories_cvs_controller_test.rb +1 -1

               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'
-              REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
+              REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               # CVS module
               MODULE_NAME = 'test'

test/functional/repositories_git_controller_test.rb +1 -1

               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
-              REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
+              REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               def setup
                 @controller = RepositoriesController.new

test/unit/repository_cvs_test.rb +1 -1

               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'
-              REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
+              REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               # CVS module
               MODULE_NAME = 'test'

test/unit/repository_git_test.rb +1 -1

               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
-              REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
+              REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               def setup
                 @project = Project.find(1)

General Comments 0

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

No TODOs yet

	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