odisk 0.2.1 → 0.2.2

data/README.md

@@ -25,9 +25,9 @@ which utilizes an alternative approach to dealing with multiple threads.
 
 ## <a name="release">Release Notes</a>
 
-### Release 0.2.1
+### Release 0.2.2
 
- - Fixed symlink sync.
+ - Added odisk_forget which removes remote entries causing a file or directory to look like a new file or directory.
 
 # Plans and Notes
 
@@ -40,10 +40,10 @@ files has not been implemented yet and changing ownership or mode only take
 effect if the file is touched as well. Feel free to give it a try and let me
 know when you run into bugs.
 
- - Support exclusion of file and directories
-  - specify on command line and create .odisk/exclude file
+ - Support ignore of file and directories
+  - specify on command line and create .odisk/ignore file
    - use ::File.fnmatch(pattern, path, ::File::FNM_DOTMATCH)
-  - pass array of excludes to digest creation
+  - pass array of ignores to digest creation
    - loosen up current restriction on any file that begins with .
 
  - Support file removal
@@ -54,7 +54,7 @@ know when you run into bugs.
 
  - Handle changes in mode, owner, and group
   - Compare to previous digest to detect changes
-   - File modification times are not changes by mode, owner, or group changes
+   - File modification times are not changed by mode, owner, or group changes
   - Note conflicts if modifications are more recent than remote
    - Use a script to pick change or keep local version
 

data/bin/odisk

@@ -67,39 +67,11 @@ if 1 != dirs.size
 end
 $local_top = ::File.expand_path(dirs[0])
 
-# Walk up the directory tree looking for .odisk directories and a remote.json
-# in that directory. If the directory does not exist then stop the walk. If
-# not found check the ~/.odisk/remotes.json file for a matching top.
-top = $local_top
-if $ruser.nil? || $rhost.nil? || $rtop.nil?
-  while ::File.directory?(::File.join(top, '.odisk'))
-    rfile = ::File.join(top, '.odisk', 'remote')
-    if ::File.file?(rfile)
-      rstr = ::File.read(rfile).strip()
-      #$remote.pass_file = ::File.expand_path($remote.pass_file) unless $remote.pass_file.nil? || $remote.pass_file.empty?
-      orig_pass_file = $remote.pass_file
-      $remote.update(rstr)
-      $remote.pass_file = ::File.expand_path($remote.pass_file) unless $remote.pass_file.nil? || $remote.pass_file.empty?
-      if !$remote.dir.nil? && !$remote.dir.empty? && top != $local_top
-        $remote.dir = $remote.dir + $local_top[top.size..-1]
-      end
-      if $remote.pass_file != orig_pass_file && !::File.file?($remote.pass_file)
-        $remote.pass_file = ::File.join(top, '.odisk', $remote.pass_file)
-      end
-      break
-    end
-    top = ::File.dirname(top)
-  end
-end
-
-ODisk.info_from_remotes($local_top, $remote) unless $remote.complete?
-$remote.user = ENV['USER'] if $remote.user.nil?
-$remote.pass_file = nil if $plain
-unless $remote.okay?
-  puts "*** user@host:top_dir not specified on command line, in local .odisk/remote file, or in ~/.odisk/remotes"
+unless ODisk.gather_remote_info($local_top, $remote)
   puts opts.help
   Process.exit!(0)
 end
+$remote.pass_file = nil if $plain
 
 Thread.current[:name] = 'main'
 ::Opee::Env.logger.formatter = proc { |s,t,p,m|

data/bin/odisk_forget

@@ -0,0 +1,122 @@
+#!/usr/bin/env ruby -wW1
+# encoding: UTF-8
+
+while (i = ARGV.index('-I'))
+  x,path = ARGV.slice!(i, 2)
+  $: << path
+end
+
+# TBD tmp for testing
+$: << ::File.join(::File.dirname(__FILE__), "../../oj/lib")
+$: << ::File.join(::File.dirname(__FILE__), "../../oj/ext")
+$: << ::File.join(::File.dirname(__FILE__), "../../opee/lib")
+$: << ::File.join(::File.dirname(__FILE__), "../lib")
+
+require 'optparse'
+begin
+  v = $VERBOSE
+  $VERBOSE = false
+  require 'net/ssh'
+  require 'net/sftp'
+  $VERBOSE = v
+end
+require 'opee'
+require 'oj'
+require 'odisk'
+
+$verbose = Logger::WARN
+$dry_run = false
+$dir = '.'
+$master = nil
+$remote = ::ODisk::Remote.new()
+
+opts = OptionParser.new(%{Usage: odisk_forget [options] <local_directory> <relative_forget_path>
+
+Will remove data for the file or directory specified on the remote server. The local file or directory
+will not be removed but the local digest will no longer includes that entry. This make the file or
+directory look new as far as oDisk is concerned.
+})
+opts.on('-s', 'decrease verbosity')                 { $verbose += 1 unless 5 == $verbose }
+opts.on('-v', 'increase verbosity')                 { $verbose -= 1 unless 0 == $verbose }
+opts.on('-n', 'dry run / no modifications')         { $dry_run = true }
+opts.on('-r', '--remote [user@host:dir:pass_file]',
+        String, 'remote user, host, directory, passphrase file for gpg')  { |r|
+  $remote.update(r)
+}
+opts.on('-h', '--help', 'Show this display')        { puts opts.help; Process.exit!(0) }
+dirs = opts.parse(ARGV)
+
+if 2 != dirs.size
+  puts opts.help
+  Process.exit!(0)
+end
+$local_top = ::File.expand_path(dirs[0])
+$forget_me = dirs[1] # relative path from top
+
+unless ODisk.gather_remote_info($local_top, $remote)
+  puts opts.help
+  Process.exit!(0)
+end
+$remote.pass_file = nil if $plain
+
+Thread.current[:name] = 'main'
+::Opee::Env.logger.formatter = proc { |s,t,p,m|
+  s = '' if s.nil?
+  "#{s[0]} [#{t.strftime('%Y-%m-%dT%H:%M:%S.%6N')} ##{p}]: #{m}\n"
+}
+::Opee::Env.logger.severity = $verbose
+
+if Logger::INFO >= $verbose
+  if $digests_only
+    ::Opee::Env.info(%{
+  Generate Local Digests
+    local directory:  #{::File.expand_path($local_top)}
+})
+  else
+    ::Opee::Env.info(%{
+  Forget "#{$forget_me}"
+    remote host:      #{$remote.host}
+    remote user:      #{$remote.user}
+    remote directory: #{$remote.dir}
+    local:            #{::File.expand_path($local_top)}
+    dry run:          #{$dry_run}
+})
+  end
+end
+
+# If $local_top/.odisk/remote does not exist or is different that what is in $remote, replace it.
+remote_str = $remote.to_s
+top_remote_path = ::File.join($local_top, '.odisk', 'remote')
+if !::File.file?(top_remote_path) || ::File.read(top_remote_path).strip() != remote_str
+  ::Opee::Env.info("Writing #{top_remote_path}")
+  unless $dry_run
+  `mkdir -p #{::File.join($local_top, '.odisk')}`
+  ::File.open(top_remote_path, 'w') { |f| f.write(remote_str + "\n") }
+  end
+end
+
+path = ::File.join($local_top, $forget_me)
+local_digest_path = ::File.join(::File.dirname(path), '.odisk', 'digest.json')
+forget_name = ::File.basename(path)
+remote_path = ::File.join($remote.dir, $forget_me)
+remote_digest_path = ::File.join(::File.dirname(remote_path), '.odisk', 'digest.json')
+
+# Remove forget_me from local digest.
+digest = Oj.load_file(local_digest_path, mode: :object)
+digest.delete(forget_name)
+Oj.to_file(local_digest_path, digest, indent: 2) unless $dry_run
+
+# Remove forget_me from remote digest
+Net::SSH.start($remote.host, $remote.user) do |ssh|
+  ssh.exec!(%{rm -rf "#{remote_path}.gpg"})
+  ssh.exec!(%{rm -rf "#{remote_path}"})
+end
+
+# Update the remote digest by removing the forget_me entry.
+Net::SFTP.start($remote.host, $remote.user) do |ftp|
+  json = ftp.download!(remote_digest_path)
+  digest = Oj.load(json, mode: :object)
+  digest.delete(forget_name)
+  json = Oj.dump(digest, indent: 2)
+  ftp.open!(remote_digest_path, 'w') { |res| ftp.write!(res[:handle], 0, json) }
+end

data/lib/odisk.rb

@@ -1,6 +1,41 @@
 
 module ODisk
 
+  # Walk up the directory tree looking for .odisk directories and a
+  # remote.json in that directory. If the directory does not exist then stop
+  # the walk. If not found check the ~/.odisk/remotes.json file for a matching
+  # top.
+  def self.gather_remote_info(local_dir, remote)
+    top = local_dir
+    if remote.user.nil? || remote.host.nil? || remote.dir.nil?
+      while ::File.directory?(::File.join(top, '.odisk'))
+        rfile = ::File.join(top, '.odisk', 'remote')
+        if ::File.file?(rfile)
+          rstr = ::File.read(rfile).strip()
+          #remote.pass_file = ::File.expand_path(remote.pass_file) unless remote.pass_file.nil? || remote.pass_file.empty?
+          orig_pass_file = remote.pass_file
+          remote.update(rstr)
+          remote.pass_file = ::File.expand_path(remote.pass_file) unless remote.pass_file.nil? || remote.pass_file.empty?
+          if !remote.dir.nil? && !remote.dir.empty? && top != $local_top
+            remote.dir = remote.dir + local_dir[top.size..-1]
+          end
+          if remote.pass_file != orig_pass_file && !::File.file?(remote.pass_file)
+            remote.pass_file = ::File.join(top, '.odisk', remote.pass_file)
+          end
+          break
+        end
+        top = ::File.dirname(top)
+      end
+    end
+    info_from_remotes(local_dir, remote) unless remote.complete?
+    remote.user = ENV['USER'] if remote.user.nil?
+    unless remote.okay?
+      puts "*** user@host:top_dir not specified on command line, in local .odisk/remote file, or in ~/.odisk/remotes"
+      return false
+    end
+    true
+  end
+
   def self.info_from_remotes(local_dir, remote)
     orig_pass_file = remote.pass_file
     local_dir = ::File.expand_path(local_dir)

data/lib/odisk/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odisk
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opee
@@ -79,6 +79,7 @@ description: Remote Encrypted File Synchronization, oDisk
 email: peter@ohler.com
 executables:
 - odisk
+- odisk_forget
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -104,8 +105,8 @@ files:
 - lib/odisk.rb
 - LICENSE
 - README.md
-- !binary |-
-  YmluL29kaXNr
+- bin/odisk
+- bin/odisk_forget
 homepage: http://www.ohler.com/odisk
 licenses: []
 post_install_message: 
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: odisk
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Remote Encrypted File Synchronization, oDisk