kitchen-vagrant 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f14b0bd44b5d2410304663136b51941d1a1eff2
-  data.tar.gz: cc0746859601fc19473a31010d74b7b38e4273c3
+  metadata.gz: ebbecb8fd84f5a6754c77012e1c2aa77fe00a03d
+  data.tar.gz: c311ef68bb8440dbd2b329ac052a79e9d9cbf7e1
 SHA512:
-  metadata.gz: 37d4368bcfcbcc104468b093ad22bcc46702bc1e177251d2364d1c41625b90bccc5cfd201ed13474e0d01e62848c801c9fcc60d800971769667950d27207e46d
-  data.tar.gz: 378daba28fd8e44e566bac03eb2eb13c6d66ddad274a1f3327a086e62b8add759e41b12d122571a13c97c113f807477e9e61fa6a2ba81bdea295cbeff3c8bd8a
+  metadata.gz: 1336ebc431e2f7a94877772b95ea68e480685327c0bddb30cfb0a38a54145bfaf254de66a32968b35e7f6a0fd470cd0c0ec8f6afea828705323f20aaedfe325e
+  data.tar.gz: 334c1e861b07944baa717c25f204c6307ec6c86ba4d2ae1e8a281e68bdf44b802094fc99d1185168a27cdfa0dfa74b952eaadb090c0fdbad9d33cc0d97fecb1f

data/CHANGELOG.md

@@ -1,12 +1,25 @@
+## 0.11.2 / 2013-11-05
+
+### Bug fixes
+
+* Remove misleading `quiet` option ([@sethvargo][])
+* Relax dependency on Test Kitchen ([@sethvargo][])
+* Remove deprecated references to `vagrant-berkshelf` ([@sethvargo][])
+
+### Improvements
+
+* Allow users to specify custom SSH private key ([@manul][])
+* Use platform to determine which vagrant box to download (assume Opscode) ([@sethvargo][])
+
 ## 0.11.1 / 2013-08-29
 
 ### Bug fixes
 
