ungulate 0.0.6 → 0.0.7
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +4 -4
- data/VERSION +1 -1
- data/features/step_definitions/queue_steps.rb +4 -4
- data/features/support.rb +0 -1
- data/lib/ungulate/file_upload.rb +1 -1
- data/lib/ungulate/job.rb +5 -5
- data/spec/ungulate/file_upload_spec.rb +1 -1
- data/spec/ungulate/job_spec.rb +4 -4
- data/ungulate.gemspec +16 -16
- metadata +34 -17
data/Rakefile
CHANGED
@@ -11,11 +11,11 @@ begin
|
|
11
11
|
gem.homepage = "http://github.com/camelpunch/ungulate"
|
12
12
|
gem.authors = ["Andrew Bruce"]
|
13
13
|
gem.add_dependency "activesupport", ">= 2.3.5"
|
14
|
-
gem.add_dependency "
|
15
|
-
gem.add_dependency "rmagick", ">= 2.
|
14
|
+
gem.add_dependency "right_aws", ">= 2.0.0"
|
15
|
+
gem.add_dependency "rmagick", ">= 2.13.1"
|
16
16
|
gem.add_dependency "mime-types", ">= 1.16"
|
17
|
-
gem.add_development_dependency "rspec", ">= 1.
|
18
|
-
gem.add_development_dependency "cucumber", ">= 0.
|
17
|
+
gem.add_development_dependency "rspec", ">= 1.3.0"
|
18
|
+
gem.add_development_dependency "cucumber", ">= 0.8.1"
|
19
19
|
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
|
20
20
|
end
|
21
21
|
Jeweler::GemcutterTasks.new
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.0.
|
1
|
+
0.0.7
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Given /^an empty queue$/ do
|
2
|
-
sqs =
|
3
|
-
|
2
|
+
sqs = RightAws::SqsGen2.new(ENV['AMAZON_ACCESS_KEY_ID'],
|
3
|
+
ENV['AMAZON_SECRET_ACCESS_KEY'])
|
4
4
|
@queue_name = 'ungulate-test-queue'
|
5
5
|
@q = sqs.queue @queue_name
|
6
6
|
@q.clear
|
@@ -9,8 +9,8 @@ end
|
|
9
9
|
Given /^a request to resize "([^\"]*)" to sizes:$/ do |key, table|
|
10
10
|
@bucket_name = "ungulate-test"
|
11
11
|
|
12
|
-
@s3 =
|
13
|
-
|
12
|
+
@s3 = RightAws::S3.new(ENV['AMAZON_ACCESS_KEY_ID'],
|
13
|
+
ENV['AMAZON_SECRET_ACCESS_KEY'])
|
14
14
|
@bucket = @s3.bucket @bucket_name
|
15
15
|
@bucket.put key, File.open('features/camels.jpg').read
|
16
16
|
|
data/features/support.rb
CHANGED
data/lib/ungulate/file_upload.rb
CHANGED
data/lib/ungulate/job.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
require 'rubygems'
|
2
|
-
require '
|
2
|
+
require 'right_aws'
|
3
3
|
require 'RMagick'
|
4
4
|
require 'mime/types'
|
5
5
|
|
@@ -9,14 +9,14 @@ module Ungulate
|
|
9
9
|
|
10
10
|
def self.s3
|
11
11
|
@s3 ||=
|
12
|
-
|
13
|
-
|
12
|
+
RightAws::S3.new(ENV['AMAZON_ACCESS_KEY_ID'],
|
13
|
+
ENV['AMAZON_SECRET_ACCESS_KEY'])
|
14
14
|
end
|
15
15
|
|
16
16
|
def self.sqs
|
17
17
|
@sqs ||=
|
18
|
-
|
19
|
-
|
18
|
+
RightAws::SqsGen2.new(ENV['AMAZON_ACCESS_KEY_ID'],
|
19
|
+
ENV['AMAZON_SECRET_ACCESS_KEY'])
|
20
20
|
end
|
21
21
|
|
22
22
|
def self.pop(queue_name)
|
@@ -126,7 +126,7 @@ module Ungulate
|
|
126
126
|
FileUpload.queue_name = 'somequeuename'
|
127
127
|
FileUpload.access_key_id = 'someaccesskey'
|
128
128
|
FileUpload.secret_access_key = 'somesecret'
|
129
|
-
|
129
|
+
RightAws::SqsGen2.stub(:new).with('someaccesskey', 'somesecret').
|
130
130
|
and_return(sqs)
|
131
131
|
sqs.stub(:queue).with('somequeuename').and_return(:queue_instance)
|
132
132
|
end
|
data/spec/ungulate/job_spec.rb
CHANGED
@@ -7,7 +7,7 @@ module Ungulate
|
|
7
7
|
ENV['AMAZON_ACCESS_KEY_ID'] = 'test-key-id'
|
8
8
|
ENV['AMAZON_SECRET_ACCESS_KEY'] = 'test-secret'
|
9
9
|
@bucket = mock('Bucket', :put => nil)
|
10
|
-
@sqs = mock('
|
10
|
+
@sqs = mock('SqsGen2')
|
11
11
|
@s3 = mock('S3')
|
12
12
|
@q = mock('Queue')
|
13
13
|
@versions = {
|
@@ -20,10 +20,10 @@ module Ungulate
|
|
20
20
|
|
21
21
|
describe :sqs do
|
22
22
|
before do
|
23
|
-
|
23
|
+
RightAws::SqsGen2.stub(:new).with('test-key-id', 'test-secret').and_return(@sqs)
|
24
24
|
end
|
25
25
|
|
26
|
-
it "should return a
|
26
|
+
it "should return a SqsGen2 instance using environment variables" do
|
27
27
|
Job.sqs.should == @sqs
|
28
28
|
end
|
29
29
|
|
@@ -78,7 +78,7 @@ module Ungulate
|
|
78
78
|
|
79
79
|
describe :s3 do
|
80
80
|
before do
|
81
|
-
|
81
|
+
RightAws::S3.stub(:new).with('test-key-id', 'test-secret').and_return(@s3)
|
82
82
|
end
|
83
83
|
|
84
84
|
it "should return a S3 instance using environment variables" do
|
data/ungulate.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{ungulate}
|
8
|
-
s.version = "0.0.
|
8
|
+
s.version = "0.0.7"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Andrew Bruce"]
|
12
|
-
s.date = %q{2010-
|
12
|
+
s.date = %q{2010-06-15}
|
13
13
|
s.default_executable = %q{ungulate_server.rb}
|
14
14
|
s.description = %q{WIP}
|
15
15
|
s.email = %q{andrew@camelpunch.com}
|
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
|
|
49
49
|
s.homepage = %q{http://github.com/camelpunch/ungulate}
|
50
50
|
s.rdoc_options = ["--charset=UTF-8"]
|
51
51
|
s.require_paths = ["lib"]
|
52
|
-
s.rubygems_version = %q{1.3.
|
52
|
+
s.rubygems_version = %q{1.3.7}
|
53
53
|
s.summary = %q{Process images using Amazon SQS and S3}
|
54
54
|
s.test_files = [
|
55
55
|
"spec/spec_helper.rb",
|
@@ -63,28 +63,28 @@ Gem::Specification.new do |s|
|
|
63
63
|
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
|
64
64
|
s.specification_version = 3
|
65
65
|
|
66
|
-
if Gem::Version.new(Gem::
|
66
|
+
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
67
67
|
s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
|
68
|
-
s.add_runtime_dependency(%q<
|
69
|
-
s.add_runtime_dependency(%q<rmagick>, [">= 2.
|
68
|
+
s.add_runtime_dependency(%q<right_aws>, [">= 2.0.0"])
|
69
|
+
s.add_runtime_dependency(%q<rmagick>, [">= 2.13.1"])
|
70
70
|
s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
|
71
|
-
s.add_development_dependency(%q<rspec>, [">= 1.
|
72
|
-
s.add_development_dependency(%q<cucumber>, [">= 0.
|
71
|
+
s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
|
72
|
+
s.add_development_dependency(%q<cucumber>, [">= 0.8.1"])
|
73
73
|
else
|
74
74
|
s.add_dependency(%q<activesupport>, [">= 2.3.5"])
|
75
|
-
s.add_dependency(%q<
|
76
|
-
s.add_dependency(%q<rmagick>, [">= 2.
|
75
|
+
s.add_dependency(%q<right_aws>, [">= 2.0.0"])
|
76
|
+
s.add_dependency(%q<rmagick>, [">= 2.13.1"])
|
77
77
|
s.add_dependency(%q<mime-types>, [">= 1.16"])
|
78
|
-
s.add_dependency(%q<rspec>, [">= 1.
|
79
|
-
s.add_dependency(%q<cucumber>, [">= 0.
|
78
|
+
s.add_dependency(%q<rspec>, [">= 1.3.0"])
|
79
|
+
s.add_dependency(%q<cucumber>, [">= 0.8.1"])
|
80
80
|
end
|
81
81
|
else
|
82
82
|
s.add_dependency(%q<activesupport>, [">= 2.3.5"])
|
83
|
-
s.add_dependency(%q<
|
84
|
-
s.add_dependency(%q<rmagick>, [">= 2.
|
83
|
+
s.add_dependency(%q<right_aws>, [">= 2.0.0"])
|
84
|
+
s.add_dependency(%q<rmagick>, [">= 2.13.1"])
|
85
85
|
s.add_dependency(%q<mime-types>, [">= 1.16"])
|
86
|
-
s.add_dependency(%q<rspec>, [">= 1.
|
87
|
-
s.add_dependency(%q<cucumber>, [">= 0.
|
86
|
+
s.add_dependency(%q<rspec>, [">= 1.3.0"])
|
87
|
+
s.add_dependency(%q<cucumber>, [">= 0.8.1"])
|
88
88
|
end
|
89
89
|
end
|
90
90
|
|
metadata
CHANGED
@@ -1,12 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ungulate
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
+
hash: 17
|
4
5
|
prerelease: false
|
5
6
|
segments:
|
6
7
|
- 0
|
7
8
|
- 0
|
8
|
-
-
|
9
|
-
version: 0.0.
|
9
|
+
- 7
|
10
|
+
version: 0.0.7
|
10
11
|
platform: ruby
|
11
12
|
authors:
|
12
13
|
- Andrew Bruce
|
@@ -14,16 +15,18 @@ autorequire:
|
|
14
15
|
bindir: bin
|
15
16
|
cert_chain: []
|
16
17
|
|
17
|
-
date: 2010-
|
18
|
+
date: 2010-06-15 00:00:00 +01:00
|
18
19
|
default_executable: ungulate_server.rb
|
19
20
|
dependencies:
|
20
21
|
- !ruby/object:Gem::Dependency
|
21
22
|
name: activesupport
|
22
23
|
prerelease: false
|
23
24
|
requirement: &id001 !ruby/object:Gem::Requirement
|
25
|
+
none: false
|
24
26
|
requirements:
|
25
27
|
- - ">="
|
26
28
|
- !ruby/object:Gem::Version
|
29
|
+
hash: 9
|
27
30
|
segments:
|
28
31
|
- 2
|
29
32
|
- 3
|
@@ -32,40 +35,46 @@ dependencies:
|
|
32
35
|
type: :runtime
|
33
36
|
version_requirements: *id001
|
34
37
|
- !ruby/object:Gem::Dependency
|
35
|
-
name:
|
38
|
+
name: right_aws
|
36
39
|
prerelease: false
|
37
40
|
requirement: &id002 !ruby/object:Gem::Requirement
|
41
|
+
none: false
|
38
42
|
requirements:
|
39
43
|
- - ">="
|
40
44
|
- !ruby/object:Gem::Version
|
45
|
+
hash: 15
|
41
46
|
segments:
|
42
47
|
- 2
|
43
|
-
-
|
44
|
-
-
|
45
|
-
version: 2.
|
48
|
+
- 0
|
49
|
+
- 0
|
50
|
+
version: 2.0.0
|
46
51
|
type: :runtime
|
47
52
|
version_requirements: *id002
|
48
53
|
- !ruby/object:Gem::Dependency
|
49
54
|
name: rmagick
|
50
55
|
prerelease: false
|
51
56
|
requirement: &id003 !ruby/object:Gem::Requirement
|
57
|
+
none: false
|
52
58
|
requirements:
|
53
59
|
- - ">="
|
54
60
|
- !ruby/object:Gem::Version
|
61
|
+
hash: 57
|
55
62
|
segments:
|
56
63
|
- 2
|
57
|
-
-
|
58
|
-
-
|
59
|
-
version: 2.
|
64
|
+
- 13
|
65
|
+
- 1
|
66
|
+
version: 2.13.1
|
60
67
|
type: :runtime
|
61
68
|
version_requirements: *id003
|
62
69
|
- !ruby/object:Gem::Dependency
|
63
70
|
name: mime-types
|
64
71
|
prerelease: false
|
65
72
|
requirement: &id004 !ruby/object:Gem::Requirement
|
73
|
+
none: false
|
66
74
|
requirements:
|
67
75
|
- - ">="
|
68
76
|
- !ruby/object:Gem::Version
|
77
|
+
hash: 47
|
69
78
|
segments:
|
70
79
|
- 1
|
71
80
|
- 16
|
@@ -76,28 +85,32 @@ dependencies:
|
|
76
85
|
name: rspec
|
77
86
|
prerelease: false
|
78
87
|
requirement: &id005 !ruby/object:Gem::Requirement
|
88
|
+
none: false
|
79
89
|
requirements:
|
80
90
|
- - ">="
|
81
91
|
- !ruby/object:Gem::Version
|
92
|
+
hash: 27
|
82
93
|
segments:
|
83
94
|
- 1
|
84
|
-
-
|
85
|
-
-
|
86
|
-
version: 1.
|
95
|
+
- 3
|
96
|
+
- 0
|
97
|
+
version: 1.3.0
|
87
98
|
type: :development
|
88
99
|
version_requirements: *id005
|
89
100
|
- !ruby/object:Gem::Dependency
|
90
101
|
name: cucumber
|
91
102
|
prerelease: false
|
92
103
|
requirement: &id006 !ruby/object:Gem::Requirement
|
104
|
+
none: false
|
93
105
|
requirements:
|
94
106
|
- - ">="
|
95
107
|
- !ruby/object:Gem::Version
|
108
|
+
hash: 61
|
96
109
|
segments:
|
97
110
|
- 0
|
98
|
-
-
|
99
|
-
-
|
100
|
-
version: 0.
|
111
|
+
- 8
|
112
|
+
- 1
|
113
|
+
version: 0.8.1
|
101
114
|
type: :development
|
102
115
|
version_requirements: *id006
|
103
116
|
description: WIP
|
@@ -146,23 +159,27 @@ rdoc_options:
|
|
146
159
|
require_paths:
|
147
160
|
- lib
|
148
161
|
required_ruby_version: !ruby/object:Gem::Requirement
|
162
|
+
none: false
|
149
163
|
requirements:
|
150
164
|
- - ">="
|
151
165
|
- !ruby/object:Gem::Version
|
166
|
+
hash: 3
|
152
167
|
segments:
|
153
168
|
- 0
|
154
169
|
version: "0"
|
155
170
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
171
|
+
none: false
|
156
172
|
requirements:
|
157
173
|
- - ">="
|
158
174
|
- !ruby/object:Gem::Version
|
175
|
+
hash: 3
|
159
176
|
segments:
|
160
177
|
- 0
|
161
178
|
version: "0"
|
162
179
|
requirements: []
|
163
180
|
|
164
181
|
rubyforge_project:
|
165
|
-
rubygems_version: 1.3.
|
182
|
+
rubygems_version: 1.3.7
|
166
183
|
signing_key:
|
167
184
|
specification_version: 3
|
168
185
|
summary: Process images using Amazon SQS and S3
|