jro_apps/redmine Commit - r11695:01411ab56788

prevent coderay "warning: already initialized constant" on Ruby 1.8.7 (#13692)...

Toshi MARUYAMA -

r11695:01411ab56788

parent child

Context file:

r11695:01411ab56788

Collapse all files

Gemfile +1 -1

              source 'https://rubygems.org'
              gem "rails", "3.2.13"
              gem "jquery-rails", "~> 2.0.2"
              gem "i18n", "~> 0.6.0"
-             gem "coderay", "~> 1.0.6"
+             gem "coderay", "~> 1.0.9"
              gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
              gem "builder", "3.0.0"
              # Optional gem for LDAP authentication
              group :ldap do
                gem "net-ldap", "~> 0.3.1"
              end
              # Optional gem for OpenID authentication
              group :openid do
                gem "ruby-openid", "~> 2.1.4", :require => "openid"
                gem "rack-openid"
              end
              # Optional gem for exporting the gantt to a PNG file, not supported with jruby
              platforms :mri, :mingw do
                group :rmagick do
                  # RMagick 2 supports ruby 1.9
                  # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
                  # different requirements for the same gem on different platforms
                  gem "rmagick", ">= 2.0.0"
                end
              end
              platforms :jruby do
                # jruby-openssl is bundled with JRuby 1.7.0
                gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
                gem "activerecord-jdbc-adapter", "1.2.5"
              end
              # Include database gems for the adapters found in the database
              # configuration file
              require 'erb'
              require 'yaml'
              database_file = File.join(File.dirname(__FILE__), "config/database.yml")
              if File.exist?(database_file)
                database_config = YAML::load(ERB.new(IO.read(database_file)).result)
                adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
                if adapters.any?
                  adapters.each do |adapter|
                    case adapter
                    when 'mysql2'
                      gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw]
                      gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
                    when 'mysql'
                      gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw]
                      gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
                    when /postgresql/
                      gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw]
                      gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
                    when /sqlite3/
                      gem "sqlite3", :platforms => [:mri, :mingw]
                      gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
                    when /sqlserver/
                      gem "tiny_tds", "~> 0.5.1", :platforms => [:mri, :mingw]
                      gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
                    else
                      warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems")
                    end
                  end
                else
                  warn("No adapter found in config/database.yml, please configure it first")
                end
              else
                warn("Please configure your config/database.yml first")
              end
              group :development do
                gem "rdoc", ">= 2.4.2"
                gem "yard"
              end
              group :test do
                gem "shoulda", "~> 3.3.2"
                gem "mocha", ">= 0.14", :require => 'mocha/api'
                if RUBY_VERSION >= '1.9.3'
                  gem "capybara", "~> 2.1.0"
                  gem "selenium-webdriver"
                end
              end
              local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
              if File.exists?(local_gemfile)
                puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
                instance_eval File.read(local_gemfile)
              end
              # Load plugins' Gemfiles
              Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file|
                puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
                #TODO: switch to "eval_gemfile file" when bundler >= 1.2.0 will be required (rails 4)
                instance_eval File.read(file), file
              end

lib/redmine/syntax_highlighting.rb 0 -1

              # Redmine - project management software
              # Copyright (C) 2006-2013  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.
              module Redmine
                module SyntaxHighlighting
                  class << self
                    attr_reader :highlighter
                    delegate :highlight_by_filename, :highlight_by_language, :to => :highlighter
                    def highlighter=(name)
                      if name.is_a?(Module)
                        @highlighter = name
                      else
                        @highlighter = const_get(name)
                      end
                    end
                  end
                  module CodeRay
                    require 'coderay'
-                   require 'coderay/helpers/file_type'
                    class << self
                      # Highlights +text+ as the content of +filename+
                      # Should not return line numbers nor outer pre tag
                      def highlight_by_filename(text, filename)
                        language = ::CodeRay::FileType[filename]
                        language ? ::CodeRay.scan(text, language).html(:break_lines => true) : ERB::Util.h(text)
                      end
                      # Highlights +text+ using +language+ syntax
                      # Should not return outer pre tag
                      def highlight_by_language(text, language)
                        ::CodeRay.scan(text, language).html(:wrap => :span)
                      end
                    end
                  end
                end
                SyntaxHighlighting.highlighter = 'CodeRay'
              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