diff options
-rw-r--r-- | lib/net/http.rb | 2 | ||||
-rw-r--r-- | lib/net/http/net-http.gemspec | 29 | ||||
-rw-r--r-- | lib/net/http/version.rb | 5 | ||||
-rw-r--r-- | test/net/http/test_https.rb | 10 | ||||
-rw-r--r-- | tool/sync_default_gems.rb | 8 |
5 files changed, 48 insertions, 6 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb index de9963d18c..a1d1d3e9c5 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -20,7 +20,7 @@ # See Net::HTTP for an overview and examples. # -require_relative 'protocol' +require 'net/protocol' require 'uri' autoload :OpenSSL, 'openssl' diff --git a/lib/net/http/net-http.gemspec b/lib/net/http/net-http.gemspec new file mode 100644 index 0000000000..15887130b4 --- /dev/null +++ b/lib/net/http/net-http.gemspec @@ -0,0 +1,29 @@ +begin + require_relative "lib/net/http/version" +rescue LoadError # Fallback to load version file in ruby core repository + require_relative "version" +end + +Gem::Specification.new do |spec| + spec.name = "net-http" + spec.version = Net::Http::VERSION + spec.authors = ["NARUSE, Yui"] + spec.email = ["naruse@airemix.jp"] + + spec.summary = %q{HTTP client api for Ruby.} + spec.description = %q{HTTP client api for Ruby.} + spec.homepage = "https://github.com/ruby/net-http" + spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0") + + spec.metadata["homepage_uri"] = spec.homepage + spec.metadata["source_code_uri"] = spec.homepage + + # Specify which files should be added to the gem when it is released. + # The `git ls-files -z` loads the files in the RubyGem that have been added into git. + spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do + `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } + end + spec.bindir = "exe" + spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } + spec.require_paths = ["lib"] +end diff --git a/lib/net/http/version.rb b/lib/net/http/version.rb new file mode 100644 index 0000000000..832d597111 --- /dev/null +++ b/lib/net/http/version.rb @@ -0,0 +1,5 @@ +module Net + module Http + VERSION = "0.1.0" + end +end diff --git a/test/net/http/test_https.rb b/test/net/http/test_https.rb index 204bfb7ad3..64101b6bda 100644 --- a/test/net/http/test_https.rb +++ b/test/net/http/test_https.rb @@ -12,14 +12,14 @@ end class TestNetHTTPS < Test::Unit::TestCase include TestNetHTTPUtils - def self.fixture(key) + def self.read_fixture(key) File.read(File.expand_path("../fixtures/#{key}", __dir__)) end - CA_CERT = OpenSSL::X509::Certificate.new(fixture("cacert.pem")) - SERVER_KEY = OpenSSL::PKey.read(fixture("server.key")) - SERVER_CERT = OpenSSL::X509::Certificate.new(fixture("server.crt")) - DHPARAMS = OpenSSL::PKey::DH.new(fixture("dhparams.pem")) + CA_CERT = OpenSSL::X509::Certificate.new(read_fixture("cacert.pem")) + SERVER_KEY = OpenSSL::PKey.read(read_fixture("server.key")) + SERVER_CERT = OpenSSL::X509::Certificate.new(read_fixture("server.crt")) + DHPARAMS = OpenSSL::PKey::DH.new(read_fixture("dhparams.pem")) TEST_STORE = OpenSSL::X509::Store.new.tap {|s| s.add_cert(CA_CERT) } CONFIG = { diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 6d374a19e3..1794e017dc 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -62,6 +62,7 @@ # * https://github.com/ruby/net-protocol # * https://github.com/ruby/net-imap # * https://github.com/ruby/net-ftp +# * https://github.com/ruby/net-http # require 'fileutils' @@ -122,6 +123,7 @@ $repositories = { "net-protocol": "ruby/net-protocol", "net-imap": "ruby/net-imap", "net-ftp": "ruby/net-ftp", + "net-http": "ruby/net-http", } def sync_default_gems(gem) @@ -289,6 +291,12 @@ def sync_default_gems(gem) when "net-ftp" sync_lib "net-ftp" mv "lib/net-ftp.gemspec", "lib/net/ftp" + when "net-http" + rm_rf(%w[lib/net/http.rb lib/net/http test/net/http]) + cp_r("#{upstream}/lib/net/http.rb", "lib/net") + cp_r("#{upstream}/lib/net/http", "lib/net") + cp_r("#{upstream}/test/net/http", "test/net") + cp_r("#{upstream}/net-http.gemspec", "lib/net/http") when "readline-ext" rm_rf(%w[ext/readline test/readline]) cp_r("#{upstream}/ext/readline", "ext") |