libmspack 0.0.5 → 0.10.1.2

data/ext/libmspack/mspack/system.c

@@ -13,7 +13,7 @@
 
 #include <system.h>
 
-#ifndef LARGEFILE_SUPPORT
+#if !LARGEFILE_SUPPORT
 const char *largefile_msg = "library not compiled to support large files.";
 #endif
 
@@ -27,13 +27,19 @@ int mspack_version(int entity) {
     * - added mschmd_header::chunk_cache;
     */
   case MSPACK_VER_MSCHMD:
+  /* CAB decoder version 1 -> 2 changes:
+   * - added MSCABD_PARAM_SALVAGE
+   */
+  case MSPACK_VER_MSCABD:
+  /* OAB decoder version  1 -> 2 changes:
+   * - added msoab_decompressor::set_param and MSOABD_PARAM_DECOMPBUF
+   */
+  case MSPACK_VER_MSOABD:
     return 2;
   case MSPACK_VER_LIBRARY:
   case MSPACK_VER_SYSTEM:
-  case MSPACK_VER_MSCABD:
   case MSPACK_VER_MSSZDDD:
   case MSPACK_VER_MSKWAJD:
-  case MSPACK_VER_MSOABD:
     return 1;
   case MSPACK_VER_MSCABC:
   case MSPACK_VER_MSCHMC:
@@ -63,7 +69,7 @@ int mspack_valid_system(struct mspack_system *sys) {
 
 /* returns the length of a file opened for reading */
 int mspack_sys_filelen(struct mspack_system *system,
-		       struct mspack_file *file, off_t *length)
+                       struct mspack_file *file, off_t *length)
 {
   off_t current;
 
@@ -113,7 +119,7 @@ struct mspack_file_p {
 };
 
 static struct mspack_file *msp_open(struct mspack_system *self,
-				    const char *filename, int mode)
+                                    const char *filename, int mode)
 {
   struct mspack_file_p *fh;
   const char *fmode;
@@ -169,7 +175,7 @@ static int msp_seek(struct mspack_file *file, off_t offset, int mode) {
     case MSPACK_SYS_SEEK_END:   mode = SEEK_END; break;
     default: return -1;
     }
-#ifdef HAVE_FSEEKO
+#if HAVE_FSEEKO
     return fseeko(self->fh, offset, mode);
 #else
     return fseek(self->fh, offset, mode);
@@ -180,7 +186,7 @@ static int msp_seek(struct mspack_file *file, off_t offset, int mode) {
 
 static off_t msp_tell(struct mspack_file *file) {
   struct mspack_file_p *self = (struct mspack_file_p *) file;
-#ifdef HAVE_FSEEKO
+#if HAVE_FSEEKO
   return (self) ? (off_t) ftello(self->fh) : 0;
 #else
   return (self) ? (off_t) ftell(self->fh) : 0;
@@ -198,7 +204,7 @@ static void msp_msg(struct mspack_file *file, const char *format, ...) {
 }
 
 static void *msp_alloc(struct mspack_system *self, size_t bytes) {
-#ifdef DEBUG
+#if DEBUG
   /* make uninitialised data obvious */
   char *buf = malloc(bytes + 8);
   if (buf) memset(buf, 0xDC, bytes);
@@ -210,7 +216,7 @@ static void *msp_alloc(struct mspack_system *self, size_t bytes) {
 }
 
 static void msp_free(void *buffer) {
-#ifdef DEBUG
+#if DEBUG
   char *buf = buffer;
   size_t bytes;
   if (buf) {

data/ext/libmspack/mspack/system.h

@@ -1,5 +1,5 @@
 /* This file is part of libmspack.
- * (C) 2003-2004 Stuart Caie.
+ * (C) 2003-2018 Stuart Caie.
  *
  * libmspack is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License (LGPL) version 2.1
@@ -21,6 +21,9 @@ extern "C" {
 
 #include <mspack.h>
 
+/* assume <string.h> exists */
+#include <string.h>
+
 /* fix for problem with GCC 4 and glibc (thanks to Ville Skytta)
  * http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=150429
  */
@@ -28,18 +31,19 @@ extern "C" {
 # undef read
 #endif
 
-#ifdef DEBUG
-# include <stdio.h>
 /* Old GCCs don't have __func__, but __FUNCTION__:
  * http://gcc.gnu.org/onlinedocs/gcc/Function-Names.html
  */
-# if __STDC_VERSION__ < 199901L
-#  if __GNUC__ >= 2
-#   define __func__ __FUNCTION__
-#  else
-#   define __func__ "<unknown>"
-#  endif
+#if __STDC_VERSION__ < 199901L
+# if __GNUC__ >= 2
+#  define __func__ __FUNCTION__
+# else
+#  define __func__ "<unknown>"
 # endif
+#endif
+
+#if DEBUG
+# include <stdio.h>
 # define D(x) do { printf("%s:%d (%s) ",__FILE__, __LINE__, __func__); \
                    printf x ; fputc('\n', stdout); fflush(stdout);} while (0);
 #else
@@ -53,70 +57,54 @@ extern "C" {
  * greater than 2GB is detected, an error message indicating the library
  * can't support the file should be printed.
  */
-#ifdef HAVE_LIMITS_H
-# include <limits.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# define PRId64 "lld"
+# define PRIu64 "llu"
+# define PRId32 "ld"
+# define PRIu32 "lu"
 #endif
 
+#include <limits.h>
 #if ((defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS >= 64) || \
      (defined(FILESIZEBITS)      && FILESIZEBITS      >= 64) || \
-     (defined(SIZEOF_OFF_T)      && SIZEOF_OFF_T      >= 8)  || \
-     defined(_LARGEFILE_SOURCE) || defined(_LARGEFILE64_SOURCE))
-# define LARGEFILE_SUPPORT
-# define LD "lld"
-# define LU "llu"
+     defined(_LARGEFILE_SOURCE) || defined(_LARGEFILE64_SOURCE) || \
+     SIZEOF_OFF_T >= 8)
+# define LARGEFILE_SUPPORT 1
+# define LD PRId64
+# define LU PRIu64
 #else
 extern const char *largefile_msg;
-# define LD "ld"
-# define LU "lu"
+# define LD PRId32
+# define LU PRIu32
 #endif
 
 /* endian-neutral reading of little-endian data */
-#define __egi32(a,n) ( ((((unsigned char *) a)[n+3]) << 24) | \
-		       ((((unsigned char *) a)[n+2]) << 16) | \
-		       ((((unsigned char *) a)[n+1]) <<  8) | \
-		       ((((unsigned char *) a)[n+0])))
-#define EndGetI64(a) ((((unsigned long long int) __egi32(a,4)) << 32) | \
-		      ((unsigned int) __egi32(a,0)))
+#define __egi32(a,n) (((unsigned int) ((unsigned char *)(a))[n+3] << 24) | \
+                      ((unsigned int) ((unsigned char *)(a))[n+2] << 16) | \
+                      ((unsigned int) ((unsigned char *)(a))[n+1] <<  8) | \
+                      ((unsigned int) ((unsigned char *)(a))[n]))
+#define EndGetI64(a) (((unsigned long long int) __egi32(a,4) << 32) | __egi32(a,0))
 #define EndGetI32(a) __egi32(a,0)
 #define EndGetI16(a) ((((a)[1])<<8)|((a)[0]))
 
 /* endian-neutral reading of big-endian data */
-#define EndGetM32(a) (((((unsigned char *) a)[0]) << 24) | \
-		      ((((unsigned char *) a)[1]) << 16) | \
-		      ((((unsigned char *) a)[2]) <<  8) | \
-		      ((((unsigned char *) a)[3])))
+#define EndGetM32(a) (((unsigned int) ((unsigned char *)(a))[0] << 24) | \
+                      ((unsigned int) ((unsigned char *)(a))[1] << 16) | \
+                      ((unsigned int) ((unsigned char *)(a))[2] <<  8) | \
+                      ((unsigned int) ((unsigned char *)(a))[3]))
 #define EndGetM16(a) ((((a)[0])<<8)|((a)[1]))
 
 extern struct mspack_system *mspack_default_system;
 
 /* returns the length of a file opened for reading */
 extern int mspack_sys_filelen(struct mspack_system *system,
-			      struct mspack_file *file, off_t *length);
+                              struct mspack_file *file, off_t *length);
 
 /* validates a system structure */
 extern int mspack_valid_system(struct mspack_system *sys);
 
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
-#if HAVE_STRING_H
-# include <string.h>
-#endif
-
-#if HAVE_MEMCMP
-# define mspack_memcmp memcmp
-#else
-/* inline memcmp() */
-static inline int mspack_memcmp(const void *s1, const void *s2, size_t n) {
-  unsigned char *c1 = (unsigned char *) s1;
-  unsigned char *c2 = (unsigned char *) s2;
-  if (n == 0) return 0;
-  while (--n && (*c1 == *c2)) c1++, c2++;
-  return *c1 - *c2;
-}
-#endif
-
 #ifdef __cplusplus
 }
 #endif

data/ext/libmspack/mspack/szddd.c

@@ -66,8 +66,8 @@ void mspack_destroy_szdd_decompressor(struct msszdd_decompressor *base)
 {
     struct msszdd_decompressor_p *self = (struct msszdd_decompressor_p *) base;
     if (self) {
-	struct mspack_system *sys = self->system;
-	sys->free(self);
+        struct mspack_system *sys = self->system;
+        sys->free(self);
     }
 }
 
@@ -77,7 +77,7 @@ void mspack_destroy_szdd_decompressor(struct msszdd_decompressor *base)
  * opens an SZDD file without decompressing, reads header
  */
 static struct msszddd_header *szddd_open(struct msszdd_decompressor *base,
-					 const char *filename)
+                                         const char *filename)
 {
     struct msszdd_decompressor_p *self = (struct msszdd_decompressor_p *) base;
     struct msszddd_header *hdr;
@@ -90,18 +90,18 @@ static struct msszddd_header *szddd_open(struct msszdd_decompressor *base,
     fh  = sys->open(sys, filename, MSPACK_SYS_OPEN_READ);
     hdr = (struct msszddd_header *) sys->alloc(sys, sizeof(struct msszddd_header_p));
     if (fh && hdr) {
-	((struct msszddd_header_p *) hdr)->fh = fh;
-	self->error = szddd_read_headers(sys, fh, hdr);
+        ((struct msszddd_header_p *) hdr)->fh = fh;
+        self->error = szddd_read_headers(sys, fh, hdr);
     }
     else {
-	if (!fh)  self->error = MSPACK_ERR_OPEN;
-	if (!hdr) self->error = MSPACK_ERR_NOMEMORY;
+        if (!fh)  self->error = MSPACK_ERR_OPEN;
+        if (!hdr) self->error = MSPACK_ERR_NOMEMORY;
     }
     
     if (self->error) {
-	if (fh)  sys->close(fh);
-	if (hdr) sys->free(hdr);
-	hdr = NULL;
+        if (fh) sys->close(fh);
+        sys->free(hdr);
+        hdr = NULL;
     }
 
     return hdr;
@@ -113,7 +113,7 @@ static struct msszddd_header *szddd_open(struct msszdd_decompressor *base,
  * closes an SZDD file
  */
 static void szddd_close(struct msszdd_decompressor *base,
-			struct msszddd_header *hdr)
+                        struct msszddd_header *hdr)
 {
     struct msszdd_decompressor_p *self = (struct msszdd_decompressor_p *) base;
     struct msszddd_header_p *hdr_p = (struct msszddd_header_p *) hdr;
@@ -142,33 +142,33 @@ static unsigned char szdd_signature_qbasic[8] = {
 };
 
 static int szddd_read_headers(struct mspack_system *sys,
-			      struct mspack_file *fh,
-			      struct msszddd_header *hdr)
+                              struct mspack_file *fh,
+                              struct msszddd_header *hdr)
 {
     unsigned char buf[8];
 
     /* read and check signature */
     if (sys->read(fh, buf, 8) != 8) return MSPACK_ERR_READ;
 
-    if ((mspack_memcmp(buf, szdd_signature_expand, 8) == 0)) {
-	/* common SZDD */
-	hdr->format = MSSZDD_FMT_NORMAL;
+    if ((memcmp(buf, szdd_signature_expand, 8) == 0)) {
+        /* common SZDD */
+        hdr->format = MSSZDD_FMT_NORMAL;
 
-	/* read the rest of the header */
-	if (sys->read(fh, buf, 6) != 6) return MSPACK_ERR_READ;
-	if (buf[0] != 0x41) return MSPACK_ERR_DATAFORMAT;
-	hdr->missing_char = buf[1];
-	hdr->length = EndGetI32(&buf[2]);
+        /* read the rest of the header */
+        if (sys->read(fh, buf, 6) != 6) return MSPACK_ERR_READ;
+        if (buf[0] != 0x41) return MSPACK_ERR_DATAFORMAT;
+        hdr->missing_char = buf[1];
+        hdr->length = EndGetI32(&buf[2]);
     }
-    else if ((mspack_memcmp(buf, szdd_signature_qbasic, 8) == 0)) {
-	/* special QBasic SZDD */
-	hdr->format = MSSZDD_FMT_QBASIC;
-	if (sys->read(fh, buf, 4) != 4) return MSPACK_ERR_READ;
-	hdr->missing_char = '\0';
-	hdr->length = EndGetI32(buf);
+    else if ((memcmp(buf, szdd_signature_qbasic, 8) == 0)) {
+        /* special QBasic SZDD */
+        hdr->format = MSSZDD_FMT_QBASIC;
+        if (sys->read(fh, buf, 4) != 4) return MSPACK_ERR_READ;
+        hdr->missing_char = '\0';
+        hdr->length = EndGetI32(buf);
     }
     else {
-	return MSPACK_ERR_SIGNATURE;
+        return MSPACK_ERR_SIGNATURE;
     }
     return MSPACK_ERR_OK;
 }
@@ -179,7 +179,7 @@ static int szddd_read_headers(struct mspack_system *sys,
  * decompresses an SZDD file
  */
 static int szddd_extract(struct msszdd_decompressor *base,
-			 struct msszddd_header *hdr, const char *filename)
+                         struct msszddd_header *hdr, const char *filename)
 {
     struct msszdd_decompressor_p *self = (struct msszdd_decompressor_p *) base;
     struct mspack_file *fh, *outfh;
@@ -195,19 +195,19 @@ static int szddd_extract(struct msszdd_decompressor *base,
     /* seek to the compressed data */
     data_offset = (hdr->format == MSSZDD_FMT_NORMAL) ? 14 : 12;
     if (sys->seek(fh, data_offset, MSPACK_SYS_SEEK_START)) {
-	return self->error = MSPACK_ERR_SEEK;
+        return self->error = MSPACK_ERR_SEEK;
     }
 
     /* open file for output */
     if (!(outfh = sys->open(sys, filename, MSPACK_SYS_OPEN_WRITE))) {
-	return self->error = MSPACK_ERR_OPEN;
+        return self->error = MSPACK_ERR_OPEN;
     }
 
     /* decompress the data */
     self->error = lzss_decompress(sys, fh, outfh, SZDD_INPUT_SIZE,
-				  hdr->format == MSSZDD_FMT_NORMAL
-				  ? LZSS_MODE_EXPAND
-				  : LZSS_MODE_QBASIC);
+                                  hdr->format == MSSZDD_FMT_NORMAL
+                                  ? LZSS_MODE_EXPAND
+                                  : LZSS_MODE_QBASIC);
 
     /* close output file */
     sys->close(outfh);
@@ -221,7 +221,7 @@ static int szddd_extract(struct msszdd_decompressor *base,
  * unpacks directly from input to output
  */
 static int szddd_decompress(struct msszdd_decompressor *base,
-			    const char *input, const char *output)
+                            const char *input, const char *output)
 {
     struct msszdd_decompressor_p *self = (struct msszdd_decompressor_p *) base;
     struct msszddd_header *hdr;

data/ext/libmspack/test-driver

@@ -0,0 +1,148 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2013-07-13.22; # UTC
+
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+              [--expect-failure={yes|no}] [--color-tests={yes|no}]
+              [--enable-hard-errors={yes|no}] [--]
+              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+
+test_name= # Used for reporting.
+log_file=  # Where to save the output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) enable_hard_errors=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+   *) break;;
+  esac
+  shift
+done
+
+missing_opts=
+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
+test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
+test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
+if test x"$missing_opts" != x; then
+  usage_error "the following mandatory options are missing:$missing_opts"
+fi
+
+if test $# -eq 0; then
+  usage_error "missing argument"
+fi
+
+if test $color_tests = yes; then
+  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+  red='' # Red.
+  grn='' # Green.
+  lgn='' # Light green.
+  blu='' # Blue.
+  mgn='' # Magenta.
+  std=''     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  tweaked_estatus=1
+else
+  tweaked_estatus=$estatus
+fi
+
+case $tweaked_estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:

data/lib/libmspack/version.rb

@@ -1,4 +1,5 @@
 module LibMsPack
     # Version
-    VERSION = '0.0.5'
+    VERSION = '0.10.1.2'
 end
+

data/lib/libmspack.rb

@@ -15,7 +15,7 @@ require 'libmspack/constants'
 
 module LibMsPack
     extend FFI::Library
-    ffi_lib FFI::Compiler::Loader.find('libmspack')
+    ffi_lib FFI::Compiler::Loader.find('mspack')
 
     include LibMsPack::Constants
     include LibMsPack::MsPack

data/libmspack.gemspec

@@ -10,24 +10,24 @@ Gem::Specification.new do |spec|
   spec.email         = ['davispuh@gmail.com']
   spec.description   = 'A library for compressing and decompressing some loosely related Microsoft compression formats, CAB, CHM, HLP, LIT, KWAJ and SZDD.'
   spec.summary       = 'Ruby wrapper for libmspack.'
-  spec.homepage      = 'https://github.com/davispuh/ruby-libmspack'
+  spec.homepage      = 'https://gitlab.com/davispuh/ruby-libmspack'
   spec.licenses      = ['UNLICENSE', 'LGPL-2']
 
   spec.platform      = Gem::Platform::RUBY
   spec.files         = `git ls-files`.split($/)
-  spec.files        += Dir.glob('ext/**/*')
+  spec.files        += Dir.glob('ext/**/*').reject {|f| %r{/libmspack/(doc|examples|test)/}.match?(f) }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
   spec.extensions << 'ext/Rakefile'
 
   spec.add_runtime_dependency 'ffi'
-  spec.add_runtime_dependency 'ffi-compiler', '> 0.1.3'
+  spec.add_runtime_dependency 'ffi-compiler2', '>= 2.0.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'svn-downloader'
 end
+

data/spec/libmspack_spec.rb

@@ -5,22 +5,23 @@ describe LibMsPack do
 
     describe '.MsPackSelfTest' do
         it 'should pass' do
-            LibMsPack.SysSelfTest.should eq(LibMsPack::MSPACK_ERR_OK)
+            expect(LibMsPack.SysSelfTest).to eq(LibMsPack::MSPACK_ERR_OK)
         end
     end
 
     describe '.Version' do
         it 'should return LIBRARY version' do
-            LibMsPack.Version(LibMsPack::MSPACK_VER_LIBRARY).should eq(1)
+            expect(LibMsPack.Version(LibMsPack::MSPACK_VER_LIBRARY)).to eq(1)
         end
 
         it 'should return SYSTEM version' do
-            LibMsPack.Version(LibMsPack::MSPACK_VER_SYSTEM).should eq(1)
+            expect(LibMsPack.Version(LibMsPack::MSPACK_VER_SYSTEM)).to eq(1)
         end
 
         it 'should return MSCHMD version' do
-            LibMsPack.Version(LibMsPack::MSPACK_VER_MSCHMD).should eq(2)
+            expect(LibMsPack.Version(LibMsPack::MSPACK_VER_MSCHMD)).to eq(2)
         end
     end
 
 end
+