vagrant 0.2.0.pre → 0.2.0

data/Gemfile

@@ -1,7 +1,7 @@
 source :gemcutter
 
 # Gems required for the lib to even run
-gem "virtualbox", ">= 0.5.2"
+gem "virtualbox", ">= 0.5.3"
 gem "net-ssh", ">= 2.0.19"
 gem "net-scp", ">= 1.0.2"
 gem "git-style-binaries", ">= 0.1.10"

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gemspec.homepage = "http://github.com/mitchellh/vagrant"
     gemspec.authors = ["Mitchell Hashimoto", "John Bender"]
 
-    gemspec.add_dependency('virtualbox', '>= 0.5.2')
+    gemspec.add_dependency('virtualbox', '>= 0.5.3')
     gemspec.add_dependency('net-ssh', '>= 2.0.19')
     gemspec.add_dependency('net-scp', '>= 1.0.2')
     gemspec.add_dependency('json', '>= 1.2.0')

data/VERSION

@@ -1 +1 @@
-0.2.0.pre
+0.2.0

data/bin/vagrant

@@ -9,7 +9,7 @@ end
 require 'git-style-binary/command'
 
 GitStyleBinary.primary do
-  version "0.1.4"
+  version "0.2.0"
 
   run { educate }
 end

data/lib/vagrant/actions/box/download.rb

@@ -26,6 +26,9 @@ module Vagrant
           end
 
           raise ActionException.new("Unknown URI type for box download.") unless @downloader
+
+          # Prepare the downloader
+          @downloader.prepare(@runner.uri)
         end
 
         def execute!

data/lib/vagrant/downloaders/base.rb

@@ -5,6 +5,9 @@ module Vagrant
     class Base
       include Vagrant::Util
 
+      # Called prior to execution so any error checks can be done
+      def prepare(source_url); end
+
       # Downloads the source file to the destination file. It is up to
       # implementors of this class to handle the logic.
       def download!(source_url, destination_file); end

data/lib/vagrant/downloaders/file.rb

@@ -3,6 +3,16 @@ module Vagrant
     # "Downloads" a file to a temporary file. Basically, this downloader
     # simply does a file copy.
     class File < Base
+      def prepare(source_url)
+        if !::File.file?(source_url)
+          raise Actions::ActionException.new(<<-msg)
+The given box does not exist on the file system:
+
+#{source_url}
+msg
+        end
+      end
+
       def download!(source_url, destination_file)
         FileUtils.cp(source_url, destination_file.path)
       end

data/test/vagrant/actions/box/download_test.rb

@@ -16,6 +16,10 @@ class DownloadBoxActionTest < Test::Unit::TestCase
       @uri = mock("uri")
       @uri.stubs(:is_a?).returns(false)
       URI.stubs(:parse).returns(@uri)
+
+      @downloader = mock("downloader")
+      Vagrant::Downloaders::File.any_instance.stubs(:prepare)
+      Vagrant::Downloaders::HTTP.any_instance.stubs(:prepare)
     end
 
     should "raise an exception if no URI type is matched" do
@@ -25,6 +29,13 @@ class DownloadBoxActionTest < Test::Unit::TestCase
       }
     end
 
+    should "call #prepare on the downloader" do
+      @downloader.expects(:prepare).with(@runner.uri).once
+      Vagrant::Downloaders::File.expects(:new).returns(@downloader)
+      @uri.stubs(:is_a?).with(URI::Generic).returns(true)
+      @action.prepare
+    end
+
     should "set the downloader to file if URI is generic" do
       @uri.stubs(:is_a?).with(URI::Generic).returns(true)
       @action.prepare

data/test/vagrant/downloaders/base_test.rb

@@ -11,6 +11,13 @@ class BaseDownloaderTest < Test::Unit::TestCase
     end
 
     should "implement prepare which does nothing" do
+      assert_nothing_raised do
+        assert @base.respond_to?(:prepare)
+        @base.prepare("source")
+      end
+    end
+
+    should "implement download! which does nothing" do
       assert_nothing_raised do
         assert @base.respond_to?(:download!)
         @base.download!("source", "destination")

data/test/vagrant/downloaders/file_test.rb

@@ -6,6 +6,15 @@ class FileDownloaderTest < Test::Unit::TestCase
     @uri = "foo.box"
   end
 
+  context "preparing" do
+    should "raise an exception if the file does not exist" do
+      File.expects(:file?).with(@uri).returns(false)
+      assert_raises(Vagrant::Actions::ActionException) {
+        @downloader.prepare(@uri)
+      }
+    end
+  end
+
   context "downloading" do
     should "cp the file" do
       path = '/path'

data/vagrant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vagrant}
-  s.version = "0.2.0.pre"
+  s.version = "0.2.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mitchell Hashimoto", "John Bender"]
-  s.date = %q{2010-03-15}
+  s.date = %q{2010-03-16}
   s.description = %q{Vagrant is a tool for building and distributing virtualized development environments.}
   s.email = ["mitchell.hashimoto@gmail.com", "john.m.bender@gmail.com"]
   s.executables = ["vagrant", "vagrant-box", "vagrant-down", "vagrant-halt", "vagrant-init", "vagrant-package", "vagrant-reload", "vagrant-resume", "vagrant-ssh", "vagrant-status", "vagrant-suspend", "vagrant-up"]
@@ -183,14 +183,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<virtualbox>, [">= 0.5.2"])
+      s.add_runtime_dependency(%q<virtualbox>, [">= 0.5.3"])
       s.add_runtime_dependency(%q<net-ssh>, [">= 2.0.19"])
       s.add_runtime_dependency(%q<net-scp>, [">= 1.0.2"])
       s.add_runtime_dependency(%q<json>, [">= 1.2.0"])
       s.add_runtime_dependency(%q<git-style-binaries>, [">= 0.1.10"])
       s.add_runtime_dependency(%q<archive-tar-minitar>, ["= 0.5.2"])
     else
-      s.add_dependency(%q<virtualbox>, [">= 0.5.2"])
+      s.add_dependency(%q<virtualbox>, [">= 0.5.3"])
       s.add_dependency(%q<net-ssh>, [">= 2.0.19"])
       s.add_dependency(%q<net-scp>, [">= 1.0.2"])
       s.add_dependency(%q<json>, [">= 1.2.0"])
@@ -198,7 +198,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<archive-tar-minitar>, ["= 0.5.2"])
     end
   else
-    s.add_dependency(%q<virtualbox>, [">= 0.5.2"])
+    s.add_dependency(%q<virtualbox>, [">= 0.5.3"])
     s.add_dependency(%q<net-ssh>, [">= 2.0.19"])
     s.add_dependency(%q<net-scp>, [">= 1.0.2"])
     s.add_dependency(%q<json>, [">= 1.2.0"])

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 2
   - 0
-  - pre
-  version: 0.2.0.pre
+  version: 0.2.0
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -07:00
+date: 2010-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 5
-        - 2
-        version: 0.5.2
+        - 3
+        version: 0.5.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -253,13 +252,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: