From 13664db505223649fdd2eca8e9a1ba5b11cda72c Mon Sep 17 00:00:00 2001 From: Kazuo ASANO Date: Fri, 19 Jun 2015 20:47:10 +0900 Subject: [PATCH 1/2] =?UTF-8?q?redmine=5Fcode=5Freview=E3=82=92=20v0.6.5?= =?UTF-8?q?=E3=81=AB=E5=9B=BA=E5=AE=9A=E3=81=99=E3=82=8B=E3=80=82=20=20=20?= =?UTF-8?q?=E7=8F=BE=E7=8A=B6=E3=80=81default=E3=81=AE=E3=83=AA=E3=83=9D?= =?UTF-8?q?=E3=82=B8=E3=83=88=E3=83=AA=E3=82=92checkout=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=81=A8Redmine=20v2.5.2=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=8A=E3=82=89=E3=81=9A=20=20=20redmine=5Fcode=5Fr?= =?UTF-8?q?eview=20plugin=20requires=20Redmine=203.0.0=20or=20higher=20=20?= =?UTF-8?q?=20=E3=81=A8=E3=81=AA=E3=82=8Abundle=20install=E6=99=82?= =?UTF-8?q?=E3=81=AB=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=A8=E3=81=AA=E3=81=A3?= =?UTF-8?q?=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=E7=82=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit redmine_chartsをdevelopの最新を取得せず、c0070d2のcommitまでの取得に変更する。 Bundlerにて、rspec-mocksの依存関係が満たせないため。 > Bundler could not find compatible versions for gem "rspec-mocks": > In Gemfile: > rspec-rails (~> 2.11.0) ruby depends on > rspec (~> 2.11.0) ruby depends on > rspec-mocks (~> 2.11.0) ruby > > rspec-activemodel-mocks (>= 0) ruby depends on > rspec-mocks (~> 3.0.0) ruby --- redmine/setup/redmine-plugins.lst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redmine/setup/redmine-plugins.lst b/redmine/setup/redmine-plugins.lst index e70f1f13..47e99fb5 100644 --- a/redmine/setup/redmine-plugins.lst +++ b/redmine/setup/redmine-plugins.lst @@ -10,7 +10,7 @@ redmine_xls_export,0.2.1.t4,https://github.com/two-pack/redmine_xls_export.git redmine_plugin_views_revisions,redmine_plugin_views_revisions,http://www.redmine.org/attachments/download/7705/redmine_plugin_views_revisions_v001.zip redmine_importer,master,https://github.com/zh/redmine_importer.git -redmine_code_review,default,https://bitbucket.org/haru_iida/redmine_code_review +redmine_code_review,redmine_code_review,https://bitbucket.org/haru_iida/redmine_code_review/downloads/redmine_code_review-0.6.5.zip redmine_hudson,redmine2.x,https://bitbucket.org/okamototk/redmine_hudson ##redmine_ms_projects,master,https://github.com/suer/redmine_ms_projects.git redmine_backlogs,master,https://github.com/backlogs/redmine_backlogs.git @@ -26,7 +26,7 @@ clipboard_image_paste,master,https://github.com/peclik/clipboard_image_paste.git #redmine_lightbox,master,https://github.com/zipme/redmine_lightbox.git redmine_banner,master,https://github.com/akiko-pusu/redmine_banner.git open_flash_chart,master,https://github.com/pullmonkey/open_flash_chart.git -redmine_charts,develop,https://github.com/drakontia/redmine_charts.git +redmine_charts,c0070d2,https://github.com/drakontia/redmine_charts.git redmine_local_avatars,master,https://github.com/luckval/redmine_local_avatars.git redmine_git_branch_hook,master,https://github.com/mikoto20000/redmine_git_branch_hook.git # advanced_roadmapはbacklogsと競合するためどちらかを選択 From d0a89b4173f6b0f51ab5ecf7a53140ec34945970 Mon Sep 17 00:00:00 2001 From: Kazuo ASANO Date: Fri, 19 Jun 2015 21:21:22 +0900 Subject: [PATCH 2/2] =?UTF-8?q?bundle=20exec=20passenger-install-apache2-m?= =?UTF-8?q?odule=20--auto=20=E3=81=A7=E3=81=AEBundler=20could=20not=20find?= =?UTF-8?q?=20compatible=20versions=E5=AF=BE=E5=BF=9C=20redmine=20v2.5.2?= =?UTF-8?q?=20=E3=81=A8plugin=20redmine=5Fbacklogs=E3=82=92=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E3=81=AB=E5=8B=95=E4=BD=9C=E3=81=95=E3=81=9B=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No such file to load -- nokogiri のエラー対策 ruby 1.9.3p484 使用時に praw requires Ruby_version = '>= 2.0.0'となってしまう為、v1.3.0に指定する。 No such file to load -- mocha のエラー対策 --- redmine/Gemfile_backlogs | 85 +++++++++++++++++++++++++ redmine/Gemfile_redmine_v2.5.2 | 111 +++++++++++++++++++++++++++++++++ smelt | 2 + 3 files changed, 198 insertions(+) create mode 100644 redmine/Gemfile_backlogs create mode 100644 redmine/Gemfile_redmine_v2.5.2 diff --git a/redmine/Gemfile_backlogs b/redmine/Gemfile_backlogs new file mode 100644 index 00000000..559f68c4 --- /dev/null +++ b/redmine/Gemfile_backlogs @@ -0,0 +1,85 @@ +source 'https://rubygems.org' + +redmine_version_file = File.expand_path("../../../lib/redmine/version.rb",__FILE__) +if (!File.exists? redmine_version_file) + redmine_version_file = File.expand_path("lib/redmine/version.rb"); +end +version_file = IO.read(redmine_version_file) +redmine_version_minor = version_file.match(/MINOR =/).post_match.match(/\d/)[0].to_i +redmine_version_major = version_file.match(/MAJOR =/).post_match.match(/\d/)[0].to_i + +chiliproject_file = File.dirname(__FILE__) + "/lib/chili_project.rb" +chiliproject = File.file?(chiliproject_file) + +deps = Hash.new +@dependencies.map{|dep| deps[dep.name] = dep } +rails3 = Gem::Dependency.new('rails', '~>3.0') +RAILS_VERSION_IS_3 = rails3 =~ deps['rails'] + +gem "holidays", "~>1.0.3" +gem "icalendar" +# Choose nokogiri depending on RM version. This is done to avoid conflict with +# RM 2.3 which pinned nokogiri at "<1.6.0" for group :test. +if (redmine_version_major == 2 && redmine_version_minor == 3) +gem "nokogiri", "< 1.6.0" +else +gem "nokogiri" +end +gem "open-uri-cached" +#gem "prawn" +gem 'json' +gem "system_timer" if RUBY_VERSION =~ /^1\.8\./ && RUBY_PLATFORM =~ /darwin|linux/ + +group :development do + gem "inifile" +end + +group :test do + gem 'chronic' + gem 'ZenTest', "=4.5.0" # 4.6.0 has a nasty bug that breaks autotest + gem 'autotest-rails' + if RAILS_VERSION_IS_3 + unless chiliproject + gem 'capybara', "~> 1.1" if ENV['IN_RBL_TESTENV'] == 'true' # redmine 2.3 conflicts + gem "faye-websocket", "~>0.4.7" + gem "poltergeist", "~>1.0" + end + gem 'cucumber-rails', :require => false + gem "culerity" + else + unless chiliproject + gem "capybara", "~>1.1.0" + gem "poltergeist", "~>0.6.0" + end + gem "cucumber", "=1.1.0" + gem 'cucumber-rails2', "~> 0.3.5" + gem "culerity", "=0.2.15" + end + gem "database_cleaner" + if RAILS_VERSION_IS_3 + gem "gherkin", "~> 2.6" + else + gem "gherkin", "~> 2.5.0" + end + gem "redgreen" if RUBY_VERSION < "1.9" + if RAILS_VERSION_IS_3 + gem "rspec", '~>2.11.0' + gem "rspec-rails", '~> 2.11.0' + else + gem "rspec", "=1.3.1" + gem "rspec-rails", "=1.3.3" + end + if RUBY_VERSION >= "1.9" + gem "simplecov", "~>0.6" + else + gem "rcov", "=0.9.11" + end + gem "ruby-prof", :platforms => [:ruby] + gem "spork" + gem "test-unit", "=1.2.3" if RUBY_VERSION >= "1.9" and ENV['IN_RBL_TESTENV'] == 'true' + gem "timecop", '~> 0.3.5' +end + +# moved out of the dev group so backlogs can be tested by the user after install. Too many issues of weird setups with apache, nginx, etc. +# thin doesn't work for jruby +gem "thin", :platforms => [:ruby] diff --git a/redmine/Gemfile_redmine_v2.5.2 b/redmine/Gemfile_redmine_v2.5.2 new file mode 100644 index 00000000..6e3d83a5 --- /dev/null +++ b/redmine/Gemfile_redmine_v2.5.2 @@ -0,0 +1,111 @@ +source 'https://rubygems.org' + +gem "rails", "3.2.19" +gem "rake", "~> 10.1.1" +gem "jquery-rails", "~> 2.0.2" +gem "coderay", "~> 1.1.0" +gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby] +gem "builder", "3.0.0" +gem "mime-types" +gem "awesome_nested_set", "2.1.6" +gem "prawn", "1.3.0" +gem "open-uri-cached" +gem "nokogiri" + +# 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.3.0", :require => "openid" + gem "rack-openid" +end + +platforms :mri, :mingw do + # Optional gem for exporting the gantt to a PNG file, not supported with jruby + 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 + + # Optional Markdown support, not for JRuby + group :markdown do + # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped + gem "redcarpet", "~> 2.3.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.3.2" +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 "shoulda-matchers", "1.4.1" + gem "mocha", "~> 1.0.0", :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 diff --git a/smelt b/smelt index 92a35937..bda3dd6e 100755 --- a/smelt +++ b/smelt @@ -279,6 +279,8 @@ then fi cp redmine/Gemfile.local $INSTALL_DIR/ +mv $INSTALL_DIR/Gemfile $INSTALL_DIR/Gemfile.org +cp redmine/Gemfile_redmine_v2.5.2 $INSTALL_DIR/Gemfile $CPCMD redmine/config/* $INSTALL_DIR/config/ $CPCMD redmine/public/themes/* $INSTALL_DIR/public/themes/