From 27030566a426bf0b1cd9c0bad47ef9c7d29da586 Mon Sep 17 00:00:00 2001 From: Pavel Chipiga Date: Mon, 30 Jul 2012 02:32:23 +0300 Subject: [PATCH] Update rails, grit, gollum. Fix re-encoding bug. Refs #263 --- Gemfile | 6 +-- Gemfile.lock | 93 +++++++++++++++++++++++------------------- doc/README_FOR_APP | 2 + lib/ext/core/string.rb | 5 ++- 4 files changed, 59 insertions(+), 47 deletions(-) diff --git a/Gemfile b/Gemfile index 0ace218c6..65f5da383 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.2.6' #, :git => 'git://github.com/rails/rails.git' +gem 'rails', '3.2.7' #, :git => 'git://github.com/rails/rails.git' gem 'pg', '~> 0.14.0' # gem 'silent-postgres', :git => 'git://github.com/dolzenko/silent-postgres.git' #'~> 0.1.1' @@ -31,7 +31,7 @@ gem 'github-linguist', '~> 2.1.2', :require => 'linguist' gem 'diff-display', '~> 0.0.1' # Wiki -gem "gollum", "1.3.1" +gem "gollum", :git => 'git://github.com/github/gollum.git' gem "redcarpet", "1.17.2" gem 'creole' gem 'rdiscount' @@ -41,7 +41,7 @@ gem 'wikicloth' gem 'unicorn', '~> 4.3.1', :platforms => [:mri, :rbx] gem 'trinidad', '~> 1.0.2', :platforms => :jruby -gem 'newrelic_rpm', '~> 3.4.0.1', :platforms => [:mri, :rbx] +gem 'newrelic_rpm', '~> 3.4.1', :platforms => [:mri, :rbx] gem 'whenever', '~> 0.7.3', :require => false gem 'jbuilder', '~> 0.4.0' diff --git a/Gemfile.lock b/Gemfile.lock index 1ff9bd23d..8d70a5ad0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,6 +6,23 @@ GIT redhillonrails_core (2.0.0.pre) activerecord (>= 3.1.0.rc) +GIT + remote: git://github.com/github/gollum.git + revision: c9bc2a89f655760c0a21da6d3ab37c5f6267e96c + specs: + gollum (2.1.0) + github-markdown + github-markup (>= 0.7.0, < 1.0.0) + grit (~> 2.5.0) + mustache (>= 0.11.2, < 1.0.0) + nokogiri (~> 1.4) + posix-spawn (~> 0.3.0) + pygments.rb (~> 0.2.0) + sanitize (~> 2.0.0) + sinatra (~> 1.0) + stringex (~> 1.4.0) + useragent (~> 0.4.9) + GIT remote: git://github.com/rdblue/grack.git revision: 020be3fef3fb308b9d214252522aa5945bf6584a @@ -14,9 +31,9 @@ GIT GIT remote: git://github.com/warpc/grit.git - revision: 696b0967cb7e6bac044569d898e5acef431d4f97 + revision: f04f779fb052725b964ba259f8073a34e493c0c7 specs: - grit (2.4.1) + grit (2.5.0) diff-lcs (~> 1.1) mime-types (~> 1.15) posix-spawn (~> 0.3.6) @@ -25,38 +42,36 @@ GEM remote: http://rubygems.org/ specs: RedCloth (4.2.9) - actionmailer (3.2.6) - actionpack (= 3.2.6) + actionmailer (3.2.7) + actionpack (= 3.2.7) mail (~> 2.4.4) - actionpack (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + actionpack (3.2.7) + activemodel (= 3.2.7) + activesupport (= 3.2.7) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) + journey (~> 1.0.4) rack (~> 1.4.0) rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.1.3) - activemodel (3.2.6) - activesupport (= 3.2.6) + activemodel (3.2.7) + activesupport (= 3.2.7) builder (~> 3.0.0) - activerecord (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + activerecord (3.2.7) + activemodel (= 3.2.7) + activesupport (= 3.2.7) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - activesupport (3.2.6) + activeresource (3.2.7) + activemodel (= 3.2.7) + activesupport (= 3.2.7) + activesupport (3.2.7) i18n (~> 0.6) multi_json (~> 1.0) airbrake (3.1.2) activesupport builder - albino (1.3.3) - posix-spawn (>= 0.3.6) ancestry (1.3.0) activerecord (>= 2.3.14) arel (3.0.2) @@ -122,16 +137,8 @@ GEM escape_utils (~> 0.2.3) mime-types (~> 1.18) pygments.rb (>= 0.2.13) + github-markdown (0.5.0) github-markup (0.7.4) - gollum (1.3.1) - albino (~> 1.3.2) - github-markup (>= 0.4.0, < 1.0.0) - grit (~> 2.4.1) - mustache (>= 0.11.2, < 1.0.0) - nokogiri (~> 1.4) - redcarpet - sanitize (~> 2.0.0) - sinatra (~> 1.0) haml (3.1.6) haml-rails (0.3.4) actionpack (~> 3.0) @@ -180,7 +187,7 @@ GEM net-ssh (2.5.2) net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) - newrelic_rpm (3.4.0.1) + newrelic_rpm (3.4.1) nokogiri (1.5.5) omniauth (1.1.0) hashie (~> 1.2) @@ -216,14 +223,14 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.6) - actionmailer (= 3.2.6) - actionpack (= 3.2.6) - activerecord (= 3.2.6) - activeresource (= 3.2.6) - activesupport (= 3.2.6) + rails (3.2.7) + actionmailer (= 3.2.7) + actionpack (= 3.2.7) + activerecord (= 3.2.7) + activeresource (= 3.2.7) + activesupport (= 3.2.7) bundler (~> 1.0) - railties (= 3.2.6) + railties (= 3.2.7) rails-backbone (0.7.2) coffee-script (~> 2.2.0) ejs (~> 1.0.0) @@ -232,9 +239,9 @@ GEM railties (>= 3.0.0) rails3-jquery-autocomplete (1.0.7) rails (~> 3.0) - railties (3.2.6) - actionpack (= 3.2.6) - activesupport (= 3.2.6) + railties (3.2.7) + actionpack (= 3.2.7) + activesupport (= 3.2.7) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -315,6 +322,7 @@ GEM tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) state_machine (1.1.2) + stringex (1.4.0) systemu (2.5.2) therubyracer (0.10.1) libv8 (~> 3.3.10) @@ -335,6 +343,7 @@ GEM kgio (~> 2.6) rack raindrops (~> 0.7) + useragent (0.4.10) uuid (2.3.5) macaddr (~> 1.0) vegas (0.1.11) @@ -369,7 +378,7 @@ DEPENDENCIES diff-display (~> 0.0.1) factory_girl_rails (~> 3.5.0) github-linguist (~> 2.1.2) - gollum (= 1.3.1) + gollum! grack! grit! haml-rails (~> 0.3.4) @@ -379,13 +388,13 @@ DEPENDENCIES jquery-rails (~> 2.0.2) mailcatcher meta-tags (~> 1.2.5) - newrelic_rpm (~> 3.4.0.1) + newrelic_rpm (~> 3.4.1) omniauth (~> 1.1.0) omniauth-openid (~> 1.0.1) paperclip (~> 3.1.4) perform_later (~> 1.3.0) pg (~> 0.14.0) - rails (= 3.2.6) + rails (= 3.2.7) rails-backbone (~> 0.7.2) rails3-generators rails3-jquery-autocomplete (~> 1.0.7) diff --git a/doc/README_FOR_APP b/doc/README_FOR_APP index cca71ab75..cd837c6bc 100644 --- a/doc/README_FOR_APP +++ b/doc/README_FOR_APP @@ -25,4 +25,6 @@ sudo urpmi lib64magic-devel # mandriva brew install libmagic; brew link libmagic # brew gem install ruby-filemagic +sudo urpmi python-devel + git config --global core.quotepath false diff --git a/lib/ext/core/string.rb b/lib/ext/core/string.rb index e84bca715..9ff9bde77 100644 --- a/lib/ext/core/string.rb +++ b/lib/ext/core/string.rb @@ -15,9 +15,10 @@ class String encode!(Encoding::UTF_16, default_encoding, options).encode!(default_encoding, Encoding::UTF_16) raise unless valid_encoding? # check result end + self rescue replace "--broken encoding: #{detect_encoding[:encoding] || 'unknown'}" - ensure - self + # ensure + # return self end end