malloc 1.0.0 → 1.1.1

data/COPYING

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

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/packagetask'
 require 'rbconfig'
 
 PKG_NAME = 'malloc'
-PKG_VERSION = '1.0.0'
+PKG_VERSION = '1.1.1'
 CXX = ENV[ 'CXX' ] || 'g++'
 STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -54,8 +54,8 @@ desc 'Install Ruby extension'
 task :install => :all do
   verbose true do
     for f in RB_FILES do
-      FileUtils.mkdir_p "#{$SITELIBDIR}/#{File.dirname( f[ 4 .. -1 ] )}"
-      FileUtils.cp_r f, "#{$SITELIBDIR}/#{f[ 4 .. -1 ]}"
+      FileUtils.mkdir_p "#{$SITELIBDIR}/#{File.dirname f.gsub( /^lib\//, '' )}"
+      FileUtils.cp_r f, "#{$SITELIBDIR}/#{f.gsub( /^lib\//, '' )}"
     end
     FileUtils.mkdir_p $SITEARCHDIR
     FileUtils.cp SO_FILE, "#{$SITEARCHDIR}/#{File.basename SO_FILE}"
@@ -66,7 +66,7 @@ desc 'Uninstall Ruby extension'
 task :uninstall do
   verbose true do
     for f in RB_FILES do
-      FileUtils.rm_f "#{$SITELIBDIR}/#{f[ 4 .. -1 ]}"
+      FileUtils.rm_f "#{$SITELIBDIR}/#{f.gsub /^lib\//, ''}"
     end
     FileUtils.rm_f "#{$SITEARCHDIR}/#{File.basename SO_FILE}"
   end
@@ -112,6 +112,7 @@ begin
     s.has_rdoc = 'yard'
     s.extra_rdoc_files = []
     s.rdoc_options = %w{--no-private}
+    s.add_development_dependency %q{rake}
   end
   GEM_SOURCE = "#{PKG_NAME}-#{PKG_VERSION}.gem"
   $BINSPEC = Gem::Specification.new do |s|
@@ -128,7 +129,6 @@ begin
     s.test_files = TC_FILES
     s.require_paths = [ 'lib', 'ext' ]
     s.rubyforge_project = %q{hornetseye}
-    s.add_development_dependency %q{rake}
     s.has_rdoc = 'yard'
     s.extra_rdoc_files = []
     s.rdoc_options = %w{--no-private}
@@ -137,15 +137,17 @@ begin
   desc "Build the gem file #{GEM_SOURCE}"
   task :gem => [ "pkg/#{GEM_SOURCE}" ]
   file "pkg/#{GEM_SOURCE}" => [ 'pkg' ] + $SPEC.files do
-    Gem::Builder.new( $SPEC ).build
-    verbose true do
-      FileUtils.mv GEM_SOURCE, "pkg/#{GEM_SOURCE}"
+    when_writing 'Creating GEM' do
+      Gem::Builder.new( $SPEC ).build
+      verbose true do
+        FileUtils.mv GEM_SOURCE, "pkg/#{GEM_SOURCE}"
+      end
     end
   end
   desc "Build the gem file #{GEM_BINARY}"
   task :gem_binary => [ "pkg/#{GEM_BINARY}" ]
   file "pkg/#{GEM_BINARY}" => [ 'pkg' ] + $BINSPEC.files do
-    when_writing 'Creating GEM' do
+    when_writing 'Creating binary GEM' do
       Gem::Builder.new( $BINSPEC ).build
       verbose true do
         FileUtils.mv GEM_BINARY, "pkg/#{GEM_BINARY}"
@@ -160,8 +162,7 @@ rule '.o' => '.cc' do |t|
    sh "#{CXX} #{$CXXFLAGS} -c -o #{t.name} #{t.source}"
 end
 
-file 'ext/error.o' => [ 'ext/error.cc', 'ext/error.hh' ]
 file 'ext/malloc.o' => [ 'ext/malloc.cc', 'ext/malloc.hh', 'ext/error.hh' ]
 
 CLEAN.include 'ext/*.o'
-CLOBBER.include SO_FILE, 'doc'
+CLOBBER.include SO_FILE, 'doc', '.yardoc'

data/ext/error.hh

@@ -35,11 +35,10 @@ public:
   virtual const char* what(void) const throw() {
     temp = m_message.str();
     return temp.c_str();
-    return NULL;
   }
 protected:
   std::ostringstream m_message;
-  static std::string temp;
+  mutable std::string temp;
 };
 
 #define ERRORMACRO( condition, class, params, message ) \

data/ext/malloc.cc

@@ -53,7 +53,7 @@ VALUE Malloc::mallocNew( VALUE rbClass, VALUE rbSize )
                 << " bytes of memory" );
     retVal = Data_Wrap_Struct( rbClass, 0, xfree, (void *)self );
   } catch( std::exception &e ) {
-    rb_raise( rb_eRuntimeError, e.what() );
+    rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return retVal;
 }
@@ -68,7 +68,7 @@ VALUE Malloc::mallocPlus( VALUE rbSelf, VALUE rbOffset )
                 << offset << ')' );
     retVal = Data_Wrap_Struct( cRubyClass, 0, 0, (void *)( self + offset ) );
   } catch( std::exception &e ) {
-    rb_raise( rb_eRuntimeError, e.what() );
+    rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return retVal;
 }

data/lib/malloc_ext.rb

@@ -1,3 +1,19 @@
+# malloc - Raw memory allocation for Ruby
+# Copyright (C) 2010 Jan Wedekind
+#
+# 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 3 of the License, 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/>.
+
 # String#bytesize is defined if it does not exist already
 class String
 
@@ -29,13 +45,15 @@ module Hornetseye
       # Allocate the specified number of bytes of raw memory.
       #
       # @example Allocate raw memory
-      # require 'malloc'
-      # include Hornetseye
-      # m = Malloc.new 32
-      # # Malloc(32)
+      #   require 'malloc'
+      #   include Hornetseye
+      #   m = Malloc.new 32
+      #   # Malloc(32)
       #
       # @param [Integer] size Number of bytes to allocate.
       # @return [Malloc] A new Malloc object.
+      #
+      # @see Malloc
       def new( size )
         retval = orig_new size
         retval.instance_eval { @size = size }
@@ -49,13 +67,13 @@ module Hornetseye
     # Number of bytes allocated
     #
     # @example Querying size of allocated memory
-    # require 'malloc'
-    # include Hornetseye
-    # m = Malloc.new 32
-    # m.size
-    # # 32
-    # ( m + 8 ).size
-    # # 24
+    #   require 'malloc'
+    #   include Hornetseye
+    #   m = Malloc.new 32
+    #   m.size
+    #   # 32
+    #   ( m + 8 ).size
+    #   # 24
     #
     # @return [Integer] Size of allocated memory.
     attr_reader :size
@@ -63,9 +81,9 @@ module Hornetseye
     # Display information about this object
     #
     # @example Displaying information about a Malloc object
-    # require 'malloc'
-    # Hornetseye::Malloc.new( 8 ).inspect
-    # "Malloc(8)"
+    #   require 'malloc'
+    #   Hornetseye::Malloc.new( 8 ).inspect
+    #   "Malloc(8)"
     #
     # @return [String] A string with information about this object.
     def inspect
@@ -75,12 +93,12 @@ module Hornetseye
     # Read data from memory
     #
     # @example Convert data of Malloc object to string
-    # require 'malloc'
-    # include Hornetseye
-    # m = Malloc.new 5
-    # m.write 'abcde'
-    # m.to_s
-    # "abcde"
+    #   require 'malloc'
+    #   include Hornetseye
+    #   m = Malloc.new 5
+    #   m.write 'abcde'
+    #   m.to_s
+    #   "abcde"
     #
     # @return [String] A string containing the data.
     #
@@ -92,15 +110,15 @@ module Hornetseye
     # Operator for doing pointer arithmetic
     #
     # @example Pointer arithmetic
-    # require 'malloc'
-    # include Hornetseye
-    # m = Malloc.new 4
-    # # Malloc(4)
-    # m.write 'abcd'
-    # n = m + 2
-    # # Malloc(2)
-    # n.read 2
-    # # "cd"
+    #   require 'malloc'
+    #   include Hornetseye
+    #   m = Malloc.new 4
+    #   # Malloc(4)
+    #   m.write 'abcd'
+    #   n = m + 2
+    #   # Malloc(2)
+    #   n.read 2
+    #   # "cd"
     #
     # @param [Integer] offset Non-negative offset for pointer.
     # @return [Malloc] A new Malloc object.
@@ -119,13 +137,13 @@ module Hornetseye
     # Read data from memory
     #
     # @example Reading and writing data
-    # require 'malloc'
-    # include Hornetseye
-    # m = Malloc.new 4
-    # # Malloc(4)
-    # m.write 'abcd'
-    # m.read 2
-    # # "ab"
+    #   require 'malloc'
+    #   include Hornetseye
+    #   m = Malloc.new 4
+    #   # Malloc(4)
+    #   m.write 'abcd'
+    #   m.read 2
+    #   # "ab"
     #
     # @param [Integer] length Number of bytes to read.
     # @return [String] A string containing the data.
@@ -143,13 +161,13 @@ module Hornetseye
     # Write data to memory
     #
     # @example Reading and writing data
-    # require 'malloc'
-    # include Hornetseye
-    # m = Malloc.new 4
-    # # Malloc(4)
-    # m.write 'abcd'
-    # m.read 2
-    # # "ab"
+    #   require 'malloc'
+    #   include Hornetseye
+    #   m = Malloc.new 4
+    #   # Malloc(4)
+    #   m.write 'abcd'
+    #   m.read 2
+    #   # "ab"
     #
     # @param [String] string A string with the data.
     # @return [String] Returns the parameter +string+.
@@ -167,4 +185,22 @@ module Hornetseye
 
   end
 
+  # Shortcut for instantiating Malloc object
+  #
+  # @example Create malloc object
+  #   require 'malloc'
+  #   include Hornetseye
+  #   m = Malloc 4
+  #   # Malloc(4)
+  #
+  # @param [Integer] size Number of bytes to allocate.
+  # @return [Malloc] A new Malloc object.
+  #
+  # @see Malloc.new
+  def Malloc( size )
+    Malloc.new size
+  end
+
+  module_function :Malloc
+
 end

data/test/tc_malloc.rb

@@ -1,3 +1,19 @@
+# malloc - Raw memory allocation for Ruby
+# Copyright (C) 2010 Jan Wedekind
+#
+# 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 3 of the License, 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/>.
+
 require 'test/unit'
 Kernel::require 'malloc'
 
@@ -5,6 +21,7 @@ class TC_Malloc < Test::Unit::TestCase
 
   def test_new
     assert_nothing_raised { Hornetseye::Malloc.new 32 }
+    assert_nothing_raised { Hornetseye::Malloc 32 }
     assert_raise( ArgumentError ) { Hornetseye::Malloc.new }
   end
 

data/test/ts_malloc.rb

@@ -1,3 +1,19 @@
 #!/usr/bin/env ruby
+# malloc - Raw memory allocation for Ruby
+# Copyright (C) 2010 Jan Wedekind
+#
+# 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 3 of the License, 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/>.
+
 require 'tc_malloc'
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: malloc
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -9,10 +14,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 +00:00
+date: 2010-09-25 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 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: []
@@ -27,11 +44,10 @@ files:
 - COPYING
 - .document
 - lib/malloc_ext.rb
-- ext/error.cc
 - ext/malloc.cc
 - ext/init.cc
-- ext/error.hh
 - ext/malloc.hh
+- ext/error.hh
 - test/ts_malloc.rb
 - test/tc_malloc.rb
 has_rdoc: yard
@@ -45,21 +61,25 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: hornetseye
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Object for raw memory allocation and pointer operations

data/ext/error.cc

@@ -1,20 +0,0 @@
-/* HornetsEye - Computer Vision with Ruby
-   Copyright (C) 2006, 2007, 2008, 2009  Jan Wedekind
-
-   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 3 of the License, 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/>. */
-#include "error.hh"
-
-using namespace std;
-
-string Error::temp;