vagrant 0.7.5 → 0.7.6

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.7.6 (July 2, 2011)
+
+  - Run Chef commands in a single command. [GH-390]
+  - Add `nfs` option for Chef to mount Chef folders via NFS. [GH-378]
+  - Add translation for `aborted` state in VM. [GH-371]
+  - Use full paths with the Chef provisioner so that restart cookbook will
+    work. [GH-374]
+  - Add "--no-color" as an argument and no colorized output will be used. [GH-379]
+  - Added DEVICE option to the RedHat host only networking entry, which allows
+    host only networking to work even if the VM has multiple NICs. [GH-382]
+  - Touch the network configuration file for RedHat so that the `sed` works
+    with host only networking. [GH-381]
+  - Load prerelease versions of plugins if available.
+  - Do not load a plugin if it depends on an invalid version of Vagrant.
+  - Encrypted data bag support in Chef server provisioner. [GH-398]
+  - Use the `-H` flag to set the proper home directory for `sudo`. [GH-370]
+
 ## 0.7.5 (May 16, 2011)
 
   - `config.ssh.port` can be specified and takes highest precedence if specified.

data/Gemfile

@@ -4,7 +4,7 @@ gem "vagrant", :path => '.'
 
 # Use the following gems straight from git, since Vagrant dev
 # typically coincides with it
-gem "virtualbox", :git => "git://github.com/mitchellh/virtualbox.git"
+gem "virtualbox", :git => "git://github.com/mitchellh/virtualbox.git", :ref => "038729cd89a15111106404726b75a1d463edc892"
 
 # Gems required for testing only. To install run
 # gem bundle test

data/bin/vagrant

@@ -5,10 +5,12 @@ require 'vagrant/cli'
 env = Vagrant::Environment.new
 
 begin
+  shell = ARGV.include?("--no-color") ? Thor::Shell::Basic.new : Thor::Base.shell.new
+
   # Set the UI early in case any errors are raised, and load
   # the config immediately, so we gather any new commands from
   # plugins
-  env.ui = Vagrant::UI::Shell.new(env, Thor::Base.shell.new)
+  env.ui = Vagrant::UI::Shell.new(env, shell)
   env.load!
 
   # Kick start the CLI

data/lib/vagrant/plugin.rb

@@ -21,6 +21,9 @@ module Vagrant
     # load path. This file is loaded to kick off the load sequence
     # for that plugin.
     def self.load!
+      # Our version is used for checking dependencies
+      our_version = Gem::Version.create(Vagrant::VERSION)
+
       # RubyGems 1.8.0 deprecated `source_index`. Gem::Specification is the
       # new replacement. For now, we support both, but special-case 1.8.x
       # so that we avoid deprecation messages.
@@ -37,7 +40,13 @@ module Vagrant
         # useful for developers.
         specs = Gem::VERSION >= "1.6.0" ? source.latest_specs(true) : source.latest_specs
 
-        source.latest_specs.each do |spec|
+        specs.each do |spec|
+          # If this gem depends on Vagrant, verify this is a valid release of
+          # Vagrant for this gem to load into.
+          vagrant_dep = spec.dependencies.find { |d| d.name == "vagrant" }
+          next if vagrant_dep && !vagrant_dep.requirement.satisfied_by?(our_version)
+
+          # Find a vagrant_init.rb to verify if this is a plugin
           file = nil
           if Gem::VERSION >= "1.8.0"
             file = spec.matches_for_glob("**/vagrant_init.rb").first

data/lib/vagrant/provisioners/chef_server.rb

@@ -15,6 +15,8 @@ module Vagrant
         attr_accessor :file_cache_path
         attr_accessor :file_backup_path
         attr_accessor :environment
+        attr_accessor :encrypted_data_bag_secret_key_path
+        attr_accessor :encrypted_data_bag_secret
 
         def initialize
           super
@@ -23,6 +25,8 @@ module Vagrant
           @client_key_path = "/etc/chef/client.pem"
           @file_cache_path = "/srv/chef/file_store"
           @file_backup_path = "/srv/chef/cache"
+          @encrypted_data_bag_secret_key_path = nil
+          @encrypted_data_bag_secret = "/etc/chef/encrypted_data_bag_secret"
         end
 
         def validate(errors)
@@ -45,6 +49,7 @@ module Vagrant
         chown_provisioning_folder
         create_client_key_folder
         upload_validation_key
+        upload_encrypted_data_bag_secret if config.encrypted_data_bag_secret_key_path
         setup_json
         setup_server_config
         run_chef_client
@@ -63,6 +68,11 @@ module Vagrant
         env.ui.info I18n.t("vagrant.provisioners.chef.upload_validation_key")
         vm.ssh.upload!(validation_key_path, guest_validation_key_path)
       end
+      
+      def upload_encrypted_data_bag_secret
+        env.ui.info I18n.t("vagrant.provisioners.chef.upload_encrypted_data_bag_secret_key")
+        vm.ssh.upload!(encrypted_data_bag_secret_key_path, config.encrypted_data_bag_secret)
+      end
 
       def setup_server_config
         setup_config("chef_server_client", "client.rb", {
@@ -73,20 +83,20 @@ module Vagrant
           :client_key => config.client_key_path,
           :file_cache_path => config.file_cache_path,
           :file_backup_path => config.file_backup_path,
-          :environment => config.environment
+          :environment => config.environment,
+          :encrypted_data_bag_secret => config.encrypted_data_bag_secret
         })
       end
 
       def run_chef_client
         command_env = config.binary_env ? "#{config.binary_env} " : ""
-        commands = ["cd #{config.provisioning_path}",
-                    "#{command_env}#{chef_binary_path("chef-client")} -c client.rb -j dna.json"]
+        command = "#{command_env}#{chef_binary_path("chef-client")} -c #{config.provisioning_path}/client.rb -j #{config.provisioning_path}/dna.json"
 
         env.ui.info I18n.t("vagrant.provisioners.chef.running_client")
         vm.ssh.execute do |ssh|
-          ssh.sudo!(commands) do |channel, type, data|
+          ssh.sudo!(command) do |channel, type, data|
             if type == :exit_status
-              ssh.check_exit_status(data, commands)
+              ssh.check_exit_status(data, command)
             else
               env.ui.info("#{data}: #{type}")
             end
@@ -97,6 +107,10 @@ module Vagrant
       def validation_key_path
         File.expand_path(config.validation_key_path, env.root_path)
       end
+      
+      def encrypted_data_bag_secret_key_path
+        File.expand_path(config.encrypted_data_bag_secret_key_path, env.root_path)
+      end
 
       def guest_validation_key_path
         File.join(config.provisioning_path, "validation.pem")

data/lib/vagrant/provisioners/chef_solo.rb

@@ -9,6 +9,7 @@ module Vagrant
         attr_accessor :roles_path
         attr_accessor :data_bags_path
         attr_accessor :recipe_url
+        attr_accessor :nfs
 
         def initialize
           super
@@ -16,6 +17,7 @@ module Vagrant
           @cookbooks_path = ["cookbooks", [:vm, "cookbooks"]]
           @roles_path = []
           @data_bags_path = []
+          @nfs = false
         end
 
         def validate(errors)
@@ -42,19 +44,19 @@ module Vagrant
 
       def share_cookbook_folders
         host_cookbook_paths.each_with_index do |cookbook, i|
-          env.config.vm.share_folder("v-csc-#{i}", cookbook_path(i), cookbook)
+          env.config.vm.share_folder("v-csc-#{i}", cookbook_path(i), cookbook, :nfs => config.nfs)
         end
       end
 
       def share_role_folders
         host_role_paths.each_with_index do |role, i|
-          env.config.vm.share_folder("v-csr-#{i}", role_path(i), role)
+          env.config.vm.share_folder("v-csr-#{i}", role_path(i), role, :nfs => config.nfs)
         end
       end
 
       def share_data_bags_folders
         host_data_bag_paths.each_with_index do |data_bag, i|
-          env.config.vm.share_folder("v-csdb-#{i}", data_bag_path(i), data_bag)
+          env.config.vm.share_folder("v-csdb-#{i}", data_bag_path(i), data_bag, :nfs => config.nfs)
         end
       end
 
@@ -71,13 +73,13 @@ module Vagrant
 
       def run_chef_solo
         command_env = config.binary_env ? "#{config.binary_env} " : ""
-        commands = ["cd #{config.provisioning_path}", "#{command_env}#{chef_binary_path("chef-solo")} -c solo.rb -j dna.json"]
+        command = "#{command_env}#{chef_binary_path("chef-solo")} -c #{config.provisioning_path}/solo.rb -j #{config.provisioning_path}/dna.json"
 
         env.ui.info I18n.t("vagrant.provisioners.chef.running_solo")
         vm.ssh.execute do |ssh|
-          ssh.sudo!(commands) do |channel, type, data|
+          ssh.sudo!(command) do |channel, type, data|
             if type == :exit_status
-              ssh.check_exit_status(data, commands)
+              ssh.check_exit_status(data, command)
             else
               env.ui.info("#{data}: #{type}")
             end

data/lib/vagrant/ssh/session.rb

@@ -34,7 +34,7 @@ module Vagrant
       # of `sudo`.
       def sudo!(commands, options=nil, &block)
         channel = session.open_channel do |ch|
-          ch.exec("sudo #{env.config.ssh.sudo_shell} -l") do |ch2, success|
+          ch.exec("sudo -H #{env.config.ssh.sudo_shell} -l") do |ch2, success|
             # Set the terminal
             ch2.send_data "export TERM=vt100\n"
 

data/lib/vagrant/systems/redhat.rb

@@ -6,6 +6,7 @@ module Vagrant
         # interface file.
         vm.ssh.execute do |ssh|
           # Clear out any previous entries
+          ssh.exec!("sudo touch /etc/sysconfig/network-scripts/ifcfg-eth#{net_options[:adapter]}")
           ssh.exec!("sudo sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/sysconfig/network-scripts/ifcfg-eth#{net_options[:adapter]} > /tmp/vagrant-ifcfg-eth#{net_options[:adapter]}")
           ssh.exec!("sudo su -c 'cat /tmp/vagrant-ifcfg-eth#{net_options[:adapter]} > /etc/sysconfig/network-scripts/ifcfg-eth#{net_options[:adapter]}'")
         end

data/lib/vagrant/version.rb

@@ -2,5 +2,5 @@ module Vagrant
   # This will always be up to date with the current version of Vagrant,
   # since it is used to generate the gemspec and is also the source of
   # the version for `vagrant -v`
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

data/templates/chef_server_client.erb

@@ -10,6 +10,8 @@ validation_client_name "<%= validation_client_name %>"
 validation_key         "<%= validation_key %>"
 client_key             "<%= client_key %>"
 
+encrypted_data_bag_secret "<%= encrypted_data_bag_secret %>"
+
 <% unless environment.nil? %>
 environment        "<%= environment %>"
 <% end %>

data/templates/locales/en.yml

@@ -187,6 +187,11 @@ en:
       ssh:
         execute: "Execute: %{command}"
       status:
+        aborted: |-
+          The VM is in an aborted state. This means that it was abruptly
+          stopped without properly closing the session. Run `vagrant up`
+          to resume this virtual machine. If any problems persist, you may
+          have to destroy and restart the virtual machine.
         output: |-
           Current VM states:
 
@@ -460,6 +465,7 @@ en:
         json: "Generating chef JSON and uploading..."
         client_key_folder: "Creating folder to hold client key..."
         upload_validation_key: "Uploading chef client validation key..."
+        upload_encrypted_data_bag_secret_key: "Uploading chef encrypted data bag secret key..."
         running_client: "Running chef-client..."
         running_solo: "Running chef-solo..."
         invalid_provisioner: "Vagrant::Provisioners::Chef is not a valid provisioner! Use ChefSolo or ChefServer instead."

data/templates/network_entry_redhat.erb

@@ -5,4 +5,5 @@ BOOTPROTO=static
 DHCPCLASS=
 IPADDR=<%= net_options[:ip] %>
 NETMASK=<%= net_options[:netmask] %>
+DEVICE=eth<%= net_options[:adapter] %>
 #VAGRANT-END

data/test/vagrant/provisioners/chef_server_test.rb

@@ -162,7 +162,8 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
         :client_key => @config.client_key_path,
         :file_cache_path => @config.file_cache_path,
         :file_backup_path => @config.file_backup_path,
-        :environment => @config.environment
+        :environment => @config.environment,
+        :encrypted_data_bag_secret => @config.encrypted_data_bag_secret
       })
 
       @action.setup_server_config
@@ -175,8 +176,8 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
       @vm.ssh.stubs(:execute).yields(@ssh)
     end
 
-    should "cd into the provisioning directory and run chef client" do
-      @ssh.expects(:sudo!).with(["cd #{@config.provisioning_path}", "chef-client -c client.rb -j dna.json"]).once
+    should "run chef client" do
+      @ssh.expects(:sudo!).with("chef-client -c #{@config.provisioning_path}/client.rb -j #{@config.provisioning_path}/dna.json").once
       @action.run_chef_client
     end
 

data/test/vagrant/provisioners/chef_solo_test.rb

@@ -69,7 +69,7 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
     should "share each cookbook folder" do
       share_seq = sequence("share_seq")
       @host_cookbook_paths.each_with_index do |cookbook, i|
-        @env.config.vm.expects(:share_folder).with("v-csc-#{i}", @action.cookbook_path(i), cookbook).in_sequence(share_seq)
+        @env.config.vm.expects(:share_folder).with("v-csc-#{i}", @action.cookbook_path(i), cookbook, :nfs => false).in_sequence(share_seq)
       end
 
       @action.share_cookbook_folders
@@ -85,13 +85,13 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
     should "share each role folder" do
       share_seq = sequence("share_seq")
       @host_role_paths.each_with_index do |role, i|
-        @env.config.vm.expects(:share_folder).with("v-csr-#{i}", @action.role_path(i), role).in_sequence(share_seq)
+        @env.config.vm.expects(:share_folder).with("v-csr-#{i}", @action.role_path(i), role, :nfs => false).in_sequence(share_seq)
       end
 
       @action.share_role_folders
     end
   end
-  
+
   context "sharing data bag folders" do
     setup do
       @host_data_bag_paths = ["foo", "bar"]
@@ -101,7 +101,7 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
     should "share each data bag folder" do
       share_seq = sequence("share_seq")
       @host_data_bag_paths.each_with_index do |data_bag, i|
-        @env.config.vm.expects(:share_folder).with("v-csdb-#{i}", @action.data_bag_path(i), data_bag).in_sequence(share_seq)
+        @env.config.vm.expects(:share_folder).with("v-csdb-#{i}", @action.data_bag_path(i), data_bag, :nfs => false).in_sequence(share_seq)
       end
 
       @action.share_data_bags_folders
@@ -145,7 +145,7 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
       assert_equal result, @action.host_role_paths
     end
   end
-  
+
   context "host data bags paths" do
     should "get folders path for configured data bag path" do
       result = mock("result")
@@ -249,8 +249,8 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
       @vm.ssh.stubs(:execute).yields(@ssh)
     end
 
-    should "cd into the provisioning directory and run chef solo" do
-      @ssh.expects(:sudo!).with(["cd #{@config.provisioning_path}", "chef-solo -c solo.rb -j dna.json"]).once
+    should "run chef solo" do
+      @ssh.expects(:sudo!).with("chef-solo -c #{@config.provisioning_path}/solo.rb -j #{@config.provisioning_path}/dna.json").once
       @action.run_chef_solo
     end
 

data/vagrant.gemspec

@@ -15,10 +15,10 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "vagrant"
 
   s.add_dependency "archive-tar-minitar", "= 0.5.2"
-  s.add_dependency "erubis", "~> 2.6.6"
+  s.add_dependency "erubis", "~> 2.7.0"
   s.add_dependency "json", "~> 1.5.1"
   s.add_dependency "mario", "~> 0.0.6"
-  s.add_dependency "net-ssh", "~> 2.1.0"
+  s.add_dependency "net-ssh", "~> 2.1.4"
   s.add_dependency "net-scp", "~> 1.0.4"
   s.add_dependency "i18n", "~> 0.5.0"
   s.add_dependency "thor", "~> 0.14.6"

metadata

@@ -2,7 +2,7 @@
 name: vagrant
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 Z
+date: 2011-07-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.6.6
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -64,7 +64,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: *id005
@@ -421,7 +421,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3225636291366202094
+      hash: -133062890691025626
       segments: 
       - 0
       version: "0"
@@ -434,7 +434,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: vagrant
-rubygems_version: 1.8.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Build and distribute virtualized development environments.