malloc 1.4.0 → 1.5.0

data/COPYING

@@ -80,7 +80,7 @@ modification follow.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
- 
+
   "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
@@ -513,7 +513,7 @@ actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
-  
+
   If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'malloc'
-PKG_VERSION = '1.4.0'
+PKG_VERSION = '1.5.0'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -22,6 +22,7 @@ BIN_FILES = [ 'README.md', 'COPYING', '.document', SO_FILE ] +
             RB_FILES + TS_FILES + TC_FILES
 SUMMARY = %q{Object for raw memory allocation and pointer operations}
 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.}
+LICENSE = 'GPL-3+'
 AUTHOR = %q{Jan Wedekind}
 EMAIL = %q{jan@wedesoft.de}
 HOMEPAGE = %q{http://wedesoft.github.com/malloc/}
@@ -81,13 +82,24 @@ end
 begin
   require 'yard'
   YARD::Rake::YardocTask.new :yard do |y|
-    y.options << '--no-private'
-    y.files << FileList[ 'lib/**/*.rb' ]
+    y.files << RB_FILES
   end
 rescue LoadError
   STDERR.puts 'Please install \'yard\' if you want to generate documentation'
 end
 
+begin
+  require 'fpm'
+  desc 'Create Debian package'
+  task :deb => :gem do
+    system "fpm -f -s gem -t deb -n #{PKG_NAME} -m '#{AUTHOR} <#{EMAIL}>' " +
+           "--deb-priority optional -d ruby1.9.1 " +
+           "pkg/#{PKG_NAME}-#{PKG_VERSION}.gem"
+  end
+rescue LoadError
+  STDERR.puts 'Please install \'fpm\' if you want to create Debian packages'
+end
+
 Rake::PackageTask.new PKG_NAME, PKG_VERSION do |p|
   p.need_tar = true
   p.package_files = PKG_FILES
@@ -103,6 +115,7 @@ begin
     s.date = Date.today.to_s
     s.summary = SUMMARY
     s.description = DESCRIPTION
+    s.license = LICENSE
     s.author = AUTHOR
     s.email = EMAIL
     s.homepage = HOMEPAGE
@@ -113,7 +126,6 @@ begin
     s.extensions = %w{Rakefile}
     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"
@@ -124,6 +136,7 @@ begin
     s.date = Date.today.to_s
     s.summary = SUMMARY
     s.description = DESCRIPTION
+    s.license = LICENSE
     s.author = AUTHOR
     s.email = EMAIL
     s.homepage = HOMEPAGE
@@ -133,7 +146,6 @@ begin
     s.rubyforge_project = %q{hornetseye}
     s.has_rdoc = 'yard'
     s.extra_rdoc_files = []
-    s.rdoc_options = %w{--no-private}
   end
   GEM_BINARY = "#{PKG_NAME}-#{PKG_VERSION}-#{$BINSPEC.platform}.gem"
   desc "Build the gem file #{GEM_SOURCE}"

data/ext/malloc.cc

@@ -40,6 +40,8 @@ VALUE Malloc::init( VALUE rbModule )
                     RUBY_METHOD_FUNC( mallocRead ), 1 );
   rb_define_method( cRubyClass, "orig_write",
                     RUBY_METHOD_FUNC( mallocWrite ), -1 );
+  rb_define_method( cRubyClass, "to_i",
+                    RUBY_METHOD_FUNC( mallocToI ), 0 );
   return cRubyClass;
 }
 
@@ -105,3 +107,9 @@ VALUE Malloc::mallocWrite( int argc, VALUE *rbArgv, VALUE rbSelf )
   return retVal;
 }
 
+VALUE Malloc::mallocToI( VALUE rbSelf )
+{
+  char *self; Data_Get_Struct( rbSelf, char, self );
+  return LONG2NUM((long)self);
+}
+

data/ext/malloc.hh

@@ -27,6 +27,7 @@ public:
   static VALUE mallocPlus( VALUE rbSelf, VALUE rbOffset );
   static VALUE mallocRead( VALUE rbSelf, VALUE rbLength );
   static VALUE mallocWrite( int argc, VALUE *rbArgv, VALUE rbSelf );
+  static VALUE mallocToI( VALUE rbSelf );
 };
 
 #endif

data/lib/malloc_ext.rb

@@ -29,7 +29,7 @@ class String
     end
 
   end
-  
+
 end
 
 # Namespace of the Hornetseye project.
@@ -60,6 +60,26 @@ module Hornetseye
 
       private :orig_new
 
+      # Create new Malloc object with aligned memory
+      #
+      # Allocate memory with specified alignment
+      #
+      # @example Allocate raw memory
+      #   m = Malloc.align 256, 16
+      #   # Malloc(256)
+      #
+      # @param [Integer] size Number of bytes to allocate.
+      # @param [Integer] alignment Page size of memory to align with
+      # @return [Malloc] A new Malloc object.
+      #
+      # @see Malloc
+      def align size, alignment
+        offset = alignment - 1
+        retval = Malloc.new size + offset
+        incr = ((retval.to_i + offset) & ~offset) - retval.to_i
+        retval + incr
+      end
+
     end
 
     # Number of bytes allocated

data/test/tc_malloc.rb

@@ -77,4 +77,9 @@ class TC_Malloc < Test::Unit::TestCase
     assert_raise( RuntimeError ) { ( m + 2 ).read 5 }
   end
 
+  def test_align
+    m = Malloc.align 256, 16
+    assert_equal 0, m.to_i & 15
+  end
+
 end

metadata

@@ -1,88 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: malloc
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 4
-  - 0
-  version: 1.4.0
+version: !ruby/object:Gem::Version
+  version: 1.5.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jan Wedekind
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-30 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-05-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        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.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+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: 
+extensions:
 - Rakefile
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - README.md
 - COPYING
 - .document
 - lib/malloc_ext.rb
-- ext/malloc.cc
 - ext/init.cc
+- ext/malloc.cc
+- ext/error.hh
 - ext/malloc.hh
 - ext/rubyinc.hh
-- ext/error.hh
 - test/ts_malloc.rb
 - test/tc_malloc.rb
-has_rdoc: yard
 homepage: http://wedesoft.github.com/malloc/
-licenses: []
-
+licenses:
+- GPL-3+
 post_install_message: 
-rdoc_options: 
-- --no-private
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: hornetseye
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Object for raw memory allocation and pointer operations
-test_files: 
+test_files:
 - test/tc_malloc.rb