Remove cruft

8 files changed, 2 insertions, 74 deletions

diff --git a/.rspec b/.rspec
index eca491f..7060880 100644
--- a/.rspec
+++ b/.rspec
@@ -1 +1 @@
--cbfp
+-cbfs
diff --git a/Gemfile b/Gemfile
index b1dd8e0..c1b379a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,8 +8,3 @@ group(:test) do
 
 end
 
-group(:kitchen) do
-
-  gem 'test-kitchen', '>= 0.7.0.beta.1'
-
-end
diff --git a/mixlib-shellout.gemspec b/mixlib-shellout.gemspec
index cf72f12..f74f15f 100644
--- a/mixlib-shellout.gemspec
+++ b/mixlib-shellout.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://wiki.opscode.com/"
 
 
-  %w(rspec).each { |gem| s.add_development_dependency gem }
+  s.add_development_dependency "rspec", "~> 2.0"
 
   s.bindir       = "bin"
   s.executables  = []
diff --git a/test/kitchen/Kitchenfile b/test/kitchen/Kitchenfile
deleted file mode 100644
index 60afd49..0000000
--- a/test/kitchen/Kitchenfile
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2012, Opscode, Inc. (<legal@opscode.com>)
-#
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-#
-
-integration_test "mixlib-shellout" do
-  language 'ruby'
-  runtimes ['1.9.3']
-  install 'bundle install --without kitchen'
-  script 'bundle exec rspec spec'
-  run_list_extras ['mixlib-shellout_test::default']
-end
diff --git a/test/kitchen/cookbooks/Cheffile b/test/kitchen/cookbooks/Cheffile
deleted file mode 100644
index 5313b1d..0000000
--- a/test/kitchen/cookbooks/Cheffile
+++ /dev/null
@@ -1,3 +0,0 @@
-cookbook 'rvm',
-:git => 'https://github.com/fnichol/chef-rvm.git',
-:ref => 'd6cdb2ab93c421ca6234cbaf5548c914eba4084f'
diff --git a/test/kitchen/cookbooks/mixlib-shellout_test/README.md b/test/kitchen/cookbooks/mixlib-shellout_test/README.md
deleted file mode 100644
index dd93d60..0000000
--- a/test/kitchen/cookbooks/mixlib-shellout_test/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This cookbook is used with test-kitchen to test the parent project, mixlib-shellout.
diff --git a/test/kitchen/cookbooks/mixlib-shellout_test/metadata.rb b/test/kitchen/cookbooks/mixlib-shellout_test/metadata.rb
deleted file mode 100644
index b44b488..0000000
--- a/test/kitchen/cookbooks/mixlib-shellout_test/metadata.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-maintainer       "Opscode, Inc."
-maintainer_email "cookbooks@opscode.com"
-license          "Apache 2.0"
-description      "This cookbook is used with test-kitchen to test the parent project, mixlib-shellout."
-version          "1.0.0"
diff --git a/test/kitchen/cookbooks/mixlib-shellout_test/recipes/default.rb b/test/kitchen/cookbooks/mixlib-shellout_test/recipes/default.rb
deleted file mode 100644
index fa78b4a..0000000
--- a/test/kitchen/cookbooks/mixlib-shellout_test/recipes/default.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Cookbook Name:: mixlib-shellout_test
-# Recipe:: default
-#
-# Copyright 2012, Opscode, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-#
-
-node.set['rvm']['user_installs'] = [
-  { 'user'          => 'vagrant',
-    'default_ruby'  => 'ruby-1.9.3-p327',
-    'rubies'        => ['1.9.3']
-  }
-]
-
-node.set['rvm']['gems'] = {
-  "ruby-1.9.3-p327" => [
-    { 'name' => 'bundler' }
-  ]
-}
-include_recipe "rvm::user"