chef-server-api 0.9.0 → 0.9.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Rakefile +6 -2
- data/app/models/sandbox_file.rb +4 -1
- data/lib/chef-server-api/version.rb +1 -1
- data/spec/unit/sandbox_file_spec.rb +9 -0
- metadata +35 -46
data/Rakefile
CHANGED
@@ -3,8 +3,12 @@ require File.dirname(__FILE__) + '/lib/chef-server-api/version'
|
|
3
3
|
require 'rubygems'
|
4
4
|
require 'rake/gempackagetask'
|
5
5
|
|
6
|
-
|
7
|
-
require 'merb-core
|
6
|
+
begin
|
7
|
+
require 'merb-core'
|
8
|
+
require 'merb-core/tasks/merb'
|
9
|
+
rescue LoadError
|
10
|
+
STDERR.puts "merb is not installed, merb rake tasks will not be available."
|
11
|
+
end
|
8
12
|
|
9
13
|
GEM_NAME = "chef-server-api"
|
10
14
|
AUTHOR = "Opscode"
|
data/app/models/sandbox_file.rb
CHANGED
@@ -99,7 +99,10 @@ module ChefServerApi
|
|
99
99
|
|
100
100
|
def commit_stringio_to(destination_file_path)
|
101
101
|
Tempfile.open("sandbox") do |src|
|
102
|
-
|
102
|
+
@input.rewind
|
103
|
+
while chunk = @input.read(8184)
|
104
|
+
src.write(chunk)
|
105
|
+
end
|
103
106
|
src.close
|
104
107
|
Chef::Log.info("upload_checksum: move #{src.path} to #{destination_file_path}")
|
105
108
|
FileUtils.mv(src.path, destination_file_path)
|
@@ -120,6 +120,15 @@ describe ChefServerApi::SandboxFile do
|
|
120
120
|
@sandbox_file.commit_to('/tmp/final_home')
|
121
121
|
@tempfile.string.should == "riseofthemachines\nriseofthechefs\n"
|
122
122
|
end
|
123
|
+
|
124
|
+
it "calls #read and not #string on the rack input [CHEF-1363 regression test]" do
|
125
|
+
@input.should_not_receive(:string)
|
126
|
+
@tempfile = StringIO.new
|
127
|
+
@tempfile.stub!(:path).and_return("/tmpfile/source")
|
128
|
+
Tempfile.stub!(:open).and_yield(@tempfile)
|
129
|
+
FileUtils.stub!(:mv)
|
130
|
+
@sandbox_file.commit_to('/tmp/final_home')
|
131
|
+
end
|
123
132
|
end
|
124
133
|
|
125
134
|
context "and a tempfile for input" do
|
metadata
CHANGED
@@ -1,13 +1,12 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: chef-server-api
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash: 59
|
5
4
|
prerelease: false
|
6
5
|
segments:
|
7
6
|
- 0
|
8
7
|
- 9
|
9
|
-
-
|
10
|
-
version: 0.9.
|
8
|
+
- 2
|
9
|
+
version: 0.9.2
|
11
10
|
platform: ruby
|
12
11
|
authors:
|
13
12
|
- Opscode
|
@@ -15,135 +14,127 @@ autorequire:
|
|
15
14
|
bindir: bin
|
16
15
|
cert_chain: []
|
17
16
|
|
18
|
-
date: 2010-06-
|
17
|
+
date: 2010-06-29 00:00:00 -07:00
|
19
18
|
default_executable:
|
20
19
|
dependencies:
|
21
20
|
- !ruby/object:Gem::Dependency
|
22
|
-
prerelease: false
|
23
|
-
type: :runtime
|
24
21
|
name: merb-core
|
25
|
-
|
22
|
+
requirement: &id001 !ruby/object:Gem::Requirement
|
26
23
|
none: false
|
27
24
|
requirements:
|
28
25
|
- - ~>
|
29
26
|
- !ruby/object:Gem::Version
|
30
|
-
hash: 19
|
31
27
|
segments:
|
32
28
|
- 1
|
33
29
|
- 1
|
34
30
|
- 0
|
35
31
|
version: 1.1.0
|
36
|
-
requirement: *id001
|
37
|
-
- !ruby/object:Gem::Dependency
|
38
|
-
prerelease: false
|
39
32
|
type: :runtime
|
33
|
+
prerelease: false
|
34
|
+
version_requirements: *id001
|
35
|
+
- !ruby/object:Gem::Dependency
|
40
36
|
name: merb-slices
|
41
|
-
|
37
|
+
requirement: &id002 !ruby/object:Gem::Requirement
|
42
38
|
none: false
|
43
39
|
requirements:
|
44
40
|
- - ~>
|
45
41
|
- !ruby/object:Gem::Version
|
46
|
-
hash: 19
|
47
42
|
segments:
|
48
43
|
- 1
|
49
44
|
- 1
|
50
45
|
- 0
|
51
46
|
version: 1.1.0
|
52
|
-
requirement: *id002
|
53
|
-
- !ruby/object:Gem::Dependency
|
54
|
-
prerelease: false
|
55
47
|
type: :runtime
|
48
|
+
prerelease: false
|
49
|
+
version_requirements: *id002
|
50
|
+
- !ruby/object:Gem::Dependency
|
56
51
|
name: merb-assets
|
57
|
-
|
52
|
+
requirement: &id003 !ruby/object:Gem::Requirement
|
58
53
|
none: false
|
59
54
|
requirements:
|
60
55
|
- - ~>
|
61
56
|
- !ruby/object:Gem::Version
|
62
|
-
hash: 19
|
63
57
|
segments:
|
64
58
|
- 1
|
65
59
|
- 1
|
66
60
|
- 0
|
67
61
|
version: 1.1.0
|
68
|
-
requirement: *id003
|
69
|
-
- !ruby/object:Gem::Dependency
|
70
|
-
prerelease: false
|
71
62
|
type: :runtime
|
63
|
+
prerelease: false
|
64
|
+
version_requirements: *id003
|
65
|
+
- !ruby/object:Gem::Dependency
|
72
66
|
name: merb-helpers
|
73
|
-
|
67
|
+
requirement: &id004 !ruby/object:Gem::Requirement
|
74
68
|
none: false
|
75
69
|
requirements:
|
76
70
|
- - ~>
|
77
71
|
- !ruby/object:Gem::Version
|
78
|
-
hash: 19
|
79
72
|
segments:
|
80
73
|
- 1
|
81
74
|
- 1
|
82
75
|
- 0
|
83
76
|
version: 1.1.0
|
84
|
-
requirement: *id004
|
85
|
-
- !ruby/object:Gem::Dependency
|
86
|
-
prerelease: false
|
87
77
|
type: :runtime
|
78
|
+
prerelease: false
|
79
|
+
version_requirements: *id004
|
80
|
+
- !ruby/object:Gem::Dependency
|
88
81
|
name: merb-param-protection
|
89
|
-
|
82
|
+
requirement: &id005 !ruby/object:Gem::Requirement
|
90
83
|
none: false
|
91
84
|
requirements:
|
92
85
|
- - ~>
|
93
86
|
- !ruby/object:Gem::Version
|
94
|
-
hash: 19
|
95
87
|
segments:
|
96
88
|
- 1
|
97
89
|
- 1
|
98
90
|
- 0
|
99
91
|
version: 1.1.0
|
100
|
-
requirement: *id005
|
101
|
-
- !ruby/object:Gem::Dependency
|
102
|
-
prerelease: false
|
103
92
|
type: :runtime
|
93
|
+
prerelease: false
|
94
|
+
version_requirements: *id005
|
95
|
+
- !ruby/object:Gem::Dependency
|
104
96
|
name: json
|
105
|
-
|
97
|
+
requirement: &id006 !ruby/object:Gem::Requirement
|
106
98
|
none: false
|
107
99
|
requirements:
|
108
100
|
- - <=
|
109
101
|
- !ruby/object:Gem::Version
|
110
|
-
hash: 3
|
111
102
|
segments:
|
112
103
|
- 1
|
113
104
|
- 4
|
114
105
|
- 2
|
115
106
|
version: 1.4.2
|
116
|
-
requirement: *id006
|
117
|
-
- !ruby/object:Gem::Dependency
|
118
|
-
prerelease: false
|
119
107
|
type: :runtime
|
108
|
+
prerelease: false
|
109
|
+
version_requirements: *id006
|
110
|
+
- !ruby/object:Gem::Dependency
|
120
111
|
name: uuidtools
|
121
|
-
|
112
|
+
requirement: &id007 !ruby/object:Gem::Requirement
|
122
113
|
none: false
|
123
114
|
requirements:
|
124
115
|
- - ~>
|
125
116
|
- !ruby/object:Gem::Version
|
126
|
-
hash: 9
|
127
117
|
segments:
|
128
118
|
- 2
|
129
119
|
- 1
|
130
120
|
- 1
|
131
121
|
version: 2.1.1
|
132
|
-
requirement: *id007
|
133
|
-
- !ruby/object:Gem::Dependency
|
134
|
-
prerelease: false
|
135
122
|
type: :runtime
|
123
|
+
prerelease: false
|
124
|
+
version_requirements: *id007
|
125
|
+
- !ruby/object:Gem::Dependency
|
136
126
|
name: thin
|
137
|
-
|
127
|
+
requirement: &id008 !ruby/object:Gem::Requirement
|
138
128
|
none: false
|
139
129
|
requirements:
|
140
130
|
- - ">="
|
141
131
|
- !ruby/object:Gem::Version
|
142
|
-
hash: 3
|
143
132
|
segments:
|
144
133
|
- 0
|
145
134
|
version: "0"
|
146
|
-
|
135
|
+
type: :runtime
|
136
|
+
prerelease: false
|
137
|
+
version_requirements: *id008
|
147
138
|
description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
|
148
139
|
email: chef@opscode.com
|
149
140
|
executables:
|
@@ -215,7 +206,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
215
206
|
requirements:
|
216
207
|
- - ">="
|
217
208
|
- !ruby/object:Gem::Version
|
218
|
-
hash: 3
|
219
209
|
segments:
|
220
210
|
- 0
|
221
211
|
version: "0"
|
@@ -224,7 +214,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
224
214
|
requirements:
|
225
215
|
- - ">="
|
226
216
|
- !ruby/object:Gem::Version
|
227
|
-
hash: 3
|
228
217
|
segments:
|
229
218
|
- 0
|
230
219
|
version: "0"
|