[DRE-commits] [ruby-kitchen-vagrant] 04/06: Add 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 ruby-kitchen-vagrant.

commit b09c67d69ac5ce26d410ac0bb58c7db47d55dd91
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Wed Jul 8 18:07:50 2015 +0300

    Add patches
---
 debian/patches/0001-Remove-CI-stuff.patch          | 32 +++++++++++++++++++
 ...tfile.erb-from-usr-share-ruby-kitchen-vag.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 71 insertions(+)

diff --git a/debian/patches/0001-Remove-CI-stuff.patch b/debian/patches/0001-Remove-CI-stuff.patch
new file mode 100644
index 0000000..fc1e179
--- /dev/null
+++ b/debian/patches/0001-Remove-CI-stuff.patch
@@ -0,0 +1,32 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Wed, 8 Jul 2015 18:07:36 +0300
+Subject: Remove CI stuff
+
+---
+ spec/spec_helper.rb | 16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index dd841de..24b0d1b 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -15,19 +15,3 @@
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+-
+-if ENV["CODECLIMATE_REPO_TOKEN"]
+-  require "codeclimate-test-reporter"
+-  CodeClimate::TestReporter.start
+-elsif ENV["COVERAGE"]
+-  require "simplecov"
+-  SimpleCov.profiles.define "gem" do
+-    command_name "Specs"
+-
+-    add_filter ".gem/"
+-    add_filter "/spec/"
+-
+-    add_group "Libraries", "/lib/"
+-  end
+-  SimpleCov.start "gem"
+-end
diff --git a/debian/patches/0002-Take-Vagrantfile.erb-from-usr-share-ruby-kitchen-vag.patch b/debian/patches/0002-Take-Vagrantfile.erb-from-usr-share-ruby-kitchen-vag.patch
new file mode 100644
index 0000000..c32a665
--- /dev/null
+++ b/debian/patches/0002-Take-Vagrantfile.erb-from-usr-share-ruby-kitchen-vag.patch
@@ -0,0 +1,37 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Thu, 9 Jul 2015 11:41:16 +0300
+Subject: Take Vagrantfile.erb from /usr/share/ruby-kitchen-vagrant/
+
+---
+ lib/kitchen/driver/vagrant.rb       | 4 +++-
+ spec/kitchen/driver/vagrant_spec.rb | 2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/lib/kitchen/driver/vagrant.rb b/lib/kitchen/driver/vagrant.rb
+index 06c5566..b454fd6 100644
+--- a/lib/kitchen/driver/vagrant.rb
++++ b/lib/kitchen/driver/vagrant.rb
+@@ -66,7 +66,9 @@ module Kitchen
+       default_config :synced_folders, []
+ 
+       default_config :vagrantfile_erb,
+-        File.join(File.dirname(__FILE__), "../../../templates/Vagrantfile.erb")
++        File.join(File.dirname(__FILE__),
++                  %w|.. .. .. .. .. share ruby-kitchen-vagrant templates|,
++                  'Vagrantfile.erb')
+       expand_path_for :vagrantfile_erb
+ 
+       default_config :vagrantfiles, []
+diff --git a/spec/kitchen/driver/vagrant_spec.rb b/spec/kitchen/driver/vagrant_spec.rb
+index 4970f90..e602167 100644
+--- a/spec/kitchen/driver/vagrant_spec.rb
++++ b/spec/kitchen/driver/vagrant_spec.rb
+@@ -288,7 +288,7 @@ describe Kitchen::Driver::Vagrant do
+ 
+     it "sets :vagrantfile_erb to a default" do
+       expect(driver[:vagrantfile_erb]).to match(
+-        %r{/kitchen-vagrant/templates/Vagrantfile\.erb$}
++        %r{/share/ruby-kitchen-vagrant/templates/Vagrantfile\.erb$}
+       )
+     end
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cdb650f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Remove-CI-stuff.patch
+0002-Take-Vagrantfile.erb-from-usr-share-ruby-kitchen-vag.patch

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