bitpack 0.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5a4225281a59edd833532a17d15221435c3a257a
+  data.tar.gz: d4eb429fd206d5ac5215d41d7939f33e9c70937e
+SHA512:
+  metadata.gz: 44a8ee1fdd340d00b8749a63e30335da9f1a36a9f54f9b676cc5c467119b1478712e3ffc8e9ff7042726cf1fcf2041692a087d08904e9f19cc2722eb402323a0
+  data.tar.gz: 0ce6f765a75e38711589c03ce362e181b864a016d183a710606f623f652558096bfd3ca7d2e142dc3288c26887e25477aac93b0e1bb819bf538408eca024eb8a

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 Corey Burrows
+Copyright (c) 2017 Corey Burrows
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,39 +1,11 @@
-
 require 'rubygems'
-Gem::manage_gems
-require 'rake/gempackagetask'
 require 'rake/clean'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
-NAME = 'bitpack'
-VERS = '0.1'
-GEM_NAME = "#{NAME}-#{VERS}.gem"
+require './lib/bitpack/version'
 
 RDOC_MAIN = "README"
 
-spec = Gem::Specification.new do |s|
-  s.name             = NAME
-  s.version          = VERS
-  s.author           = "Corey Burrows"
-  s.email            = "corey.burrows@gmail.com"
-  s.platform         = Gem::Platform::RUBY
-  s.summary          = "Library for packing and unpacking binary strings."
-  s.files            = %w{README CHANGELOG LICENSE Rakefile} +
-                       Dir.glob("ext/**/*.{h,c,rb}") +
-                       Dir.glob("lib/**/*.{rb}") +
-                       Dir.glob("test/**/*.rb")
-  s.require_path     = "."
-  s.autorequire      = "bitpack"
-  s.extensions       = ["ext/extconf.rb"]
-  #s.test_file        = ""
-  s.has_rdoc         = true
-  s.extra_rdoc_files = [ RDOC_MAIN, "CHANGELOG", "LICENSE" ]
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_tar = true
-end
-
 Rake::RDocTask.new do |rd|
   rd.main = RDOC_MAIN
   rd.rdoc_files.include(RDOC_MAIN, "CHANGELOG", "LICENSE", "ext/**/*.c", "lib/**/*.rb")
@@ -45,43 +17,31 @@ CLEAN.include FileList["ext/**/*.o",
                        "ext/**/*.bundle",
                        "ext/**/Makefile",
                        "ext/**/mkmf.log",
-                       "pkg/*.gem",
+                       "*.gem",
                        "test/*.o",
                        "test/test_driver",
                        "html"
                       ]
 
 task :build do
-  Dir.chdir('ext')
-  sh('ruby extconf.rb')
-  sh('make')
-  Dir.chdir('..')
-end
-
-task :c_test do
-  Dir.chdir('test')
-  sh('make')
-  Dir.chdir('..')
-end
-
-task :ruby_test do
-  Dir.chdir('test')
-  sh('ruby bitpack_tests.rb')
-  Dir.chdir('..')
+  Dir.chdir('ext/bitpack') do
+    sh('ruby extconf.rb && make')
+  end
 end
 
-task :test => [ :build, :c_test, :ruby_test ] do
+task :test => [:build] do
+  sh('ruby test/bitpack_tests.rb')
 end
 
 task :gem do
-  sh %{rake pkg/#{GEM_NAME}}
+  sh %{gem build bitpack.gemspec}
 end
 
 task :install => :gem do
-  sh %{sudo gem install pkg/#{GEM_NAME}}
+  sh %{gem install ./bitpack-#{BitPack::VERSION}.gem}
 end
 
 task :uninstall do
-  sh %{sudo gem uninstall #{NAME}}
+  sh %{gem uninstall bitpack}
 end
 

data/ext/{bitpack.c → bitpack/bitpack.c}

@@ -315,7 +315,7 @@ int bitpack_get_bits(bitpack_t bp, unsigned long num_bits, unsigned long index,
         bitpack_get(bp, index + i, &bit);
 
         if (bit == 1) {
-            v |= bit << (num_bits - i - 1);
+            v |= (unsigned long)bit << (num_bits - i - 1);
         }
     }
 

data/ext/{bitpack_ext.c → bitpack/bitpack_ext.c}

@@ -6,7 +6,7 @@
 static VALUE cBitPack;
 
 /* mapping of BitPack error codes to ruby exceptions */
-static VALUE bp_exceptions[6];
+static VALUE bp_exceptions[7];
 
 /*
  * call-seq:
@@ -64,7 +64,7 @@ static VALUE bp_from_bytes(VALUE class, VALUE bytes_str)
 
     str = StringValue(bytes_str);
 
-    bp = bitpack_init_from_bytes((unsigned char *)RSTRING(str)->ptr, RSTRING(str)->len);
+    bp = bitpack_init_from_bytes((unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str));
 
     if (bp == NULL) {
         rb_raise(bp_exceptions[BITPACK_ERR_MALLOC_FAILED], "malloc() failed");
@@ -187,7 +187,7 @@ static VALUE bp_on(VALUE self, VALUE index)
     Data_Get_Struct(self, struct _bitpack_t, bp);
 
     if (!bitpack_on(bp, NUM2ULONG(index))) {
-        rb_raise(bp_exceptions[bitpack_get_error(bp)],
+        rb_raise(bp_exceptions[bitpack_get_error(bp)], "%s",
                 bitpack_get_error_str(bp));
     }
 
@@ -209,7 +209,7 @@ static VALUE bp_off(VALUE self, VALUE index)
     Data_Get_Struct(self, struct _bitpack_t, bp);
 
     if (!bitpack_off(bp, NUM2ULONG(index))) {
-        rb_raise(bp_exceptions[bitpack_get_error(bp)],
+        rb_raise(bp_exceptions[bitpack_get_error(bp)], "%s",
                 bitpack_get_error_str(bp));
     }
 
@@ -230,7 +230,7 @@ static VALUE bp_get(VALUE self, VALUE index)
     Data_Get_Struct(self, struct _bitpack_t, bp);
 
     if (!bitpack_get(bp, NUM2ULONG(index), &bit)) {
-        rb_raise(bp_exceptions[bitpack_get_error(bp)],
+        rb_raise(bp_exceptions[bitpack_get_error(bp)], "%s",
                 bitpack_get_error_str(bp));
     }
 
@@ -265,7 +265,7 @@ static VALUE bp_set_bits(VALUE self, VALUE value, VALUE num_bits, VALUE index)
     Data_Get_Struct(self, struct _bitpack_t, bp);
 
     if (!bitpack_set_bits(bp, NUM2ULONG(value), NUM2ULONG(num_bits), NUM2ULONG(index))) {
-        rb_raise(bp_exceptions[bitpack_get_error(bp)],
+        rb_raise(bp_exceptions[bitpack_get_error(bp)], "%s",
                 bitpack_get_error_str(bp));
     }
 
@@ -303,9 +303,9 @@ static VALUE bp_set_bytes(VALUE self, VALUE bytes, VALUE index)
 
     str = StringValue(bytes);
 
-    if (!bitpack_set_bytes(bp, (unsigned char *)RSTRING(str)->ptr,
-          RSTRING(str)->len, NUM2ULONG(index))) {
-        rb_raise(bp_exceptions[bitpack_get_error(bp)],
+    if (!bitpack_set_bytes(bp, (unsigned char *)RSTRING_PTR(str),
+          RSTRING_LEN(str), NUM2ULONG(index))) {
+        rb_raise(bp_exceptions[bitpack_get_error(bp)], "%s",
                 bitpack_get_error_str(bp));
     }
 
@@ -350,7 +350,7 @@ static VALUE bp_get_bits(VALUE self, VALUE num_bits, VALUE index)
     Data_Get_Struct(self, struct _bitpack_t, bp);
 
     if (!bitpack_get_bits(bp, NUM2ULONG(num_bits), NUM2ULONG(index), &value)) {
-        rb_raise(bp_exceptions[bitpack_get_error(bp)],
+        rb_raise(bp_exceptions[bitpack_get_error(bp)], "%s",
                 bitpack_get_error_str(bp));
     }
 
@@ -382,7 +382,7 @@ static VALUE bp_get_bytes(VALUE self, VALUE num_bytes, VALUE index)
     Data_Get_Struct(self, struct _bitpack_t, bp);
 
     if (!bitpack_get_bytes(bp, NUM2ULONG(num_bytes), NUM2ULONG(index), &bytes)) {
-        rb_raise(bp_exceptions[bitpack_get_error(bp)],
+        rb_raise(bp_exceptions[bitpack_get_error(bp)], "%s",
                 bitpack_get_error_str(bp));
     }
 
@@ -420,7 +420,7 @@ static VALUE bp_append_bits(VALUE self, VALUE value, VALUE num_bits)
     Data_Get_Struct(self, struct _bitpack_t, bp);
 
     if (!bitpack_append_bits(bp, NUM2ULONG(value), NUM2ULONG(num_bits))) {
-        rb_raise(bp_exceptions[bitpack_get_error(bp)],
+        rb_raise(bp_exceptions[bitpack_get_error(bp)], "%s",
                 bitpack_get_error_str(bp));
     }
 
@@ -463,9 +463,9 @@ static VALUE bp_append_bytes(VALUE self, VALUE value)
 
     str = StringValue(value);
 
-    if (!bitpack_append_bytes(bp, (unsigned char *)RSTRING(str)->ptr,
-          RSTRING(str)->len)) {
-        rb_raise(bp_exceptions[bitpack_get_error(bp)],
+    if (!bitpack_append_bytes(bp, (unsigned char *)RSTRING_PTR(str),
+          RSTRING_LEN(str))) {
+        rb_raise(bp_exceptions[bitpack_get_error(bp)], "%s",
                 bitpack_get_error_str(bp));
     }
 
@@ -501,7 +501,7 @@ static VALUE bp_read_bits(VALUE self, VALUE num_bits)
     Data_Get_Struct(self, struct _bitpack_t, bp);
 
     if (!bitpack_read_bits(bp, NUM2ULONG(num_bits), &value)) {
-        rb_raise(bp_exceptions[bitpack_get_error(bp)],
+        rb_raise(bp_exceptions[bitpack_get_error(bp)], "%s",
                 bitpack_get_error_str(bp));
     }
 
@@ -536,7 +536,7 @@ static VALUE bp_read_bytes(VALUE self, VALUE num_bytes)
     Data_Get_Struct(self, struct _bitpack_t, bp);
 
     if (!bitpack_read_bytes(bp, NUM2ULONG(num_bytes), &value)) {
-        rb_raise(bp_exceptions[bitpack_get_error(bp)],
+        rb_raise(bp_exceptions[bitpack_get_error(bp)], "%s",
                 bitpack_get_error_str(bp));
     }
 
@@ -562,7 +562,7 @@ static VALUE bp_to_bin(VALUE self)
     Data_Get_Struct(self, struct _bitpack_t, bp);
 
     if (!bitpack_to_bin(bp, &s)) {
-        rb_raise(bp_exceptions[bitpack_get_error(bp)],
+        rb_raise(bp_exceptions[bitpack_get_error(bp)], "%s",
                 bitpack_get_error_str(bp));
     }
 
@@ -607,7 +607,7 @@ static VALUE bp_to_bytes(VALUE self)
     Data_Get_Struct(self, struct _bitpack_t, bp);
 
     if (!bitpack_to_bytes(bp, &s, &num_bytes)) {
-        rb_raise(bp_exceptions[bitpack_get_error(bp)],
+        rb_raise(bp_exceptions[bitpack_get_error(bp)], "%s",
                 bitpack_get_error_str(bp));
     }
 
@@ -655,8 +655,5 @@ void Init_bitpack()
     bp_exceptions[BITPACK_ERR_RANGE_TOO_BIG] = rb_eRangeError;
     bp_exceptions[BITPACK_ERR_READ_PAST_END] = rb_eRangeError;
     bp_exceptions[BITPACK_ERR_EMPTY]         = rb_eRangeError;
-
-    /* require the pure ruby methods */
-    rb_require("lib/bitpack.rb");
 }
 

data/ext/{extconf.rb → bitpack/extconf.rb}

@@ -4,5 +4,5 @@ require "mkmf"
 
 $CFLAGS << ' -W -Wall'
 
-create_makefile("bitpack")
+create_makefile("bitpack/bitpack")
 

data/lib/bitpack.rb

@@ -1,4 +1,3 @@
-
 class BitPack
   # Element Assignment. Sets the bit at +index+, or the range of bits indicated
   # by the Range object +range+, or the range specified by +index+ and +length+.
@@ -51,3 +50,4 @@ class BitPack
   end
 end
 
+require "bitpack/bitpack"

data/lib/bitpack/version.rb

@@ -0,0 +1,3 @@
+class BitPack
+  VERSION = '0.2.0'
+end

data/test/bitpack_tests.rb

@@ -1,5 +1,6 @@
-
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 $:.unshift File.join(File.dirname(__FILE__), '..', 'ext')
+
 require 'bitpack'
 
 require 'test/unit'
@@ -103,7 +104,7 @@ class TC_BitPack < Test::Unit::TestCase
     assert_equal("000000001011010111111111111111111111111111111111", bp.to_bin)
     assert_equal(0, bp.get_bits(8, 0))
 
-    unsigned_long_size = [1].pack("L").size
+    unsigned_long_size = [1].pack("L_").size
 
     # error cases
     msg = sprintf("range size %d bits is too large (maximum size is %d bits)", unsigned_long_size * 8 + 1, unsigned_long_size * 8)

metadata

@@ -1,57 +1,72 @@
---- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
+--- !ruby/object:Gem::Specification
 name: bitpack
-version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2007-11-14 00:00:00 -06:00
-summary: Library for packing and unpacking binary strings.
-require_paths: 
-- .
-email: corey.burrows@gmail.com
-homepage: 
-rubyforge_project: 
-description: 
-autorequire: bitpack
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
-authors: 
+authors:
 - Corey Burrows
-files: 
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2017-08-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.1.0
+description: 
+email: corey.burrows@gmail.com
+executables: []
+extensions:
+- ext/bitpack/extconf.rb
+extra_rdoc_files:
 - README
 - CHANGELOG
 - LICENSE
+files:
+- CHANGELOG
+- LICENSE
+- README
 - Rakefile
-- ext/bitpack.h
-- ext/bitpack.c
-- ext/bitpack_ext.c
-- ext/extconf.rb
+- ext/bitpack/bitpack.c
+- ext/bitpack/bitpack.h
+- ext/bitpack/bitpack_ext.c
+- ext/bitpack/extconf.rb
 - lib/bitpack.rb
+- lib/bitpack/version.rb
 - test/bitpack_tests.rb
-test_files: []
-
+homepage: https://github.com/burrows/bitpack
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
 rdoc_options: []
-
-extra_rdoc_files: 
-- README
-- CHANGELOG
-- LICENSE
-executables: []
-
-extensions: 
-- ext/extconf.rb
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-dependencies: []
-
+rubyforge_project: 
+rubygems_version: 2.4.5.1
+signing_key: 
+specification_version: 4
+summary: Library for packing and unpacking binary strings.
+test_files: []