sheepsafe 0.2.8 → 0.3.0

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.3.0
+
+- Always recycle proxy on network changes, and wait a few seconds more
+  when bringing the proxy up so that the network change is in effect
+
 === 0.2.8
 
 - example.com changed again, search for /RFC 2606/ in body instead

data/lib/sheepsafe/controller.rb

@@ -40,12 +40,13 @@ module Sheepsafe
         return
       end
 
+      # Always recycle the proxy server on network changes
+      bring_socks_proxy 'down'
       if network_up?
         if network_changed?
           if switch_to_trusted?
             notify_ok "Switching to #{@config.trusted_location} location"
             system "scselect #{@config.trusted_location}"
-            bring_socks_proxy 'down'
           elsif switch_to_untrusted?
             notified = false
             loop do
@@ -63,8 +64,7 @@ module Sheepsafe
           @config.last_network = @network
           @config.write
         elsif !@network.trustworthy?
-          # recycle the proxy server on network changes
-          bring_socks_proxy 'restart'
+          bring_socks_proxy 'up'
         end
       else
         log("AirPort is off")
@@ -102,7 +102,7 @@ module Sheepsafe
           Process.kill("TERM", pid)
           exit 0
         end
-        sleep 2                 # wait a bit before starting proxy
+        sleep 5                 # wait a bit before starting proxy
         exit_count = 0
         ssh_command = "ssh #{@config.ssh_args}"
         loop do

data/lib/sheepsafe.rb

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

data/sheepsafe.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name              = 'sheepsafe'
-  s.version           = '0.2.8'
-  s.date              = '2011-03-22'
+  s.version           = '0.3.0'
+  s.date              = '2011-04-14'
 
   s.rubyforge_project = %q{caldersphere}
 

data/spec/sheepsafe_spec.rb

@@ -58,7 +58,8 @@ describe Sheepsafe::Controller do
 
     it "recycles the proxy server process when on the untrusted network" do
       network.stub :trustworthy? => false
-      controller.should_receive(:bring_socks_proxy).with('restart')
+      controller.should_receive(:bring_socks_proxy).with('down')
+      controller.should_receive(:bring_socks_proxy).with('up')
       controller.run
     end
   end
@@ -97,6 +98,7 @@ describe Sheepsafe::Controller do
         controller.should_receive(:switch_to_untrusted?).and_return true
         controller.should_receive(:open).and_return("596")
         controller.should_receive(:system).with("scselect untrusted_location")
+        controller.should_receive(:bring_socks_proxy).with('down')
         controller.should_receive(:bring_socks_proxy).with('up')
         controller.run
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sheepsafe
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 8
-  version: 0.2.8
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Nick Sieger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 -05:00
+date: 2011-04-14 00:00:00 -05:00
 default_executable: sheepsafe
 dependencies: 
 - !ruby/object:Gem::Dependency