odisk 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e47c67f5f819c4407c0abf408cfd60dbc73500f9
-  data.tar.gz: 5d46d912edaea7dafa30ddb77501faeacb11353b
+SHA256:
+  metadata.gz: 15f5e70c89940ff3b118ee2af18e325c17ccc295feb29ce9094df1c9b5ca0af8
+  data.tar.gz: 508c5b8aba4dcb6213d74ec571d99cfe3299ed106d30903f55db1aa7bfff9939
 SHA512:
-  metadata.gz: e009aef9fed7f59faec64e2c76ad2bae9dde297cf659afb22b30271dc262c455b25c9d9664cd7ad8bea8cb7c820d236ffcdd76a9524f667105aba6dd91d87f4a
-  data.tar.gz: a87cbd291609febc9406e6baf46dfd242b0d1f9a17cbc1d904c85d9c42a4363a4f4a393c44334894605a2ad11c5d90261e0926aa94b406560cf2090f10aa7187
+  metadata.gz: dccde36cc8a7d9d7d4b4f1b9c2a26e77ab2f9c81a2c781ae9e36e5edefb53f30f213abb9c4587980037e0614231f185f8db82eedb700eda60a440f6584133b2b
+  data.tar.gz: 0e30cba180161353aff6905b99440a12cae965e2089898a2562438cf2a270d9e979d61ef449fd2684caf670d88b96a3a3c81ee2c9ea881356af39ef3c50718b1

data/README.md

@@ -25,6 +25,12 @@ which utilizes an alternative approach to dealing with multiple threads.
 
 ## <a name="release">Release Notes</a>
 
+### Release 1.0.2
+
+ - Made groups handling more tolerant.
+
+ - Updated gpg command arguments for more modern version.
+
 ### Release 1.0.1
 
  - Ruby time has changed so a change in time comparisons was made.

data/lib/odisk/crypter.rb

@@ -20,7 +20,7 @@ module ODisk
     def encrypt(src, dest, remote)
       ::Opee::Env.info("encrypt \"#{src}\" into \"#{dest}\"")
       unless $dry_run
-        `gpg -c --batch --yes --force-mdc --no-use-agent --passphrase-file "#{$remote.pass_file}" -o "#{dest}" "#{src}"`
+        `gpg -c --batch --yes --force-mdc --passphrase-file "#{$remote.pass_file}" -o "#{dest}" "#{src}"`
         @copy_queue.add_method(:upload, dest, remote, true)
       end
       @crypt_queue.ask(:ready, self)
@@ -29,7 +29,7 @@ module ODisk
     def decrypt(src, dest)
       ::Opee::Env.info("decrypt \"#{src}\" into \"#{dest}\"")
       unless $dry_run
-        `gpg -d --batch --yes -q --no-use-agent --passphrase-file "#{$remote.pass_file}" -o "#{dest}" "#{src}"`
+        `gpg -d --batch --yes -q --passphrase-file "#{$remote.pass_file}" -o "#{dest}" "#{src}"`
         ::File.delete(src)
         ::Opee::Env.warn("Downloaded and decrypted \"#{dest}\"")
       end

data/lib/odisk/diff.rb

@@ -63,7 +63,9 @@ module ODisk
         end
         h[k] = [lv, rv] unless lv == rv unless (:mtime == m && !@remote.is_a?(::ODisk::File))
       end
-      pre = prefix.nil? ? @local.name : (prefix + '.' + @local.name)
+      unless @local.nil?
+        pre = prefix.nil? ? @local.name : (prefix + '.' + @local.name)
+      end
       @sub_diffs.each do |name,d|
         d.fill_hash(pre, h)
       end

data/lib/odisk/digest.rb

@@ -24,7 +24,11 @@ module ODisk
     def self.create_info(path, filename=nil, top=nil)
       top = $local_top if top.nil?
       filename = ::File.basename(path) if filename.nil?
-      stat = ::File.lstat(path)
+      begin
+        stat = ::File.lstat(path)
+      rescue
+        return nil
+      end
       if stat.directory?
         c = ::ODisk::Dir.new(filename)
       elsif stat.symlink?

data/lib/odisk/statfixer.rb

@@ -73,6 +73,22 @@ module ODisk
       # TBD tell progress about the completion
     end
 
+    def get_group(g)
+      begin
+        Etc.getgrnam(g).gid
+      rescue
+        nil
+      end
+    end
+
+    def get_owner(o)
+      begin
+        Etc.getpwnam(o).uid
+      rescue
+        nil
+      end
+    end
+
     def fix_stats(path, info)
       e = Digest.create_info(path)
       diff = Diff.new(e, info)
@@ -84,12 +100,12 @@ module ODisk
           when :mtime
            ::File.utime(info.mtime, info.mtime, path) unless info.is_a?(::ODisk::Link)
           when :owner
-            owner = Etc.getpwnam(info.owner).uid
-            group = Etc.getgrnam(info.group).gid
+            owner = get_owner(info.owner)
+            group = get_group(info.group)
             ::File::lchown(owner, group, path)
           when :group
-            owner = Etc.getpwnam(info.owner).uid
-            group = Etc.getgrnam(info.group).gid
+            owner = get_owner(info.owner)
+            group = get_group(info.group)
             begin
               ::File::lchown(owner, group, path)
             rescue Errno::EPERM

data/lib/odisk/version.rb

@@ -1,5 +1,5 @@
 
 module ODisk
   # Current version of the module. 
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odisk
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2018-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oterm
@@ -137,9 +137,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: odisk
-rubygems_version: 2.4.5
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Remote Encrypted File Synchronization, oDisk
 test_files: []
-has_rdoc: true