mincore 0.0.9.3.pre.5 → 0.0.9.3.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0c5eec397c85e7a6ae6dcd06f6573a2d38b7a41
-  data.tar.gz: 97ab5400c69017429c46a386ec608e8994ae1c71
+  metadata.gz: 04072cb8e6a47e2caf76f1bfec55c96d61dab4c4
+  data.tar.gz: 91a65f908ef21bd83006065033f4c862bec9bd62
 SHA512:
-  metadata.gz: 893e4f55fdcfda9003080cf12fe14ceb0d56d2e8e7c46d8ecf24fb2519403c2a462375aae639e9e51dd05963186f837f611e2993dfee4afdab48c3ab4174253a
-  data.tar.gz: 646240810002f8cf79a3dba7b37a6c720a1392b35d14bdb40ffcd031f0f681d3f025de8c9afc69a4a599bb20ddaaef2c4e0a95eef7b67717b0703c05416a4f60
+  metadata.gz: 11aeb4e96b4b84e22dd7d2b0d29d2c9027aedbf09890ce6387e1d64c664850b2322674de660640a7a18187cbf299829d7346394ae2dda42e8cfc67e2a45ba516
+  data.tar.gz: 38d74cee2c2d15e0aba22ad0be2bdd426cfc2cb424b1ea90367986c5753bf3d59c04f5063123abb1b1f6eacb6be4a426864b0d21ef7f29d35e6b3a712e80c3d0

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 
 before_script: ./bin/ci/before_build.sh
 
-script: "bundle exec rake test"
+script: "bundle exec rake ci_test"
 
 rvm:
   - 1.9.3

data/Rakefile

@@ -5,7 +5,7 @@ WORKDIR='writable_tmp_dir'
 
 CLEAN.include("#{WORKDIR}/*")
 
