vagrant 0.6.0 → 0.6.1

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 0.6.0 (unreleased)
+## 0.6.1 (September 27, 2010)
+
+  - Fix issues with Ruby 1.8.7 where Vagrant simply failed.
+
+## 0.6.0 (September 27, 2010)
 
   - VM name now defaults to the name of the containing folder, plus a timestamp.
     This should make it easier to identify VMs in the VirtualBox GUI.

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant (0.6.0)
+    vagrant (0.6.1)
       archive-tar-minitar (= 0.5.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)

data/lib/vagrant/config.rb

@@ -116,19 +116,19 @@ module Vagrant
     #
     # If you're looking to create your own configuration class, see {Base}.
     class Top < Base
-      @@configures = []
+      @@configures = {} if !defined?(@@configures)
 
       class << self
         # The list of registered configuration classes as well as the key
         # they're registered under.
         def configures_list
-          @@configures ||= []
+          @@configures ||= {}
         end
 
         # Registers a configuration class with the given key. This method shouldn't
         # be called. Instead, inherit from {Base} and call {Base.configures}.
         def configures(key, klass)
-          configures_list << [key, klass]
+          configures_list[key] = klass
           attr_reader key.to_sym
         end
       end

data/lib/vagrant/ui.rb

@@ -26,16 +26,20 @@ module Vagrant
       end
 
       [[:warn, :yellow], [:error, :red], [:info, nil], [:confirm, :green]].each do |method, color|
-        define_method(method) do |message, opts=nil|
-          @shell.say("#{line_reset}#{format_message(message, opts)}", color)
-        end
+        class_eval <<-CODE
+          def #{method}(message, opts=nil)
+            @shell.say("\#{line_reset}\#{format_message(message, opts)}", "#{color}")
+          end
+        CODE
       end
 
       [:ask, :no?, :yes?].each do |method|
-        define_method(method) do |message, opts=nil|
-          opts ||= {}
-          @shell.send(method, format_message(message, opts), opts[:color])
-        end
+        class_eval <<-CODE
+          def #{method}(message, opts=nil)
+            opts ||= {}
+            @shell.send(method, format_message(message, opts), opts[:color])
+          end
+        CODE
       end
 
       def report_progress(progress, total, show_parts=true)

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.0"
+  VERSION = "0.6.1"
 end

data/test/vagrant/config_test.rb

@@ -138,7 +138,7 @@ class ConfigTest < Test::Unit::TestCase
 
   context "top config class" do
     setup do
-      @configures_list = []
+      @configures_list = {}
       @klass::Top.stubs(:configures_list).returns(@configures_list)
     end
 
@@ -149,8 +149,8 @@ class ConfigTest < Test::Unit::TestCase
       end
 
       should "add key and klass to configures list" do
-        @configures_list.expects(:<<).with([@key, @config_klass])
         @klass::Top.configures(@key, @config_klass)
+        assert_equal @config_klass, @configures_list[@key]
       end
     end
 
@@ -168,7 +168,7 @@ class ConfigTest < Test::Unit::TestCase
           instance = mock("instance#{i}")
           instance.expects(:env=).with(env)
           klass.expects(:new).returns(instance)
-          @configures_list << [key, klass]
+          @configures_list[key] = klass
         end
 
         @klass::Top.new(env)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -19,201 +20,214 @@ date: 2010-09-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: archive-tar-minitar
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 5
         - 2
         version: 0.5.2
+  requirement: *id001
   type: :runtime
+  name: archive-tar-minitar
   prerelease: false
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: erubis
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 2
         - 6
         - 6
         version: 2.6.6
+  requirement: *id002
   type: :runtime
+  name: erubis
   prerelease: false
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 4
         - 6
         version: 1.4.6
+  requirement: *id003
   type: :runtime
+  name: json
   prerelease: false
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mario
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
         - 0
         - 6
         version: 0.0.6
+  requirement: *id004
   type: :runtime
+  name: mario
   prerelease: false
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 33
         segments: 
         - 2
         - 0
         - 23
         version: 2.0.23
+  requirement: *id005
   type: :runtime
+  name: net-ssh
   prerelease: false
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: net-scp
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 1
         - 0
         - 3
         version: 1.0.3
+  requirement: *id006
   type: :runtime
+  name: net-scp
   prerelease: false
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: i18n
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 4
         - 1
         version: 0.4.1
+  requirement: *id007
   type: :runtime
+  name: i18n
   prerelease: false
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: thor
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 35
         segments: 
         - 0
         - 14
         - 2
         version: 0.14.2
+  requirement: *id008
   type: :runtime
+  name: thor
   prerelease: false
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: virtualbox
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 0
         - 7
         - 3
         version: 0.7.3
+  requirement: *id009
   type: :runtime
+  name: virtualbox
   prerelease: false
-  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id010
   type: :development
+  name: rake
   prerelease: false
-  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: contest
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 0
         - 1
         - 2
         version: 0.1.2
+  requirement: *id011
   type: :development
+  name: contest
   prerelease: false
-  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id012
   type: :development
+  name: mocha
   prerelease: false
-  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id013
   type: :development
+  name: ruby-debug
   prerelease: false
-  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15424057
         segments: 
         - 1
         - 0
@@ -221,9 +235,10 @@ dependencies:
         - rc
         - 6
         version: 1.0.0.rc.6
+  requirement: *id014
   type: :development
+  name: bundler
   prerelease: false
-  version_requirements: *id014
 description: Vagrant is a tool for building and distributing virtualized development environments.
 email: 
 - mitchell.hashimoto@gmail.com
@@ -456,7 +471,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -489429923350272274
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -465,6 +480,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3