ethon 0.7.4 → 0.8.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2ZmZmIxYjlmYzhiMDJmODM5YjczNWE5NGQwYTA1OTIzMTU2YTQ5YQ==
-  data.tar.gz: !binary |-
-    YThkNDc2ZmViYTdlZDkxNWUxMjRiNmE5NzIyNDUyN2QxMDlkNDc2MA==
+SHA1:
+  metadata.gz: 2f2d076d0f8210b0e2ac4f9a798b6f7091bc72e1
+  data.tar.gz: e4e029697e2da2f8f0ff32eeae74dbe52b37342c
 SHA512:
-  metadata.gz: !binary |-
-    ZjZjYTk3OGM3MGNlMmU3YmJiMGNkM2ZhMGE3MGRlNWUyYmYzMjFkOTRjNmVj
-    YWY1NzBmZTIyYTFlY2I2M2ZlMzhmMDk1ZWJiNDk2MDlhODJhMTg1ZWVhM2Yy
-    MjM5ODJjNWI0MTY3MWU0NzkxZTFkNWQ0YTdkZGJhMmY1YzdmYzc=
-  data.tar.gz: !binary |-
-    MmZiN2MxYmQyYmM4YWExOTIxYzU4NDlkYWRhYmE0M2RlZWIzOGJlY2IwOThm
-    MzkyZGQ0OGMzOTQyZWE0ZjZhODU5ZTlkMjk3ZWFjZGI2Y2E0NzZiOTM3ZjFl
-    NTkyMzYzNDQ2NWRjY2FkOWJjMDVjZGFkZmRmZDE3ZmI3ZjRmYTg=
+  metadata.gz: 44c3c55ce791f04ab8c0722b91473a0f16b897da96312b3f660e20929dfcaef3d961dedcb21b08cee0a08b152f597883cf6f02de23d912379237a3cf7b14e1dc
+  data.tar.gz: 87306062771ee5c5fe442bb041b1b03aa55ae200fff87e65fe00ecf390b6e41212dc961973b71560d74c769ab5fb3c639a42182b41d6576822cde797c219e68b

data/lib/ethon/curl.rb

@@ -31,7 +31,7 @@ module Ethon
     @blocking = true
 
     @@initialized = false
-    @@init_mutex = Mutex.new
+    @@curl_mutex = Mutex.new
 
     class << self
       # This function sets up the program environment that libcurl needs.
@@ -55,7 +55,7 @@ module Ethon
       #
       # @raise [ Ethon::Errors::GlobalInit ] If Curl.global_init fails.
       def init
-        @@init_mutex.synchronize {
+        @@curl_mutex.synchronize {
           if not @@initialized
             raise Errors::GlobalInit.new if Curl.global_init(GLOBAL_ALL) != 0
             @@initialized = true
@@ -63,6 +63,27 @@ module Ethon
           end
         }
       end
+
+      # This function releases resources acquired by curl_global_init.
+      # You should call curl_global_cleanup once for each call you make to
+      # curl_global_init, after you are done using libcurl.
+      # This function is not thread safe. You must not call it when any other thread in the
+      # program (i.e. a thread sharing the same memory) is running. This doesn't just
+      # mean no other thread that is using libcurl. Because curl_global_cleanup calls functions of other
+      # libraries that are similarly thread unsafe, it could conflict with
+      # any other thread that uses these other libraries.
+      # See the description in libcurl of global environment requirements
+      # for details of how to use this function.
+      def cleanup
+        @@curl_mutex.synchronize {
+          if @@initialized
+            Curl.global_cleanup()
+            @@initialized = false
+            Ethon.logger.debug("ETHON: Libcurl cleanup") if Ethon.logger
+          end
+        }
+      end
+
     end
   end
 end

data/lib/ethon/curls/functions.rb

@@ -8,7 +8,8 @@ module Ethon
       # :nodoc:
       def self.extended(base)
         base.attach_function :global_init,                :curl_global_init,         [:long],                        :int
-        base.attach_function :free,                       :curl_free,                [:pointer],                      :void
+        base.attach_function :global_cleanup,             :curl_global_cleanup,      [],                             :void
+        base.attach_function :free,                       :curl_free,                [:pointer],                     :void
 
         base.attach_function :easy_init,                  :curl_easy_init,           [],                             :pointer
         base.attach_function :easy_cleanup,               :curl_easy_cleanup,        [:pointer],                     :void

data/lib/ethon/easy/operations.rb

@@ -26,6 +26,16 @@ module Ethon
         @return_code
       end
 
+      # Clean up the easy.
+      #
+      # @example Perform clean up.
+      #   easy.cleanup
+      #
+      # @return the result of the free which is nil
+      def cleanup
+        handle.free
+      end
+
       # Prepare the easy. Options, headers and callbacks
       # were set.
       #

data/lib/ethon/multi/operations.rb

@@ -124,7 +124,10 @@ module Ethon
         else
           @timeval[:sec] = timeout / 1000
           @timeval[:usec] = (timeout * 1000) % 1000000
-          code = Curl.select(max_fd + 1, @fd_read, @fd_write, @fd_excep, @timeval)
+          loop do
+            code = Curl.select(max_fd + 1, @fd_read, @fd_write, @fd_excep, @timeval)
+            break unless code < 0 && ::FFI.errno == Errno::EINTR::Errno
+          end
           raise Errors::Select.new(::FFI.errno) if code < 0
         end
       end

data/lib/ethon/version.rb

@@ -1,5 +1,5 @@
 module Ethon
 
   # Ethon version.
-  VERSION = '0.7.4'
+  VERSION = '0.8.0'
 end

data/spec/ethon/curl_spec.rb

@@ -23,5 +23,15 @@ describe Ethon::Curl do
         Ethon::Curl.init
       end
     end
+
+    context "when global_cleanup is called" do
+      before { expect(Ethon::Curl).to receive(:global_cleanup) }
+
+      it "logs" do
+        expect(Ethon.logger).to receive(:debug).twice
+        Ethon::Curl.init
+        Ethon::Curl.cleanup
+      end
+    end
   end
 end

data/spec/ethon/easy/operations_spec.rb

@@ -50,6 +50,11 @@ describe Ethon::Easy::Operations do
       easy.perform
     end
 
+    it "calls Curl.easy_cleanup" do
+      FFI::AutoPointer.any_instance.should_receive(:free)
+      easy.cleanup
+    end
+
     it "logs" do
       expect(Ethon.logger).to receive(:debug)
       easy.perform

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Hans Hasselberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
 description: Very lightweight libcurl wrapper.
@@ -31,9 +31,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -143,12 +143,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []