From 28b48929dfeef26f41c582b972fb8884ea40269c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 22 Feb 2010 18:17:43 -0800
Subject: [PATCH] Changed box actions and commands to use the Box class instead
 of passed in params.

---
 lib/vagrant/actions/box/add.rb            |  8 +-----
 lib/vagrant/actions/box/download.rb       |  7 +----
 lib/vagrant/box.rb                        | 15 +++++++++++
 lib/vagrant/commands.rb                   |  2 +-
 test/vagrant/actions/box/download_test.rb |  8 +++++-
 test/vagrant/box_test.rb                  | 32 +++++++++++++++++++++++
 test/vagrant/commands_test.rb             |  2 +-
 7 files changed, 58 insertions(+), 16 deletions(-)
 create mode 100644 test/vagrant/box_test.rb

diff --git a/lib/vagrant/actions/box/add.rb b/lib/vagrant/actions/box/add.rb
index 1786834e6..b46ba2c3d 100644
--- a/lib/vagrant/actions/box/add.rb
+++ b/lib/vagrant/actions/box/add.rb
@@ -2,14 +2,8 @@ module Vagrant
   module Actions
     module Box
       class Add < Base
-        def initialize(runner, name, path, *args)
-          super
-          @name = name
-          @uri = path
-        end
-
         def prepare
-          @runner.add_action(Download, @uri)
+          @runner.add_action(Download)
         end
       end
     end
diff --git a/lib/vagrant/actions/box/download.rb b/lib/vagrant/actions/box/download.rb
index 0fbaee608..4d394e00a 100644
--- a/lib/vagrant/actions/box/download.rb
+++ b/lib/vagrant/actions/box/download.rb
@@ -7,11 +7,6 @@ module Vagrant
         BASENAME = "box"
         BUFFERSIZE = 1048576 # 1 MB
 
-        def initialize(runner, uri, *args)
-          super
-          @uri = uri
-        end
-
         def execute!
           with_tempfile do |tempfile|
             copy_uri_to(tempfile)
@@ -27,7 +22,7 @@ module Vagrant
 
         def copy_uri_to(f)
           logger.info "Copying box to temporary location..."
-          open(@uri) do |remote_file|
+          open(@runner.uri) do |remote_file|
             loop do
               break if remote_file.eof?
               f.write(remote_file.read(BUFFERSIZE))
diff --git a/lib/vagrant/box.rb b/lib/vagrant/box.rb
index bc38c0e79..3be3223e6 100644
--- a/lib/vagrant/box.rb
+++ b/lib/vagrant/box.rb
@@ -1,5 +1,20 @@
 module Vagrant
   class Box < Actions::Runner
+    attr_accessor :name
+    attr_accessor :uri
+    attr_accessor :temp_path
 
+    class <<self
+      def add(name, uri)
+        box = new
+        box.name = name
+        box.uri = uri
+        box.add
+      end
+    end
+
+    def add
+      execute!(Actions::Box::Add)
+    end
   end
 end
\ No newline at end of file
diff --git a/lib/vagrant/commands.rb b/lib/vagrant/commands.rb
index 4470388e2..f1e499146 100644
--- a/lib/vagrant/commands.rb
+++ b/lib/vagrant/commands.rb
@@ -158,7 +158,7 @@ error
 
       # Adds a box to the local filesystem, given a URI.
       def box_add(name, path)
-        Box.execute!(Actions::Box::Add, name, path)
+        Box.add(name, path)
       end
 
       private
diff --git a/test/vagrant/actions/box/download_test.rb b/test/vagrant/actions/box/download_test.rb
index dbc82af69..81faa1f28 100644
--- a/test/vagrant/actions/box/download_test.rb
+++ b/test/vagrant/actions/box/download_test.rb
@@ -3,7 +3,8 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
 class DownloadBoxActionTest < Test::Unit::TestCase
   setup do
     @uri = "foo.com"
-    @wrapper_vm, @vm, @action = mock_action(Vagrant::Actions::Box::Download, @uri)
+    @runner, @vm, @action = mock_action(Vagrant::Actions::Box::Download)
+    @runner.stubs(:uri).returns(@uri)
     mock_config
 
     Vagrant::Env.stubs(:tmp_path).returns("foo")
@@ -48,6 +49,11 @@ class DownloadBoxActionTest < Test::Unit::TestCase
       @action.stubs(:open).yields(@file)
     end
 
+    should "open with the given uri" do
+      @action.expects(:open).with(@uri).once
+      @action.copy_uri_to(@tempfile)
+    end
+
     should "read from the file and write to the tempfile" do
       data = mock("data")
       write_seq = sequence("write_seq")
diff --git a/test/vagrant/box_test.rb b/test/vagrant/box_test.rb
new file mode 100644
index 000000000..dea08a9c4
--- /dev/null
+++ b/test/vagrant/box_test.rb
@@ -0,0 +1,32 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+
+class BoxTest < Test::Unit::TestCase
+  context "class methods" do
+    context "adding" do
+      setup do
+        @name = "foo"
+        @uri = "bar"
+      end
+
+      should "create a new instance, set the variables, and add it" do
+        box = mock("box")
+        box.expects(:name=).with(@name)
+        box.expects(:uri=).with(@uri)
+        box.expects(:add).once
+        Vagrant::Box.expects(:new).returns(box)
+        Vagrant::Box.add(@name, @uri)
+      end
+    end
+  end
+
+  context "instance methods" do
+    setup do
+      @box = Vagrant::Box.new
+    end
+
+    should "execute the Add action when add is called" do
+      @box.expects(:execute!).with(Vagrant::Actions::Box::Add).once
+      @box.add
+    end
+  end
+end
diff --git a/test/vagrant/commands_test.rb b/test/vagrant/commands_test.rb
index b0ee47ffc..f948dfb9a 100644
--- a/test/vagrant/commands_test.rb
+++ b/test/vagrant/commands_test.rb
@@ -206,7 +206,7 @@ class CommandsTest < Test::Unit::TestCase
     end
 
     should "execute the add action with the name and path" do
-      Vagrant::Box.expects(:execute!).with(Vagrant::Actions::Box::Add, @name, @path).once
+      Vagrant::Box.expects(:add).with(@name, @path).once
       Vagrant::Commands.box_add(@name, @path)
     end
   end