sheepsafe 0.2.3 → 0.2.4

data/README.md

@@ -49,6 +49,21 @@ but this setup Works For Me.
 - After installing the gem, run `sheepsafe install` and follow the
   prompts for configuring Sheepsafe.
 
+## Usage
+
+- `sheepsafe`: when run with no arguments, this checks your current
+  network and updates settings if necessary.
+- `sheepsafe install`: Run the command-line installer. Fill out the
+  prompts and you're ready.
+- `sheepsafe update`: Run when you've upgraded the gem to make sure
+  launchd is running the most recent version.
+- `sheepsafe add`: Add the current network to your list of trusted
+  networks.
+- `sheepsafe list`: Show the list of trusted networks.
+- `sheepsafe proxy up`: Manually start the SSH SOCKS proxy.
+- `sheepsafe proxy down`: Manually stop the SSH SOCKS proxy.
+- `sheepsafe proxy kick`: Manually restart the SSH SOCKS proxy.
+
 ## Growl
 
 If you wish to receive Growl notifications when Sheepsafe is switching

data/lib/sheepsafe/controller.rb

@@ -19,7 +19,7 @@ module Sheepsafe
     end
 
     def run
-      if ARGV.first == 'proxy'  # 'sheepsafe proxy up/down'
+      if ARGV.first == 'proxy'  # 'sheepsafe proxy up/down/kick'
         bring_socks_proxy ARGV[1]
         return
       end
@@ -32,16 +32,24 @@ module Sheepsafe
             system "scselect #{@config.trusted_location}"
             bring_socks_proxy 'down'
           elsif switch_to_untrusted?
+            notified = false
+            loop do
+              require 'open-uri'
+              length = open("http://example.com") {|f| f.meta['content-length'] } rescue nil
+              break if length == "596" # successful contact w/ example.com
+              notify_warning("Waiting for internet connection before switching") unless notified
+              notified = true
+              sleep 5
+            end
             notify_warning "Switching to #{@config.untrusted_location} location"
-            bring_socks_proxy 'up'
             system "scselect #{@config.untrusted_location}"
+            bring_socks_proxy 'up'
           end
           @config.last_network = @network
           @config.write
         elsif !@network.trusted?
           # recycle the proxy server on network changes
-          bring_socks_proxy 'down'
-          bring_socks_proxy 'up'
+          bring_socks_proxy 'restart'
         end
       else
         log("AirPort is off")
@@ -66,7 +74,14 @@ module Sheepsafe
     end
 
     def bring_socks_proxy(direction)
-      Daemons.run_proc '.sheepsafe.proxy', :ARGV => [direction == 'up' ? 'start' : 'stop'], :dir_mode => :normal, :dir => ENV['HOME'] do
+      cmd = case direction
+            when 'up'   then 'start'
+            when 'down' then 'stop'
+            when 'kick' then 'restart'
+            else
+              direction
+            end
+      Daemons.run_proc('.sheepsafe.proxy', :ARGV => [cmd], :dir_mode => :normal, :dir => ENV['HOME']) do
         pid = nil
         trap("TERM") do
           Process.kill("TERM", pid)
@@ -76,14 +91,14 @@ module Sheepsafe
           pid = fork do
             exec("ssh -ND #{@config.socks_port} #{@config.ssh_host}")
           end
-          Process.waitpid(pid, 0)
+          Process.waitpid(pid)
           sleep 1
         end
       end
     end
 
     def proxy_running?
-      File.exist?("#{ENV['HOME']}/.sheepsafe.proxy.pid")
+      File.exist?("#{ENV['HOME']}/.sheepsafe.proxy.pid") && File.read("#{ENV['HOME']}/.sheepsafe.proxy.pid").to_i > 0
     end
 
     def notify_ok(msg)

data/lib/sheepsafe/installer.rb

@@ -79,6 +79,7 @@ MSG
     # For details see http://tech.inhelsinki.nl/locationchanger/
     def write_launchd_plist
       say "Setting up launchd configuration file #{PLIST_FILE}..."
+      Dir.mkdir(File.dirname(PLIST_FILE)) unless File.directory?(File.dirname(PLIST_FILE))
       plist = <<-PLIST
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
@@ -138,6 +139,23 @@ PLIST
       register_launchd_task
     end
 
+    def add
+      @config.trusted_names << @network.ssid	
+      @config.last_network = nil
+      say "Adding #{config.trusted_names[num]} to your trusted locations"
+      write_config
+      @controller.run
+    end
+
+    def list
+      say "Currently trusted locations:"
+      puts @config.trusted_names
+    end
+
+    #
+    # Needed? Remove current network from trusted
+    #
+
     private
     def update_config_with_network
       unless config.trusted_location

data/lib/sheepsafe.rb

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

data/sheepsafe.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = 'sheepsafe'
-  s.version           = '0.2.3'
+  s.version           = '0.2.4'
   s.date              = '2010-11-09'
 
   s.rubyforge_project = %q{caldersphere}

data/spec/sheepsafe_spec.rb

@@ -58,8 +58,7 @@ describe Sheepsafe::Controller do
 
     it "recycles the proxy server process when on the untrusted network" do
       network.stub :trusted? => false
-      controller.should_receive(:bring_socks_proxy).with('down').ordered
-      controller.should_receive(:bring_socks_proxy).with('up').ordered
+      controller.should_receive(:bring_socks_proxy).with('restart')
       controller.run
     end
   end
@@ -94,8 +93,9 @@ describe Sheepsafe::Controller do
     end
 
     context "to untrusted" do
-      it "changes to the untrusted location" do
+      it "changes to the untrusted location after connecting to example.com" 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('up')
         controller.run

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sheepsafe
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Nick Sieger