em_aws 0.1.5 → 0.1.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    em_aws (0.1.5)
+    em_aws (0.1.6)
       aws-sdk
       em-http-request
       em-synchrony
@@ -26,10 +26,10 @@ GEM
       http_parser.rb (>= 0.5.3)
     em-socksify (0.2.0)
       eventmachine (>= 1.0.0.beta.4)
-    em-synchrony (1.0.1)
+    em-synchrony (1.0.2)
       eventmachine (>= 1.0.0.beta.1)
-    eventmachine (1.0.0.beta.4)
-    eventmachine (1.0.0.beta.4-java)
+    eventmachine (1.0.0.rc.2)
+    eventmachine (1.0.0.rc.2-java)
     http_parser.rb (0.5.3)
     http_parser.rb (0.5.3-java)
     httparty (0.8.3)
@@ -39,8 +39,8 @@ GEM
     json (1.7.3-java)
     multi_json (1.3.6)
     multi_xml (0.5.1)
-    nokogiri (1.5.4)
-    nokogiri (1.5.4-java)
+    nokogiri (1.5.5)
+    nokogiri (1.5.5-java)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
       rspec-expectations (~> 2.10.0)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Joshua T. Mckinney
+Copyright (c) 2010-2012 Joshua T. Mckinney
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,6 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-ALL AWS-SDK code is covered under the AWS-SDK [license](https://github.com/amazonwebservices/aws-sdk-for-ruby/blob/master/LICENSE.txt)
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -51,4 +51,10 @@ All requests to AWS will use EM-Synchrony's implementation of em-http-request fo
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
 ## Thanks
+
 Code based on HTTParty Hander in [aws-sdk](https://github.com/amazonwebservices/aws-sdk-for-ruby/blob/master/README.rdoc)
+
+## License
+
+EmAws [license](https://github.com/JoshMcKin/em_aws/blob/master/LICENSE.txt)
+AWS-SDK [license](https://github.com/amazonwebservices/aws-sdk-for-ruby/blob/master/LICENSE.txt)

data/lib/em_aws/patches.rb

@@ -1,22 +1,22 @@
 require 'em-synchrony'
 require 'em-synchrony/thread'
-module AWS
-  # Use EM::Synchrony.sleep for all Kernel.sleep in AWS
-  DupKernel = Kernel
-  
-  class PatchKernel
-    class << self
-      def sleep(count)
-        EM::Synchrony.sleep(count)
-      end
-      def method_missing(method,*args,&block)
-        DupKernel.send(method, *args, &block)
-      end
+
+Mutex.class_eval do
+  class << self
+    alias :mutex_new :new
+    def new    
+      return EM::Synchrony::Thread::Mutex.new   if defined?(EM) && EM.reactor_running?
+      mutex_new
+    end
+  end
+end
+
+Kernel.class_eval do
+  class << self
+    alias :kernel_sleep :sleep
+    def sleep(count)      
+      return EM::Synchrony.sleep(count) if defined?(EM) && EM.reactor_running?
+      kernel_sleep(count)
     end
   end
-  
-  Kernel = PatchKernel
-  
-  # Use a fiber safe mutex for Mutex in AWS
-  Mutex = EM::Synchrony::Thread::Mutex  
 end

data/lib/em_aws/version.rb

@@ -1,3 +1,3 @@
 module EmAws
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/patches_spec.rb

@@ -1,18 +1,11 @@
 require 'spec_helper'
 require 'aws'
-describe AWS::Mutex do
+describe Mutex do
   it "should be a fiber safe mutex" do
-    AWS::Mutex.new.should be_kind_of(EM::Synchrony::Thread::Mutex)
-  end
-  
-  it "should be a fiber mutex when called within AWS module" do
-    AWS.module_eval <<-STR
-    def self.mutex_new
-      Mutex.new
+    EM.synchrony do
+      Mutex.new.should be_kind_of(EM::Synchrony::Thread::Mutex)
+      EM.stop
     end
-    STR
-
-    AWS.mutex_new.should be_kind_of(EM::Synchrony::Thread::Mutex)
   end
   
   it "should not affect Mutex outside AWS" do
@@ -20,29 +13,17 @@ describe AWS::Mutex do
   end
 end
 
-describe AWS::Kernel,'#sleep' do
+describe Kernel,'#sleep' do
   it "should be a fiber safe sleep from with AWS module" do
-    EM::Synchrony.stub(:sleep).and_return("fiber safe")
-    AWS::Kernel.sleep(1).should eql("fiber safe")
+    EM.synchrony do
+      EM::Synchrony.stub(:sleep).and_return("fiber safe")
+      Kernel.sleep(1).should eql("fiber safe")
+      EM.stop
+    end
   end
   
-  it "should not affect normal Kernel.sleep " do
-    EM::Synchrony.stub(:sleep).and_return("fiber safe")
+  it "should not affect normal Kernel.sleep if not in EM" do
     Kernel.sleep(1).should eql(1)
   end
-  
-  it "should be a fiber mutex when called within AWS module" do
-    AWS.module_eval <<-STR
-    def self.sleep(time)
-      Kernel.sleep(time)
-    end
-    STR
-    EM::Synchrony.stub(:sleep).and_return("fiber safe")
-    AWS.sleep(0.01).should eql("fiber safe")
-  end 
-  
-  it "should not interfer with other Kernel methods" do     
-    lambda {AWS::Kernel.rand}.should_not raise_error
-  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em_aws
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-16 00:00:00.000000000Z
+date: 2012-06-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70322481988020 !ruby/object:Gem::Requirement
+  requirement: &70257021529300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322481988020
+  version_requirements: *70257021529300
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70322481987600 !ruby/object:Gem::Requirement
+  requirement: &70257021528820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322481987600
+  version_requirements: *70257021528820
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70322481987160 !ruby/object:Gem::Requirement
+  requirement: &70257021528380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322481987160
+  version_requirements: *70257021528380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70322481986740 !ruby/object:Gem::Requirement
+  requirement: &70257021527920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322481986740
+  version_requirements: *70257021527920
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70322481986320 !ruby/object:Gem::Requirement
+  requirement: &70257021527460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322481986320
+  version_requirements: *70257021527460
 description: Adds EM-Synchrony support to AWS-SDK gem
 email:
 - joshmckin@gmail.com