[DRE-commits] [ruby-asset-sync] 04/06: Refresh patches

[Christian Hofstaedtler]

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

zeha pushed a commit to branch master
in repository ruby-asset-sync.

commit 876f6e88fbe31466f1ce25ebbd360771e71c9c4a
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Mon Dec 23 22:58:39 2013 +0100

    Refresh patches
---
 debian/patches/disable-aws-tests.patch             | 14 ++++---
 debian/patches/remove-rubygems-bundler.patch       | 26 +++++++++++++
 .../remove-simplecov-rubygems-bundler.patch        | 45 ----------------------
 debian/patches/series                              |  2 +-
 4 files changed, 35 insertions(+), 52 deletions(-)

diff --git a/debian/patches/disable-aws-tests.patch b/debian/patches/disable-aws-tests.patch
index 810e015..4aef83c 100644
--- a/debian/patches/disable-aws-tests.patch
+++ b/debian/patches/disable-aws-tests.patch
@@ -3,18 +3,20 @@ Description: Disable tests with aws
 Author: Praveen Arimbrathodiyil <praveen at debian.org>
 Last-Update: 2013-06-06
 
---- a/spec/integration/aws_integration_spec.rb
-+++ b/spec/integration/aws_integration_spec.rb
-@@ -30,7 +30,7 @@
+Index: ruby-asset-sync/spec/integration/aws_integration_spec.rb
+===================================================================
+--- ruby-asset-sync.orig/spec/integration/aws_integration_spec.rb	2013-12-23 22:53:39.266839306 +0100
++++ ruby-asset-sync/spec/integration/aws_integration_spec.rb	2013-12-23 22:53:39.262839320 +0100
+@@ -41,7 +41,7 @@ describe "AssetSync" do
      end
    end
  
 -  it "sync" do
 +  xit "sync" do
      execute "rake ASSET_SYNC_PREFIX=#{@prefix} assets:precompile"
-     bucket(@prefix).files.size.should == 5
+     # bucket(@prefix).files.size.should == 5
  
-@@ -42,12 +42,12 @@
+@@ -58,12 +58,12 @@ describe "AssetSync" do
      app_js_gz.content_encoding.should == "gzip"
    end
  
@@ -27,5 +29,5 @@ Last-Update: 2013-06-06
 -  it "sync with gzip_compression=true" do
 +  xit "sync with gzip_compression=true" do
      execute "rake ASSET_SYNC_PREFIX=#{@prefix} ASSET_SYNC_GZIP_COMPRESSION=true assets:precompile"
-     bucket(@prefix).files.size.should == 3
+     # bucket(@prefix).files.size.should == 3
  
diff --git a/debian/patches/remove-rubygems-bundler.patch b/debian/patches/remove-rubygems-bundler.patch
new file mode 100644
index 0000000..cb83117
--- /dev/null
+++ b/debian/patches/remove-rubygems-bundler.patch
@@ -0,0 +1,26 @@
+Index: ruby-asset-sync/spec/spec_helper.rb
+===================================================================
+--- ruby-asset-sync.orig/spec/spec_helper.rb	2013-12-23 22:55:36.138440557 +0100
++++ ruby-asset-sync/spec/spec_helper.rb	2013-12-23 22:58:20.909875255 +0100
+@@ -1,6 +1,3 @@
+-require 'rubygems'
+-require 'bundler'
+-
+ begin
+   require 'simplecov'
+   SimpleCov.start do
+@@ -10,14 +7,6 @@ rescue LoadError
+   # SimpleCov ain't available - continue
+ end
+ 
+-begin
+-  Bundler.setup(:default, :development)
+-rescue Bundler::BundlerError => e
+-  $stderr.puts e.message
+-  $stderr.puts "Run `bundle install` to install missing gems"
+-  exit e.status_code
+-end
+-
+ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+ $LOAD_PATH.unshift(File.dirname(__FILE__))
+ require 'asset_sync'
diff --git a/debian/patches/remove-simplecov-rubygems-bundler.patch b/debian/patches/remove-simplecov-rubygems-bundler.patch
deleted file mode 100644
index 07ea9a1..0000000
--- a/debian/patches/remove-simplecov-rubygems-bundler.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Remove simplecov, rubygems and bundler
- simplecov is used for code coverage. It may be enabled again
- when simplecov is packaged.
- apt is used for satisfying dependencies, these are tracked in debian/control
-Author: Praveen Arimbrathodiyil <praveen at debian.org>
-Last-Update: 2013-05-06
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,20 +1,20 @@
--require 'rubygems'
--require 'bundler'
-+#require 'rubygems'
-+#require 'bundler'
- 
--if RUBY_VERSION != '1.8.7'
--  require 'simplecov'
--  SimpleCov.start do
--    add_filter 'spec'
--  end
--end
-+#if RUBY_VERSION != '1.8.7'
-+#  require 'simplecov'
-+#  SimpleCov.start do
-+#    add_filter 'spec'
-+#  end
-+#end
- 
--begin
--  Bundler.setup(:default, :development)
--rescue Bundler::BundlerError => e
--  $stderr.puts e.message
--  $stderr.puts "Run `bundle install` to install missing gems"
--  exit e.status_code
--end
-+#begin
-+#  Bundler.setup(:default, :development)
-+#rescue Bundler::BundlerError => e
-+#  $stderr.puts e.message
-+#  $stderr.puts "Run `bundle install` to install missing gems"
-+#  exit e.status_code
-+#end
- 
- $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
- $LOAD_PATH.unshift(File.dirname(__FILE__))
diff --git a/debian/patches/series b/debian/patches/series
index 654ef8b..f086edc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-remove-simplecov-rubygems-bundler.patch
+remove-rubygems-bundler.patch
 disable-aws-tests.patch

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