vagrant 0.1.3 → 0.1.4.pre.a

data/Gemfile

@@ -6,7 +6,7 @@ gem "net-ssh", ">= 2.0.19"
 gem "net-scp", ">= 1.0.2"
 gem "git-style-binaries", ">= 0.1.10"
 gem "json", ">= 1.2.0"
-gem "tarruby", ">= 0.1.5"
+gem "archive-tar-minitar", ">= 0.5.2"
 
 # Gems required for testing only. To install run
 # gem bundle test

data/README.md

@@ -34,6 +34,14 @@ There is also a fairly short (12 minute) [getting started video](http://vimeo.co
 explains how to build a fully functional LAMP development environment, which
 covers a few parts of Vagrant in more detail than the website guide.
 
+## Installing the Gem from Git
+
+If you want the bleeding edge version of Vagrant, we try to keep master pretty stable
+and you're welcome to give it a shot. The following is an example showing how to do this:
+
+    rake build
+    sudo rake install
+
 ## Contributing to Vagrant
 
 To hack on vagrant, you'll need [bundler](http://github.com/carlhuda/bundler) which can

data/Rakefile

@@ -15,7 +15,7 @@ begin
     gemspec.add_dependency('net-scp', '>= 1.0.2')
     gemspec.add_dependency('json', '>= 1.2.0')
     gemspec.add_dependency('git-style-binaries', '>= 0.1.10')
-    gemspec.add_dependency('tarruby', '>= 0.1.5')
+    gemspec.add_dependency('archive-tar-minitar', '>= 0.5.2')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -38,4 +38,4 @@ begin
 rescue LoadError
   puts "Yard not available. Install it with: gem install yard"
   puts "if you wish to be able to generate developer documentation."
-end
+end

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4.pre.a

data/bin/vagrant

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

data/lib/vagrant.rb

@@ -3,8 +3,8 @@ $:.unshift(libdir)
 PROJECT_ROOT = File.join(libdir, '..') unless defined?(PROJECT_ROOT)
 
 # The libs which must be loaded prior to the rest
-%w{tempfile open-uri ftools json pathname logger uri net/http virtualbox net/ssh tarruby
-  net/scp fileutils vagrant/util vagrant/actions/base vagrant/downloaders/base}.each do |f|
+%w{tempfile open-uri json pathname logger uri net/http virtualbox net/ssh archive/tar/minitar
+  net/scp fileutils vagrant/util vagrant/actions/base vagrant/downloaders/base vagrant/actions/runner}.each do |f|
   require f
 end
 

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

@@ -4,7 +4,6 @@ module Vagrant
       # This action unpackages a downloaded box file into its final
       # box destination within the vagrant home folder.
       class Unpackage < Base
-        TAR_OPTIONS = [File::RDONLY, 0644, Tar::GNU]
 
         def execute!
           @runner.invoke_around_callback(:unpackage) do
@@ -38,12 +37,10 @@ msg
         def decompress
           Dir.chdir(box_dir) do
             logger.info "Extracting box to #{box_dir}..."
-            Tar.open(@runner.temp_path, *TAR_OPTIONS) do |tar|
-              tar.extract_all
-            end
+            Archive::Tar::Minitar.unpack(@runner.temp_path, box_dir)
           end
         end
       end
     end
   end
-end
+end

data/lib/vagrant/actions/runner.rb

@@ -69,11 +69,15 @@ module Vagrant
       # to execute a single action on an instance. The syntax for executing a
       # single method on an instance is the same as the {execute!} class method.
       def execute!(single_action=nil, *args)
+
         if single_action
           actions.clear
           add_action(single_action, *args)
         end
 
+        # Raising it here might be too late and hard debug where the actions are comming from (meta actions)
+        raise DuplicateActionException.new if action_klasses.uniq.size < action_klasses.size
+    
         # Call the prepare method on each once its
         # initialized, then call the execute! method
         begin
@@ -123,6 +127,12 @@ module Vagrant
         end
         results
       end
+
+      def action_klasses
+        actions.map { |a| a.class }
+      end
     end
+    
+    class DuplicateActionException < Exception; end
   end
-end
+end

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

@@ -38,20 +38,24 @@ module Vagrant
 
         def compress
           logger.info "Packaging VM into #{tar_path} ..."
-          Tar.open(tar_path, File::CREAT | File::WRONLY, 0644, Tar::GNU) do |tar|
-            begin
-              current_dir = FileUtils.pwd
-              @include_files.each do |f|
-                logger.info "Packaging additional file: #{f}"
-                tar.append_file(f)
-              end
+          File.open(tar_path, File::CREAT | File::WRONLY, 0644) do |tar|
+            Archive::Tar::Minitar::Output.open(tar) do |output|
+              begin
+                current_dir = FileUtils.pwd
+
+                include_files.each do |f|
+                  logger.info "Packaging additional file: #{f}"
+                  Archive::Tar::Minitar.pack_file(f, output)
+                end
 
-              FileUtils.cd(temp_path)
+                FileUtils.cd(temp_path)
 
-              # Append tree will append the entire directory tree unless a relative folder reference is used
-              tar.append_tree(".")
-            ensure
-              FileUtils.cd(current_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

data/lib/vagrant/commands.rb

@@ -21,7 +21,7 @@ error
         end
 
         # Copy over the rootfile template into this directory
-        File.copy(File.join(PROJECT_ROOT, "templates", Env::ROOTFILE_NAME), rootfile_path)
+        FileUtils.cp(File.join(PROJECT_ROOT, "templates", Env::ROOTFILE_NAME), rootfile_path)
       end
 
       # Bring up a vagrant instance. This handles everything from importing

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

@@ -84,6 +84,7 @@ class UnpackageBoxActionTest < Test::Unit::TestCase
 
       @action.stubs(:box_dir).returns(@box_dir)
       Dir.stubs(:chdir).yields
+      Archive::Tar::Minitar.stubs(:unpack)
     end
 
     should "change to the box directory" do
@@ -92,9 +93,7 @@ class UnpackageBoxActionTest < Test::Unit::TestCase
     end
 
     should "open the tar file within the new directory, and extract it all" do
-      @tar = mock("tar")
-      @tar.expects(:extract_all).once
-      Tar.expects(:open).with(@runner.temp_path, anything, anything, anything).yields(@tar)
+      Archive::Tar::Minitar.expects(:unpack).with(@runner.temp_path, @box_dir).once
       @action.decompress
     end
   end

data/test/vagrant/actions/runner_test.rb

@@ -1,8 +1,8 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
 class ActionRunnerTest < Test::Unit::TestCase
-  def mock_fake_action
-    action = mock("action")
+  def mock_fake_action(action_klass = nil, runner = nil)
+    action = action_klass ? action_klass.new(runner) : mock("action")
     action.stubs(:prepare)
     action.stubs(:execute!)
     action.stubs(:cleanup)
@@ -129,6 +129,7 @@ class ActionRunnerTest < Test::Unit::TestCase
   context "instance method execute" do
     setup do
       @runner = Vagrant::Actions::Runner.new
+      @runner.stubs(:action_klasses).returns([Vagrant::Actions::Base])
     end
 
     should "clear the actions and run a single action if given to execute!" do
@@ -233,4 +234,29 @@ class ActionRunnerTest < Test::Unit::TestCase
       assert @runner.actions.empty?
     end
   end
+
+  context "duplicate action exceptions" do
+    setup do
+      @runner = Vagrant::Actions::Runner.new
+    end
+    
+    should "should be raised when a duplicate is added" do
+      action = mock_fake_action
+      2.times {@runner.actions << action }
+      assert_raise Vagrant::Actions::DuplicateActionException do
+        @runner.execute!
+      end
+    end
+
+    should "should not be raise when no duplicate actions are present" do
+      @runner.actions << mock_fake_action(Vagrant::Actions::Base, @runner)
+      @runner.actions << mock_fake_action(Vagrant::Actions::VM::Halt, @runner)
+      
+      assert_nothing_raised { @runner.execute! }
+    end
+
+    should "should not raise when a single action is specified" do
+      assert_nothing_raised { @runner.execute!(Vagrant::Actions::Base) }
+    end
+  end
 end

data/test/vagrant/actions/vm/package_test.rb

@@ -66,27 +66,49 @@ class PackageActionTest < Test::Unit::TestCase
       @temp_path = "foo"
       @action.stubs(:temp_path).returns(@temp_path)
 
+      @include_files = []
+      @action.stubs(:include_files).returns(@include_files)
+
       @pwd = "bar"
       FileUtils.stubs(:pwd).returns(@pwd)
       FileUtils.stubs(:cd)
 
-      @tar = mock("tar")
-      Tar.stubs(:open).yields(@tar)
+      @file = mock("file")
+      File.stubs(:open).yields(@file)
+
+      @output = mock("output")
+      @tar = Archive::Tar::Minitar
+      Archive::Tar::Minitar::Output.stubs(:open).yields(@output)
+      @tar.stubs(:pack_file)
     end
 
     should "open the tar file with the tar path properly" do
-      Tar.expects(:open).with(@tar_path, File::CREAT | File::WRONLY, 0644, Tar::GNU).once
+      File.expects(:open).with(@tar_path, File::CREAT | File::WRONLY, 0644).once
+      @action.compress
+    end
+
+    should "open tar file" do
+      Archive::Tar::Minitar::Output.expects(:open).with(@file).once
       @action.compress
     end
 
     #----------------------------------------------------------------
-    # Methods below this comment test the block yielded by Tar.open
+    # Methods below this comment test the block yielded by Minitar open
     #----------------------------------------------------------------
     should "cd to the directory and append the directory" do
+      @files = []
       compress_seq = sequence("compress_seq")
+
       FileUtils.expects(:pwd).once.returns(@pwd).in_sequence(compress_seq)
       FileUtils.expects(:cd).with(@temp_path).in_sequence(compress_seq)
-      @tar.expects(:append_tree).with(".").in_sequence(compress_seq)
+      Dir.expects(:glob).returns(@files).in_sequence(compress_seq)
+
+      5.times do |i|
+        file = mock("file#{i}")
+        @tar.expects(:pack_file).with(file, @output).once.in_sequence(compress_seq)
+        @files << file
+      end
+
       FileUtils.expects(:cd).with(@pwd).in_sequence(compress_seq)
       @action.compress
     end
@@ -102,17 +124,21 @@ class PackageActionTest < Test::Unit::TestCase
     end
 
     should "add included files when passed" do
-      include_files = ['foo', 'bar']
-      action = mock_action(Vagrant::Actions::VM::Package, "bing", include_files).last
-      action.stubs(:temp_path).returns("foo")
-      @tar.expects(:append_tree).with(".")
-      include_files.each { |f| @tar.expects(:append_file).with(f) }
-      action.compress
+      compress_seq = sequence("compress")
+      @files = []
+      5.times do |i|
+        file = mock("file#{i}")
+        @tar.expects(:pack_file).with(file, @output).once.in_sequence(compress_seq)
+        @files << file
+      end
+
+      @action.expects(:include_files).returns(@files)
+      @action.compress
     end
 
     should "not add files when none are specified" do
-      @tar.expects(:append_tree).with(".")
-      @tar.expects(:append_file).never
+      @tar.expects(:pack_file).never
+      Dir.expects(:glob).once.returns([])
       @action.compress
     end
   end

data/test/vagrant/busy_test.rb

@@ -54,9 +54,11 @@ class BusyTest < Test::Unit::TestCase
     should "report busy to the outside world regardless of thread" do
       Thread.new do
         Vagrant.busy do
-          sleep(1)
+          sleep(2)
         end
       end
+      # Give the thread time to start
+      sleep(1)
 
       # While the above thread is executing vagrant should be busy
       assert Vagrant.busy?

data/test/vagrant/commands_test.rb

@@ -12,7 +12,7 @@ class CommandsTest < Test::Unit::TestCase
 
   context "init" do
     setup do
-      File.stubs(:copy)
+      FileUtils.stubs(:cp)
       @rootfile_path = File.join(Dir.pwd, Vagrant::Env::ROOTFILE_NAME)
       @template_path = File.join(PROJECT_ROOT, "templates", Vagrant::Env::ROOTFILE_NAME)
     end
@@ -25,7 +25,7 @@ class CommandsTest < Test::Unit::TestCase
 
     should "copy the templated rootfile to the current path" do
       File.expects(:exist?).with(@rootfile_path).returns(false)
-      File.expects(:copy).with(@template_path, @rootfile_path).once
+      FileUtils.expects(:cp).with(@template_path, @rootfile_path).once
       Vagrant::Commands.init
     end
   end

data/vagrant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vagrant}
-  s.version = "0.1.3"
+  s.version = "0.1.4.pre.a"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mitchell Hashimoto", "John Bender"]
-  s.date = %q{2010-03-08}
+  s.date = %q{2010-03-09}
   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-suspend", "vagrant-up"]
@@ -161,14 +161,14 @@ Gem::Specification.new do |s|
       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<tarruby>, [">= 0.1.5"])
+      s.add_runtime_dependency(%q<archive-tar-minitar>, [">= 0.5.2"])
     else
       s.add_dependency(%q<virtualbox>, [">= 0.5.0"])
       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"])
       s.add_dependency(%q<git-style-binaries>, [">= 0.1.10"])
-      s.add_dependency(%q<tarruby>, [">= 0.1.5"])
+      s.add_dependency(%q<archive-tar-minitar>, [">= 0.5.2"])
     end
   else
     s.add_dependency(%q<virtualbox>, [">= 0.5.0"])
@@ -176,7 +176,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<net-scp>, [">= 1.0.2"])
     s.add_dependency(%q<json>, [">= 1.2.0"])
     s.add_dependency(%q<git-style-binaries>, [">= 0.1.10"])
-    s.add_dependency(%q<tarruby>, [">= 0.1.5"])
+    s.add_dependency(%q<archive-tar-minitar>, [">= 0.5.2"])
   end
 end
 

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  - pre
+  - a
+  version: 0.1.4.pre.a
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -08:00
+date: 2010-03-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,7 +91,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: tarruby
+  name: archive-tar-minitar
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
@@ -97,9 +99,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
         - 5
-        version: 0.1.5
+        - 2
+        version: 0.5.2
   type: :runtime
   version_requirements: *id006
 description: Vagrant is a tool for building and distributing virtualized development environments.
@@ -232,11 +234,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: