purecdb 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fca6f6f647583ae3cc4025f677f80abb82599d85
+  data.tar.gz: 9f60409470e5fd6f85f05719db05abc4ad173d81
+SHA512:
+  metadata.gz: 06322d92a058c1ea7ff4de8fe668d2713c14989c34025ca04c1686850484c391917e4f60a81e5a061ca27b0bbb3d8f9b80487cb064bdec7e74f206fde538a8ad
+  data.tar.gz: 3bf61f1a8a35f6958a909ca8cddd26dcb917257e3dfa9f5040175987a402dd2b6a153f3020dca283da2176410b2e7144f8bf10494711e9df10b648d6e894ac72

data/Dockerfile

@@ -0,0 +1,12 @@
+# -*- sh -*-
+FROM ruby:2.2
+
+RUN gem install -n /usr/bin bundler
+RUN gem install -n /usr/bin rake
+
+RUN apt-get update && apt-get install -y tinycdb && apt-get clean
+
+ADD bundle_config /usr/local/bundle/config
+
+WORKDIR /app
+

data/Gemfile.lock

@@ -1,12 +1,16 @@
 PATH
   remote: .
   specs:
-    purecdb (0.1.0)
+    purecdb (1.1.0)
+      ffi-mmap
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
+    ffi (1.9.14)
+    ffi-mmap (0.2.0)
+      ffi
     json (1.8.3)
     rake (10.4.2)
     rdoc (4.2.2)
@@ -34,3 +38,6 @@ DEPENDENCIES
   rake (~> 10.0)
   rdoc
   rspec
+
+BUNDLED WITH
+   1.12.5

data/Makefile

@@ -1,13 +1,5 @@
+IMAGE=purecdb
 
-BX=bundle exec
+include Rules.mk
 
-rdoc:
-	rm -rf doc
-	${BX} rdoc --main=README.md -O -U -x'~' README.md lib
 
-.PHONY: spec
-spec:
-	${BX} rspec
-
-bundle:
-	bundle install --path vendor/bundle

data/Rules.mk

@@ -0,0 +1,33 @@
+DR=docker run -t -i -v ${PWD}:/app ${IMAGE}
+B=${DR} bundle
+BE=${B} exec
+
+build: container
+	echo Building gem
+	rm -f pkg/*
+	${BE} rake build
+
+push: build
+	gem push `/bin/ls -q pkg/* | tail -n1`
+
+container: Dockerfile
+	docker build -t ${IMAGE} .
+
+update: container
+	${B} update
+
+bundle: container
+	${B} install --binstubs ./bin --path=./vendor/bundle
+
+rdoc:
+	rm -rf doc
+	${BE} rdoc --main=README.md -O -U -x'~' README.md lib
+
+.PHONY: spec
+spec:
+	${BE} rspec ./spec
+
+
+cli:
+	${DR} /bin/bash -l
+

data/bundle_config

@@ -0,0 +1,3 @@
+---
+BUNDLE_PATH: "./vendor/bundle"
+BUNDLE_DISABLE_SHARED_GEMS: true

data/lib/purecdb/reader.rb

@@ -1,3 +1,8 @@
+begin
+    require 'ffi/mmap'
+rescue LoadError
+end
+
 module PureCDB
 
   #
@@ -15,10 +20,11 @@ module PureCDB
     #   PureCDB::Reader.new(file, options) {|r| ... }
     #
     # +file+ can be a String or any object that meets the minimum
-    # requirements, which means having  #sysseek, #sysopen to and #sysclos
+    # requirements, which means having  #sysseek, #sysopen to and #sysclose
     # which does not arbitrarily sttop access ot it.
     #
-    # If Mmap is available, the code will attempt to use it.
+    # If Mmap is available, the code will attempt to use it if target is a
+    # filename
     # 
     def initialize target, *options
       if target.is_a?(String)
@@ -41,7 +47,7 @@ module PureCDB
         raise "#{mode}bit mode detected in file; options request #{@mode}bit mode"
       end
 
-      @m = Mmap.new(target,"r", Mmap::MAP_SHARED) rescue nil
+      @m = FFI::Mmap.new(target,"r", FFI::Mmap::MAP_SHARED) rescue nil
       read_hashes
 
       raise "Invalid File (Hashes are all empty)" if @hashes.uniq == [0]
@@ -53,6 +59,18 @@ module PureCDB
       end
     end
 
+    #
+    # Is the file mmap'ed? Note that this may in theory return true right after
+    # opening the file, but return false after attempting to read if the 
+    # attempt to read from the mmap object fails for whatever reason. 
+    #
+    # I'm not sure that can ever happen, but to be 100% sure, check *after* a
+    # lookup
+    #
+    def mmap?
+       @m.nil? == false
+    end
+
     #
     # Alternative to PureCDB::Reader.new(target,options) ..
     #
@@ -132,7 +150,6 @@ module PureCDB
 
     # Warning: This will be very slow if not mmap'd
     def read r
-      @m = nil
       if @m
         res = @m[r]
         return res if res

data/lib/purecdb/version.rb

@@ -1,3 +1,3 @@
 module PureCDB
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/purecdb.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
     spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
   end
 
+  spec.add_dependency "ffi-mmap"
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"

metadata

@@ -1,78 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: purecdb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi-mmap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Pure Ruby CDB reader/writer w/64 bit extensions
@@ -82,16 +87,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - Makefile
 - README.md
 - Rakefile
+- Rules.mk
 - bin/console
 - bin/setup
+- bundle_config
 - lib/purecdb.rb
 - lib/purecdb/base.rb
 - lib/purecdb/reader.rb
@@ -100,26 +108,27 @@ files:
 - purecdb.gemspec
 homepage: https://github.com/hokstadconsulting/purecdb
 licenses: []
+metadata:
+  allowed_push_host: 'TODO: Set to ''http://mygemserver.com'' to prevent pushes to
+    rubygems.org, or delete to allow pushes to any server.'
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.6.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Pure Ruby CDB reader/writer w/64 bit extensions
 test_files: []