-Rake::TestTask.new(:test) do |t|
+Rake::TestTask.new(:ci_test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
@@ -13,7 +13,10 @@ Rake::TestTask.new(:test) do |t|
 end
 
 
-
+task :test do
+  ENV["COVERALLS"]="DISABLE"
+  Rake::Task["ci_test"].invoke
+end
 
 task :default => :test
 

data/lib/mincore.rb

@@ -12,10 +12,11 @@ class File
     builder.include("<fcntl.h>")
     builder.include("<unistd.h>")
     builder.include("<sys/mman.h>")
-    #    builder.include("<fcntl.h>")
+    builder.include("<errno.h>")
     #    builder.include("<fcntl.h>")
 
-    builder.prefix("#define exiterr(s) { perror(s); exit(-1); }")
+#    builder.prefix("#define exiterr(s) { perror(s); exit(-1); }")
+    builder.prefix("#define exiterr(s) { rb_sys_fail(s); }")
   end
 
   inline do |builder|    
@@ -47,15 +48,19 @@ static VALUE  _mincore(char *filename) {
     PAGESIZE = getpagesize();
 
     fd = open(filename, O_RDONLY);
-//    fprintf(stderr, "running fstat() on %s", filename);
 
+    if ( fd == -1 ) {
+        exiterr("can't open file"); 
+    }
 
 
-    if(fstat(fd, &st) == -1)
-        exiterr("fstat");
+    if(fstat(fd, &st) == -1) { // untested path
+        exiterr("fstat failed");
+    }
+
     if(!S_ISREG(st.st_mode)) {
-        fprintf(stderr, "%s: S_ISREG: not a regular file", filename);
-        return EXIT_FAILURE;
+        errno = EBADF;
+        exiterr("not a regular file");
     }
     
     if ( st.st_size == 0 ) {
@@ -68,13 +73,14 @@ static VALUE  _mincore(char *filename) {
     pages = (st.st_size + PAGESIZE - 1) / PAGESIZE;
     pageinfo = calloc(sizeof(*pageinfo), pages);
 
-    if(!pageinfo) {
+    if(!pageinfo) { // untested path
         exiterr("calloc");
     }
 
     file = mmap(NULL, st.st_size, PROT_NONE, MAP_SHARED, fd, 0);
 
-    if(file == MAP_FAILED) {
+    if(file == MAP_FAILED) { // untested path
+        free(pageinfo);
         exiterr("mmap");
     }
 
@@ -88,16 +94,13 @@ static VALUE  _mincore(char *filename) {
 
     pageinfo_arr = rb_ary_new2(pages);
     for(i=0; i<pages; i++) {
-        VALUE status = ((pageinfo[i] & 1)?Qtrue:Qfalse);
+        VALUE status = ((pageinfo[i] & 1) ? Qtrue : Qfalse);
         rb_ary_push(pageinfo_arr, status);
     }
 
 
     rb_ary_push(val, pageinfo_arr);
     
-//    val = (long long) st.st_size;
-//    fprintf (stderr, "val=%d\\n", val);    
-
     munmap(file, st.st_size);
     free(pageinfo);
 
@@ -117,21 +120,22 @@ static VALUE _cachedel(char *filename, int count) {
     fd = open(filename, O_RDONLY);
 
     if(fd == -1) {
-        exiterr("open");
+        exiterr("can't open file");
     }
 
     if(fstat(fd, &st) == -1) {
-        exiterr("fstat");
+        exiterr("fstat failed");
     }
 
     if(!S_ISREG(st.st_mode)) {
-        fprintf(stderr, "%s: S_ISREG: not a regular file", filename);
-        ret = -1;
+        errno = EBADF;
+        exiterr("not a regular file");
     }
 
     for(i = 0; i < count; i++) {
-        if(posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED) == -1) {
-            exiterr("posix_fadvise");
+        ret = posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED) ;
+        if(ret) {
+            exiterr("posix_fadvise failed");
         }
     }
 
@@ -160,7 +164,7 @@ C_CODE
   # 
   # @param filename [String] file name
   # @param count [Int] times `posix_fadvise()` will be run
-  # @return [Int] execution status
+  # @return [Int] execution status of the last `posix_fadvise()` call
   def self.cachedel(filename, count=1) 
     self._cachedel(filename, count)
   end

data/mincore.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'mincore'
-  s.version     = '0.0.9.3.pre.5'
+  s.version     = '0.0.9.3.pre.6'
   s.date        = '2013-11-19'
 
   s.homepage    = 'http://github.com/noushi/ruby-mincore'

data/test/mincore_test.rb

@@ -41,15 +41,7 @@ class TestableFile
 #  alias_method :fill, :cli_fill
 
   def read(pages=@size_kb)
-    if pages == @size_kb
-      `cat #{@name} >/dev/null`
-    else
-      4.times do 
-        File.open(@name, "r").each do |line|
-          line
-        end
-      end
-    end
+    `dd if=#{@name} of=/dev/null bs=#{File.PAGESIZE} count=#{pages}`
   end
 
   def delete
@@ -88,6 +80,15 @@ class MincoreTest < Test::Unit::TestCase
     _generic_mincore_test 40, :delete => true
   end
 
+  def test_mincore_devnull
+    assert_raise(Errno::EBADF) { File.mincore("/dev/null") }
+  end
+
+  # don't run this as root, mincore() will succeed!
+  def test_mincore_etcshadow
+    assert_raise(Errno::EACCES) { File.mincore("/etc/shadow") }
+  end
+
   def test_cachedel_empty_file
     _generic_cachedel_test 0
   end

data/test/test_helper.rb

@@ -28,8 +28,8 @@ class Array
 end
 
 
-
-require 'coveralls'
-Coveralls.wear!
-
+unless ENV["COVERALLS"] == "DISABLE"
+  require 'coveralls'
+  Coveralls.wear!
+end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mincore
 version: !ruby/object:Gem::Version
-  version: 0.0.9.3.pre.5
+  version: 0.0.9.3.pre.6
 platform: ruby
 authors:
 - Reda NOUSHI