vagrant 0.6.7 → 0.6.8

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.6.8 (unreleased)
+
+  - Network interfaces are now up/down in distinct commands instead of just
+    restarting "networking." [GH-192]
+  - Add missing translation for chef binary missing. [GH-203]
+  - Fix default settings for Opscode platform and comments. [GH-213]
+  - Blank client name for chef server now uses FQDN by default, instead of "client" [GH-214]
+  - Run list can now be nil, which will cause it to sync with chef server (when
+    chef server is enabled). [GH-214]
+  - Multiple NFS folders now work on linux. [GH-215]
+  - Add translation for state "stuck" which is very rare. [GH-218]
+  - virtualbox gem dependency minimum raised to 0.7.6 to verify FFI < 1.0.0 is used.
+  - Fix issue where box downloading from `vagrant up` didn't reload the box collection. [GH-229]
+
 ## 0.6.7 (November 3, 2010)
 
   - Added validation to verify that a box is specified.

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant (0.6.7)
+    vagrant (0.6.8)
       archive-tar-minitar (= 0.5.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)
@@ -17,7 +17,7 @@ PATH
       net-scp (~> 1.0.3)
       net-ssh (~> 2.0.23)
       thor (~> 0.14.2)
-      virtualbox (~> 0.7.3)
+      virtualbox (~> 0.7.6)
 
 GEM
   remote: http://rubygems.org/

data/lib/vagrant/action/vm/check_box.rb

@@ -16,6 +16,7 @@ module Vagrant
 
             env.ui.info I18n.t("vagrant.actions.vm.check_box.not_found", :name => box_name)
             Vagrant::Box.add(env.env, box_name, box_url)
+            env["boxes"].reload!
           end
 
           @app.call(env)

data/lib/vagrant/box_collection.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 module Vagrant
   # Represents a collection of boxes, providing helpful methods for
   # finding boxes. An instance of this is returned by {Environment#boxes}.
@@ -9,21 +11,25 @@ module Vagrant
   #
   #     env.boxes.find("base") # => #<Vagrant::Box>
   #
-  class BoxCollection < Array
+  class BoxCollection
+    include Enumerable
+    extend Forwardable
+    def_delegators :@boxes, :length, :each
+
     # The environment this box collection belongs to
     attr_reader :env
 
     def initialize(env)
-      super()
-
       @env = env
+      @boxes = []
+
       reload!
     end
 
     # Find a box in the collection by the given name. The name must
     # be a string, for now.
     def find(name)
-      each do |box|
+      @boxes.each do |box|
         return box if box.name == name
       end
 
@@ -33,12 +39,12 @@ module Vagrant
     # Loads the list of all boxes from the source. This modifies the
     # current array.
     def reload!
-      clear
+      @boxes.clear
 
       Dir.open(env.boxes_path) do |dir|
         dir.each do |d|
           next if d == "." || d == ".." || !File.directory?(env.boxes_path.join(d))
-          self << Box.new(env, d)
+          @boxes << Box.new(env, d)
         end
       end
     end

data/lib/vagrant/provisioners/chef.rb

@@ -84,7 +84,6 @@ module Vagrant
         def initialize
           @validation_client_name = "chef-validator"
           @client_key_path = "/etc/chef/client.pem"
-          @node_name = "client"
 
           @cookbooks_path = ["cookbooks", [:vm, "cookbooks"]]
           @roles_path = []
@@ -92,13 +91,12 @@ module Vagrant
           @log_level = :info
           @json = {
             :instance_role => "vagrant",
-            :run_list => []
           }
         end
 
         # Returns the run list for the provisioning
         def run_list
-          json[:run_list]
+          json[:run_list] ||= []
         end
 
         # Sets the run list to the specified value
@@ -138,9 +136,13 @@ module Vagrant
             errors.add(I18n.t("vagrant.config.chef.validation_key_path")) if !validation_key_path
           end
 
-          if [:chef_solo, :chef_server].include?(top.vm.provisioner)
-            # Validations shared by both chef solo and server
-            errors.add(I18n.t("vagrant.config.chef.run_list_empty")) if !run_list || run_list.empty?
+          if top.vm.provisioner == :chef_solo
+            # On chef solo, a run list MUST be specified
+            errors.add(I18n.t("vagrant.config.chef.run_list_empty")) if !json[:run_list] || run_list.empty?
+          elsif top.vm.provisioner == :chef_server
+            # On chef server, the run list is allowed to be nil, which causes it
+            # to sync with the chef server.
+            errors.add(I18n.t("vagrant.config.chef.run_list_empty")) if json[:run_list] && run_list.empty?
           end
         end
       end

data/lib/vagrant/systems/linux.rb

@@ -80,8 +80,9 @@ module Vagrant
         vm.ssh.upload!(StringIO.new(entry), "/tmp/vagrant-network-entry")
 
         vm.ssh.execute do |ssh|
+          ssh.exec!("sudo /sbin/ifdown eth#{net_options[:adapter]} 2> /dev/null")
           ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-entry >> /etc/network/interfaces'")
-          ssh.exec!("sudo /etc/init.d/networking restart")
+          ssh.exec!("sudo /sbin/ifup eth#{net_options[:adapter]}")
         end
       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.6.7"
+  VERSION = "0.6.8"
 end

data/templates/chef_server_client.erb

@@ -1,6 +1,8 @@
 log_level          <%= log_level.inspect %>
 log_location       STDOUT
+<% if node_name %>
 node_name          "<%= node_name %>"
+<% end %>
 ssl_verify_mode    :verify_none
 chef_server_url    "<%= chef_server_url %>"
 

data/templates/chef_solo_solo.erb

@@ -1,4 +1,6 @@
+<% if node_name %>
 node_name "<%= node_name %>"
+<% end %>
 file_cache_path "<%= provisioning_path %>"
 cookbook_path <%= cookbooks_path %>
 role_path <%= roles_path %>

data/templates/commands/init/Vagrantfile.erb

@@ -24,7 +24,7 @@ Vagrant::Config.run do |config|
   # Share an additional folder to the guest VM. The first argument is
   # an identifier, the second is the path on the guest to mount the
   # folder, and the third is the path on the host to the actual folder.
-  # config.vm.share_folder "v-data", "/vagrant_data", "../data")
+  # config.vm.share_folder("v-data", "/vagrant_data", "../data")
 
   # Enable provisioning with chef solo, specifying a cookbooks path (relative
   # to this Vagrantfile), and adding some recipes and/or roles.
@@ -40,12 +40,22 @@ Vagrant::Config.run do |config|
   # Enable provisioning with chef server, specifying the chef server URL,
   # and the path to the validation key (relative to this Vagrantfile).
   #
+  # The Opscode Platform uses HTTPS. Substitute your organization for
+  # ORGNAME in the URL and validation key.
+  #
+  # If you have your own Chef Server, use the appropriate URL, which may be
+  # HTTP instead of HTTPS depending on your configuration. Also change the
+  # validation key to validation.pem.
+  #
   # config.vm.provisioner = :chef_server
-  # config.chef.chef_server_url = "http://api.opscode.com/organizations/organization"
-  # config.chef.validation_key_path = "kiip-validator.pem"
+  # config.chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+  # config.chef.validation_key_path = "ORGNAME-validator.pem"
+  #
+  # If you're using the Opscode platform, your validator client is
+  # ORGNAME-validator, replacing ORGNAME with your organization name.
+  #
+  # IF you have your own Chef Server, the default validation client name is
+  # chef-validator, unless you changed the configuration.
   #
-  # If you're using the OpsCode platform, you'll have to set this as well.
-  # If you're using your own chef server, you may have to set it, but it depends
-  # on how your Chef server is configured.
-  # config.chef.validation_client_name = "organization-validator"
+  # config.chef.validation_client_name = "ORGNAME-validator"
 end

data/templates/locales/en.yml

@@ -9,6 +9,10 @@ en:
     errors:
       base_vm_not_found: The base VM with the name '%{name}' was not found.
       box_not_found: Box '%{name}' could not be found.
+      chef_not_detected: |-
+        The chef (either `chef-solo` or `chef-client`) binary was not found on
+        the VM and is required for chef provisioning. Please verify that chef
+        is installed and that the binary is available on the PATH.
       cli_missing_env: This command requires that a Vagrant environment be properly passed in as the last parameter.
       config_validation: |-
         There was a problem with the configuration of Vagrant. The error message(s)
@@ -146,6 +150,11 @@ en:
           suspend the virtual machine. In either case, to restart it again,
           simply run `vagrant up`.
         saved: To resume this VM, simply run `vagrant up`.
+        stuck: |-
+          The VM is "stuck!" This is a very rare state which means that
+          VirtualBox is unable to recover the current state of the VM.
+          The only known solution to this problem is to restart your
+          machine, sorry.
         listing: |-
           This environment represents multiple VMs. The VMs are all listed
           above with their current state. For more information about a specific

data/templates/nfs/exports_linux.erb

@@ -1,3 +1,5 @@
 # VAGRANT-BEGIN: <%= uuid %>
-<% folders.each do |name, opts| %><%= opts[:hostpath] %> <%= ip %>(rw,no_subtree_check,all_squash<% if opts[:map_uid] %>,anonuid=<%= opts[:map_uid] %><% end %><% if opts[:map_gid] %>,anongid=<%= opts[:map_gid] %><% end %>)<% end %>
-# VAGRANT-END: <%= uuid %>
+<% folders.each do |name, opts| %>
+<%= opts[:hostpath] %> <%= ip %>(rw,no_subtree_check,all_squash<% if opts[:map_uid] %>,anonuid=<%= opts[:map_uid] %><% end %><% if opts[:map_gid] %>,anongid=<%= opts[:map_gid] %><% end %>)
+<% end %>
+# VAGRANT-END: <%= uuid %>

data/test/vagrant/action/vm/check_box_test.rb

@@ -6,9 +6,6 @@ class CheckBoxVMActionTest < Test::Unit::TestCase
   end
 
   context "calling" do
-    setup do
-    end
-
     should "raise error if box not specified" do
       app, env = action_env(vagrant_env(vagrantfile(<<-vf)))
         config.vm.box = nil
@@ -47,6 +44,7 @@ class CheckBoxVMActionTest < Test::Unit::TestCase
       seq = sequence("seq")
       env.env.boxes.expects(:find).returns(nil)
       Vagrant::Box.expects(:add).with(env.env, env["config"].vm.box, env["config"].vm.box_url).in_sequence(seq)
+      env.env.boxes.expects(:reload!).in_sequence(seq)
       app.expects(:call).with(env).once.in_sequence(seq)
 
       assert_nothing_raised {

data/vagrant.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "net-scp", "~> 1.0.3"
   s.add_dependency "i18n", "~> 0.4.1"
   s.add_dependency "thor", "~> 0.14.2"
-  s.add_dependency "virtualbox", "~> 0.7.3"
+  s.add_dependency "virtualbox", "~> 0.7.6"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "contest", ">= 0.1.2"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 7
-  version: 0.6.7
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 -07:00
+date: 2010-11-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -148,8 +148,8 @@ dependencies:
         segments: 
         - 0
         - 7
-        - 3
-        version: 0.7.3
+        - 6
+        version: 0.7.6
   type: :runtime
   prerelease: false
   version_requirements: *id009
@@ -441,7 +441,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1852392342619946444
+      hash: 2622964393659946965
       segments: 
       - 0
       version: "0"