-* Pull request #36: README fix for synched_folders. (@mattray)
+* Pull request [#36][]: README fix for synched_folders. ([@mattray][])
 
 ### Improvements
 
-* Pull request #34: Disable synced folders by default. (@dje)
+* Pull request [#34][]: Disable synced folders by default. ([@dje][])
 
 
 ## 0.11.0 / 2013-07-23
@@ -111,14 +124,20 @@ The initial release.
 [#29]: https://github.com/opscode/kitchen-vagrant/issues/29
 [#30]: https://github.com/opscode/kitchen-vagrant/issues/30
 [#31]: https://github.com/opscode/kitchen-vagrant/issues/31
+[#34]: https://github.com/opscode/kitchen-vagrant/issues/34
+[#36]: https://github.com/opscode/kitchen-vagrant/issues/36
 [@TheDude05]: https://github.com/TheDude05
 [@albertsj1]: https://github.com/albertsj1
+[@dje]: https://github.com/dje
 [@fnichol]: https://github.com/fnichol
 [@fujin]: https://github.com/fujin
 [@gildegoma]: https://github.com/gildegoma
 [@josephholsten]: https://github.com/josephholsten
 [@keiths-osc]: https://github.com/keiths-osc
+[@manul]: https://github.com/manul
 [@martinisoft]: https://github.com/martinisoft
+[@mattray]: https://github.com/mattray
 [@petejkim]: https://github.com/petejkim
 [@sandfish8]: https://github.com/sandfish8
+[@sethvargo]: https://github.com/sethvargo
 [@tmatilai]: https://github.com/tmatilai

data/README.md

@@ -44,26 +44,14 @@ software from VMware and then must also purchase the Vagrant VMware plugin.
 [VMware Workstation][workstation_dl]
 
 
-### <a name="dependencies-berkshelf"></a> Vagrant Berkshelf Plugin
-
-If a Berksfile is present in your project's root directory, then this driver
-will check to ensure that the [vagrant-berkshelf][vagrant_berkshelf] plugin is
-installed.
-
-If your project doesn't use Berkshelf then this check will be skipped.
-
-**Note:** Prior to release 1.2.0, then name of the vagrant-berkshelf gem was
-berkshelf-vagrant. This driver no longer checks for the existance of
-berkshelf-vagrant, so upgrading this Vagrant plugin is recommended.
-
 ## <a name="installation"></a> Installation and Setup
 
 Please read the [Driver usage][driver_usage] page for more details.
 
 ## <a name="default-config"></a> Default Configuration
 
-This driver can determine the Vagrant box name and download URL for a select
-number of platforms. Currently, the following platform names are supported:
+This driver can predict the Vagrant box name and download URL for a select
+number of platforms that have been published by Opscode, such as:
 
 ```ruby
 ---
@@ -203,16 +191,6 @@ be used.
 
 The default is unset, or `nil`.
 
-### <a name="config-use-vagrant-berkshelf-plugin"></a> use_vagrant_berkshelf_plugin
-
-Determines whether or not this driver will use the vagrant-berkself Vagrant
-plugin to assemble cookbook dependencies. If this value if falsey (`nil`,
-`false`) then the driver will skip the vagrant-berkshelf dependency check
-and not activate the plugin in the rendered Vagrantfile. If this value is
-truthy the opposite behvior will be used.
-
-The default is unset, or `nil`.
-
 ### <a name="config-synced-folders"></a> synced_folders
 
 Allow the user to specify a collection of synced folders for on each Vagrant
@@ -259,6 +237,16 @@ would like to connect with a different account than Vagrant default user.
 If this value is nil, then Vagrant parameter `config.ssh.default.username`
 will be used (which is usually set to 'vagrant').
 
+### <a name="config-ssh-key"></a> ssh\_key
+
+This is the path to the private key file used for SSH authentication if you
+would like to use your own private ssh key instead of the default vagrant
+insecure private key.
+
+If this value is a relative path, then it will be expanded relative to the
+location of the main Vagrantfile. If this value is nil, then the default
+insecure private key that ships with Vagrant will be used.
+
 The default value is unset, or `nil`.
 
 ## <a name="development"></a> Development
@@ -292,7 +280,6 @@ Apache 2.0 (see [LICENSE][license])
 [driver_usage]:     http://docs.kitchen-ci.org/drivers/usage
 [chef_omnibus_dl]:  http://www.opscode.com/chef/install/
 
-[vagrant_berkshelf]:        http://rubygems.org/gems/vagrant-berkshelf
 [vagrant_dl]:               http://downloads.vagrantup.com/
 [vagrant_machine_settings]: http://docs.vagrantup.com/v2/vagrantfile/machine_settings.html
 [vagrant_networking]:       http://docs.vagrantup.com/v2/networking/basic_usage.html

data/kitchen-vagrant.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'test-kitchen', '~> 1.0.0.beta.3'
+  gem.add_dependency 'test-kitchen', '~> 1.0.0.beta'
 
   gem.add_development_dependency 'cane'
   gem.add_development_dependency 'tailor'

data/lib/kitchen/driver/vagrant.rb

@@ -37,10 +37,11 @@ module Kitchen
       default_config :customize, { :memory => '256' }
       default_config :synced_folders, {}
       default_config :box do |driver|
-        driver.default_values("box")
+        "opscode-#{driver.instance.platform.name}"
       end
       default_config :box_url do |driver|
-        driver.default_values("box_url")
+        "https://opscode-vm-bento.s3.amazonaws.com/vagrant/" \
+          "opscode_#{driver.instance.platform.name}_provisionerless.box"
       end
 
       required_config :box
@@ -58,11 +59,7 @@ module Kitchen
 
       def converge(state)
         create_vagrantfile
-        if config[:use_vagrant_provision]
-          run "vagrant provision"
-        else
-          super
-        end
+        super
       end
 
       def setup(state)
@@ -88,35 +85,12 @@ module Kitchen
 
       def verify_dependencies
         check_vagrant_version
-        check_berkshelf_plugin if config[:use_vagrant_berkshelf_plugin]
-      end
-
-      def default_values(value)
-        (default_boxes[instance.platform.name] || Hash.new)[value]
       end
 
       protected
 
       WEBSITE = "http://downloads.vagrantup.com/"
       MIN_VER = "1.1.0"
-      OMNITRUCK_PREFIX = "https://opscode-vm-bento.s3.amazonaws.com/vagrant"
-      PLATFORMS = %w{
-        ubuntu-10.04 ubuntu-12.04 ubuntu-12.10 ubuntu-13.04
-        centos-6.4 centos-5.9 debian-7.1.0
-      }
-
-      def default_boxes
-        @default_boxes ||= begin
-          hash = Hash.new
-          PLATFORMS.each do |platform|
-            hash[platform] = Hash.new
-            hash[platform]["box"] = "opscode-#{platform}"
-            hash[platform]["box_url"] =
-              "#{OMNITRUCK_PREFIX}/opscode_#{platform}_provisionerless.box"
-          end
-          hash
-        end
-      end
 
       def run(cmd, options = {})
         cmd = "echo #{cmd}" if config[:dry_run]
@@ -124,8 +98,7 @@ module Kitchen
       end
 
       def silently_run(cmd)
-        run_command(cmd,
-          :live_stream => nil, :quiet => logger.debug? ? false : true)
+        run_command(cmd, :live_stream => nil)
       end
 
       def vagrant_root
@@ -181,17 +154,6 @@ module Kitchen
             " Please upgrade to version #{MIN_VER} or higher from #{WEBSITE}."
         end
       end
-
-      def check_berkshelf_plugin
-        if File.exists?(File.join(config[:kitchen_root], "Berksfile"))
-          plugins = silently_run("vagrant plugin list").split("\n")
-          if ! plugins.find { |p| p =~ /^vagrant-berkshelf\b/ }
-            raise UserError, "Detected a Berksfile but the vagrant-berkshelf" +
-              " plugin was not found in Vagrant. Please run:" +
-              " `vagrant plugin install vagrant-berkshelf' and retry."
-          end
-        end
-      end
     end
   end
 end

data/lib/kitchen/driver/vagrant_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Vagrant Kitchen driver
-    VAGRANT_VERSION = "0.11.1"
+    VAGRANT_VERSION = "0.11.2"
   end
 end

data/lib/kitchen/vagrant/vagrantfile_creator.rb

@@ -52,6 +52,9 @@ module Kitchen
         arr << %{  c.vm.box = "#{config[:box]}"}
         arr << %{  c.vm.box_url = "#{config[:box_url]}"} if config[:box_url]
         arr << %{  c.vm.synced_folder ".", "/vagrant", disabled: true}
+        if config[:ssh_key]
+          arr << %{  c.ssh.private_key_path = "#{config[:ssh_key]}"}
+        end
         arr << %{  c.vm.hostname = "#{instance.name}.vagrantup.com"}
         arr << %{  c.ssh.username = "#{config[:username]}"} if config[:username]
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+        version: 1.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+        version: 1.0.0.beta
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
@@ -109,3 +109,4 @@ signing_key:
 specification_version: 4
 summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
 test_files: []
+has_rdoc: