odisk 0.9.0 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 894e016fdb7500d4c16de0066f8165943f6aba8f
+  data.tar.gz: f88e240eaefcf75d4f16781221014af8c1940b33
+SHA512:
+  metadata.gz: eadc880cf4cb6ab1f9827c9475c72e8a06542406d25e9fb873c6192780595a1867daa952059a94fe3de183446f116ebfa215515416a858e99a961d54b5464b03
+  data.tar.gz: 60d03915af7ad91af8ad4f37a99b86037f64deb33919356cd0692789ab45f8aaedfed795092febe0ad420ca96bd29efd6cb414bde0e91cdcc982b46e8c95e721

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.0
+
+ - Added support for the Opee/OTerm Inspector
+
+ - Fixed race condition on shutdown bug
+
 ### Release 0.9.0
 
  - Updated to work properly with Ubuntu 12. 

data/bin/odisk

@@ -1,14 +1,21 @@
-#!/usr/bin/env ruby -wW1
+#!/usr/bin/env ruby
 # encoding: UTF-8
 
-while (i = ARGV.index('-I'))
-  x,path = ARGV.slice!(i, 2)
+# Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
+# required. That can be set in the RUBYOPT environment variable.
+# export RUBYOPT=-w
+
+$VERBOSE = true
+
+while (index = ARGV.index('-I'))
+  _,path = ARGV.slice!(index, 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__), "../../oterm/lib")
 $: << ::File.join(::File.dirname(__FILE__), "../../opee/lib")
 $: << ::File.join(::File.dirname(__FILE__), "../lib")
 
@@ -34,6 +41,8 @@ $remote = ::ODisk::Remote.new()
 $crypter_count = 2
 $copier_count = 4
 $careful = false
+$group_tolerant = false
+$inspector_port = 0
 
 opts = OptionParser.new(%{Usage: odisk [options] <local_directory>
 
@@ -45,6 +54,7 @@ opts.on('-v', 'increase verbosity')                 { $verbose -= 1 unless 0 ==
 opts.on('-d', 'generate digests only')              { $digests_only = true }
 opts.on('-u', 'unencrypted or plain remote files')  { $plain = true }
 opts.on('-c', 'careful mode, no local removes')     { $careful = true }
+opts.on('-g', 'allow differences in groups')        { $group_tolerant = true }
 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|
@@ -62,8 +72,9 @@ opts.on('-m', '--master [local | remote]',
     Process.exit!(0)
   end
 }
-opts.on('-e', '--encrypt-count Integer', Integer, 'number of encryption actors') { |i| $crypter_count = i }
-opts.on('-c', '--copier-count Integer', Integer, 'number of copier actors')      { |i| $copier_count = i }
+opts.on('-e', '--encrypt-count Integer', Integer, 'number of encryption actors') { |cnt| $crypter_count = cnt }
+opts.on('-c', '--copier-count Integer', Integer, 'number of copier actors')      { |cnt| $copier_count = cnt }
+opts.on('-i', '--inspector-port Integer', Integer, 'inspector port')             { |port| $inspector_port = port }
 opts.on('-h', '--help', 'Show this display')                                     { puts opts.help; Process.exit!(0) }
 dirs = opts.parse(ARGV)
 
@@ -101,10 +112,16 @@ if Logger::INFO >= $verbose
     local:            #{::File.expand_path($local_top)}
     dry run:          #{$dry_run}
     master:           #{$master.nil? ? 'NONE' : (::ODisk::Planner::Step::LOCAL == $master ? 'LOCAL' : 'REMOTE')}
+    inspector port:   #{$inspector_port}
 })
   end
 end
 
+inspector = nil
+if 0 < $inspector_port 
+  inspector = Opee::SocketInspector.new($inspector_port)
+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')
@@ -151,12 +168,13 @@ fetcher = ::ODisk::Fetcher.new(:name => 'Fetcher',
                                :collector => planner) unless $digests_only
 digester = ::ODisk::Digester.new(:name => 'Digester',
                                  :collector => planner)
-starter = ::ODisk::SyncStarter.new(:name => 'Starter',
-                                   :dir_queue => dir_wq,
-                                   :digester => digester,
-                                   :fetcher => fetcher,
-                                   :collector => planner)
+::ODisk::SyncStarter.new(:name => 'Starter',
+                         :dir_queue => dir_wq,
+                         :digester => digester,
+                         :fetcher => fetcher,
+                         :collector => planner)
 
 dir_wq.ask(:add, '')
 
 ::Opee::Env.wait_close()
+#inspector.acceptThread.join() if nil != inspector

data/bin/odisk_forget

@@ -1,6 +1,12 @@
-#!/usr/bin/env ruby -wW1
+#!/usr/bin/env ruby
 # encoding: UTF-8
 
+# Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
+# required. That can be set in the RUBYOPT environment variable.
+# export RUBYOPT=-w
+
+$VERBOSE = true
+
 while (i = ARGV.index('-I'))
   x,path = ARGV.slice!(i, 2)
   $: << path

data/bin/odisk_remove

@@ -1,6 +1,12 @@
-#!/usr/bin/env ruby -wW1
+#!/usr/bin/env ruby
 # encoding: UTF-8
 
+# Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
+# required. That can be set in the RUBYOPT environment variable.
+# export RUBYOPT=-w
+
+$VERBOSE = true
+
 while (i = ARGV.index('-I'))
   x,path = ARGV.slice!(i, 2)
   $: << path

data/lib/odisk/copier.rb

@@ -81,7 +81,7 @@ module ODisk
     end
 
     def remove_remote(path)
-      unless $dry_runb
+      unless $dry_run
         @ssh = Net::SSH.start($remote.host, $remote.user) if @ssh.nil?
         out = @ssh.exec!(%{rm -rf "#{path}" "#{path}.gpg"})
         raise out unless out.nil? || out.strip().empty?

data/lib/odisk/fetcher.rb

@@ -25,9 +25,9 @@ module ODisk
     end
 
     def close()
+      super()
       @ftp.close_channel() unless @ftp.nil?
       @ftp = nil
-      super()
     end
 
     private

data/lib/odisk/info.rb

@@ -30,7 +30,7 @@ module ODisk
       # don't check master flag
       (@name == o.name &&
        @owner == o.owner &&
-       @group == o.group &&
+       (@group == o.group || $group_tolerant) &&
        @mode == o.mode &&
        @removed == o.removed)
     end

data/lib/odisk/version.rb

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

metadata

@@ -1,78 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: odisk
 version: !ruby/object:Gem::Version
-  version: 0.9.0
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: oterm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: opee
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Remote Encrypted File Synchronization, oDisk
@@ -85,6 +90,12 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- LICENSE
+- README.md
+- bin/odisk
+- bin/odisk_forget
+- bin/odisk_remove
+- lib/odisk.rb
 - lib/odisk/copier.rb
 - lib/odisk/crypter.rb
 - lib/odisk/diff.rb
@@ -103,36 +114,29 @@ files:
 - lib/odisk/syncjob.rb
 - lib/odisk/syncstarter.rb
 - lib/odisk/version.rb
-- lib/odisk.rb
-- LICENSE
-- README.md
-- bin/odisk
-- bin/odisk_forget
-- bin/odisk_remove
 homepage: http://www.ohler.com/odisk
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: odisk
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Remote Encrypted File Synchronization, oDisk
 test_files: []