[DRE-commits] [ruby-i18n] 03/05: refreshed strip_bundler patch

[Jonas Genannt]

This is an automated email from the git hooks/post-receive script.

hggh-guest pushed a commit to branch master
in repository ruby-i18n.

commit 5cb83c37bbffe0282bddf0446a845420c479b9b1
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Tue Jul 29 20:58:38 2014 +0200

    refreshed strip_bundler patch
---
 debian/patches/strip_bundler.patch | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/debian/patches/strip_bundler.patch b/debian/patches/strip_bundler.patch
index bc7f486..191cbff 100644
--- a/debian/patches/strip_bundler.patch
+++ b/debian/patches/strip_bundler.patch
@@ -3,35 +3,35 @@ Description: disable bundler on build time, do not install dependency on build
              time via bundler
 Forwarded: not-needed
 
+diff --git a/test/run_all.rb b/test/run_all.rb
+index 46bc43c..965b345 100644
 --- a/test/run_all.rb
 +++ b/test/run_all.rb
-@@ -1,7 +1,3 @@
+@@ -1,6 +1,3 @@
 -def bundle_check
--  `bundle check` == "The Gemfile's dependencies are satisfied\n"
+-  `bundle check` == "Resolving dependencies...\nThe Gemfile's dependencies are satisfied\n"
 -end
--
- command  = 'ruby -w -Ilib -Itest test/all.rb'
- gemfiles = %w(ci/Gemfile.rails-3.x ci/Gemfile.rails-2.3.x ci/Gemfile.no-rails)
  
-@@ -9,11 +5,6 @@
-   puts "BUNDLE_GEMFILE=#{gemfile}"
-   ENV['BUNDLE_GEMFILE'] = gemfile
- 
--  unless bundle_check
--    puts "bundle install"
--    system('bundle install')
--  end
--
+ def execute(command)
    puts command
-   system('ruby -w -Ilib -Itest test/all.rb')
+@@ -13,8 +10,6 @@ results = gemfiles.map do |gemfile|
+   puts "\nBUNDLE_GEMFILE=#{gemfile}"
+   ENV['BUNDLE_GEMFILE'] = File.expand_path("../../#{gemfile}", __FILE__)
+ 
+-  execute 'bundle install' unless bundle_check
+-  execute 'bundle exec ruby -w -Ilib -Itest test/all.rb'
  end
+ 
+ exit results.all?
+diff --git a/test/test_helper.rb b/test/test_helper.rb
+index d24b81f..0c83fcc 100644
 --- a/test/test_helper.rb
 +++ b/test/test_helper.rb
-@@ -12,7 +12,6 @@
+@@ -30,7 +30,6 @@ def gem(gem_name, *version_requirements)
    gem_name =='i18n' ? puts("skipping loading the i18n gem ...") : super
  end
  
 -require 'bundler/setup'
  require 'i18n'
- require 'mocha'
+ require 'mocha/setup'
  require 'test_declarative'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-i18n.git