Browse files

* Fixed SSL cert issue. Ruby 1.9 uses VERIFY_PEER by default I believ…

…e which makes it not work. Changed to VERIFY_NONE.
  • Loading branch information...
1 parent f3172f3 commit e4b6e408b23ae96fc6ffe94080630f1578c3b893 unknown committed Jul 23, 2009
Showing with 53 additions and 89 deletions.
  1. +12 −89 Rakefile
  2. +5 −0 VERSION.yml
  3. +35 −0 http_connection.gemspec
  4. +1 −0 lib/right_http_connection.rb
View
101 Rakefile
@@ -5,99 +5,22 @@ require 'rake/testtask'
require 'rake/packagetask'
require 'rake/gempackagetask'
require 'rake/rdoctask'
-require 'rake/contrib/rubyforgepublisher'
require 'fileutils'
-require 'hoe'
include FileUtils
require File.join(File.dirname(__FILE__), 'lib', 'right_http_connection')
-AUTHOR = 'RightScale' # can also be an array of Authors
-EMAIL = "rubygems@rightscale.com"
-DESCRIPTION = "RightScale's robust HTTP/S connection module"
-GEM_NAME = 'right_http_connection' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'rightscale' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-
-NAME = "right_http_connection"
-REV = nil # UNCOMMENT IF REQUIRED: File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
-VERS = RightHttpConnection::VERSION::STRING + (REV ? ".#{REV}" : "")
-CLEAN.include ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']
-RDOC_OPTS = ['--quiet', '--title', 'right_http_connection documentation',
- "--opname", "index.html",
- "--line-numbers",
- "--main", "README",
- "--inline-source"]
-
-# Suppress Hoe's self-inclusion as a dependency for our Gem. This also keeps
-# Rake & rubyforge out of the dependency list. Users must manually install
-# these gems to run tests, etc.
-# TRB 2/19/09: also do this for the extra_dev_deps array present in newer hoes.
-# Older versions of RubyGems will try to install developer-dependencies as
-# required runtime dependencies....
-class Hoe
- def extra_deps
- @extra_deps.reject do |x|
- Array(x).first == 'hoe'
+begin
+ require 'jeweler'
+ Jeweler::Tasks.new do |gemspec|
+ gemspec.name = "http_connection"
+ gemspec.summary = "HTTP helper library"
+ gemspec.email = "travis@appoxy.com"
+ gemspec.homepage = "http://github.com/appoxy/http_connection/"
+ gemspec.description = "HTTP helper library"
+ gemspec.authors = ["Travis Reeder", "RightScale"]
+ gemspec.files = FileList['lib/**/*.rb']
end
- end
- def extra_dev_deps
- @extra_dev_deps.reject do |x|
- Array(x).first == 'hoe'
- end
- end
+rescue LoadError
+ puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
end
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERS) do |p|
- p.author = AUTHOR
- p.description = DESCRIPTION
- p.email = EMAIL
- p.summary = DESCRIPTION
- p.url = HOMEPATH
- p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
- p.test_globs = ["test/**/test_*.rb"]
- p.clean_globs = CLEAN #An array of file patterns to delete on clean.
- p.remote_rdoc_dir = "right_http_gem_doc"
-
- # == Optional
- p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
- #p.extra_deps = [] # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
- #p.spec_extras = {} # A hash of extra values to set in the gemspec.
-end
-
-
-desc 'Generate website files'
-task :website_generate do
- Dir['website/**/*.txt'].each do |txt|
- sh %{ ruby scripts/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} }
- end
-end
-
-desc 'Upload website files to rubyforge'
-task :website_upload do
- config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
- host = "#{config["username"]}@rubyforge.org"
- remote_dir = "/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/"
- # remote_dir = "/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
- local_dir = 'website'
- sh %{rsync -av #{local_dir}/ #{host}:#{remote_dir}}
-end
-
-desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload]
-
-desc 'Release the website and new gem version'
-task :deploy => [:check_version, :website, :release]
-
-task :check_version do
- unless ENV['VERSION']
- puts 'Must pass a VERSION=x.y.z release version'
- exit
- end
- unless ENV['VERSION'] == VERS
- puts "Please update your version.rb to match the release version, currently #{VERS}"
- exit
- end
-end
View
5 VERSION.yml
@@ -0,0 +1,5 @@
+---
+:major: 1
+:minor: 3
+:patch: 0
+
View
35 http_connection.gemspec
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+ s.name = %q{http_connection}
+ s.version = "1.3.0"
+
+ s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+ s.authors = ["Travis Reeder", "RightScale"]
+ s.date = %q{2009-07-23}
+ s.description = %q{HTTP helper library}
+ s.email = %q{travis@appoxy.com}
+ s.extra_rdoc_files = [
+ "README.txt"
+ ]
+ s.files = [
+ "lib/net_fix.rb",
+ "lib/right_http_connection.rb"
+ ]
+ s.has_rdoc = true
+ s.homepage = %q{http://github.com/appoxy/http_connection/}
+ s.rdoc_options = ["--charset=UTF-8"]
+ s.require_paths = ["lib"]
+ s.rubygems_version = %q{1.3.1}
+ s.summary = %q{HTTP helper library}
+
+ if s.respond_to? :specification_version then
+ current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+ s.specification_version = 2
+
+ if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+ else
+ end
+ else
+ end
+end
View
1 lib/right_http_connection.rb
@@ -299,6 +299,7 @@ def start(request_params)
true
}
@http.use_ssl = true
+ @http.verify_mode = OpenSSL::SSL::VERIFY_NONE # Looks like Ruby 1.9 defaults to VERIFY_PEER which doesn't work well
ca_file = get_param(:ca_file)
if ca_file
@http.verify_mode = OpenSSL::SSL::VERIFY_PEER

0 comments on commit e4b6e40

Please sign in to comment.