vagrant 0.5.0 → 0.5.1

data/lib/vagrant/action.rb

@@ -45,6 +45,7 @@ module Vagrant
     def run(callable, options=nil)
       callable = Builder.new.use(callable) if callable.kind_of?(Class)
       callable = self.class.actions[callable] if callable.kind_of?(Symbol)
+      raise Exceptions::UncallableAction.new(callable) if !callable
 
       action_environment = Action::Environment.new(env)
       action_environment.merge!(options || {})

data/lib/vagrant/action/box/package.rb

@@ -0,0 +1,19 @@
+require 'vagrant/action/general/package'
+
+module Vagrant
+  class Action
+    module Box
+      # Packages a box which has already been unpackaged (such as
+      # for the `vagrant box repackage` command) by leveraging the
+      # general packager middleware.
+      class Package < General::Package
+        # Alias instead of calling super for testability
+        alias_method :general_call, :call
+        def call(env)
+          env["package.directory"] = env["box"].directory
+          general_call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/action/builtin.rb

@@ -32,6 +32,7 @@ module Vagrant
       # halt - Halts the VM, attempting gracefully but then forcing
       # a restart if fails.
       halt = Builder.new do
+        use VM::DiscardState
         use VM::Halt
         use VM::DisableNetworks
       end
@@ -89,6 +90,7 @@ module Vagrant
         use VM::ClearForwardedPorts
         use VM::ClearSharedFolders
         use VM::Export
+        use VM::PackageVagrantfile
         use VM::Package
       end
 
@@ -109,6 +111,13 @@ module Vagrant
       end
 
       register :box_remove, box_remove
+
+      # box_repackage - Repackages a box.
+      box_repackage = Builder.new do
+        use Box::Package
+      end
+
+      register :box_repackage, box_repackage
     end
   end
 end

data/lib/vagrant/action/general/package.rb

@@ -0,0 +1,96 @@
+module Vagrant
+  class Action
+    module General
+      # A general packaging (tar) middleware. Given the following options,
+      # it will do the right thing:
+      #
+      #   * package.output - The filename of the outputted package.
+      #   * package.include - An array of files to include in the package.
+      #   * package.directory - The directory which contains the contents to
+      #       compress into the package.
+      #
+      # This middleware always produces the final file in the current working
+      # directory (FileUtils.pwd)
+      class Package
+        include Util
+
+        def initialize(app, env)
+          @app = app
+          @env = env
+          @env["package.output"] ||= env["config"].package.name
+          @env["package.include"] ||= []
+        end
+
+        def call(env)
+          @env = env
+
+          return env.error!(:package_output_exists) if File.exist?(tar_path)
+          return env.error!(:package_requires_directory) if !@env["package.directory"] || !File.directory?(@env["package.directory"])
+          return if !verify_included_files
+          compress
+
+          @app.call(env)
+
+          cleanup if env.error?
+        end
+
+        def cleanup
+          # Cleanup any packaged files if the packaging failed at some point.
+          File.delete(tar_path) if File.exist?(tar_path)
+        end
+
+        def verify_included_files
+          @env["package.include"].each do |file|
+            if !File.exist?(file)
+              @env.error!(:package_include_file_doesnt_exist, :filename => file)
+              return false
+            end
+          end
+
+          true
+        end
+
+        # This method copies the include files (passed in via command line)
+        # to the temporary directory so they are included in a sub-folder within
+        # the actual box
+        def copy_include_files
+          if @env["package.include"].length > 0
+            include_dir = File.join(@env["package.directory"], "include")
+            FileUtils.mkdir_p(include_dir)
+
+            @env["package.include"].each do |f|
+              @env.logger.info "Packaging additional file: #{f}"
+              FileUtils.cp(f, include_dir)
+            end
+          end
+        end
+
+        # Compress the exported file into a package
+        def compress
+          @env.logger.info "Compressing package to #{tar_path}..."
+          File.open(tar_path, Platform.tar_file_options) do |tar|
+            Archive::Tar::Minitar::Output.open(tar) do |output|
+              begin
+                current_dir = FileUtils.pwd
+
+                copy_include_files
+
+                FileUtils.cd(@env["package.directory"])
+                Dir.glob(File.join(".", "**", "*")).each do |entry|
+                  Archive::Tar::Minitar.pack_file(entry, output)
+                end
+              ensure
+                FileUtils.cd(current_dir)
+              end
+            end
+          end
+        end
+
+        # Path to the final box output file
+        def tar_path
+          File.join(FileUtils.pwd, @env["package.output"])
+        end
+      end
+    end
+  end
+end

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

@@ -10,10 +10,16 @@ module Vagrant
         end
 
         def call(env)
-          env.logger.info "Disabling host only networks..."
+          logged = false
 
           env["vm"].vm.network_adapters.each do |adapter|
             next if adapter.attachment_type != :host_only
+
+            if !logged
+              env.logger.info "Disabling host only networks..."
+              logged = true
+            end
+
             adapter.enabled = false
             adapter.save
           end

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

@@ -0,0 +1,22 @@
+module Vagrant
+  class Action
+    module VM
+      # Discards the saved state of the VM if its saved. If its
+      # not saved, does nothing.
+      class DiscardState
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          if env["vm"].vm.saved?
+            env.logger.info "Discarding saved state of VM..."
+            env["vm"].vm.discard_state
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -1,97 +1,21 @@
+require 'vagrant/action/general/package'
+
 module Vagrant
   class Action
     module VM
-      class Package
-        include Util
-
-        def initialize(app, env)
-          @app = app
-          @env = env
-          @env["package.output"] ||= env["config"].package.name
-          @env["package.include"] ||= []
-
-          env.error!(:box_file_exists, :output_file => tar_path) if File.exist?(tar_path)
-        end
-
+      # A subclass of {General::Package} which simply makes sure that
+      # the package directory is set to the directory which the VM
+      # was exported to.
+      class Package < General::Package
+        # Doing this so that we can test that the parent is properly
+        # called in the unit tests.
+        alias_method :general_call, :call
         def call(env)
-          @env = env
-
-          return env.error!(:package_requires_export) if !@env["export.temp_dir"]
-          return if !verify_included_files
-          compress
-
-          @app.call(env)
-
-          cleanup if env.error?
-        end
-
-        def cleanup
-          # Cleanup any packaged files if the packaging failed at some point.
-          File.delete(tar_path) if File.exist?(tar_path)
-        end
-
-        def verify_included_files
-          @env["package.include"].each do |file|
-            if !File.exist?(file)
-              @env.error!(:package_include_file_doesnt_exist, :filename => file)
-              return false
-            end
-          end
-
-          true
-        end
-
-        # This method copies the include files (passed in via command line)
-        # to the temporary directory so they are included in a sub-folder within
-        # the actual box
-        def copy_include_files
-          if @env["package.include"].length > 0
-            include_dir = File.join(@env["export.temp_dir"], "include")
-            FileUtils.mkdir_p(include_dir)
-
-            @env["package.include"].each do |f|
-              @env.logger.info "Packaging additional file: #{f}"
-              FileUtils.cp(f, include_dir)
-            end
-          end
-        end
-
-        # This method creates the auto-generated Vagrantfile at the root of the
-        # box. This Vagrantfile contains the MAC address so that the user doesn't
-        # have to worry about it.
-        def create_vagrantfile
-          File.open(File.join(@env["export.temp_dir"], "Vagrantfile"), "w") do |f|
-            f.write(TemplateRenderer.render("package_Vagrantfile", {
-              :base_mac => @env["vm"].vm.network_adapters.first.mac_address
-            }))
-          end
-        end
-
-        # Compress the exported file into a package
-        def compress
-          @env.logger.info "Packaging VM into #{tar_path}..."
-          File.open(tar_path, Platform.tar_file_options) do |tar|
-            Archive::Tar::Minitar::Output.open(tar) do |output|
-              begin
-                current_dir = FileUtils.pwd
-
-                copy_include_files
-                create_vagrantfile
-
-                FileUtils.cd(@env["export.temp_dir"])
-                Dir.glob(File.join(".", "**", "*")).each do |entry|
-                  Archive::Tar::Minitar.pack_file(entry, output)
-                end
-              ensure
-                FileUtils.cd(current_dir)
-              end
-            end
-          end
-        end
-
-        # Path to the final box output file
-        def tar_path
-          File.join(FileUtils.pwd, @env["package.output"])
+          # Just match up a couple environmental variables so that
+          # the superclass will do the right thing. Then, call the
+          # superclass
+          env["package.directory"] = env["export.temp_dir"]
+          general_call(env)
         end
       end
     end

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

@@ -0,0 +1,33 @@
+module Vagrant
+  class Action
+    module VM
+      # Puts a generated Vagrantfile into the package directory so that
+      # it can be included in the package.
+      class PackageVagrantfile
+        include Util
+
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          @env = env
+          create_vagrantfile
+          @app.call(env)
+        end
+
+        # This method creates the auto-generated Vagrantfile at the root of the
+        # box. This Vagrantfile contains the MAC address so that the user doesn't
+        # have to worry about it.
+        def create_vagrantfile
+          File.open(File.join(@env["package.directory"], "Vagrantfile"), "w") do |f|
+            f.write(TemplateRenderer.render("package_Vagrantfile", {
+              :base_mac => @env["vm"].vm.network_adapters.first.mac_address
+            }))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module Vagrant
         def call(env)
           if env["vm"].vm.saved?
             env.logger.info "Resuming suspended VM..."
-            env["actions"].run(:start)
+            env["actions"].run(Boot)
           end
 
           @app.call(env)

data/lib/vagrant/box.rb

@@ -132,11 +132,16 @@ module Vagrant
       env.actions.run(:box_add, { "box" => self })
     end
 
-    # Beings the process of destroying this box.
+    # Begins the process of destroying this box.
     def destroy
       env.actions.run(:box_remove, { "box" => self })
     end
 
+    # Begins sequence to repackage this box.
+    def repackage(options=nil)
+      env.actions.run(:box_repackage, { "box" => self }.merge(options || {}))
+    end
+
     # Returns the directory to the location of this boxes content in the local
     # filesystem.
     #

data/lib/vagrant/commands/box/list.rb

@@ -27,4 +27,4 @@ module Vagrant
       end
     end
   end
-end
+end

data/lib/vagrant/commands/box/repackage.rb

@@ -0,0 +1,35 @@
+module Vagrant
+  class Commands
+    module Box
+      # Repackage a box which has been added.
+      class Repackage < BoxCommand
+        BoxCommand.subcommand "repackage", self
+        description "Repackages a box which has already been added."
+
+        def execute(args=[])
+          args = parse_options(args)
+          return show_help if args.length != 1
+
+          box = Vagrant::Box.find(env, args.first)
+          return error_and_exit(:box_repackage_doesnt_exist) if box.nil?
+          box.repackage(options)
+        end
+
+        def options_spec(opts)
+          opts.banner = "Usage: vagrant box repackage NAME [--output FILENAME] [--include FILES]"
+
+          options["package.output"] = nil
+          options["package.include"] = []
+
+          opts.on("--include x,y,z", Array, "List of files to include in the package") do |v|
+            options["package.include"] = v
+          end
+
+          opts.on("-o", "--output FILE", "File to save the package as.") do |v|
+            options["package.output"] = v
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/commands/package.rb

@@ -57,7 +57,7 @@ module Vagrant
       end
 
       def options_spec(opts)
-        opts.banner = "Usage: vagrant package [--base BASE] [--include FILES]"
+        opts.banner = "Usage: vagrant package [--base BASE] [--output FILENAME] [--include FILES]"
 
         # Defaults
         options[:base] = nil

data/lib/vagrant/commands/reload.rb

@@ -10,6 +10,7 @@ module Vagrant
       description "Reload the vagrant environment"
 
       def execute(args=[])
+        env.require_root_path
         all_or_single(args, :reload)
       end
 

data/lib/vagrant/commands/up.rb

@@ -9,6 +9,7 @@ module Vagrant
       description "Creates the vagrant environment"
 
       def execute(args=[])
+        env.require_root_path
         all_or_single(args, :up)
       end
 

data/lib/vagrant/exceptions/uncallable_action.rb

@@ -0,0 +1,17 @@
+module Vagrant
+  module Exceptions
+    # Raised when an action sequence is trying to be run for an uncallable
+    # action (not a lambda, middleware, or registered sequence).
+    class UncallableAction < ::Exception
+      def initialize(callable)
+        super()
+
+        @callable = callable
+      end
+
+      def to_s
+        @callable.inspect
+      end
+    end
+  end
+end

data/lib/vagrant/hosts/bsd.rb

@@ -40,6 +40,7 @@ module Vagrant
       end
 
       def nfs_cleanup
+        return if !File.exist?("/etc/exports")
         system("cat /etc/exports | grep 'VAGRANT-BEGIN: #{env.vm.uuid}' > /dev/null 2>&1")
 
         if $?.to_i == 0

data/lib/vagrant/hosts/linux.rb

@@ -39,6 +39,7 @@ module Vagrant
       end
 
       def nfs_cleanup
+        return if !File.exist?("/etc/exports")
         system("cat /etc/exports | grep 'VAGRANT-BEGIN: #{env.vm.uuid}' > /dev/null 2>&1")
 
         if $?.to_i == 0

data/lib/vagrant/provisioners/chef.rb

@@ -16,6 +16,7 @@ module Vagrant
         # Chef solo specific config
         attr_accessor :cookbooks_path
         attr_accessor :roles_path
+        attr_accessor :recipe_url
 
         # Shared config
         attr_accessor :provisioning_path
@@ -27,7 +28,7 @@ module Vagrant
           @client_key_path = "/etc/chef/client.pem"
           @node_name = "client"
 
-          @cookbooks_path = "cookbooks"
+          @cookbooks_path = ["cookbooks", [:vm, "cookbooks"]]
           @roles_path = []
           @provisioning_path = "/tmp/vagrant-chef"
           @log_level = :info

data/lib/vagrant/provisioners/chef_solo.rb

@@ -32,7 +32,8 @@ module Vagrant
           :node_name => env.config.chef.node_name,
           :provisioning_path => env.config.chef.provisioning_path,
           :cookbooks_path => cookbooks_path,
-          :roles_path => roles_path
+          :recipe_url => env.config.chef.recipe_url,
+          :roles_path => roles_path,
         })
       end
 
@@ -49,23 +50,43 @@ module Vagrant
       end
 
       def host_folder_paths(paths)
-        [paths].flatten.collect { |path| File.expand_path(path, env.root_path) }
+        # Convert single cookbook paths such as "cookbooks" or [:vm, "cookbooks"]
+        # into a proper array representation.
+        paths = [paths] if paths.is_a?(String) || paths.first.is_a?(Symbol)
+
+        paths.inject([]) do |acc, path|
+          path = [:host, path] if !path.is_a?(Array)
+          type, path = path
+
+          acc << File.expand_path(path, env.root_path) if type == :host
+          acc
+        end
       end
 
-      def folder_path(folder, i)
-        File.join(env.config.chef.provisioning_path, "#{folder}-#{i}")
+      def folder_path(*args)
+        File.expand_path(args.join("-"), env.config.chef.provisioning_path)
       end
 
       def folders_path(folders, folder)
+        # Convert single cookbook paths such as "cookbooks" or [:vm, "cookbooks"]
+        # into a proper array representation.
+        folders = [folders] if folders.is_a?(String) || folders.first.is_a?(Symbol)
+
+        # Convert each path to the proper absolute path depending on if the path
+        # is a host path or a VM path
         result = []
-        folders.each_with_index do |host_path, i|
-          result << folder_path(folder, i)
+        folders.each_with_index do |path, i|
+          path = [:host, path] if !path.is_a?(Array)
+          type, path = path
+
+          result << folder_path(folder, i) if type == :host
+          result << folder_path(path) if type == :vm
         end
 
         # We're lucky that ruby's string and array syntax for strings is the
         # same as JSON, so we can just convert to JSON here and use that
         result = result[0].to_s if result.length == 1
-        result.to_json
+        result
       end
 
       def host_cookbook_paths
@@ -85,11 +106,11 @@ module Vagrant
       end
 
       def cookbooks_path
-        folders_path(host_cookbook_paths, "cookbooks")
+        folders_path(env.config.chef.cookbooks_path, "cookbooks").to_json
       end
 
       def roles_path
-        folders_path(host_role_paths, "roles")
+        folders_path(env.config.chef.roles_path, "roles").to_json
       end
     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.5.0"
+  VERSION = "0.5.1"
 end

data/templates/chef_solo_solo.erb

@@ -3,3 +3,7 @@ file_cache_path "<%= provisioning_path %>"
 cookbook_path <%= cookbooks_path %>
 role_path <%= roles_path %>
 log_level          <%= log_level.inspect %>
+
+<% if recipe_url %>
+recipe_url "<%= recipe_url %>"
+<% end %>

data/templates/strings.yml

@@ -84,6 +84,11 @@
   Specified output file: <%= output_file %>
 :box_remove_doesnt_exist: |-
   The box you're attempting to remove does not exist!
+:box_repackage_doesnt_exist: |-
+  The box you're attempting to repackage does not exist. Please check the
+  name you specified and try again. As a reminder, the repackage
+  command is for repackaging boxes which have been added through `vagrant box add`
+  but the box has been lost.
 :box_specified_doesnt_exist: |-
   Specified box `<%= box_name %>` does not exist!
 
@@ -171,6 +176,13 @@
   specific VM must be specified. This can be done by calling
   `vagrant package NAME` where NAME is a valid VM represented by
   your Vagrantfile.
+:package_output_exists: |-
+  The specified file to save the package as already exists. Please
+  remove this file or specify a different filename for outputting.
+:package_requires_directory: |-
+  A directory was not specified to package. This is an internal
+  issue. Please send the relevant stack trace (if any) and information
+  about this issue to the Vagrant team.
 :package_requires_export: |-
   Package must be used in conjunction with export.
 :provisioner_invalid_class: |-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 -07:00
+date: 2010-07-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -193,6 +193,7 @@ files:
 - lib/vagrant/action/action_exception.rb
 - lib/vagrant/action/box/destroy.rb
 - lib/vagrant/action/box/download.rb
+- lib/vagrant/action/box/package.rb
 - lib/vagrant/action/box/unpackage.rb
 - lib/vagrant/action/box/verify.rb
 - lib/vagrant/action/builder.rb
@@ -201,6 +202,7 @@ files:
 - lib/vagrant/action/env/set.rb
 - lib/vagrant/action/environment.rb
 - lib/vagrant/action/exception_catcher.rb
+- lib/vagrant/action/general/package.rb
 - lib/vagrant/action/vm/boot.rb
 - lib/vagrant/action/vm/check_box.rb
 - lib/vagrant/action/vm/check_guest_additions.rb
@@ -212,6 +214,7 @@ files:
 - lib/vagrant/action/vm/destroy.rb
 - lib/vagrant/action/vm/destroy_unused_network_interfaces.rb
 - lib/vagrant/action/vm/disable_networks.rb
+- lib/vagrant/action/vm/discard_state.rb
 - lib/vagrant/action/vm/export.rb
 - lib/vagrant/action/vm/forward_ports.rb
 - lib/vagrant/action/vm/forward_ports_helpers.rb
@@ -222,6 +225,7 @@ files:
 - lib/vagrant/action/vm/nfs.rb
 - lib/vagrant/action/vm/nfs_helpers.rb
 - lib/vagrant/action/vm/package.rb
+- lib/vagrant/action/vm/package_vagrantfile.rb
 - lib/vagrant/action/vm/persist.rb
 - lib/vagrant/action/vm/provision.rb
 - lib/vagrant/action/vm/resume.rb
@@ -235,6 +239,7 @@ files:
 - lib/vagrant/commands/box/add.rb
 - lib/vagrant/commands/box/list.rb
 - lib/vagrant/commands/box/remove.rb
+- lib/vagrant/commands/box/repackage.rb
 - lib/vagrant/commands/box.rb
 - lib/vagrant/commands/destroy.rb
 - lib/vagrant/commands/halt.rb
@@ -253,6 +258,7 @@ files:
 - lib/vagrant/downloaders/file.rb
 - lib/vagrant/downloaders/http.rb
 - lib/vagrant/environment.rb
+- lib/vagrant/exceptions/uncallable_action.rb
 - lib/vagrant/hosts/base.rb
 - lib/vagrant/hosts/bsd.rb
 - lib/vagrant/hosts/linux.rb