ds9 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c4e36345289f23d14f435bc4cb397a72a5bda5d
-  data.tar.gz: 142a14a755b07d0ea718f3de691fb87fed448ed3
+  metadata.gz: 675cfb91dad1dd9337150425144870db64e880c9
+  data.tar.gz: 31fa19e3c643ce1a425cb7c97b2fa6e145fb69d4
 SHA512:
-  metadata.gz: 52385947712d95677a593d18a16e81bbe9332042854537fcc4734fb8e5f39fb15e65380349725abe5d5ebedc9f3c6b97da573ffd18a10cc4b260924aac30551d
-  data.tar.gz: fcf9414805469006684c1ecd1a30297322892baa0e3d04804688aba6949a90b77ea0eecf99981f0ca3ae18315b6399947e75d74d649de49dd668c50e746d8ce6
+  metadata.gz: 5023590043ecd16dc8f9f004cb7c38e0b479806459c0716e108ba15160f3eb88d8d15fa0349118817aa7414d7878ece680c8dc97059bc102dfb2e13b2fa3b187
+  data.tar.gz: ed434905dc9b8129f0c812cec3a752b77618a61c157698e46c2d2b3b22221ac1a28145a089d222e31f37258e42221b5cdd9b841589a266e26a12e813e1f12b80

data/.gitignore

@@ -0,0 +1,3 @@
+Gemfile.lock
+/pkg/
+/tmp/

data/Gemfile

@@ -0,0 +1 @@
+gemspec

data/README.md

@@ -9,19 +9,33 @@ around nghttp2.
 
 ## INSTALLING
 
-On OS X:
+Add this line to your application's Gemfile:
 
+```ruby
+gem ds9
+```
+
+And then execute:
+
+```shell
+$ bundle install
 ```
-$ brew install nghttp2
+
+Or install it yourself as:
+
+```shell
 $ gem install ds9
 ```
 
-I'm not sure about other platforms, but it should Just Work if you install
-libnghttp2.
+To install this gem without nghttp2:
 
-## FEATURES/PROBLEMS:
+Use `DS9_USE_SYSTEM_LIBRARIES` ENV var:
 
-* Needs nghttp2
+```shell
+$ DS9_USE_SYSTEM_LIBRARIES=1 bundle install
+```
+
+or, the `--use-system-libraries` option:
 
 ## SYNOPSIS:
 
@@ -142,23 +156,11 @@ end
 
 ## HACKING:
 
-On OS X:
-
 ```
-$ brew install nghttp2
-$ gem install hoe rake-compiler
-$ rake compile test
+$ bundle install
+$ bundle exec rake compile test
 ```
 
-## REQUIREMENTS:
-
-* Needs nghttp2
-
-## INSTALL:
-
-* brew install nghttp2
-* gem install ds9
-
 ## LICENSE:
 
 (The MIT License)

data/Rakefile

@@ -1,31 +1,12 @@
-# -*- ruby -*-
-
-require 'rubygems'
-require 'hoe'
-
-Hoe.plugins.delete :rubyforge
-Hoe.plugin :minitest
-Hoe.plugin :gemspec # `gem install hoe-gemspec`
-Hoe.plugin :git     # `gem install hoe-git`
-
-gem 'rake-compiler', '>= 0.4.1'
+require "bundler/gem_tasks"
 require "rake/extensiontask"
 
-Hoe.spec 'ds9' do
-  developer('Aaron Patterson', 'tenderlove@ruby-lang.org')
-  self.readme_file   = 'README.md'
-  self.history_file  = 'CHANGELOG.md'
-  self.extra_rdoc_files  = FileList['*.md']
-  extra_dev_deps << ['rake-compiler', '>= 0.4.1']
-
-  self.spec_extras = {
-    :required_ruby_version => '>= 2.2.2'
-  }
+task default: :compile
 
-  self.spec_extras[:extensions] = ["ext/ds9/extconf.rb"]
-  Rake::ExtensionTask.new "ds9", spec do |ext|
-    ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
-  end
+Rake::ExtensionTask.new("ds9") do |t|
+  t.name = "ds9"
+  t.ext_dir = "ext/ds9"
+  t.lib_dir = "lib"
 end
 
 # vim: syntax=ruby

data/ds9.gemspec

@@ -0,0 +1,33 @@
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "ds9/version"
+
+Gem::Specification.new do |s|
+  s.name = "ds9"
+  s.version = DS9::VERSION
+  s.authors = ["Aaron Patterson", "Yuta Iwama"]
+  s.email = ["tenderlove@ruby-lang.org", "ganmacs@gmail.com"]
+
+  s.summary = "This library allows you to write HTTP/2 clients and servers"
+  s.description = "This library allows you to write HTTP/2 clients and servers. It is a wrapper\naround nghttp2."
+  s.homepage = "https://github.com/tenderlove/ds9"
+  s.licenses = ["MIT"]
+
+  s.files = `git ls-files -z`.split("\x0")
+  s.require_paths = ["lib"]
+  s.extensions = ["ext/ds9/extconf.rb"]
+
+  s.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  s.rubygems_version = "2.4.8"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.extra_rdoc_files = ["CHANGELOG.md", "README.md"]
+  s.rdoc_options = ["--main", "README.md"]
+  s.date = "2015-07-06"
+
+  s.add_runtime_dependency "mini_portile2", ">= 2.2.0"
+
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "minitest", "~> 5.7"
+  s.add_development_dependency "rdoc", "~> 4.0"
+  s.add_development_dependency "rake-compiler", ">= 1.0.5"
+end

data/ext/ds9/extconf.rb

@@ -1,16 +1,43 @@
 require 'mkmf'
 
-if with_config("static")
-  ldflags = pkg_config 'libnghttp2', 'libs-only-L'
+def using_system_libraries?
+  arg_config('--use-system-libraries', !!ENV['DS9_USE_SYSTEM_LIBRARIES'])
+end
+
+if using_system_libraries?
+  if with_config("static")
+    ldflags = pkg_config 'libnghttp2', 'libs-only-L'
 
-  archive = File.join ldflags.sub(/^-L/, ''), 'libnghttp2.a'
-  if File.exist? archive
-    $LDFLAGS << " #{archive}"
+    archive = File.join ldflags.sub(/^-L/, ''), 'libnghttp2.a'
+    if File.exist? archive
+      $LDFLAGS << " #{archive}"
+    else
+      raise "couldn't find archive"
+    end
   else
-    raise "couldn't find archive"
+    pkg_config 'libnghttp2'
   end
 else
-  pkg_config 'libnghttp2'
+  message "Building nghttp2\n"
+  require 'rubygems'
+  require 'mini_portile2'
+  recipe = MiniPortile.new('nghttp2', 'v1.34.0')
+  # We need to compile nghttp2 with `-fPIC` option, so delete `--disable-shared` from MiniPortile#configure_defaults
+  recipe.configure_options = ['--enable-lib-only', '--enable-static', "--host=#{recipe.host}"]
+
+  recipe.files << {
+    url: 'https://github.com/nghttp2/nghttp2/releases/download/v1.34.0/nghttp2-1.34.0.tar.gz',
+    sha1: '2d0ad93a254a7a6e6c737f2fd2e10e4810a41f74',
+  }
+  recipe.cook
+
+  # `recipe.activate` uses invalid path for this package.
+  $LIBPATH = ["#{recipe.path}/lib"] + $LIBPATH
+  $CPPFLAGS << " -I#{recipe.path}/include"
+  $LIBS << " -lnghttp2 -lstdc++"
 end
 
+abort 'nghttp2/nghttp2.h not found' unless have_header('nghttp2/nghttp2.h')
+abort 'libnghttp2 not found' unless have_library('nghttp2')
+
 create_makefile 'ds9'

data/lib/ds9.rb

@@ -1,9 +1,8 @@
 require 'ds9.so'
 require 'stringio'
+require 'ds9/version'
 
 module DS9
-  VERSION = '1.3.0'
-
   module Frames
     class Frame
       Header = Struct.new :length, :stream_id, :type, :flags

data/lib/ds9/version.rb

