file_pool 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7f119ba9e27968da351cae536fb49dcb7e8c967
-  data.tar.gz: 5f774c28a82bbca70a397343132c3258aea9cadd
+  metadata.gz: 92b693e812622ddf1df122afe233c2bde4907921
+  data.tar.gz: e126ad5ff94b137c1bd983ea64b438dd60129aff
 SHA512:
-  metadata.gz: ed3d39e566dc996e3c0f5909443190514770bd1a48c87fbbf65fdc950d2a92bb0e6c5df897070a5acdda1fc82157d2b40bf27fdf4d8eca48b70b0adec4536f2e
-  data.tar.gz: 366078e33a3fa105a5254cc41acaf625033ad3daff5417bcecc1487b3b23f99a345e8fc03dc3389983affe6478cd600d9451d5c6b5a3f38d5e494f7af3cec581
+  metadata.gz: 0e34e2384e4d185ef4c6063892c18799d82d2b5e8825090d16c843d34e0b33f58e1b0641158e502252e5559226d206480b21027dc25ef41a37a64143ae45ba35
+  data.tar.gz: 0db3ef7390c70efd6cc77cb147a0147273caafe9ef0d905866dbd3b8981dd923d7bc25305d5d54bde87318d1a6e424be63559631e5e22efa1134340018d9280a

data/lib/file_pool.rb

@@ -26,13 +26,33 @@ module FilePool
   #   * :encryption_block_size (Integer) sets the block size for
   #     encryption/decryption in bytes. Larger blocks need more memory and less time (less IO).
   #     Defaults to 1'048'576 (1 MiB).
+  #   * :copy_source (true,false)
+  #     if +false+ files added to the pool are hard-linked with the source if source and file pool 
+  #     are on the same file system (default). If set to +true+ files are always copied into the pool.
+  #   * :mode (Integer)
+  #     File mode to set on all files added to the pool. E.g. +mode:+ +0640+ for +rw-r-----+ or symbolic "u=wrx,go=rx"
+  #     (see Ruby stdlib FileUtils#chmod).
+  #     Note that the desired mode is not set if the file is hard-linked with the source. 
+  #     Use +copy_source:true+ when to ensure.
+  #   * :owner
+  #     Owner of the files added to the pool. 
+  #     Note that the desired owner is not set if the file is hard-linked with the source. 
+  #     Use +copy_source:true+ when to ensure.
+  #   * :group
+  #     Group of the files added to the pool. 
+  #     Note that the desired group is not set if the file is hard-linked with the source. 
+  #     Use +copy_source:true+ when to ensure.
   def self.setup root, options={}
-    unless(unknown = options.keys - [:encryption_block_size, :secrets_file]).empty?
+    unless(unknown = options.keys - [:encryption_block_size, :secrets_file, :copy_source, :mode, :owner, :group]).empty?
       puts "FilePool Warning: unknown option(s) passed to #setup: #{unknown.inspect}"
     end
     @@root = root
     @@crypted_mode = false
     @@block_size = options[:encryption_block_size] || (1024*1024)
+    @@copy_source = options[:copy_source] || false
+    @@mode = options[:mode]
+    @@group = options[:group]
+    @@owner = options[:owner]
     configure options[:secrets_file]
   end
 
@@ -64,13 +84,16 @@ module FilePool
     else
       FileUtils.mkpath(id2dir newid)
     end
-    FileUtils.link(path, target)
 
-    return newid
+    if !@@copy_source and (File.stat(path).dev == File.stat(File.dirname(target)).dev)
+      FileUtils.link(path, target)
+    else
+      FileUtils.copy(path, target)
+      FileUtils.chmod(@@mode, target) if @@mode
+      FileUtils.chown(@@owner, @@group, target)
+    end
 
-  rescue Errno::EXDEV
-    FileUtils.copy(path, target)
-    return newid
+    newid
   end
 
   #
@@ -90,7 +113,7 @@ module FilePool
   def self.add path
     self.add!(path)
 
-  rescue Exception => ex
+  rescue Exception
     return false
   end
 

data/lib/file_pool/version.rb

@@ -1,3 +1,3 @@
 module FilePool
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: file_pool
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - robokopp (Robert Anniés)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   FilePool helps to manage a large number of files in a Ruby
   project. It takes care of the storage of files in a balanced directory
@@ -47,19 +61,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Manage a large number files in a pool
 test_files: []
-has_rdoc: