vagrant 0.6.0 → 0.6.1

Sign up to get free protection for your applications and to get access to all the features.
data/CHANGELOG.md CHANGED
@@ -1,4 +1,8 @@
1
- ## 0.6.0 (unreleased)
1
+ ## 0.6.1 (September 27, 2010)
2
+
3
+ - Fix issues with Ruby 1.8.7 where Vagrant simply failed.
4
+
5
+ ## 0.6.0 (September 27, 2010)
2
6
 
3
7
  - VM name now defaults to the name of the containing folder, plus a timestamp.
4
8
  This should make it easier to identify VMs in the VirtualBox GUI.
data/Gemfile.lock CHANGED
@@ -8,7 +8,7 @@ GIT
8
8
  PATH
9
9
  remote: .
10
10
  specs:
11
- vagrant (0.6.0)
11
+ vagrant (0.6.1)
12
12
  archive-tar-minitar (= 0.5.2)
13
13
  erubis (~> 2.6.6)
14
14
  i18n (~> 0.4.1)
@@ -116,19 +116,19 @@ module Vagrant
116
116
  #
117
117
  # If you're looking to create your own configuration class, see {Base}.
118
118
  class Top < Base
119
- @@configures = []
119
+ @@configures = {} if !defined?(@@configures)
120
120
 
121
121
  class << self
122
122
  # The list of registered configuration classes as well as the key
123
123
  # they're registered under.
124
124
  def configures_list
125
- @@configures ||= []
125
+ @@configures ||= {}
126
126
  end
127
127
 
128
128
  # Registers a configuration class with the given key. This method shouldn't
129
129
  # be called. Instead, inherit from {Base} and call {Base.configures}.
130
130
  def configures(key, klass)
131
- configures_list << [key, klass]
131
+ configures_list[key] = klass
132
132
  attr_reader key.to_sym
133
133
  end
134
134
  end
data/lib/vagrant/ui.rb CHANGED
@@ -26,16 +26,20 @@ module Vagrant
26
26
  end
27
27
 
28
28
  [[:warn, :yellow], [:error, :red], [:info, nil], [:confirm, :green]].each do |method, color|
29
- define_method(method) do |message, opts=nil|
30
- @shell.say("#{line_reset}#{format_message(message, opts)}", color)
31
- end
29
+ class_eval <<-CODE
30
+ def #{method}(message, opts=nil)
31
+ @shell.say("\#{line_reset}\#{format_message(message, opts)}", "#{color}")
32
+ end
33
+ CODE
32
34
  end
33
35
 
34
36
  [:ask, :no?, :yes?].each do |method|
35
- define_method(method) do |message, opts=nil|
36
- opts ||= {}
37
- @shell.send(method, format_message(message, opts), opts[:color])
38
- end
37
+ class_eval <<-CODE
38
+ def #{method}(message, opts=nil)
39
+ opts ||= {}
40
+ @shell.send(method, format_message(message, opts), opts[:color])
41
+ end
42
+ CODE
39
43
  end
40
44
 
41
45
  def report_progress(progress, total, show_parts=true)
@@ -2,5 +2,5 @@ module Vagrant
2
2
  # This will always be up to date with the current version of Vagrant,
3
3
  # since it is used to generate the gemspec and is also the source of
4
4
  # the version for `vagrant -v`
5
- VERSION = "0.6.0"
5
+ VERSION = "0.6.1"
6
6
  end
@@ -138,7 +138,7 @@ class ConfigTest < Test::Unit::TestCase
138
138
 
139
139
  context "top config class" do
140
140
  setup do
141
- @configures_list = []
141
+ @configures_list = {}
142
142
  @klass::Top.stubs(:configures_list).returns(@configures_list)
143
143
  end
144
144
 
@@ -149,8 +149,8 @@ class ConfigTest < Test::Unit::TestCase
149
149
  end
150
150
 
151
151
  should "add key and klass to configures list" do
152
- @configures_list.expects(:<<).with([@key, @config_klass])
153
152
  @klass::Top.configures(@key, @config_klass)
153
+ assert_equal @config_klass, @configures_list[@key]
154
154
  end
155
155
  end
156
156
 
@@ -168,7 +168,7 @@ class ConfigTest < Test::Unit::TestCase
168
168
  instance = mock("instance#{i}")
169
169
  instance.expects(:env=).with(env)
170
170
  klass.expects(:new).returns(instance)
171
- @configures_list << [key, klass]
171
+ @configures_list[key] = klass
172
172
  end
173
173
 
174
174
  @klass::Top.new(env)
metadata CHANGED
@@ -1,12 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant
3
3
  version: !ruby/object:Gem::Version
4
+ hash: 5
4
5
  prerelease: false
5
6
  segments:
6
7
  - 0
7
8
  - 6
8
- - 0
9
- version: 0.6.0
9
+ - 1
10
+ version: 0.6.1
10
11
  platform: ruby
11
12
  authors:
12
13
  - Mitchell Hashimoto
@@ -19,201 +20,214 @@ date: 2010-09-27 00:00:00 -07:00
19
20
  default_executable:
20
21
  dependencies:
21
22
  - !ruby/object:Gem::Dependency
22
- name: archive-tar-minitar
23
- requirement: &id001 !ruby/object:Gem::Requirement
23
+ version_requirements: &id001 !ruby/object:Gem::Requirement
24
24
  none: false
25
25
  requirements:
26
26
  - - "="
27
27
  - !ruby/object:Gem::Version
28
+ hash: 15
28
29
  segments:
29
30
  - 0
30
31
  - 5
31
32
  - 2
32
33
  version: 0.5.2
34
+ requirement: *id001
33
35
  type: :runtime
36
+ name: archive-tar-minitar
34
37
  prerelease: false
35
- version_requirements: *id001
36
38
  - !ruby/object:Gem::Dependency
37
- name: erubis
38
- requirement: &id002 !ruby/object:Gem::Requirement
39
+ version_requirements: &id002 !ruby/object:Gem::Requirement
39
40
  none: false
40
41
  requirements:
41
42
  - - ~>
42
43
  - !ruby/object:Gem::Version
44
+ hash: 27
43
45
  segments:
44
46
  - 2
45
47
  - 6
46
48
  - 6
47
49
  version: 2.6.6
50
+ requirement: *id002
48
51
  type: :runtime
52
+ name: erubis
49
53
  prerelease: false
50
- version_requirements: *id002
51
54
  - !ruby/object:Gem::Dependency
52
- name: json
53
- requirement: &id003 !ruby/object:Gem::Requirement
55
+ version_requirements: &id003 !ruby/object:Gem::Requirement
54
56
  none: false
55
57
  requirements:
56
58
  - - ~>
57
59
  - !ruby/object:Gem::Version
60
+ hash: 11
58
61
  segments:
59
62
  - 1
60
63
  - 4
61
64
  - 6
62
65
  version: 1.4.6
66
+ requirement: *id003
63
67
  type: :runtime
68
+ name: json
64
69
  prerelease: false
65
- version_requirements: *id003
66
70
  - !ruby/object:Gem::Dependency
67
- name: mario
68
- requirement: &id004 !ruby/object:Gem::Requirement
71
+ version_requirements: &id004 !ruby/object:Gem::Requirement
69
72
  none: false
70
73
  requirements:
71
74
  - - ~>
72
75
  - !ruby/object:Gem::Version
76
+ hash: 19
73
77
  segments:
74
78
  - 0
75
79
  - 0
76
80
  - 6
77
81
  version: 0.0.6
82
+ requirement: *id004
78
83
  type: :runtime
84
+ name: mario
79
85
  prerelease: false
80
- version_requirements: *id004
81
86
  - !ruby/object:Gem::Dependency
82
- name: net-ssh
83
- requirement: &id005 !ruby/object:Gem::Requirement
87
+ version_requirements: &id005 !ruby/object:Gem::Requirement
84
88
  none: false
85
89
  requirements:
86
90
  - - ~>
87
91
  - !ruby/object:Gem::Version
92
+ hash: 33
88
93
  segments:
89
94
  - 2
90
95
  - 0
91
96
  - 23
92
97
  version: 2.0.23
98
+ requirement: *id005
93
99
  type: :runtime
100
+ name: net-ssh
94
101
  prerelease: false
95
- version_requirements: *id005
96
102
  - !ruby/object:Gem::Dependency
97
- name: net-scp
98
- requirement: &id006 !ruby/object:Gem::Requirement
103
+ version_requirements: &id006 !ruby/object:Gem::Requirement
99
104
  none: false
100
105
  requirements:
101
106
  - - ~>
102
107
  - !ruby/object:Gem::Version
108
+ hash: 17
103
109
  segments:
104
110
  - 1
105
111
  - 0
106
112
  - 3
107
113
  version: 1.0.3
114
+ requirement: *id006
108
115
  type: :runtime
116
+ name: net-scp
109
117
  prerelease: false
110
- version_requirements: *id006
111
118
  - !ruby/object:Gem::Dependency
112
- name: i18n
113
- requirement: &id007 !ruby/object:Gem::Requirement
119
+ version_requirements: &id007 !ruby/object:Gem::Requirement
114
120
  none: false
115
121
  requirements:
116
122
  - - ~>
117
123
  - !ruby/object:Gem::Version
124
+ hash: 13
118
125
  segments:
119
126
  - 0
120
127
  - 4
121
128
  - 1
122
129
  version: 0.4.1
130
+ requirement: *id007
123
131
  type: :runtime
132
+ name: i18n
124
133
  prerelease: false
125
- version_requirements: *id007
126
134
  - !ruby/object:Gem::Dependency
127
- name: thor
128
- requirement: &id008 !ruby/object:Gem::Requirement
135
+ version_requirements: &id008 !ruby/object:Gem::Requirement
129
136
  none: false
