kitchen-vagrant 0.10.0 → 0.11.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9430d9441747a79f824f1e3184ce45c0625f81db
+  data.tar.gz: 3308136470c272ea805a8488d2f2d68a98069474
+SHA512:
+  metadata.gz: 3cb8a5e5124fc64ddc6ac844a68c2f98459ae55815071109f49e41a369325569f88c6288e1be26e97ebbbecba11a2b368478016bc55a915fb254157298051337
+  data.tar.gz: 05b4128d4ad3b1e3841211c335c523de928c13c1bc83d51f23c40838aa53c322b7e942974dc4b3847528ca4cbd76e37c7d87c40dc2da1a397f9f505eae2d65da

data/.travis.yml

@@ -1,9 +1,3 @@
 language: ruby
 rvm:
   - 1.9.3
-notifications:
-  irc:
-    channels:
-    - "irc.freenode.org#jamie-ci"
-    use_notice: true
-    skip_join: true

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 0.11.0 / 2013-07-23
+
+### New features
+
+* Pull request #30: Support computed defaults for a select list of pre-determined platforms (see pull request and readme for quick example). (@fnichol)
+* Pull request #25: Add rackspace support. (@josephholsten)
+
+### Improvements
+
+* Pull request #20: Respect `VAGRANT_DEFAULT_PROVIDER` environment variable. (@tmatilai)
+* Pull request #24: Allow to override Vagrant default SSH username. (@gildegoma)
+* Pull request #21: Configure tailor to actually check the code style. (@tmatilai)
+
+### Bug fixes
+
+* Pull request #29, issue #28: Allow the vagrant guest setting to be set in the generated Vagrantfile via the kitchen.yml. (@keiths-osc)
+* Pull request #31: Add some quotes around Vagrantfile value. (@albertsj1)
+
+
 ## 0.10.0 / 2013-05-08
 
 ### New features

data/README.md

@@ -60,6 +60,43 @@ berkshelf-vagrant, so upgrading this Vagrant plugin is recommended.
 
 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:
+
+```ruby
+---
+platforms:
+- name: ubuntu-10.04
+- name: ubuntu-12.04
+- name: ubuntu-12.10
+- name: ubuntu-13.04
+- name: centos-5.9
+- name: centos-6.4
+- name: debian-7.1.0
+```
+
+This will effectively generate a configuration similar to:
+
+```ruby
+---
+platforms:
+- name: ubuntu-10.04
+  driver_config:
+    box: opscode-ubuntu-10.04
+    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box
+- name: ubuntu-12.04
+  driver_config:
+    box: opscode-ubuntu-12.04
+    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
+- name: ubuntu-12.10
+  driver_config:
+    box: opscode-ubuntu-12.10
+    box_url: ...
+# ...
+```
+
 ## <a name="config"></a> Configuration
 
 ### <a name="config-box"></a> box
@@ -199,6 +236,16 @@ installed. There are several different behaviors available:
 
 The default value is unset, or `nil`.
 
+### <a name="config-username"></a> username
+
+This is the username used for SSH authentication if you
+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').
+
+The default value is unset, or `nil`.
+
 ## <a name="development"></a> Development
 
 * Source hosted at [GitHub][repo]

data/Rakefile

@@ -5,7 +5,9 @@ require 'tailor/rake_task'
 desc "Run cane to check quality metrics"
 Cane::RakeTask.new
 
-Tailor::RakeTask.new
+Tailor::RakeTask.new do |task|
+  task.file_set('lib/**/*.rb', 'code')
+end
 
 desc "Display LOC stats"
 task :stats do
@@ -13,4 +15,7 @@ task :stats do
   sh "countloc -r lib/kitchen"
 end
 
-task :default => [ :cane, :tailor, :stats ]
+desc "Run all quality tasks"
+task :quality => [:cane, :tailor, :stats]
+
+task :default => [ :quality ]

data/kitchen-vagrant.gemspec

@@ -17,7 +17,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.alpha.6'
+  gem.add_dependency 'test-kitchen', '~> 1.0.0.beta.1'
 
   gem.add_development_dependency 'cane'
   gem.add_development_dependency 'tailor'

data/lib/kitchen/driver/vagrant.rb

@@ -34,8 +34,14 @@ module Kitchen
     #   dependency hook checks when feature is released
     class Vagrant < Kitchen::Driver::SSHBase
 
-      default_config :customize, {:memory => '256'}
+      default_config :customize, { :memory => '256' }
       default_config :synced_folders, {}
+      default_config :box do |driver|
+        driver.default_values("box")
+      end
+      default_config :box_url do |driver|
+        driver.default_values("box_url")
+      end
 
       required_config :box
 
@@ -52,14 +58,10 @@ module Kitchen
 
       def converge(state)
         create_vagrantfile
-        ssh_args = build_ssh_args(state)
-        install_omnibus(ssh_args) if config[:require_chef_omnibus]
         if config[:use_vagrant_provision]
           run "vagrant provision"
         else
-          prepare_chef_home(ssh_args)
-          upload_chef_data(ssh_args)
-          run_chef_solo(ssh_args)
+          super
         end
       end
 
@@ -89,10 +91,32 @@ module Kitchen
         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]

data/lib/kitchen/driver/vagrant_version.rb

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

data/lib/kitchen/vagrant/vagrantfile_creator.rb

@@ -34,6 +34,7 @@ module Kitchen
         arr = []
         arr << %{Vagrant.configure("2") do |c|}
         common_block(arr)
+        guest_block(arr)
         network_block(arr)
         provider_block(arr)
         chef_block(arr) if config[:use_vagrant_provision]
@@ -51,6 +52,13 @@ module Kitchen
         arr << %{  c.vm.box = "#{config[:box]}"}
         arr << %{  c.vm.box_url = "#{config[:box_url]}"} if config[:box_url]
         arr << %{  c.vm.hostname = "#{instance.name}.vagrantup.com"}
+        arr << %{  c.ssh.username = "#{config[:username]}"} if config[:username]
+      end
+
+      def guest_block(arr)
+        if config[:guest]
+          arr << %{  c.vm.guest = #{config[:guest]}}
+        end
       end
 
       def network_block(arr)
@@ -62,14 +70,14 @@ module Kitchen
       end
 
       def provider_block(arr)
-        provider = config[:provider] || 'virtualbox'
-
         arr << %{  c.vm.provider :#{provider} do |p|}
         case provider
         when 'virtualbox'
           virtualbox_customize(arr)
         when 'vmware_fusion', 'vmware_workstation'
           vmware_customize(arr)
+        when 'rackspace'
+          rackspace_customize(arr)
         end
         arr << %{  end}
       end
@@ -124,9 +132,13 @@ module Kitchen
         File.join(config[:kitchen_root], "Berksfile")
       end
 
+      def provider
+        config[:provider] || ENV['VAGRANT_DEFAULT_PROVIDER'] || 'virtualbox'
+      end
+
       def virtualbox_customize(arr)
         config[:customize].each do |key, value|
-          arr << %{    p.customize ["modifyvm", :id, "--#{key}", #{value}]}
+          arr << %{    p.customize ["modifyvm", :id, "--#{key}", "#{value}"]}
         end
       end
 
@@ -148,6 +160,12 @@ module Kitchen
         end
       end
 
+      def rackspace_customize(arr)
+        config[:customize].each do |key, value|
+          arr << %{    p.#{key} = "#{value}"}
+        end
+      end
+
       def key_path
         return nil if instance.suite.encrypted_data_bag_secret_key_path.nil?
 

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.10.0
-  prerelease: 
+  version: 0.11.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.6
+        version: 1.0.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.6
+        version: 1.0.0.beta.1
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tailor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
@@ -95,32 +86,25 @@ files:
 - lib/kitchen/vagrant/vagrantfile_creator.rb
 homepage: https://github.com/opscode/kitchen-vagrant/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4281053971058593237
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4281053971058593237
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
 test_files: []