zscan 2.0.3 → 2.0.4

data/ext/zscan.c

@@ -328,7 +328,7 @@ static VALUE zscan_zero_or_one(int argc, VALUE* argv, VALUE self) {
   REQUIRE_BLOCK;
   volatile VALUE a = Qnil;
   volatile VALUE r;
-  rb_scan_args(argc, argv, "01", &a);
+  rb_scan_args(argc, argv, "01", (VALUE*)&a);
   if (a == Qnil) {
     a = rb_ary_new();
   }
@@ -349,7 +349,7 @@ static VALUE zscan_zero_or_more(int argc, VALUE* argv, VALUE self) {
   volatile VALUE r;
   long backpos;
   P;
-  rb_scan_args(argc, argv, "01", &a);
+  rb_scan_args(argc, argv, "01", (VALUE*)&a);
   if (a == Qnil) {
     a = rb_ary_new();
   }
@@ -377,7 +377,7 @@ static VALUE zscan_one_or_more(int argc, VALUE* argv, VALUE self) {
   if (RTEST(r)) {
     long backpos;
     P;
-    rb_scan_args(argc, argv, "01", &a);
+    rb_scan_args(argc, argv, "01", (VALUE*)&a);
     if (a == Qnil) {
       a = rb_ary_new();
     }

data/lib/zscan.rb

@@ -3,7 +3,7 @@ require_relative "zscan/bspec"
 require "date"
 
 class ZScan
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 
   def initialize s, dup=false
     if s.encoding.ascii_compatible?

data/rakefile

@@ -2,7 +2,7 @@ require_relative "generate/generate"
 Dir.chdir __dir__
 version_re   = /\d+(\.\d+)*/
 version      = `command grep 'VERSION =' lib/zscan.rb`[version_re]
-gem_files    = Dir.glob('{rakefile,zscan.gemspec,readme.md,**/*.{rb,h,c,inc},ext/pack/COPYING*}')
+gem_files    = Dir.glob('{rakefile,zscan.gemspec,readme.md,**/*.{rb,h,c,inc},ext/pack/COPYING*}') - Dir.glob('ext/pack/{pack.c,internal.h}')
 gem_package  = "zscan-#{version}.gem"
 generate_src = [__FILE__, *Dir.glob('generate/*')]
 
@@ -12,10 +12,18 @@ task :default => [:gen, :test, gem_package]
 desc "build and test"
 task :test => 'ext/Makefile' do
   sh "make -C ext"
-  sh "rspec"
+  sh "ruby spec/*.rb"
 end
 
-file 'ext/Makefile' do
+desc "clean"
+task :clean do
+  if File.exist?('ext/Makefile')
+    sh "cd ext && make clean"
+  end
+  sh "rm -f ext/pack/pack.c ext/pack/internal.h ext/Makefile zscan*.gem"
+end
+
+file 'ext/Makefile' => ['ext/extconf.rb', 'ext/pack/pack-25.c', 'ext/pack/pack-23.c'] do
   Dir.chdir 'ext' do
     sh "ruby extconf.rb"
   end

data/readme.md

@@ -205,7 +205,6 @@ Thought of that but the API can be quirky... It's way beyond a string scanner.
 ## Build
 
 ```bash
-gem ins rspec
 rake gen
 rake
 ```
@@ -213,7 +212,7 @@ rake
 ## License
 
 ```
-Copyright (C) 2013 by Zete Lui (BSD)
+Copyright (C) 2013 by Zete Lui (MIT)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/spec/binary_scan_spec.rb

@@ -48,7 +48,7 @@ describe 'ZScan binary scanning methods' do
 
     a = [2, 4.0]
     z = ZScan.new a.pack('cf')
-    assert_equal nil, z.scan_bytes(s)
+    assert_nil z.scan_bytes(s)
     assert_equal 0, z.pos
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,2 @@
 require_relative "../lib/zscan"
-require 'rspec/autorun'
-RSpec.configure do |config|
-  config.expect_with :stdlib
-  config.before :all do
-    # GC.stress = true
-  end
-end
+require 'minitest/autorun'

data/zscan.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name = "zscan"
-  s.version = "2.0.3" # version mapped from zscan.rb, don't change here
+  s.version = "2.0.4" # version mapped from zscan.rb, don't change here
   s.author = "Zete Lui"
   s.homepage = "https://github.com/luikore/zscan"
   s.platform = Gem::Platform::RUBY
   s.summary = "improved string scanner"
   s.description = "improved string scanner, respects anchors and lookbehinds, supports codepoint positioning"
   s.required_ruby_version = ">=1.9.2"
-  s.licenses = ['BSD']
+  s.licenses = ['MIT']
 
   s.files = Dir.glob('{rakefile,zscan.gemspec,readme.md,**/*.{rb,h,c,inc},ext/pack/COPYING*}')
   s.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zscan
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Zete Lui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies: []
 description: improved string scanner, respects anchors and lookbehinds, supports codepoint
   positioning
@@ -18,36 +18,40 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- rakefile
-- zscan.gemspec
-- readme.md
 - benchmark/one-or-more.rb
 - benchmark/vs-strscan.rb
 - benchmark/vs-unpack.rb
+- ext/bspec.c
+- ext/bspec_exec.inc
+- ext/bspec_init.inc
 - ext/extconf.rb
+- ext/pack/COPYING
+- ext/pack/COPYING.ja
+- ext/pack/internal-23.h
+- ext/pack/internal-25.h
+- ext/pack/internal.h
+- ext/pack/pack-23.c
+- ext/pack/pack-25.c
+- ext/pack/pack.c
+- ext/zscan.c
+- ext/zscan.h
 - generate/bspec.rb
+- generate/bspec_exec.inc
+- generate/bspec_init.inc
 - generate/generate.rb
-- lib/zscan/bspec.rb
 - lib/zscan.rb
+- lib/zscan/bspec.rb
+- rakefile
+- readme.md
 - spec/binary_scan_spec.rb
 - spec/combinator_spec.rb
 - spec/spec_helper.rb
 - spec/typed_scan_spec.rb
 - spec/zscan_spec.rb
-- ext/pack/internal.h
-- ext/zscan.h
-- ext/bspec.c
-- ext/pack/pack.c
-- ext/zscan.c
-- ext/bspec_exec.inc
-- ext/bspec_init.inc
-- generate/bspec_exec.inc
-- generate/bspec_init.inc
-- ext/pack/COPYING
-- ext/pack/COPYING.ja
+- zscan.gemspec
 homepage: https://github.com/luikore/zscan
 licenses:
-- BSD
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -55,19 +59,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: improved string scanner
 test_files: []
-has_rdoc: false