ungulate 0.0.4 → 0.0.5

data/README.rdoc

@@ -8,13 +8,13 @@ It comes with a few goodies:
 
 * ungulate_server.rb - simple queue runner that expects a YAML-encoded job description for RMagick
 * Ungulate::FileUpload - a model for e.g. Rails that does some cryptography stuff - example to follow
+* A view helper for Rails: "ungulate_upload_form_for"
 
-And some planned goodies for the future:
-
-* A view helper for Rails that makes it easy to use Ungulate::FileUpload
- 
 == Installation
-gem install ungulate
+gem install ungulate --source=gemcutter.org
+
+== Documentation
+http://wiki.github.com/camelpunch/ungulate/
 
 == Note on Patches/Pull Requests
  

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/camelpunch/ungulate"
     gem.authors = ["Andrew Bruce"]
     gem.add_dependency "activesupport", ">= 2.3.5"
-    gem.add_dependency "right_aws", ">= 1.10.0"
+    gem.add_dependency "aws", ">= 2.3.4"
     gem.add_dependency "rmagick", ">= 2.12.2"
     gem.add_dependency "mime-types", ">= 1.16"
     gem.add_development_dependency "rspec", ">= 1.2.9"

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/bin/ungulate_server.rb

@@ -11,8 +11,8 @@ logger = Logger.new STDERR
 
 loop do
   begin
-    sleep ENV['SLEEP'] || 2
-    Ungulate::Server.run(ARGV[0]) 
+    processed_something = Ungulate::Server.run(ARGV[0]) 
+    sleep(ENV['SLEEP'] || 2) unless processed_something
   rescue StandardError => e
     logger.error e.message
   end

data/features/step_definitions/command_steps.rb

@@ -1,7 +1,7 @@
 When /^I run Ungulate$/ do
   @errors = OpenStruct.new :write => ''
   $stderr = @errors
-  Ungulate.run @queue_name
+  Ungulate::Server.run @queue_name
 end
 
 Then /^there should be no errors$/ do

data/features/step_definitions/queue_steps.rb

@@ -1,6 +1,6 @@
 Given /^an empty queue$/ do
-  sqs = RightAws::SqsGen2.new(ENV['AMAZON_ACCESS_KEY_ID'],
-                              ENV['AMAZON_SECRET_ACCESS_KEY'])
+  sqs = Aws::Sqs.new(ENV['AMAZON_ACCESS_KEY_ID'],
+                     ENV['AMAZON_SECRET_ACCESS_KEY'])
   @queue_name = 'ungulate-test-queue'
   @q = sqs.queue @queue_name
   @q.clear
@@ -9,8 +9,8 @@ end
 Given /^a request to resize "([^\"]*)" to sizes:$/ do |key, table|
   @bucket_name = "ungulate-test"
 
-  @s3 = RightAws::S3.new(ENV['AMAZON_ACCESS_KEY_ID'],
-                         ENV['AMAZON_SECRET_ACCESS_KEY'])
+  @s3 = Aws::S3.new(ENV['AMAZON_ACCESS_KEY_ID'],
+                    ENV['AMAZON_SECRET_ACCESS_KEY'])
   @bucket = @s3.bucket @bucket_name
   @bucket.put key, File.open('features/camels.jpg').read
 

data/features/support.rb

@@ -1,2 +1,4 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'lib/ungulate'
 require 'ruby-debug'

data/lib/ungulate/file_upload.rb

@@ -17,7 +17,7 @@ class Ungulate::FileUpload
   end
 
   def self.queue
-    sqs = RightAws::SqsGen2.new(access_key_id, secret_access_key)
+    sqs = Aws::Sqs.new(access_key_id, secret_access_key)
     sqs.queue(queue_name)
   end
 

data/lib/ungulate/job.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'right_aws'
+require 'aws'
 require 'RMagick'
 require 'mime/types'
 
@@ -9,14 +9,14 @@ module Ungulate
 
     def self.s3
       @s3 ||=