130
137
  requirements:
131
138
  - - ~>
132
139
  - !ruby/object:Gem::Version
140
+ hash: 35
133
141
  segments:
134
142
  - 0
135
143
  - 14
136
144
  - 2
137
145
  version: 0.14.2
146
+ requirement: *id008
138
147
  type: :runtime
148
+ name: thor
139
149
  prerelease: false
140
- version_requirements: *id008
141
150
  - !ruby/object:Gem::Dependency
142
- name: virtualbox
143
- requirement: &id009 !ruby/object:Gem::Requirement
151
+ version_requirements: &id009 !ruby/object:Gem::Requirement
144
152
  none: false
145
153
  requirements:
146
154
  - - ~>
147
155
  - !ruby/object:Gem::Version
156
+ hash: 5
148
157
  segments:
149
158
  - 0
150
159
  - 7
151
160
  - 3
152
161
  version: 0.7.3
162
+ requirement: *id009
153
163
  type: :runtime
164
+ name: virtualbox
154
165
  prerelease: false
155
- version_requirements: *id009
156
166
  - !ruby/object:Gem::Dependency
157
- name: rake
158
- requirement: &id010 !ruby/object:Gem::Requirement
167
+ version_requirements: &id010 !ruby/object:Gem::Requirement
159
168
  none: false
160
169
  requirements:
161
170
  - - ">="
162
171
  - !ruby/object:Gem::Version
172
+ hash: 3
163
173
  segments:
164
174
  - 0
165
175
  version: "0"
176
+ requirement: *id010
166
177
  type: :development
178
+ name: rake
167
179
  prerelease: false
168
- version_requirements: *id010
169
180
  - !ruby/object:Gem::Dependency
170
- name: contest
171
- requirement: &id011 !ruby/object:Gem::Requirement
181
+ version_requirements: &id011 !ruby/object:Gem::Requirement
172
182
  none: false
173
183
  requirements:
174
184
  - - ">="
175
185
  - !ruby/object:Gem::Version
186
+ hash: 31
176
187
  segments:
177
188
  - 0
178
189
  - 1
179
190
  - 2
180
191
  version: 0.1.2
192
+ requirement: *id011
181
193
  type: :development
194
+ name: contest
182
195
  prerelease: false
183
- version_requirements: *id011
184
196
  - !ruby/object:Gem::Dependency
185
- name: mocha
186
- requirement: &id012 !ruby/object:Gem::Requirement
197
+ version_requirements: &id012 !ruby/object:Gem::Requirement
187
198
  none: false
188
199
  requirements:
189
200
  - - ">="
190
201
  - !ruby/object:Gem::Version
202
+ hash: 3
191
203
  segments:
192
204
  - 0
193
205
  version: "0"
206
+ requirement: *id012
194
207
  type: :development
208
+ name: mocha
195
209
  prerelease: false
196
- version_requirements: *id012
197
210
  - !ruby/object:Gem::Dependency
198
- name: ruby-debug
199
- requirement: &id013 !ruby/object:Gem::Requirement
211
+ version_requirements: &id013 !ruby/object:Gem::Requirement
200
212
  none: false
201
213
  requirements:
202
214
  - - ">="
203
215
  - !ruby/object:Gem::Version
216
+ hash: 3
204
217
  segments:
205
218
  - 0
206
219
  version: "0"
220
+ requirement: *id013
207
221
  type: :development
222
+ name: ruby-debug
208
223
  prerelease: false
209
- version_requirements: *id013
210
224
  - !ruby/object:Gem::Dependency
211
- name: bundler
212
- requirement: &id014 !ruby/object:Gem::Requirement
225
+ version_requirements: &id014 !ruby/object:Gem::Requirement
213
226
  none: false
214
227
  requirements:
215
228
  - - ">="
216
229
  - !ruby/object:Gem::Version
230
+ hash: 15424057
217
231
  segments:
218
232
  - 1
219
233
  - 0
@@ -221,9 +235,10 @@ dependencies:
221
235
  - rc
222
236
  - 6
223
237
  version: 1.0.0.rc.6
238
+ requirement: *id014
224
239
  type: :development
240
+ name: bundler
225
241
  prerelease: false
226
- version_requirements: *id014
227
242
  description: Vagrant is a tool for building and distributing virtualized development environments.
228
243
  email:
229
244
  - mitchell.hashimoto@gmail.com
@@ -456,7 +471,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
456
471
  requirements:
457
472
  - - ">="
458
473
  - !ruby/object:Gem::Version
459
- hash: -489429923350272274
474
+ hash: 3
460
475
  segments:
461
476
  - 0
462
477
  version: "0"
@@ -465,6 +480,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
465
480
  requirements:
466
481
  - - ">="
467
482
  - !ruby/object:Gem::Version
483
+ hash: 23
468
484
  segments:
469
485
  - 1
470
486
  - 3