sheepsafe 0.2.5 → 0.2.6

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.2.6
+
+- Fix error with proxy when ssh_port is not configured
+- Try to log if proxy exits repeatedly
+- Don't reopen stdout but capture it to the log file
+
 === 0.2.5
 
 - Wait a bit before starting proxy when switching networks

data/lib/sheepsafe/config.rb

@@ -32,5 +32,12 @@ module Sheepsafe
     def write
       File.open(FILE, "w") {|f| f << YAML.dump(config) }
     end
+
+    def ssh_args
+      args = ""
+      args << "-p #{ssh_port} " if ssh_port
+      args << "-ND #{socks_port} #{ssh_host}"
+      args
+    end
   end
 end

data/lib/sheepsafe/controller.rb

@@ -9,22 +9,37 @@ module Sheepsafe
   class Controller
     LOG_FILE = Sheepsafe::Config::FILE.sub(/\.yml/, '.log')
 
+    class TeeStdout
+      def initialize(controller)
+        @stdout, @controller = $stdout, controller
+      end
+
+      def write(*args,&block)
+        @stdout.write(*args, &block)
+        @controller.with_log_file {|f| f.write(*args, &block) }
+      end
+
+      def method_missing(meth, *args, &block)
+        @stdout.send(meth, *args, &block)
+        @controller.with_log_file {|f| f.send(meth, *args, &block) }
+      end
+    end
+
     def initialize(config = nil, network = nil, logger = nil)
       @config  = config  || Sheepsafe::Config.new
       @network = network || Sheepsafe::Network.new(@config)
-      @logger  = logger  || begin
-                              STDOUT.reopen(File.open(LOG_FILE, (File::WRONLY | File::APPEND)))
-                              Logger.new(STDOUT)
-                            end
+      @logger  = logger
+      $stdout  = TeeStdout.new(self)
     end
 
     def run
+      log("Sheepsafe starting")
+
       if ARGV.first == 'proxy'  # 'sheepsafe proxy up/down/kick'
         bring_socks_proxy ARGV[1]
         return
       end
 
-      log("Sheepsafe starting")
       if network_up?
         if network_changed?
           if switch_to_trusted?
@@ -88,11 +103,17 @@ module Sheepsafe
           exit 0
         end
         sleep 2                 # wait a bit before starting proxy
+        exit_count = 0
+        ssh_command = "ssh #{@config.ssh_args}"
         loop do
           pid = fork do
-            exec("ssh -p #{@config.ssh_port } -ND #{@config.socks_port} #{@config.ssh_host}")
+            exec(ssh_command)
           end
           Process.waitpid(pid)
+          exit_count += 1
+          if exit_count % 2 == 1 && exit_count < 10
+            log "command exited #{exit_count} times:\n#{}\nlast time with #{$?.exitstatus}"
+          end
           sleep 1
         end
       end
@@ -117,7 +138,15 @@ module Sheepsafe
     end
 
     def log(msg)
-      @logger.info(msg)
+      if @logger
+        @logger.info(msg)
+      else
+        with_log_file {|f| Logger.new(f).info(msg) }
+      end
+    end
+
+    def with_log_file(&block)
+      File.open(LOG_FILE, (File::WRONLY | File::APPEND), &block)
     end
   end
 end

data/lib/sheepsafe.rb

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

data/sheepsafe.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name              = 'sheepsafe'
-  s.version           = '0.2.5'
-  s.date              = '2010-11-19'
+  s.version           = '0.2.6'
+  s.date              = '2011-01-31'
 
   s.rubyforge_project = %q{caldersphere}
 

data/spec/sheepsafe_spec.rb

@@ -104,6 +104,23 @@ describe Sheepsafe::Controller do
   end
 end
 
+describe Sheepsafe::Config, "#ssh_args" do
+  let(:config) { Sheepsafe::Config.new({"ssh_host" => "dummyhost", "socks_port" => "1234"}) }
+
+  it "should include -ND socks_port with SOCKS proxy port" do
+    config.ssh_args.should =~ /-ND 1234/
+  end
+
+  it "should not include -p ssh_port if none is specified" do
+    config.ssh_args.should == "-ND 1234 dummyhost"
+  end
+
+  it "should include -p ssh_port if present" do
+    config.ssh_port = "2323"
+    config.ssh_args.should == "-p 2323 -ND 1234 dummyhost"
+  end
+end
+
 describe Sheepsafe::Network do
   let(:current_network) { Sheepsafe::Network.new }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sheepsafe
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Nick Sieger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -06:00
+date: 2011-01-31 00:00:00 -06:00
 default_executable: sheepsafe
 dependencies: 
 - !ruby/object:Gem::Dependency