@@ -0,0 +1,3 @@
+module DS9
+  VERSION = '1.3.1'
+end

data/test/test_server.rb

@@ -0,0 +1,68 @@
+require 'helper'
+
+class TestServer < DS9::TestCase
+  def test_submit_response
+    server, client = pipe do |req, res|
+      refute req.stream.stream_remote_closed?(req.stream_id)
+      refute req.stream.stream_local_closed?(req.stream_id)
+      res.submit_response([[':status', '200'],
+                           ['server', 'test server'],
+                           ['date', 'Sat, 27 Jun 2015 17:29:21 GMT']])
+      res.finish('omglol')
+    end
+
+    s = Thread.new { server.run }
+    c = Thread.new { client.run }
+
+    client.submit_request([[':method', 'GET'],
+                           [':path', '/'],
+                           [':scheme', 'https'],
+                           [':authority', ['localhost', '8080'].join(':')],
+                           ['accept', '*/*'],
+                           ['user-agent', 'test']])
+
+    responses = []
+    while (response = client.responses.pop)
+      responses << response
+      if responses.length == 1
+        client.terminate_session DS9::NO_ERROR
+      end
+    end
+
+    s.join
+    c.join
+    assert_equal ['omglol'], responses.map(&:body).map(&:string)
+  end
+
+  def test_submit_headers
+    server, client = pipe do |req, res|
+      refute req.stream.stream_remote_closed?(req.stream_id)
+      refute req.stream.stream_local_closed?(req.stream_id)
+      res.submit_headers([[':status', '200'],
+                          ['server', 'test server'],
+                          ['date', 'Sat, 27 Jun 2015 17:29:21 GMT']])
+    end
+
+    s = Thread.new { server.run }
+    c = Thread.new { client.run }
+
+    client.submit_request([[':method', 'GET'],
+                           [':path', '/'],
+                           [':scheme', 'https'],
+                           [':authority', ['localhost', '8080'].join(':')],
+                           ['accept', '*/*'],
+                           ['user-agent', 'test']])
+
+    responses = []
+    while (response = client.responses.pop)
+      responses << response
+      if responses.length == 1
+        client.terminate_session DS9::NO_ERROR
+      end
+    end
+
+    s.join
+    c.join
+    assert_equal [''], responses.map(&:body).map(&:string)
+  end
+end

metadata

@@ -1,103 +1,116 @@
 --- !ruby/object:Gem::Specification
 name: ds9
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Aaron Patterson
+- Yuta Iwama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: mini_portile2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.11'
-  type: :development
+        version: 2.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.7'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: 1.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: 1.0.5
 description: |-
-  This library allows you to write HTTP/2 clients and servers.  It is a wrapper
+  This library allows you to write HTTP/2 clients and servers. It is a wrapper
   around nghttp2.
 email:
 - tenderlove@ruby-lang.org
+- ganmacs@gmail.com
 executables: []
 extensions:
 - ext/ds9/extconf.rb
 extra_rdoc_files:
 - CHANGELOG.md
-- Manifest.txt
 - README.md
 files:
 - ".autotest"
+- ".gitignore"
 - CHANGELOG.md
-- Manifest.txt
+- Gemfile
 - README.md
 - Rakefile
+- ds9.gemspec
 - ext/ds9/ds9.c
 - ext/ds9/ds9.h
 - ext/ds9/ds9_frames.c
 - ext/ds9/extconf.rb
 - lib/ds9.rb
+- lib/ds9/version.rb
 - test/helper.rb
 - test/test_client.rb
 - test/test_ds9.rb
+- test/test_server.rb
 homepage: https://github.com/tenderlove/ds9
 licenses:
 - MIT
@@ -112,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/Manifest.txt

@@ -1,13 +0,0 @@
-.autotest
-CHANGELOG.md
-Manifest.txt
-README.md
-Rakefile
-ext/ds9/ds9.c
-ext/ds9/ds9.h
-ext/ds9/ds9_frames.c
-ext/ds9/extconf.rb
-lib/ds9.rb
-test/helper.rb
-test/test_client.rb
-test/test_ds9.rb