brotli 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81b3e01265c409832de742771d83abbfa21c0445a0ad3fa44d8ae646998786d5
-  data.tar.gz: 79d4545e4c507a0ef774412c005fe8ac999a31457347fbea31e21533c194b0ba
+  metadata.gz: ab7474a5a27fb0167098bc9838f8e57bc78082d596c5e38a7c86764fdf62bf13
+  data.tar.gz: 5a0b4d731bfd0fdbdd19a2cec36973cfc04460237acf58ac03dda51e8da82fe1
 SHA512:
-  metadata.gz: 9380345b150e5d8e2de3d9c58e4a1b5e6e4ac293f247c9a86caf5b9d1e9026b9b3a89d91254d91edf12212e553fe979894c1a01d6e0d1bfbf5cb1fd37571a7af
-  data.tar.gz: 64bb2538e6d712929a8fdfb2511f612b638c0f33d47eb38b973c9a26876e8ed44642ab1198dcc9f92614716e2b2d5b519705287897dca3ecd66e102d21a41b4e
+  metadata.gz: ae940a4cb85d44b0ad84a01fde9e8aaf285366dfcbccca4ba68619966005e1f003046de298b5d69098a4d3fcfd2a020ef49fa6eb5a3a0c790f59cd3060138bb6
+  data.tar.gz: 92b9e926ad5b98f4afc7522c0b7a1a7490f32ed474d0881643f09ae8747ada70f25aa77360dc4707c369c6e58bfa747fc0eca7efb8cc05ee2f752e802202b017

data/.travis.yml

@@ -5,17 +5,18 @@ cache:
   directories:
     - "$HOME/.ccache"
 rvm:
-  - 1.9.3
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
-  - 2.5.3
+  - 1.9
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - truffleruby
 env:
   global:
     - RANTLY_COUNT=10000
     - PATH="/usr/lib/ccache:$PATH"
-before_install:
-  - gem install bundler
+before_install: ./bin/before_install.sh
 deploy:
   provider: rubygems
   api_key:
@@ -25,3 +26,6 @@ deploy:
     tags: true
     repo: miyucy/brotli
 script: bundle exec rake && ./smoke.sh
+matrix:
+  allow_failures:
+    - rvm: truffleruby

data/bin/before_install.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -ev
+gem update --system || gem update --system '2.7.8'
+if [ "$(gem --version | cut -b 1)" = 3 ]; then
+  echo "gem: -N" >> ~/.gemrc
+else
+  echo "gem: --no-ri --no-rdoc" >> ~/.gemrc
+fi
+gem install bundler || gem install bundler -v '< 2'

data/brotli.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/brotli/extconf.rb"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "rspec"

data/ext/brotli/extconf.rb

@@ -2,31 +2,48 @@ require 'mkmf'
 require 'fileutils'
 require 'rbconfig'
 
+dir_config("brotli")
+
+# libbrotli-dev
+have_dev_pkg = [
+  have_header("brotli/decode.h"),
+  have_header("brotli/encode.h"),
+  pkg_config("libbrotlicommon"),
+  pkg_config("libbrotlidec"),
+  pkg_config("libbrotlienc")
+].all? { |e| e }
+
 $CPPFLAGS << ' -DOS_MACOSX' if RbConfig::CONFIG['host_os'] =~ /darwin|mac os/
-$INCFLAGS << ' -I$(srcdir)/enc -I$(srcdir)/dec -I$(srcdir)/common -I$(srcdir)/include'
+unless have_dev_pkg
+  $INCFLAGS << ' -I$(srcdir)/enc -I$(srcdir)/dec -I$(srcdir)/common -I$(srcdir)/include'
+end
+
 create_makefile('brotli/brotli')
 
-__DIR__ = File.expand_path(File.dirname __FILE__)
+unless have_dev_pkg
+  __DIR__ = File.expand_path(File.dirname __FILE__)
 
-%w[enc dec common include].each do |dirname|
-  FileUtils.mkdir_p dirname
-  FileUtils.cp_r File.expand_path(File.join(__DIR__, '..', '..', 'vendor', 'brotli', 'c', dirname), __DIR__), __DIR__, verbose: true
-end
+  %w[enc dec common include].each do |dirname|
+    FileUtils.mkdir_p dirname
+    FileUtils.cp_r File.expand_path(File.join(__DIR__, '..', '..', 'vendor', 'brotli', 'c', dirname), __DIR__), __DIR__, verbose: true
+  end
 
-srcs = []
-objs = []
-Dir[File.expand_path(File.join('{enc,dec,common,include}', '**', '*.c'), __DIR__)].sort.each do |file|
-  file[__DIR__ + File::SEPARATOR] = ''
-  srcs << file
-  objs << file.sub(/\.c\z/, '.' + RbConfig::CONFIG['OBJEXT'])
-end
+  srcs = []
+  objs = []
+  Dir[File.expand_path(File.join('{enc,dec,common,include}', '**', '*.c'), __DIR__)].sort.each do |file|
+    file[__DIR__ + File::SEPARATOR] = ''
+    srcs << file
+    objs << file.sub(/\.c\z/, '.' + RbConfig::CONFIG['OBJEXT'])
+  end
 
-File.open('Makefile', 'r+') do |f|
-  src = 'ORIG_SRCS = brotli.c buffer.c'
-  obj = 'OBJS = brotli.o buffer.o'
-  txt = f.read
-        .sub(/^ORIG_SRCS = .*$/, src + ' ' + srcs.join(' '))
-        .sub(/^OBJS = .*$/, obj + ' ' + objs.join(' '))
-  f.rewind
-  f.write txt
+  File.open('Makefile', 'r+') do |f|
+    obj_ext = RbConfig::CONFIG['OBJEXT']
+    src = 'ORIG_SRCS = brotli.c buffer.c'
+    obj = "OBJS = brotli.#{obj_ext} buffer.#{obj_ext}"
+    txt = f.read
+            .sub(/^ORIG_SRCS = .*$/, src + ' ' + srcs.join(' '))
+            .sub(/^OBJS = .*$/, obj + ' ' + objs.join(' '))
+    f.rewind
+    f.write txt
+  end
 end

data/lib/brotli/version.rb

@@ -1,3 +1,3 @@
 module Brotli
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/smoke.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 gem list | grep brotli && gem uninstall --force brotli
 bundle exec rake clobber build
-gem install --force --local --no-ri --no-rdoc "$(ls pkg/brotli-*.gem)"
+gem install --force --local "$(ls pkg/brotli-*.gem)"
 cat <<EOF | ruby
 require 'brotli'
 abort if Brotli.inflate(Brotli.deflate(File.read('smoke.sh'))) != File.read('smoke.sh')

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: brotli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - miyucy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2019-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +96,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/before_install.sh
 - bin/console
 - bin/setup
 - brotli.gemspec
@@ -228,8 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Brotli compressor/decompressor