-        RightAws::S3.new(ENV['AMAZON_ACCESS_KEY_ID'],
-                         ENV['AMAZON_SECRET_ACCESS_KEY'])
+        Aws::S3.new(ENV['AMAZON_ACCESS_KEY_ID'],
+                    ENV['AMAZON_SECRET_ACCESS_KEY'])
     end
 
     def self.sqs
       @sqs ||= 
-        RightAws::SqsGen2.new(ENV['AMAZON_ACCESS_KEY_ID'],
-                              ENV['AMAZON_SECRET_ACCESS_KEY'])
+        Aws::Sqs.new(ENV['AMAZON_ACCESS_KEY_ID'],
+                     ENV['AMAZON_SECRET_ACCESS_KEY'])
     end
 
     def self.pop(queue_name)

data/spec/ungulate/file_upload_spec.rb

@@ -122,7 +122,7 @@ module Ungulate
         FileUpload.queue_name = 'somequeuename'
         FileUpload.access_key_id = 'someaccesskey'
         FileUpload.secret_access_key = 'somesecret'
-        RightAws::SqsGen2.stub(:new).with('someaccesskey', 'somesecret').
+        Aws::Sqs.stub(:new).with('someaccesskey', 'somesecret').
           and_return(sqs)
         sqs.stub(:queue).with('somequeuename').and_return(:queue_instance)
       end

data/spec/ungulate/job_spec.rb

@@ -7,7 +7,7 @@ module Ungulate
       ENV['AMAZON_ACCESS_KEY_ID'] = 'test-key-id'
       ENV['AMAZON_SECRET_ACCESS_KEY'] = 'test-secret'
       @bucket = mock('Bucket')
-      @sqs = mock('SqsGen2')
+      @sqs = mock('Sqs')
       @s3 = mock('S3')
       @q = mock('Queue')
       @versions = {
@@ -20,10 +20,10 @@ module Ungulate
 
     describe :sqs do
       before do
-        RightAws::SqsGen2.stub(:new).with('test-key-id', 'test-secret').and_return(@sqs)
+        Aws::Sqs.stub(:new).with('test-key-id', 'test-secret').and_return(@sqs)
       end
 
-      it "should return a SqsGen2 instance using environment variables" do
+      it "should return a Sqs instance using environment variables" do
         Job.sqs.should == @sqs
       end
 
@@ -78,7 +78,7 @@ module Ungulate
 
     describe :s3 do
       before do
-        RightAws::S3.stub(:new).with('test-key-id', 'test-secret').and_return(@s3)
+        Aws::S3.stub(:new).with('test-key-id', 'test-secret').and_return(@s3)
       end
 
       it "should return a S3 instance using environment variables" do

data/ungulate.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ungulate}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Bruce"]
-  s.date = %q{2010-04-16}
+  s.date = %q{2010-04-26}
   s.default_executable = %q{ungulate_server.rb}
   s.description = %q{WIP}
   s.email = %q{andrew@camelpunch.com}
@@ -65,14 +65,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_runtime_dependency(%q<right_aws>, [">= 1.10.0"])
+      s.add_runtime_dependency(%q<aws>, [">= 2.3.4"])
       s.add_runtime_dependency(%q<rmagick>, [">= 2.12.2"])
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<cucumber>, [">= 0.6.2"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_dependency(%q<right_aws>, [">= 1.10.0"])
+      s.add_dependency(%q<aws>, [">= 2.3.4"])
       s.add_dependency(%q<rmagick>, [">= 2.12.2"])
       s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
@@ -80,7 +80,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-    s.add_dependency(%q<right_aws>, [">= 1.10.0"])
+    s.add_dependency(%q<aws>, [">= 2.3.4"])
     s.add_dependency(%q<rmagick>, [">= 2.12.2"])
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Andrew Bruce
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +01:00
+date: 2010-04-26 00:00:00 +01:00
 default_executable: ungulate_server.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,17 +32,17 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: right_aws
+  name: aws
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 10
-        - 0
-        version: 1.10.0
+        - 2
+        - 3
+        - 4
+        version: 2.3.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency