malloc 0.1.6 → 0.2.0

data/COPYING

@@ -1,5 +1,5 @@
-  This is the license for the Ruby extension "Malloc".
- Copyright (C) 2009 Jan Wedekind, Sheffield, United Kingdom.
+  This is the license for the computer vision library Hornetseye.
+ Copyright (C) 2006, 2007, 2008, 2009 Jan Wedekind, Sheffield, United Kingdom.
 
 
 		    GNU GENERAL PUBLIC LICENSE

data/Makefile

@@ -2,41 +2,71 @@
 .SUFFIXES: .gem .o .cc .hh .rb .tar .gz .bz2
 
 RUBY_VERSION = 1.8
-MALLOC_VERSION = 0.1.6
+MALLOC_VERSION = 0.2.0
 
+CP = cp
+RM = rm -f
+MKDIR = mkdir -p
 GEM = gem$(RUBY_VERSION)
 RUBY = ruby$(RUBY_VERSION)
 TAR = tar
+GIT = git
+SITELIBDIR = $(shell $(RUBY) -r mkmf -e "puts \"\#{Config::CONFIG['sitelibdir']}\"")
+SITEARCHDIR = $(shell $(RUBY) -r mkmf -e "puts \"\#{Config::CONFIG['sitearchdir']}\"")
 
-MAIN = Makefile malloc.gemspec binary.gemspec README COPYING
+MAIN = Makefile source.gemspec binary.gemspec README COPYING
 EXT = ext/extconf.rb $(wildcard ext/*.cc) $(wildcard ext/*.hh)
 LIB = $(wildcard lib/*.rb)
-TESTS = $(wildcard test/*.rb)
+TEST = $(wildcard test/*.rb)
 DOC = $(wildcard doc/*.rb)
-SOURCES = $(MAIN) $(EXT) $(LIB) $(TESTS) $(DOC)
+SOURCES = $(MAIN) $(EXT) $(LIB) $(TEST) $(DOC)
 
-all:: malloc-$(MALLOC_VERSION).gem
+all:: target
 
-check:: ext/malloc.so $(LIB) $(TESTS)
-	$(RUBY) -Iext -Ilib $(TESTS)
+target:: ext/malloc.so
 
-binary:: binary.gemspec ext/malloc.so $(LIB)
+gem:: malloc-$(MALLOC_VERSION).gem
+
+binary-gem:: binary.gemspec ext/malloc.so $(LIB)
 	$(GEM) build binary.gemspec
 
-install:: malloc-$(MALLOC_VERSION).gem
-	$(GEM) install $<
+install:: ext/malloc.so $(LIB)
+	$(MKDIR) $(SITELIBDIR)
+	$(MKDIR) $(SITEARCHDIR)
+	$(CP) $(LIB) $(SITELIBDIR)
+	$(CP) ext/malloc.so $(SITEARCHDIR)
 
 uninstall::
+	$(RM) $(addprefix $(SITELIBDIR)/,$(notdir $(LIB)))
+	$(RM) $(addprefix $(SITEARCHDIR)/,malloc.so)
+
+install-gem:: malloc-$(MALLOC_VERSION).gem
+	$(GEM) install --local $<
+
+uninstall-gem::
 	$(GEM) uninstall malloc || echo Nothing to uninstall
 
-dist:: malloc.tar.gz
+check:: ext/malloc.so $(LIB) $(TEST)
+	$(RUBY) -rrubygems -Iext -Ilib -Itest test/ts_malloc.rb
+
+push-gem:: malloc-$(MALLOC_VERSION).gem
+	echo Pushing $< in 3 seconds!
+	sleep 3
+	$(GEM) push $<
 
-dist-gzip:: malloc.tar.gz
+push-git::
+	echo Pushing to origin in 3 seconds!
+	sleep 3
+	$(GIT) push origin master
 
-dist-bzip2:: malloc.tar.bz2
+dist:: dist-gzip
 
-malloc-$(MALLOC_VERSION).gem: malloc.gemspec README $(EXT) $(LIB) $(TESTS) $(DOC)
-	$(GEM) build malloc.gemspec
+dist-gzip:: malloc-$(MALLOC_VERSION).tar.gz
+
+dist-bzip2:: malloc-$(MALLOC_VERSION).tar.bz2
+
+malloc-$(MALLOC_VERSION).gem: $(SOURCES)
+	$(GEM) build source.gemspec
 
 ext/Makefile: ext/extconf.rb
 	cd ext && $(RUBY) extconf.rb && cd ..
@@ -44,11 +74,12 @@ ext/Makefile: ext/extconf.rb
 ext/malloc.so: ext/Makefile $(EXT)
 	cd ext && $(MAKE) && cd ..
 
-malloc.tar.gz: $(SOURCES)
+malloc-$(MALLOC_VERSION).tar.gz: $(SOURCES)
 	$(TAR) czf $@ $(SOURCES)
 
-malloc.tar.bz2: $(SOURCES)
+malloc-$(MALLOC_VERSION).tar.bz2: $(SOURCES)
 	$(TAR) cjf $@ $(SOURCES)
 
 clean::
 	rm -f *~ ext/*~ ext/*.o ext/*.so ext/Makefile lib/*~ lib/*.so test/*~ doc/*~ *.gem
+

data/README

@@ -1,11 +1,2 @@
-This software is very experimental at the moment.
-The most pressing problem is to achieve a good combination of support across operating systems, support across Ruby versions, and ease of installation for everyone.
-
-http://www.wedesoft.demon.co.uk/hornetseye-api/files/Installation-txt.html
-http://rake-compiler.rubyforge.org/
-http://pkg-ruby-extras.alioth.debian.org/upstream-devs.html
-http://nsis.sourceforge.net/
-http://rubyforge.org/tracker/index.php?func=detail&aid=24036&group_id=126&atid=578
-http://rubyforge.org/pipermail/rubygems-developers/2009-April/004522.html
-http://rubyforge.org/tracker/index.php?func=detail&aid=27503&group_id=126&atid=575
+This Ruby extension defines the class Hornetseye::Malloc. Hornetseye::Malloc#new allows you to allocate memory, using Hornetseye::Malloc#+ one can do pointer manipulation, and Hornetseye::Malloc#read and Hornetseye::Malloc#write provide reading Ruby strings from memory and writing Ruby strings to memory.
 

data/binary.gemspec

@@ -0,0 +1,22 @@
+require 'date'
+Gem::Specification.new do |s|
+  s.name = %q{malloc}
+  s.version = '0.2.0'
+  s.platform = Gem::Platform::CURRENT
+  s.date = Date.today.to_s
+  s.summary = %q{Object for raw memory allocation and pointer operations}
+  s.description = %q{This Ruby extension defines the class Hornetseye::Malloc. Hornetseye::Malloc#new allows you to allocate memory, using Hornetseye::Malloc#+ one can do pointer manipulation, and Hornetseye::Malloc#read and Hornetseye::Malloc#write provide reading Ruby strings from memory and writing Ruby strings to memory.}
+  s.author = %q{Jan Wedekind}
+  s.email = %q{jan@wedesoft.de}
+  s.homepage = %q{http://wedesoft.github.com/malloc/}
+  s.files = [ 'README', 'COPYING' ] +
+            Dir.glob( 'lib/*.rb' ) +
+            [ 'ext/malloc.so' ] +
+            Dir.glob( 'test/*.rb' )
+  s.test_files = Dir.glob( 'test/tc_*.rb' )
+  s.require_paths = [ 'lib', 'ext' ]
+  s.rubyforge_project = %q{hornetseye}
+  s.has_rdoc = true
+  s.extra_rdoc_files = [ 'README' ]
+  s.rdoc_options = %w{--exclude=/Makefile|.*\.(cc|hh|rb)/ --main README}
+end

data/ext/init.cc

@@ -29,7 +29,8 @@ extern "C" {
 
   void Init_malloc(void)
   {
-    Malloc::init();
+    VALUE rbHornetseye = rb_define_module( "Hornetseye" );
+    Malloc::init( rbHornetseye );
     rb_require( "malloc_ext.rb" );
   }
 

data/ext/malloc.cc

@@ -29,9 +29,9 @@ using namespace std;
 
 VALUE Malloc::cRubyClass = Qnil;
 
-VALUE Malloc::init(void)
+VALUE Malloc::init( VALUE rbModule )
 {
-  cRubyClass = rb_define_class( "Malloc", rb_cObject );
+  cRubyClass = rb_define_class_under( rbModule, "Malloc", rb_cObject );
   rb_define_singleton_method( cRubyClass, "new",
                               RUBY_METHOD_FUNC( mallocNew ), 1 );
   rb_define_method( cRubyClass, "+",

data/ext/malloc.hh

@@ -22,7 +22,7 @@ class Malloc
 {
 public:
   static VALUE cRubyClass;
-  static VALUE init(void);
+  static VALUE init( VALUE rbModule );
   static VALUE mallocNew( VALUE rbClass, VALUE rbSize );
   static VALUE mallocPlus( VALUE rbSelf, VALUE rbOffset );
   static VALUE mallocRead( VALUE rbSelf, VALUE rbLength );

data/lib/malloc_ext.rb

@@ -1,59 +1,63 @@
-class String
+module Hornetseye
 
-  unless method_defined? :bytesize
+  class Malloc
 
-    def bytesize
-      size
-    end
+    class << self
 
-  end
-  
-end
+      alias_method :orig_new, :new
 
-class Malloc
+      def new( size )
+        retval = orig_new size
+        retval.instance_eval { @size = size }
+        retval
+      end
 
-  class << self
+    end
 
-    alias_method :orig_new, :new
+    attr_reader :size
 
-    def new( size )
-      retval = orig_new size
-      retval.instance_eval { @size = size }
+    alias_method :orig_plus, :+
+
+    def +( offset )
+      if offset > @size
+        raise "Offset must not be more than #{@size} (but was #{offset})"
+      end
+      mark, size = self, @size - offset
+      retval = orig_plus offset
+      retval.instance_eval { @mark, @size = mark, size }
       retval
     end
 
-  end
+    alias_method :orig_read, :read
 
-  attr_reader :size
+    def read( length )
+      raise "Only #{@size} bytes of memory left to read " +
+        "(illegal attempt to read #{length} bytes)" if length > @size
+      orig_read length
+    end
 
-  alias_method :orig_plus, :+
+    alias_method :orig_write, :write
 
-  def +( offset )
-    if offset > @size
-      raise "Offset must not be more than #{@size} (but was #{offset})"
+    def write( string )
+      if string.bytesize > @size
+        raise "Must not write more than #{@size} bytes of memory " +
+          "(illegal attempt to write #{string.bytesize} bytes)"
+      end
+      orig_write string
     end
-    mark, size = self, @size - offset
-    retval = orig_plus offset
-    retval.instance_eval { @mark, @size = mark, size }
-    retval
+
   end
 
-  alias_method :orig_read, :read
+end
 
-  def read( length )
-    raise "Only #{@size} bytes of memory left to read " +
-      "(illegal attempt to read #{length} bytes)" if length > @size
-    orig_read length
-  end
+class String
 
-  alias_method :orig_write, :write
+  unless method_defined? :bytesize
 
-  def write( string )
-    if string.bytesize > @size
-      raise "Must not write more than #{@size} bytes of memory " +
-        "(illegal attempt to write #{string.bytesize} bytes)"
+    def bytesize
+      size
     end
-    orig_write string
-  end
 
+  end
+  
 end

data/source.gemspec

@@ -0,0 +1,28 @@
+require 'date'
+Gem::Specification.new do |s|
+  s.name = %q{malloc}
+  s.version = '0.2.0'
+  s.platform = Gem::Platform::RUBY
+  s.date = Date.today.to_s
+  s.summary = %q{Object for raw memory allocation and pointer operations}
+  s.description = %q{This Ruby extension defines the class Hornetseye::Malloc. Hornetseye::Malloc#new allows you to allocate memory, using Hornetseye::Malloc#+ one can do pointer manipulation, and Hornetseye::Malloc#read and Hornetseye::Malloc#write provide reading Ruby strings from memory and writing Ruby strings to memory.}
+  s.author = %q{Jan Wedekind}
+  s.email = %q{jan@wedesoft.de}
+  s.homepage = %q{http://wedesoft.github.com/malloc/}
+  s.files = [ 'source.gemspec', 'binary.gemspec', 'Makefile', 'README',
+              'COPYING' ] +
+            Dir.glob( 'lib/*.rb' ) +
+            Dir.glob( 'ext/*.cc' ) +
+            Dir.glob( 'ext/*.hh' ) +
+            [ 'ext/extconf.rb' ] +
+            Dir.glob( 'test/*.rb' )
+  s.test_files = Dir.glob( 'test/tc_*.rb' )
+  # s.default_executable = %q{...}
+  # s.executables = Dir.glob( 'bin/*' ).collect { |f| File.basename f }
+  s.require_paths = [ 'lib', 'ext' ]
+  s.rubyforge_project = %q{hornetseye}
+  s.extensions = %w{ext/extconf.rb}
+  s.has_rdoc = true
+  s.extra_rdoc_files = [ 'README' ]
+  s.rdoc_options = %w{--exclude=/Makefile|.*\.(cc|hh|rb)/ --main README}
+end

data/test/tc_malloc.rb

@@ -0,0 +1,31 @@
+require 'test/unit'
+require 'malloc'
+
+class TC_Malloc < Test::Unit::TestCase
+
+  def test_new
+    assert_nothing_raised { Hornetseye::Malloc.new 32 }
+    assert_raise( ArgumentError ) { Hornetseye::Malloc.new }
+  end
+
+  def test_read_write
+    m = Hornetseye::Malloc.new 6
+    m.write 'abcdef'
+    assert_equal 'abcdef', m.read( 6 )
+    m.write 'ghi'
+    assert_equal 'ghidef', m.read( 6 )
+    assert_raise( RuntimeError ) { m.read 7 }
+    assert_raise( RuntimeError ) { m.write 'abcdefg' }
+  end
+
+  def test_plus
+    assert_raise( RuntimeError ) { Hornetseye::Malloc.new( 2 ) + ( -1 ) }
+    assert_nothing_raised { Hornetseye::Malloc.new( 2 ) + 2 }
+    assert_raise( RuntimeError ) { Hornetseye::Malloc.new( 2 ) + 3 }
+    m = Hornetseye::Malloc.new 6
+    m.write 'abcdef'
+    assert_equal 'cde', ( m + 2 ).read( 3 )
+    assert_raise( RuntimeError ) { ( m + 2 ).read 5 }
+  end
+
+end

data/test/ts_malloc.rb

@@ -1,31 +1,3 @@
-require 'test/unit'
-require 'malloc'
+#!/usr/bin/env ruby
+require 'tc_malloc'
 
-class TC_Malloc < Test::Unit::TestCase
-
-  def test_new
-    assert_nothing_raised { Malloc.new 32 }
-    assert_raise( ArgumentError ) { Malloc.new }
-  end
-
-  def test_read_write
-    m = Malloc.new 6
-    m.write 'abcdef'
-    assert_equal 'abcdef', m.read( 6 )
-    m.write 'ghi'
-    assert_equal 'ghidef', m.read( 6 )
-    assert_raise( RuntimeError ) { m.read 7 }
-    assert_raise( RuntimeError ) { m.write 'abcdefg' }
-  end
-
-  def test_plus
-    assert_raise( RuntimeError ) { Malloc.new( 2 ) + ( -1 ) }
-    assert_nothing_raised { Malloc.new( 2 ) + 2 }
-    assert_raise( RuntimeError ) { Malloc.new( 2 ) + 3 }
-    m = Malloc.new 6
-    m.write 'abcdef'
-    assert_equal 'cde', ( m + 2 ).read( 3 )
-    assert_raise( RuntimeError ) { ( m + 2 ).read 5 }
-  end
-
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: malloc
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -9,20 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 +00:00
+date: 2009-12-09 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
-description: This gem defines the class Malloc. Malloc#new allows you to allocate memory, using Malloc#+ one can do pointer manipulation, and Malloc#read and Malloc#write provide reading Ruby strings from memory and writing Ruby strings to memory.
+description: This Ruby extension defines the class Hornetseye::Malloc. Hornetseye::Malloc#new allows you to allocate memory, using Hornetseye::Malloc#+ one can do pointer manipulation, and Hornetseye::Malloc#read and Hornetseye::Malloc#write provide reading Ruby strings from memory and writing Ruby strings to memory.
 email: jan@wedesoft.de
 executables: []
 
 extensions: 
 - ext/extconf.rb
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README
 files: 
-- malloc.gemspec
+- source.gemspec
+- binary.gemspec
 - Makefile
 - README
 - COPYING
@@ -34,13 +35,16 @@ files:
 - ext/malloc.hh
 - ext/extconf.rb
 - test/ts_malloc.rb
+- test/tc_malloc.rb
 has_rdoc: true
 homepage: http://wedesoft.github.com/malloc/
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --exclude=/Makefile|.*\.(cc|hh|rb)/
+- --main
+- README
 require_paths: 
 - lib
 - ext
@@ -64,4 +68,4 @@ signing_key:
 specification_version: 3
 summary: Object for raw memory allocation and pointer operations
 test_files: 
-- test/ts_malloc.rb
+- test/tc_malloc.rb

data/malloc.gemspec

@@ -1,27 +0,0 @@
-require 'date'
-Gem::Specification.new do |s|
-  s.name = %q{malloc}
-  s.version = '0.1.6'
-  s.platform = Gem::Platform::RUBY
-  s.date = Date.today.to_s
-  s.summary = %q{Object for raw memory allocation and pointer operations}
-  s.description = %q{This gem defines the class Malloc. Malloc#new allows you to allocate memory, using Malloc#+ one can do pointer manipulation, and Malloc#read and Malloc#write provide reading Ruby strings from memory and writing Ruby strings to memory.}
-  s.author = %q{Jan Wedekind}
-  s.email = %q{jan@wedesoft.de}
-  s.homepage = %q{http://wedesoft.github.com/malloc/}
-  s.files = [ 'malloc.gemspec', 'Makefile', 'README', 'COPYING' ] +
-            Dir.glob( 'lib/*.rb' ) +
-            Dir.glob( 'ext/*.cc' ) +
-            Dir.glob( 'ext/*.hh' ) +
-            [ 'ext/extconf.rb',
-              'test/ts_malloc.rb' ]
-  s.test_files = [ 'test/ts_malloc.rb' ]
-  # s.default_executable = %q{...}
-  # s.executables = Dir.glob( 'bin/*' ).collect { |f| File.basename f }
-  s.require_paths = [ 'lib', 'ext' ]
-  s.rubyforge_project = %q{hornetseye}
-  s.extensions = %w{ext/extconf.rb}
-  s.has_rdoc = false
-  # s.extra_rdoc_files = [ 'README' ]
-  # s.rdoc_options = %w{--main README}
-end