hrr_rb_mount 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e185f431ad5671235bcc254acd3de74dcb3edb0bce64146b696f2e8aba6725d2
-  data.tar.gz: 16616492c26c1e57b0eaeda5b31d2e9ac35be9a6519cf7da16dfad4024da59a6
+  metadata.gz: 7e40e0f523c2e10f4590e65254da3c1533347ddc07bd085543d331434b221449
+  data.tar.gz: 557b4ac323a0c85c71e077fc87d85c1e6f23d29886b442c4ae0a45e40104526a
 SHA512:
-  metadata.gz: 9aa7073175f1addc4cb0c8776cc49ecaa66e8e1f466ecb177a67583459a96c5de74794550ef108276a939be068bc116b5c23405ac20ad97172ae925fee0d46b8
-  data.tar.gz: 9d195d10507fedd27c89a41566d2d55b9a546abff16b656f5efe012d5fe9c4bacdb286167e60df4ad14678195eac0340cc02ab187987a6e45187f8f82b85e287
+  metadata.gz: a2b316d880055d67c37d9e9230a36df9f6abb8d585fcc5cd9bd27f15a859c92734b4676047d21f7e96a64d14615ae02bdf5dde48434a6be43afbd3451aebccea
+  data.tar.gz: cbe8545e911c7cdfc686ad545f22a85d62c01a5e727b3616786b4d8e5447a451cc2a2a0891613478e4b137b61b415b09179eb462362622734b80df82310c22b4

data/.travis.yml

@@ -23,8 +23,8 @@ before_install:
 install:
   - bundle install
 before_script:
-  - bundle exec rake clean clobber
+  - sudo env RBENV_VERSION="${RBENV_VERSION}" PATH="${RBENV_ROOT}/shims:${RBENV_ROOT}/bin:${PATH}" bundle exec rake clean clobber
 script:
   - sudo env RBENV_VERSION="${RBENV_VERSION}" PATH="${RBENV_ROOT}/shims:${RBENV_ROOT}/bin:${PATH}" bundle exec rake compile spec
 after_script:
-  - bundle exec rake clean clobber
+  - sudo env RBENV_VERSION="${RBENV_VERSION}" PATH="${RBENV_ROOT}/shims:${RBENV_ROOT}/bin:${PATH}" bundle exec rake clean clobber

data/README.md

@@ -37,8 +37,10 @@ The basic usage is as follows.
 ```ruby
 require "hrr_rb_mount"
 
-HrrRbMount.mount "tmpfs", "/path/to/target", "tmpfs", HrrRbMount::NOEXEC, "size=1M" # => 0
-HrrRbMount.umount "/path/to/target"                                                 # => 0
+flags = HrrRbMount::NOEXEC
+HrrRbMount.mount "tmpfs", "/path/to/target", "tmpfs", flags, "size=1M" # => 0
+HrrRbMount.mountpoint? "/path/to/target"                               # => true
+HrrRbMount.umount "/path/to/target"                                    # => 0
 ```
 
 ## Development

data/ext/hrr_rb_mount/hrr_rb_mount.c

@@ -15,14 +15,14 @@ VALUE rb_mHrrRbMountConst;
  *   @param target [String] The location (a directory or file) specified by the pathname.
  *   @param filesystemtype [String] The filesystem type, which is supported by the kernel.
  *   @param mountflags [Integer] The mount operation is performed depending on the bits specified in the mountflags.
- *   @param data [Array] Per filesystem options.
+ *   @param data [String] Per filesystem options.
  *   @return [Integer] 0.
  *   @raise [Errno::EXXX] A SystemCallError is raised when the operation failed.
  */
 VALUE
 hrr_rb_mount_mount(int argc, VALUE *argv, VALUE self)
 {
-  char *source, *target, *filesystemtype, *data;
+  const char *source, *target, *filesystemtype, *data;
   unsigned long mountflags;
 
   rb_check_arity(argc, 3, 5);
@@ -54,8 +54,8 @@ hrr_rb_mount_mount(int argc, VALUE *argv, VALUE self)
 VALUE
 hrr_rb_mount_umount(int argc, VALUE *argv, VALUE self)
 {
-  char *target;
-  int  flags;
+  const char *target;
+  int flags;
 
   rb_check_arity(argc, 1, 2);
 

data/lib/hrr_rb_mount/version.rb

@@ -1,3 +1,3 @@
 module HrrRbMount
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/hrr_rb_mount.rb

@@ -1,7 +1,55 @@
 require "hrr_rb_mount/version"
 require "hrr_rb_mount/hrr_rb_mount"
 
-# A wrapper around mount and umount.
-# See mount(2) and umount(2) for details.
+# A wrapper around mount and umount. See mount(2) and umount(2) for details.
+#
+# == Synopsis:
+#   require "hrr_rb_mount"
+#
+#   flags = HrrRbMount::NOEXEC
+#   HrrRbMount.mount "tmpfs", "/path/to/target", "tmpfs", flags, "size=1M" # => 0
+#   HrrRbMount.mountpoint? "/path/to/target"                               # => true
+#   HrrRbMount.umount "/path/to/target"                                    # => 0
+#
 module HrrRbMount
+
+  # Constants that represent the flags for mount and umount operations.
+  module Constants
+  end
+
+  # The path to /proc/self/mountinfo.
+  PROC_MOUNTINFO_PATH = "/proc/self/mountinfo"
+
+  # Returns true if the target directory or file is a mountpoint. Otherwise, returns false.
+  #
+  # Internally, uses /proc/self/mountinfo file to detect if the target is a mountpoint.
+  #
+  # When the file is not available, then uses stat(2).
+  # In this case, bind mount is not able to be detected.
+  #
+  # == Synopsis:
+  #   HrrRbMount.mountpoint? "/proc"   # => true
+  #   HrrRbMount.mountpoint? "/proc/1" # => false
+  #
+  # @param target [String] The target path to be checked.
+  # @param follow_symlinks [Boolean] Specifies whether to follow symlinks.
+  # @return [Boolean] true or false
+  # @raise [Errno::EXXX] A SystemCallError is raised when the operation failed.
+  def self.mountpoint? target, follow_symlinks: true
+    return false if (! follow_symlinks) && File.symlink?(target)
+    begin
+      if File.exist? PROC_MOUNTINFO_PATH
+        tgt_abs_path = File.realpath(target)
+        File.foreach(PROC_MOUNTINFO_PATH){ |line|
+          break true if line.split(" ")[4] == tgt_abs_path
+        } or false
+      else
+        parent = File.join(target, "..")
+        st, pst = File.stat(target), File.stat(parent)
+        st.dev != pst.dev || st.ino == pst.ino
+      end
+    rescue Errno::ENOENT, Errno::ENOTDIR
+      false
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hrr_rb_mount
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - hirura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-08 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies: []
 description: A wrapper around mount and umount for CRuby
 email: