[DRE-commits] [test-kitchen] 33/39: refresh patches

[Hleb Valoshka]

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

tsfgnu-guest pushed a commit to branch master
in repository test-kitchen.

commit 0119f892e3fb526dd750c23d819341d56160ad9b
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Mon Apr 11 15:33:19 2016 +0300

    refresh patches
---
 .../patches/0001-Do-not-run-test-for-winrm-transport.patch  |  2 +-
 .../0005-Search-for-support-in-usr-share-test-kitchen.patch |  2 +-
 .../0009-Remove-Gemfile-to-prevent-bundler-execution.patch  | 13 +++++++++----
 .../0012-Do-not-run-gem-install-during-kitchen-init.patch   |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian/patches/0001-Do-not-run-test-for-winrm-transport.patch b/debian/patches/0001-Do-not-run-test-for-winrm-transport.patch
index 1bb05f9..9483958 100644
--- a/debian/patches/0001-Do-not-run-test-for-winrm-transport.patch
+++ b/debian/patches/0001-Do-not-run-test-for-winrm-transport.patch
@@ -36,7 +36,7 @@ index f0c1c32..dda98a8 100644
      Given a file named ".kitchen.yml" with:
      """
 diff --git a/spec/kitchen/transport/winrm_spec.rb b/spec/kitchen/transport/winrm_spec.rb
-index 152f8ff..71c96fc 100644
+index 52e9059..f9c6167 100644
 --- a/spec/kitchen/transport/winrm_spec.rb
 +++ b/spec/kitchen/transport/winrm_spec.rb
 @@ -15,7 +15,7 @@
diff --git a/debian/patches/0005-Search-for-support-in-usr-share-test-kitchen.patch b/debian/patches/0005-Search-for-support-in-usr-share-test-kitchen.patch
index b2db20c..8a5980a 100644
--- a/debian/patches/0005-Search-for-support-in-usr-share-test-kitchen.patch
+++ b/debian/patches/0005-Search-for-support-in-usr-share-test-kitchen.patch
@@ -23,7 +23,7 @@ index edbd4b7..bce54a5 100644
          )
  
 diff --git a/lib/kitchen/provisioner/chef_zero.rb b/lib/kitchen/provisioner/chef_zero.rb
-index 2cbaa55..a0da4a9 100644
+index 6b0ca80..5783698 100644
 --- a/lib/kitchen/provisioner/chef_zero.rb
 +++ b/lib/kitchen/provisioner/chef_zero.rb
 @@ -198,7 +198,7 @@ module Kitchen
diff --git a/debian/patches/0009-Remove-Gemfile-to-prevent-bundler-execution.patch b/debian/patches/0009-Remove-Gemfile-to-prevent-bundler-execution.patch
index e36b042..b6d0ff3 100644
--- a/debian/patches/0009-Remove-Gemfile-to-prevent-bundler-execution.patch
+++ b/debian/patches/0009-Remove-Gemfile-to-prevent-bundler-execution.patch
@@ -3,16 +3,16 @@ Date: Thu, 9 Jul 2015 14:15:55 +0300
 Subject: Remove Gemfile to prevent bundler execution
 
 ---
- Gemfile | 14 --------------
- 1 file changed, 14 deletions(-)
+ Gemfile | 19 -------------------
+ 1 file changed, 19 deletions(-)
  delete mode 100644 Gemfile
 
 diff --git a/Gemfile b/Gemfile
 deleted file mode 100644
-index ff48e2f..0000000
+index ea1e3eb..0000000
 --- a/Gemfile
 +++ /dev/null
-@@ -1,14 +0,0 @@
+@@ -1,19 +0,0 @@
 -# -*- encoding: utf-8 -*-
 -source "https://rubygems.org"
 -gemspec
@@ -24,6 +24,11 @@ index ff48e2f..0000000
 -  gem "guard-yard"
 -end
 -
+-group :integration do
+-  gem "berkshelf", "~> 4.3"
+-  gem "kitchen-inspec", "~> 0.12.5"
+-end
+-
 -group :test do
 -  gem "codeclimate-test-reporter", :require => nil
 -end
diff --git a/debian/patches/0012-Do-not-run-gem-install-during-kitchen-init.patch b/debian/patches/0012-Do-not-run-gem-install-during-kitchen-init.patch
index 938568e..afb651c 100644
--- a/debian/patches/0012-Do-not-run-gem-install-during-kitchen-init.patch
+++ b/debian/patches/0012-Do-not-run-gem-install-during-kitchen-init.patch
@@ -8,7 +8,7 @@ Subject: Do not run `gem install` during `kitchen init`
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/features/kitchen_init_command.feature b/features/kitchen_init_command.feature
-index a1527a2..1c6e57a 100644
+index 0b29480..6d1e6d3 100644
 --- a/features/kitchen_init_command.feature
 +++ b/features/kitchen_init_command.feature
 @@ -32,7 +32,7 @@ Feature: Add Test Kitchen support to an existing project

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