taf2-curb 0.2.7.3 → 0.2.7.4

data/Rakefile

@@ -4,11 +4,11 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-begin
-  require 'rake/gempackagetask'
-rescue LoadError
-  $stderr.puts("Rubygems support disabled")
-end
+#begin
+#  require 'rake/gempackagetask'
+#rescue LoadError
+#  $stderr.puts("Rubygems support disabled")
+#end
 
 CLEAN.include '**/*.o'
 CLEAN.include "**/*.#{Config::MAKEFILE_CONFIG['DLEXT']}"
@@ -130,74 +130,30 @@ task :doc_upload => [ :doc ] do
   end
 end
 
-# Packaging ------------------------------------------------
-PKG_FILES = FileList[
-  'ext/*.rb',
-  'ext/*.c',
-  'ext/*.h',
-  'lib/*.rb',
-  'tests/**/*',
-  'samples/**/*',
-  'doc.rb',
-  '[A-Z]*',
-]
-
 if ! defined?(Gem)
   warn "Package Target requires RubyGEMs"
 else
-  spec = Gem::Specification.new do |s|
-    
-    #### Basic information.
-
-    s.name = 'curb'
-    s.version = PKG_VERSION
-    s.summary = "Ruby bindings for the libcurl(3) URL transfer library."
-    s.description = <<-EOF
-      C-language Ruby bindings for the libcurl(3) URL transfer library.
-    EOF
-    s.extensions = 'ext/extconf.rb'    
-
-    #### Which files are to be included in this gem? 
-
-    s.files = PKG_FILES.to_a
-
-    #### Load-time details
-    s.require_path = 'lib'
-    
-    #### Documentation and testing.
-    s.has_rdoc = true
-    s.extra_rdoc_files = Dir['ext/*.c'] << 'lib/curb.rb' << 'README' << 'LICENSE'
-    s.rdoc_options <<
-      '--title' <<  'Curb API' <<
-      '--main' << 'README'
-
-    s.test_files = Dir.glob('tests/tc_*.rb')
-    
-    #### Author and project details.
-
-    s.author = "Ross Bamford"
-    s.email = "curb-devel@rubyforge.org"
-    s.homepage = "http://curb.rubyforge.org"
-    s.rubyforge_project = "curb"
-  end
-  
-  # Quick fix for Ruby 1.8.3 / YAML bug
-  if (RUBY_VERSION == '1.8.3')
-    def spec.to_yaml
-      out = super
-      out = '--- ' + out unless out =~ /^---/
-      out
-    end  
+  desc 'Generate gem specification'
+  task :gemspec do
+    require 'erb'
+    tspec = ERB.new(File.read(File.join(File.dirname(__FILE__),'lib','curb.gemspec.erb')))
+    File.open(File.join(File.dirname(__FILE__),'curb.gemspec'),'wb') do|f|
+      f << tspec.result
+    end
   end
 
-  package_task = Rake::GemPackageTask.new(spec) do |pkg|
-    pkg.need_zip = true
-    pkg.need_tar_gz = true
-    pkg.package_dir = 'pkg'    
-  end      
+  desc 'Build gem'
+  task :package => :gemspec do
+    require 'rubygems/specification'
+    spec_source = File.read File.join(File.dirname(__FILE__),'curb.gemspec')
+    spec = nil
+    # see: http://gist.github.com/16215
+    Thread.new { spec = eval("$SAFE = 3\n#{spec_source}") }.join
+    spec.validate
+    Gem::Builder.new(spec).build
+  end
 end
 
-
 # --------------------------------------------------------------------
 # Creating a release
 desc "Make a new release (Requires SVN commit / webspace access)"

data/ext/curb.h

@@ -20,12 +20,12 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.2.7.2"
+#define CURB_VERSION   "0.2.7.4"
 #define CURB_VER_NUM   224
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   2
-#define CURB_VER_MIC   4
-#define CURB_VER_PATCH 0
+#define CURB_VER_MIC   7
+#define CURB_VER_PATCH 4
 
 
 // Maybe not yet defined in Ruby

data/tests/alltests.rb

@@ -0,0 +1,3 @@
+$: << $TESTDIR = File.expand_path(File.dirname(__FILE__))
+require 'unittests'
+Dir[File.join($TESTDIR, 'bug_*.rb')].each { |lib| require lib }

data/tests/bug_curb_easy_blocks_ruby_threads.rb

@@ -0,0 +1,52 @@
+require File.join(File.dirname(__FILE__), 'helper')
+require 'webrick'
+class ::WEBrick::HTTPServer ; def access_log(config, req, res) ; end ; end
+class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
+
+class BugTestInstancePostDiffersFromClassPost < Test::Unit::TestCase
+  def test_bug
+    server = WEBrick::HTTPServer.new( :Port => 9999 )
+    server.mount_proc("/test") do|req,res|
+      sleep 0.5
+      res.body = "hi"
+      res['Content-Type'] = "text/html"
+    end
+
+    thread = Thread.new(server) do|srv|
+      srv.start
+    end
+
+    threads = []
+    timer = Time.now
+
+    5.times do |i|
+      t = Thread.new do
+        c = Curl::Easy.perform('http://localhost:9999/test')
+        c.header_str
+      end
+      threads << t
+    end
+
+    multi_responses = threads.collect do|t|
+      t.value
+    end
+
+    multi_time = (Time.now - timer)
+    puts "requested in #{multi_time}"
+
+    timer = Time.now
+    single_responses = []
+    5.times do |i|
+      c = Curl::Easy.perform('http://localhost:9999/test')
+      single_responses << c.header_str
+    end
+    
+    single_time = (Time.now - timer)
+    puts "requested in #{single_time}"
+
+    assert single_time > multi_time
+
+    server.shutdown
+    thread.join
+  end
+end

data/tests/bug_instance_post_differs_from_class_post.rb

@@ -0,0 +1,53 @@
+# From Vlad Jebelev:
+#
+# - Second thing - I think you just probably didn't have the time to update 
+# instance methods yet but when I POST with a reusal of a previous curl 
+# instance, it doesnt' work for me, e.g. when I create a curl previously and 
+# then issue:
+#  
+#   c.http_post(login_url, *fields)
+#   
+# instead of:
+#  
+#   c = Curl::Easy.http_post(login_url, *fields) do |curl|
+#     ...  
+#   end
+#    
+# then the result I am getting is quite different.
+#
+# ================
+#
+# Update:
+#
+#   It seems that class httpost is incorrectly passing arguments down to 
+#   instance httppost. This bug is intermittent, but results in an
+#   exception from the first post when it occurs.
+#   
+require File.join(File.dirname(__FILE__), 'helper')
+
+class BugTestInstancePostDiffersFromClassPost < Test::Unit::TestCase
+  def test_bug
+    5.times do |i|
+      puts "Test ##{i}"
+      do_test
+      sleep 2
+    end
+  end
+
+  def do_test
+    c = Curl::Easy.http_post('https://www.google.com/accounts/ServiceLoginAuth',
+                Curl::PostField.content('ltmpl','m_blanco'))
+    body_c, header_c = c.body_str, c.header_str
+   
+    sleep 2
+
+    c.http_post('https://www.google.com/accounts/ServiceLoginAuth',
+                Curl::PostField.content('ltmpl','m_blanco'))
+    body_i, header_i = c.body_str, c.header_str
+
+    # timestamps will differ, just check first bit. We wont get here if
+    # the bug bites anyway...
+    assert_equal header_c[0..50], header_i[0..50]
+  end
+end
+

data/tests/bug_require_last_or_segfault.rb

@@ -0,0 +1,40 @@
+# From Vlad Jebelev:
+# 
+# - if I have a require statement after "require 'curb'" and there is a 
+# POST with at least 1 field, the script will fail with a segmentation 
+# fault, e.g. the following sequence fails every time for me (Ruby 1.8.5):
+# -----------------------------------------------------------------
+# require 'curb'
+# require 'uri'
+#  
+#  url = 'https://www.google.com/accounts/ServiceLoginAuth'
+#   
+#  c = Curl::Easy.http_post(
+#         'https://www.google.com/accounts/ServiceLoginAuth',
+#               [Curl:: PostField.content('ltmpl','m_blanco')] ) do |curl|
+#  end
+#  ------------------------------------------------------------------
+#  :..dev/util$ ruby seg.rb
+#  seg.rb:6: [BUG] Segmentation fault
+#  ruby 1.8.5 (2006-08-25) [i686-linux]
+#                
+#  Aborted
+#  ------------------------------------------------------------------
+#
+require 'test/unit'
+require 'rbconfig'
+
+$rubycmd = Config::CONFIG['RUBY_INSTALL_NAME'] || 'ruby'
+
+class BugTestRequireLastOrSegfault < Test::Unit::TestCase
+  def test_bug
+    5.times do |i|
+      puts "Test ##{i}"
+
+      # will be empty string if it segfaults...
+      assert_equal 'success', `#$rubycmd #{File.dirname(__FILE__)}/require_last_or_segfault_script.rb`.chomp
+      sleep 5
+    end
+  end
+end
+

data/tests/require_last_or_segfault_script.rb

@@ -0,0 +1,36 @@
+# From Vlad Jebelev:
+# 
+# - if I have a require statement after "require 'curb'" and there is a 
+# POST with at least 1 field, the script will fail with a segmentation 
+# fault, e.g. the following sequence fails every time for me (Ruby 1.8.5):
+# -----------------------------------------------------------------
+# require 'curb'
+# require 'uri'
+#  
+#  url = 'https://www.google.com/accounts/ServiceLoginAuth'
+#   
+#  c = Curl::Easy.http_post(
+#         'https://www.google.com/accounts/ServiceLoginAuth',
+#               [Curl:: PostField.content('ltmpl','m_blanco')] ) do |curl|
+#  end
+#  ------------------------------------------------------------------
+#  :..dev/util$ ruby seg.rb
+#  seg.rb:6: [BUG] Segmentation fault
+#  ruby 1.8.5 (2006-08-25) [i686-linux]
+#                
+#  Aborted
+#  ------------------------------------------------------------------
+#
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'ext'))
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'curb'
+require 'uri'
+ 
+url = 'https://www.google.com/accounts/ServiceLoginAuth'
+ 
+c = Curl::Easy.http_post('https://www.google.com/accounts/ServiceLoginAuth',
+                         Curl:: PostField.content('ltmpl','m_blanco')) #do
+#                         end
+
+puts "success"
+

data/tests/tc_curl_download.rb

@@ -0,0 +1,27 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+class TestCurbCurlDownload < Test::Unit::TestCase
+  include TestServerMethods 
+
+  def setup
+    server_setup(9130)
+  end
+  
+  def test_download_url_to_file
+    dl_url = "http://127.0.0.1:9130/ext/curb_easy.c"
+    dl_path = File.join("/tmp/dl_url_test.file")
+
+    curb = Curl::Easy.download(dl_url, dl_path)
+    assert File.exist?(dl_path)
+  end
+
+  def test_download_bad_url_gives_404
+    dl_url = "http://127.0.0.1:9130/this_file_does_not_exist.html"
+    dl_path = File.join("/tmp/dl_url_test.file")
+
+    curb = Curl::Easy.download(dl_url, dl_path)
+    assert_equal Curl::Easy, curb.class
+    assert_equal 404, curb.response_code
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taf2-curb
 version: !ruby/object:Gem::Version 
-  version: 0.2.7.3
+  version: 0.2.7.4
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-03 00:00:00 -08:00
+date: 2009-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -28,20 +28,21 @@ files:
 - README
 - Rakefile
 - doc.rb
-- ext/curb.h
+- ext/extconf.rb
+- lib/curb.rb
+- lib/curl.rb
+- ext/curb.c
+- ext/curb_postfield.c
+- ext/curb_multi.c
+- ext/curb_errors.c
+- ext/curb_easy.c
 - ext/curb_easy.h
 - ext/curb_errors.h
 - ext/curb_macros.h
-- ext/curb_multi.h
+- ext/curb.h
 - ext/curb_postfield.h
-- ext/curb.c
-- ext/curb_easy.c
-- ext/curb_errors.c
-- ext/curb_multi.c
-- ext/curb_postfield.c
-- lib/curl.rb
-- ext/extconf.rb
-- lib/curb.rb
+- ext/curb_config.h
+- ext/curb_multi.h
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
 post_install_message: 
@@ -49,6 +50,7 @@ rdoc_options:
 - --main
 - README
 require_paths: 
+- lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -70,8 +72,14 @@ signing_key:
 specification_version: 2
 summary: Ruby libcurl bindings
 test_files: 
-- tests/tc_curl_easy.rb
 - tests/tc_curl_multi.rb
 - tests/tc_curl_postfield.rb
+- tests/bug_curb_easy_blocks_ruby_threads.rb
 - tests/unittests.rb
+- tests/bug_require_last_or_segfault.rb
+- tests/bug_instance_post_differs_from_class_post.rb
+- tests/tc_curl_download.rb
+- tests/alltests.rb
 - tests/helper.rb
+- tests/tc_curl_easy.rb
+- tests/require_last_or_segfault_script.rb