[DRE-commits] [berkshelf] 03/04: Update patches
Hleb Valoshka
tsfgnu-guest at moszumanska.debian.org
Thu Jul 27 20:44:32 UTC 2017
This is an automated email from the git hooks/post-receive script.
tsfgnu-guest pushed a commit to branch master
in repository berkshelf.
commit 2c81ba8a40de40cceef21188b94f0e7ba3a3b069
Author: Hleb Valoshka <375gnu at gmail.com>
Date: Sun Jul 23 19:25:21 2017 +0300
Update patches
---
debian/patches/0001-Remove-spork-usage.patch | 70 ----------------------
.../0002-Don-t-change-LOAD_PATH-in-bin-berks.patch | 11 ++--
...0003-Use-usr-share-berkshelf-as-data-root.patch | 36 ++++++-----
...k-for-Berkshelf-InvalidCookbookFiles-only.patch | 21 -------
debian/patches/0005-Ignore-networked-tests.patch | 34 +++++------
... 0006-Use-better-temporary-path-in-tests.patch} | 4 +-
...gnore-randomly-failing-under-sbuild-test.patch} | 4 +-
...ruby-ridley-ruby-solve-version-in-gemfile.patch | 23 -------
.../0008-Ignore-test-failing-in-sbuild.patch | 46 +++++++-------
...elax-version-of-mixlib-archive-in-gemspec.patch | 15 -----
debian/patches/series | 8 +--
11 files changed, 74 insertions(+), 198 deletions(-)
diff --git a/debian/patches/0001-Remove-spork-usage.patch b/debian/patches/0001-Remove-spork-usage.patch
deleted file mode 100644
index c936223..0000000
--- a/debian/patches/0001-Remove-spork-usage.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Hleb Valoshka <375gnu at gmail.com>
-Date: Mon, 28 Mar 2016 13:32:47 +0300
-Subject: Remove spork usage
-
----
- features/support/env.rb | 9 +--------
- spec/spec_helper.rb | 6 ------
- 2 files changed, 1 insertion(+), 14 deletions(-)
-
-diff --git a/features/support/env.rb b/features/support/env.rb
-index 680dfd2..9d39a11 100644
---- a/features/support/env.rb
-+++ b/features/support/env.rb
-@@ -1,16 +1,14 @@
--require 'spork'
--
- def windows?
- !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
- end
-
--Spork.prefork do
- require 'aruba/cucumber'
- require 'aruba/in_process'
- require 'aruba/spawn_process'
- require 'cucumber/rspec/doubles'
- require 'berkshelf/api/rspec' unless windows?
- require 'berkshelf/api/cucumber' unless windows?
-+ require 'berkshelf/cli'
-
- Dir['spec/support/**/*.rb'].each { |f| require File.expand_path(f) }
-
-@@ -72,8 +70,3 @@ Spork.prefork do
- aruba.config.io_wait_timeout = Cucumber::JRUBY ? 70 : 30
- @aruba_timeout_seconds = Cucumber::JRUBY ? 140 : 60
- end
--end
--
--Spork.each_run do
-- require 'berkshelf/cli'
--end
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 09e6ee5..8dbaa4c 100644
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,10 +1,7 @@
--require 'spork'
--
- def windows?
- !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
- end
-
--Spork.prefork do
- require 'rspec'
- require 'cleanroom/rspec'
- require 'webmock/rspec'
-@@ -66,9 +63,7 @@ Spork.prefork do
-
- result
- end
--end
-
--Spork.each_run do
- require 'berkshelf'
-
- module Berkshelf
-@@ -84,4 +79,3 @@ Spork.each_run do
- end
- end
- end
--end
diff --git a/debian/patches/0002-Don-t-change-LOAD_PATH-in-bin-berks.patch b/debian/patches/0002-Don-t-change-LOAD_PATH-in-bin-berks.patch
index 9e24821..f779789 100644
--- a/debian/patches/0002-Don-t-change-LOAD_PATH-in-bin-berks.patch
+++ b/debian/patches/0002-Don-t-change-LOAD_PATH-in-bin-berks.patch
@@ -3,16 +3,17 @@ Date: Fri, 8 Apr 2016 18:25:29 +0300
Subject: Don't change LOAD_PATH in bin/berks
---
- bin/berks | 1 -
- 1 file changed, 1 deletion(-)
+ bin/berks | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/bin/berks b/bin/berks
-index 763d9d7..41ce56b 100755
+index 098dd10..41ce56b 100755
--- a/bin/berks
+++ b/bin/berks
@@ -1,5 +1,4 @@
#!/usr/bin/env ruby
--$:.push File.expand_path('../../lib', __FILE__)
- require 'berkshelf/cli'
+-$:.push File.expand_path("../../lib", __FILE__)
+-require "berkshelf/cli"
++require 'berkshelf/cli'
Berkshelf::Cli::Runner.new(ARGV.dup).execute!
diff --git a/debian/patches/0003-Use-usr-share-berkshelf-as-data-root.patch b/debian/patches/0003-Use-usr-share-berkshelf-as-data-root.patch
index 0fbdb3d..ccdf1f6 100644
--- a/debian/patches/0003-Use-usr-share-berkshelf-as-data-root.patch
+++ b/debian/patches/0003-Use-usr-share-berkshelf-as-data-root.patch
@@ -3,20 +3,20 @@ Date: Fri, 8 Apr 2016 18:26:03 +0300
Subject: Use /usr/share/berkshelf as data root
---
- lib/berkshelf.rb | 6 +++++-
+ lib/berkshelf.rb | 7 ++++++-
spec/spec_helper.rb | 7 +++++++
spec/support/path_helpers.rb | 8 ++++++--
- 3 files changed, 18 insertions(+), 3 deletions(-)
+ 3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/lib/berkshelf.rb b/lib/berkshelf.rb
-index f0f4cfc..456248d 100644
+index 442d1e0..d632895 100644
--- a/lib/berkshelf.rb
+++ b/lib/berkshelf.rb
-@@ -51,7 +51,11 @@ module Berkshelf
+@@ -72,7 +72,11 @@ module Berkshelf
# @return [Pathname]
def root
-- @root ||= Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
+- @root ||= Pathname.new(File.expand_path("../", File.dirname(__FILE__)))
+ @root ||= Pathname.new(
+ Dir[
+ '/usr/share/berkshelf',
@@ -25,14 +25,22 @@ index f0f4cfc..456248d 100644
end
# @return [Berkshelf::Shell]
+@@ -152,6 +156,7 @@ module Berkshelf
+ ssl_options[:cert_store] = ssl_policy.store if ssl_policy.store
+
+ ridley_options = options.slice(:ssl)
++
+ ridley_options[:server_url] = options[:server_url] || Berkshelf.config.chef.chef_server_url
+ ridley_options[:client_name] = options[:client_name] || Berkshelf.config.chef.node_name
+ ridley_options[:client_key] = options[:client_key] || Berkshelf.config.chef.client_key
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 8dbaa4c..f5454bb 100644
+index bd27771..495b45a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
-@@ -67,6 +67,13 @@ end
- require 'berkshelf'
+@@ -66,6 +66,13 @@ end
+ require "berkshelf"
- module Berkshelf
+ module Berkshelf
+ class BaseGenerator
+ class << self
+ def source_root
@@ -40,18 +48,18 @@ index 8dbaa4c..f5454bb 100644
+ end
+ end
+ end
- class GitLocation
- include Berkshelf::RSpec::Git
+ class GitLocation
+ include Berkshelf::RSpec::Git
diff --git a/spec/support/path_helpers.rb b/spec/support/path_helpers.rb
-index 59a03e0..3d21e22 100644
+index a851e6f..b48ef32 100644
--- a/spec/support/path_helpers.rb
+++ b/spec/support/path_helpers.rb
@@ -26,14 +26,18 @@ module Berkshelf
#
# @return [Pathname]
def fixtures_path
-- Berkshelf.root.join('spec/fixtures')
+- Berkshelf.root.join("spec/fixtures")
+ Pathname.new(
+ File.expand_path(
+ File.join(File.dirname(__FILE__), %w[.. fixtures])))
@@ -61,7 +69,7 @@ index 59a03e0..3d21e22 100644
#
# @return [String]
def chef_config_path
-- Berkshelf.root.join('spec/config/knife.rb').to_s
+- Berkshelf.root.join("spec/config/knife.rb").to_s
+ Pathname.new(
+ File.expand_path(
+ File.join(File.dirname(__FILE__), %w[.. config/knife.rb]))).to_s
diff --git a/debian/patches/0004-Check-for-Berkshelf-InvalidCookbookFiles-only.patch b/debian/patches/0004-Check-for-Berkshelf-InvalidCookbookFiles-only.patch
deleted file mode 100644
index 5c1fbc9..0000000
--- a/debian/patches/0004-Check-for-Berkshelf-InvalidCookbookFiles-only.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Hleb Valoshka <375gnu at gmail.com>
-Date: Mon, 5 Sep 2016 12:39:39 +0300
-Subject: Check for Berkshelf::InvalidCookbookFiles only
-
----
- spec/unit/berkshelf/validator_spec.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spec/unit/berkshelf/validator_spec.rb b/spec/unit/berkshelf/validator_spec.rb
-index fdf4204..fc79aa9 100644
---- a/spec/unit/berkshelf/validator_spec.rb
-+++ b/spec/unit/berkshelf/validator_spec.rb
-@@ -8,7 +8,7 @@ describe Berkshelf::Validator do
- allow(Dir).to receive(:glob).and_return(['/there are/spaces/in this/recipes/default.rb'])
- expect {
- subject.validate_files(cookbook)
-- }.to raise_error
-+ }.to raise_error(Berkshelf::InvalidCookbookFiles)
- end
-
- it 'does not raise an error when the cookbook is valid' do
diff --git a/debian/patches/0005-Ignore-networked-tests.patch b/debian/patches/0005-Ignore-networked-tests.patch
index cb5d696..247fa46 100644
--- a/debian/patches/0005-Ignore-networked-tests.patch
+++ b/debian/patches/0005-Ignore-networked-tests.patch
@@ -11,10 +11,10 @@ Subject: Ignore networked tests
5 files changed, 20 insertions(+)
diff --git a/features/commands/install.feature b/features/commands/install.feature
-index 44405a5..8d4ed14 100644
+index 092201b..3690dc2 100644
--- a/features/commands/install.feature
+++ b/features/commands/install.feature
-@@ -60,6 +60,7 @@ Feature: berks install
+@@ -56,6 +56,7 @@ Feature: berks install
| ruby | 1.0.0 |
| elixir | 1.0.0 |
@@ -22,7 +22,7 @@ index 44405a5..8d4ed14 100644
Scenario: installing a demand that has already been installed
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -193,6 +194,7 @@ Feature: berks install
+@@ -185,6 +186,7 @@ Feature: berks install
Using example_cookbook (0.5.0) from source at ../../../spec/fixtures/cookbooks/example_cookbook-0.5.0
"""
@@ -30,7 +30,7 @@ index 44405a5..8d4ed14 100644
Scenario: installing a demand from a Git location
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -208,6 +210,7 @@ Feature: berks install
+@@ -200,6 +202,7 @@ Feature: berks install
Using berkshelf-cookbook-fixture (1.0.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at master)
"""
@@ -38,7 +38,7 @@ index 44405a5..8d4ed14 100644
Scenario: installing a demand from a Git location that has already been installed
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -221,6 +224,7 @@ Feature: berks install
+@@ -213,6 +216,7 @@ Feature: berks install
Using berkshelf-cookbook-fixture (1.0.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at master)
"""
@@ -46,15 +46,15 @@ index 44405a5..8d4ed14 100644
Scenario: installing a Berksfile that contains a Git location with a rel
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -239,6 +243,7 @@ Feature: berks install
- Using berkshelf-cookbook-fixture (1.0.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at rel/cookbooks/berkshelf-cookbook-fixture)
+@@ -231,6 +235,7 @@ Feature: berks install
+ Using berkshelf-cookbook-fixture (1.0.0) from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at rel/cookbooks/berkshelf-cookbook-fixture)
"""
+ @ignore
Scenario: installing a Berksfile that contains a Git location
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -252,6 +257,7 @@ Feature: berks install
+@@ -244,6 +249,7 @@ Feature: berks install
And the git cookbook "berkshelf-cookbook-fixture-70a527e17d91f01f031204562460ad1c17f972ee" should not have the following directories:
| .git |
@@ -62,7 +62,7 @@ index 44405a5..8d4ed14 100644
Scenario: installing a Berksfile that contains a Git location with a tag
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -267,6 +273,7 @@ Feature: berks install
+@@ -259,6 +265,7 @@ Feature: berks install
Using berkshelf-cookbook-fixture (0.2.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
"""
@@ -70,7 +70,7 @@ index 44405a5..8d4ed14 100644
Scenario: installing a Berksfile that contains a Git location with a ref
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -282,6 +289,7 @@ Feature: berks install
+@@ -274,6 +281,7 @@ Feature: berks install
Using berkshelf-cookbook-fixture (0.2.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at 70a527e)
"""
@@ -78,7 +78,7 @@ index 44405a5..8d4ed14 100644
Scenario: installing a Berksfile that contains a Git location with an abbreviated ref
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -297,6 +305,7 @@ Feature: berks install
+@@ -289,6 +297,7 @@ Feature: berks install
Using berkshelf-cookbook-fixture (0.2.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at 70a527e)
"""
@@ -86,15 +86,15 @@ index 44405a5..8d4ed14 100644
Scenario: installing a Berksfile that contains a GitHub location
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -312,6 +321,7 @@ Feature: berks install
- Using berkshelf-cookbook-fixture (0.2.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
+@@ -304,6 +313,7 @@ Feature: berks install
+ Using berkshelf-cookbook-fixture (0.2.0) from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
"""
+ @ignore
Scenario: installing a Berksfile that contains a GitHub location
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -452,6 +462,7 @@ Feature: berks install
+@@ -442,6 +452,7 @@ Feature: berks install
"""
And the exit status should be "DuplicateDependencyDefined"
@@ -102,7 +102,7 @@ index 44405a5..8d4ed14 100644
Scenario: when a Git demand points to a branch that does not satisfy the version constraint
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -465,6 +476,7 @@ Feature: berks install
+@@ -455,6 +466,7 @@ Feature: berks install
"""
And the exit status should be "CookbookValidationFailure"
@@ -111,7 +111,7 @@ index 44405a5..8d4ed14 100644
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
diff --git a/features/commands/search.feature b/features/commands/search.feature
-index fa85dbc..e7d1da8 100644
+index 49db953..1fe4fd3 100644
--- a/features/commands/search.feature
+++ b/features/commands/search.feature
@@ -1,3 +1,4 @@
@@ -141,7 +141,7 @@ index ddcddb5..40dd244 100644
Scenario: when the cookbook exists
Given I have a Berksfile pointing at the community API endpoint with:
diff --git a/features/lockfile.feature b/features/lockfile.feature
-index 14c65eb..81f2236 100644
+index 7c1affb..4f317ad 100644
--- a/features/lockfile.feature
+++ b/features/lockfile.feature
@@ -166,6 +166,7 @@ Feature: Creating and reading the Berkshelf lockfile
diff --git a/debian/patches/0009-Use-better-temporary-path-in-tests.patch b/debian/patches/0006-Use-better-temporary-path-in-tests.patch
similarity index 89%
rename from debian/patches/0009-Use-better-temporary-path-in-tests.patch
rename to debian/patches/0006-Use-better-temporary-path-in-tests.patch
index 7af4896..f815190 100644
--- a/debian/patches/0009-Use-better-temporary-path-in-tests.patch
+++ b/debian/patches/0006-Use-better-temporary-path-in-tests.patch
@@ -8,14 +8,14 @@ This should fix 'gem2deb-test-runner --autopkgtest' run
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spec/support/path_helpers.rb b/spec/support/path_helpers.rb
-index 3d21e22..a07d20b 100644
+index b48ef32..5aa67ef 100644
--- a/spec/support/path_helpers.rb
+++ b/spec/support/path_helpers.rb
@@ -19,7 +19,7 @@ module Berkshelf
#
# @return [Pathname]
def tmp_path
-- Berkshelf.root.join('spec/tmp')
+- Berkshelf.root.join("spec/tmp")
+ Pathname.new('/tmp/cb56ad8c_9567_11e6_8b1a_001a4d834cbf')
end
diff --git a/debian/patches/0010-Ignore-randomly-failing-under-sbuild-test.patch b/debian/patches/0007-Ignore-randomly-failing-under-sbuild-test.patch
similarity index 86%
rename from debian/patches/0010-Ignore-randomly-failing-under-sbuild-test.patch
rename to debian/patches/0007-Ignore-randomly-failing-under-sbuild-test.patch
index 5201852..5248702 100644
--- a/debian/patches/0010-Ignore-randomly-failing-under-sbuild-test.patch
+++ b/debian/patches/0007-Ignore-randomly-failing-under-sbuild-test.patch
@@ -8,10 +8,10 @@ TODO: a proper fix
1 file changed, 1 insertion(+)
diff --git a/features/commands/vendor.feature b/features/commands/vendor.feature
-index 5c593d2..9dd5c22 100644
+index 6bfb56d..3109da9 100644
--- a/features/commands/vendor.feature
+++ b/features/commands/vendor.feature
-@@ -21,6 +21,7 @@ Feature: Vendoring cookbooks to a directory
+@@ -19,6 +19,7 @@ Feature: Vendoring cookbooks to a directory
When I run `berks vendor cukebooks`
Then the exit status should be "BerksfileNotFound"
diff --git a/debian/patches/0007-Loose-ruby-ridley-ruby-solve-version-in-gemfile.patch b/debian/patches/0007-Loose-ruby-ridley-ruby-solve-version-in-gemfile.patch
deleted file mode 100644
index eb17f72..0000000
--- a/debian/patches/0007-Loose-ruby-ridley-ruby-solve-version-in-gemfile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Hleb Valoshka <375gnu at gmail.com>
-Date: Tue, 27 Sep 2016 16:16:29 +0300
-Subject: Loose ruby-ridley & ruby-solve version in gemfile
-
----
- berkshelf.gemspec | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/berkshelf.gemspec b/berkshelf.gemspec
-index 77e687a..c01496b 100644
---- a/berkshelf.gemspec
-+++ b/berkshelf.gemspec
-@@ -40,8 +40,8 @@ Gem::Specification.new do |s|
- s.add_dependency 'httpclient', '~> 2.7'
- s.add_dependency 'minitar', '~> 0.5', '>= 0.5.4'
- s.add_dependency 'retryable', '~> 2.0'
-- s.add_dependency 'ridley', '~> 4.5'
-- s.add_dependency 'solve', '~> 2.0'
-+ s.add_dependency 'ridley', '~> 4.4'
-+ s.add_dependency 'solve', '>= 2.0'
- s.add_dependency 'thor', '~> 0.19'
- s.add_dependency 'octokit', '~> 4.0'
- s.add_dependency 'celluloid', '= 0.16.0'
diff --git a/debian/patches/0008-Ignore-test-failing-in-sbuild.patch b/debian/patches/0008-Ignore-test-failing-in-sbuild.patch
index f0d68f7..f6c4a9e 100644
--- a/debian/patches/0008-Ignore-test-failing-in-sbuild.patch
+++ b/debian/patches/0008-Ignore-test-failing-in-sbuild.patch
@@ -10,10 +10,10 @@ Subject: Ignore test failing in sbuild
4 files changed, 17 insertions(+)
diff --git a/features/commands/install.feature b/features/commands/install.feature
-index 8d4ed14..5ff4ab7 100644
+index 3690dc2..a868de5 100644
--- a/features/commands/install.feature
+++ b/features/commands/install.feature
-@@ -4,6 +4,7 @@ Feature: berks install
+@@ -3,6 +3,7 @@ Feature: berks install
* the Chef Server is empty
* the cookbook store is empty
@@ -21,7 +21,7 @@ index 8d4ed14..5ff4ab7 100644
Scenario: installing the version that best satisfies our demand
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -21,6 +22,7 @@ Feature: berks install
+@@ -19,6 +20,7 @@ Feature: berks install
And the cookbook store should have the cookbooks:
| berkshelf | 2.0.0 |
@@ -29,7 +29,7 @@ index 8d4ed14..5ff4ab7 100644
Scenario: installing an explicit version demand
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -38,6 +40,7 @@ Feature: berks install
+@@ -35,6 +37,7 @@ Feature: berks install
And the cookbook store should have the cookbooks:
| berkshelf | 1.0.0 |
@@ -37,7 +37,7 @@ index 8d4ed14..5ff4ab7 100644
Scenario: installing demands from all groups
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -362,6 +365,7 @@ Feature: berks install
+@@ -354,6 +357,7 @@ Feature: berks install
Using fake (0.0.0)
"""
@@ -45,7 +45,7 @@ index 8d4ed14..5ff4ab7 100644
Scenario: running install when a Berksfile.lock is present
Given the Chef Server has cookbooks:
| bacon | 0.1.0 |
-@@ -501,6 +505,7 @@ Feature: berks install
+@@ -491,6 +495,7 @@ Feature: berks install
When I run `berks install`
Then the exit status should be "GitError"
@@ -54,7 +54,7 @@ index 8d4ed14..5ff4ab7 100644
Given the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:
| bacon | >= 0.0.0 |
diff --git a/features/commands/outdated.feature b/features/commands/outdated.feature
-index cbe687e..f6414fa 100644
+index f8626b3..1240dda 100644
--- a/features/commands/outdated.feature
+++ b/features/commands/outdated.feature
@@ -1,4 +1,5 @@
@@ -63,7 +63,7 @@ index cbe687e..f6414fa 100644
Scenario: the dependency is up to date
Given the Chef Server has cookbooks:
| bacon | 1.0.0 |
-@@ -25,6 +26,7 @@ Feature: berks outdated
+@@ -24,6 +25,7 @@ Feature: berks outdated
All cookbooks up to date!
"""
@@ -71,7 +71,7 @@ index cbe687e..f6414fa 100644
Scenario: the dependency has no version constraint and there are new items
Given the Chef Server has cookbooks:
| bacon | 1.0.0 |
-@@ -51,6 +53,7 @@ Feature: berks outdated
+@@ -49,6 +51,7 @@ Feature: berks outdated
* bacon (1.0.0 => 1.1.0)
"""
@@ -80,26 +80,26 @@ index cbe687e..f6414fa 100644
Given the Chef Server has cookbooks:
| bacon | 1.1.0 |
diff --git a/features/commands/vendor.feature b/features/commands/vendor.feature
-index 5483a1d..5c593d2 100644
+index 2747298..6bfb56d 100644
--- a/features/commands/vendor.feature
+++ b/features/commands/vendor.feature
-@@ -6,6 +6,7 @@ Feature: Vendoring cookbooks to a directory
+@@ -4,6 +4,7 @@ Feature: Vendoring cookbooks to a directory
+ | fake | 1.0.0 |
| ekaf | 2.0.0 |
- * the Berkshelf API server's cache is up to date
+ @ignore
Scenario: successfully vendoring a Berksfile with multiple cookbook demands
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -30,6 +31,7 @@ Feature: Vendoring cookbooks to a directory
+@@ -28,6 +29,7 @@ Feature: Vendoring cookbooks to a directory
When I successfully run `berks vendor cukebooks`
- And the directory "cukebooks/fake" should contain version "0.0.0" of the "fake" cookbook
+ Then the directory "cukebooks/fake" should contain version "0.0.0" of the "fake" cookbook
+ @ignore
Scenario: vendoring a cookbook with transitive dependencies
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -48,6 +50,7 @@ Feature: Vendoring cookbooks to a directory
+@@ -46,6 +48,7 @@ Feature: Vendoring cookbooks to a directory
And the directory "vendor/fake" should contain version "1.0.0" of the "fake" cookbook
And the directory "vendor/ekaf" should contain version "2.0.0" of the "ekaf" cookbook
@@ -107,7 +107,7 @@ index 5483a1d..5c593d2 100644
Scenario: vendoring a cookbook with transitive dependencies when a lockfile is present
Given a cookbook named "bacon"
And the cookbook "bacon" has the file "metadata.rb" with:
-@@ -80,6 +83,7 @@ Feature: Vendoring cookbooks to a directory
+@@ -78,6 +81,7 @@ Feature: Vendoring cookbooks to a directory
And the directory "vendor/fake" should contain version "1.0.0" of the "fake" cookbook
And the directory "vendor/ekaf" should contain version "2.0.0" of the "ekaf" cookbook
@@ -115,15 +115,15 @@ index 5483a1d..5c593d2 100644
Scenario: vendoring without an explicit path to vendor into
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -88,6 +92,7 @@ Feature: Vendoring cookbooks to a directory
+@@ -86,6 +90,7 @@ Feature: Vendoring cookbooks to a directory
When I successfully run `berks vendor`
- And the directory "berks-cookbooks/fake" should contain version "1.0.0" of the "fake" cookbook
+ Then the directory "berks-cookbooks/fake" should contain version "1.0.0" of the "fake" cookbook
+ @ignore
Scenario: vendoring to a directory that already exists
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -101,6 +106,7 @@ Feature: Vendoring cookbooks to a directory
+@@ -99,6 +104,7 @@ Feature: Vendoring cookbooks to a directory
And a directory named "cukebooks/fake/ponies" should not exist
And a directory named "cukebooks/existing_cookbook" should not exist
@@ -132,10 +132,10 @@ index 5483a1d..5c593d2 100644
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
diff --git a/features/json_formatter.feature b/features/json_formatter.feature
-index d886ddc..20c732c 100644
+index a6bf54d..0b816f1 100644
--- a/features/json_formatter.feature
+++ b/features/json_formatter.feature
-@@ -4,6 +4,7 @@ Feature: --format json
+@@ -3,6 +3,7 @@ Feature: --format json
* the Chef Server is empty
* the cookbook store is empty
@@ -143,7 +143,7 @@ index d886ddc..20c732c 100644
Scenario: JSON output installing a cookbook from the default location
Given I have a Berksfile pointing at the local Berkshelf API with:
"""
-@@ -33,6 +34,7 @@ Feature: --format json
+@@ -31,6 +32,7 @@ Feature: --format json
}
"""
@@ -151,7 +151,7 @@ index d886ddc..20c732c 100644
Scenario: JSON output installing a cookbook we already have
Given the cookbook store has the cookbooks:
| berkshelf-cookbook-fixture | 1.0.0 |
-@@ -121,6 +123,7 @@ Feature: --format json
+@@ -119,6 +121,7 @@ Feature: --format json
}
"""
diff --git a/debian/patches/0011-Relax-version-of-mixlib-archive-in-gemspec.patch b/debian/patches/0011-Relax-version-of-mixlib-archive-in-gemspec.patch
deleted file mode 100644
index c730ae9..0000000
--- a/debian/patches/0011-Relax-version-of-mixlib-archive-in-gemspec.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Relax version of mixlib-archive in gemspec
-Author: Lucas Kanashiro <kanashiro at debian.org>
-Last-Updated: 2017-07-21
-
---- a/berkshelf.gemspec
-+++ b/berkshelf.gemspec
-@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
- s.add_dependency 'octokit', '~> 4.0'
- s.add_dependency 'celluloid', '= 0.16.0'
- s.add_dependency 'celluloid-io', '~> 0.16.1'
-- s.add_dependency 'mixlib-archive', '~> 0.1'
-+ s.add_dependency 'mixlib-archive', '>= 0.1'
-
- s.add_development_dependency 'aruba', '~> 0.10.0' # Lock this here to avoid problems with public API changes
- s.add_development_dependency 'chef-zero', '~> 4.0'
diff --git a/debian/patches/series b/debian/patches/series
index 9938b53..edae1cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,7 @@
-0001-Remove-spork-usage.patch
0002-Don-t-change-LOAD_PATH-in-bin-berks.patch
0003-Use-usr-share-berkshelf-as-data-root.patch
-0011-Relax-version-of-mixlib-archive-in-gemspec.patch
-0004-Check-for-Berkshelf-InvalidCookbookFiles-only.patch
0005-Ignore-networked-tests.patch
0006-Shut-up-messages-about-deprecated-features.patch
-0007-Loose-ruby-ridley-ruby-solve-version-in-gemfile.patch
0008-Ignore-test-failing-in-sbuild.patch
-0009-Use-better-temporary-path-in-tests.patch
-0010-Ignore-randomly-failing-under-sbuild-test.patch
+0006-Use-better-temporary-path-in-tests.patch
+0007-Ignore-randomly-failing-under-sbuild-test.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/berkshelf.git
More information about the Pkg-ruby-extras-commits
mailing list