[DRE-commits] [ruby-yaml-db] 05/09: Drop previous patches, integrated upstream or not needed anymore

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-yaml-db.

commit d9fd086685a809852b0c5b3a494bc913d3bbd07e
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Jul 6 00:44:04 2015 +0200

    Drop previous patches, integrated upstream or not needed anymore
---
 debian/patches/gitlab.patch        | 96 --------------------------------------
 debian/patches/kill-rubygems.patch |  7 ---
 debian/patches/series              |  2 -
 3 files changed, 105 deletions(-)

diff --git a/debian/patches/gitlab.patch b/debian/patches/gitlab.patch
deleted file mode 100644
index 30d34e3..0000000
--- a/debian/patches/gitlab.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/spec/yaml_dump_spec.rb b/spec/yaml_dump_spec.rb
-index 3a73d9a..f808d3e 100644
---- a/spec/yaml_dump_spec.rb
-+++ b/spec/yaml_dump_spec.rb
-@@ -1,55 +1,50 @@
- require File.dirname(__FILE__) + '/base'
- 
- describe YamlDb::Dump do
--
--	before do
--		silence_warnings { ActiveRecord::Base = mock('ActiveRecord::Base', :null_object => true) }
--		ActiveRecord::Base.stub(:connection).and_return(stub('connection').as_null_object)
--		ActiveRecord::Base.connection.stub!(:tables).and_return([ 'mytable', 'schema_info', 'schema_migrations' ])
--		ActiveRecord::Base.connection.stub!(:columns).with('mytable').and_return([ mock('a',:name => 'a', :type => :string), mock('b', :name => 'b', :type => :string) ])
--		ActiveRecord::Base.connection.stub!(:select_one).and_return({"count"=>"2"})
--		ActiveRecord::Base.connection.stub!(:select_all).and_return([ { 'a' => 1, 'b' => 2 }, { 'a' => 3, 'b' => 4 } ])
--		YamlDb::Utils.stub!(:quote_table).with('mytable').and_return('mytable')
--	end
--
--	before(:each) do   
--	  File.stub!(:new).with('dump.yml', 'w').and_return(StringIO.new)
--	  @io = StringIO.new
--	end
--
--	it "should return a formatted string" do
--		YamlDb::Dump.table_record_header(@io)
--		@io.rewind
--		@io.read.should == "  records: \n"
--	end
--
--
--	it "should return a yaml string that contains a table header and column names" do
--		YamlDb::Dump.stub!(:table_column_names).with('mytable').and_return([ 'a', 'b' ])
--		YamlDb::Dump.dump_table_columns(@io, 'mytable')
--		@io.rewind
--		@io.read.should == <<EOYAML
--
----- 
--mytable: 
--  columns: 
-+  before do
-+    silence_warnings { ActiveRecord::Base = mock('ActiveRecord::Base', :null_object => true) }
-+    ActiveRecord::Base.stub(:connection).and_return(stub('connection').as_null_object)
-+    ActiveRecord::Base.connection.stub!(:tables).and_return([ 'mytable', 'schema_info', 'schema_migrations' ])
-+    ActiveRecord::Base.connection.stub!(:columns).with('mytable').and_return([ mock('a',:name => 'a', :type => :string), mock('b', :name => 'b', :type => :string) ])
-+    ActiveRecord::Base.connection.stub!(:select_one).and_return({"count"=>"2"})
-+    ActiveRecord::Base.connection.stub!(:select_all).and_return([ { 'a' => 1, 'b' => 2 }, { 'a' => 3, 'b' => 4 } ])
-+    YamlDb::Utils.stub!(:quote_table).with('mytable').and_return('mytable')
-+  end
-+
-+  before(:each) do
-+    File.stub!(:new).with('dump.yml', 'w').and_return(StringIO.new)
-+    @io = StringIO.new
-+  end
-+
-+  it "should return a formatted string" do
-+    YamlDb::Dump.table_record_header(@io)
-+    @io.rewind
-+    @io.read.should == "  records: \n"
-+  end
-+
-+  it "should return a yaml string that contains a table header and column names" do
-+    YamlDb::Dump.stub!(:table_column_names).with('mytable').and_return([ 'a', 'b' ])
-+    YamlDb::Dump.dump_table_columns(@io, 'mytable')
-+    @io.rewind
-+    @io.read.should == <<EOYAML
-+
-+---
-+mytable:
-+  columns:
-   - a
-   - b
- EOYAML
--	end
-+  end
- 
--	it "should return dump the records for a table in yaml to a given io stream" do
--		YamlDb::Dump.dump_table_records(@io, 'mytable')
--		@io.rewind
--		@io.read.should == <<EOYAML
-+  it "should return dump the records for a table in yaml to a given io stream" do
-+    YamlDb::Dump.dump_table_records(@io, 'mytable')
-+    @io.rewind
-+    @io.read.should == <<EOYAML
-   records: 
-   - - 1
-     - 2
-   - - 3
-     - 4
- EOYAML
--	end
--
--
--
-+  end
- end
diff --git a/debian/patches/kill-rubygems.patch b/debian/patches/kill-rubygems.patch
deleted file mode 100644
index 07752bd..0000000
--- a/debian/patches/kill-rubygems.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/lib/yaml_db.rb
-+++ b/lib/yaml_db.rb
-@@ -1,4 +1,3 @@
--require 'rubygems'
- require 'yaml'
- require 'active_record'
- require 'serialization_helper'
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b3713d0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-gitlab.patch
-kill-rubygems.patch

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