sheepsafe 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.2.2
+
+- Make Ruby wrapper around socks daemon that keeps trying to run ssh
+  even if it exits due to bad or no connection
+- Add `sheepsafe proxy up/down` to manually up/down the proxy
+
 === 0.2.1
 
 - Fix regression if config.last_network.nil?

data/lib/sheepsafe.rb

@@ -1,5 +1,5 @@
 module Sheepsafe
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end
 
 require 'sheepsafe/config'

data/lib/sheepsafe/controller.rb

@@ -19,6 +19,11 @@ module Sheepsafe
     end
 
     def run
+      if ARGV.first == 'proxy'  # 'sheepsafe proxy up/down'
+        bring_socks_proxy ARGV[1]
+        return
+      end
+
       log("Sheepsafe starting")
       if network_up?
         if network_changed?
@@ -58,8 +63,18 @@ module Sheepsafe
 
     def bring_socks_proxy(direction)
       Daemons.run_proc '.sheepsafe.proxy', :ARGV => [direction == 'up' ? 'start' : 'stop'], :dir_mode => :normal, :dir => ENV['HOME'] do
-        log("Starting ssh -ND #{@config.socks_port} #{@config.ssh_host}")
-        exec("ssh -ND #{@config.socks_port} #{@config.ssh_host}")
+        pid = nil
+        trap("TERM") do
+          Process.kill("TERM", pid)
+          exit 0
+        end
+        loop do
+          pid = fork do
+            exec("ssh -ND #{@config.socks_port} #{@config.ssh_host}")
+          end
+          Process.waitpid(pid, 0)
+          sleep 1
+        end
       end
     end
 

data/sheepsafe.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name              = 'sheepsafe'
-  s.version           = '0.2.1'
-  s.date              = '2010-10-27'
+  s.version           = '0.2.2'
+  s.date              = '2010-11-02'
 
   s.rubyforge_project = %q{caldersphere}
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sheepsafe
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Nick Sieger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 -05:00
+date: 2010-11-02 00:00:00 -05:00
 default_executable: sheepsafe
 dependencies: 
 - !ruby/object:Gem::Dependency