sheepsafe 0.3.1 → 0.3.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.3.2
+
+- Migrate all sheepsafe files to ~/.sheepsafe/ directory (Justin Ridgewell)
+- Change internet connection check to look for google.com 'gws' server
+
 === 0.3.1
 
 - Fix `sheepsafe add` (thanks Justin Ridgewell for pointing out)

data/lib/sheepsafe/config.rb

@@ -2,7 +2,7 @@ require 'yaml'
 
 module Sheepsafe
   class Config
-    FILE = File.expand_path('~/.sheepsafe.yml')
+    FILE = File.expand_path('~/.sheepsafe/sheepsafe.yml')
     DEFAULT_CONFIG = {"untrusted_location" => "Untrusted", "socks_port" => "9999", "trust_encrypted?" => "false"}
     ATTRS = %w(trusted_location untrusted_location last_network ssh_host ssh_port socks_port trust_encrypted?)
     ARRAY_ATTRS = %w(trusted_names untrusted_names)
@@ -10,7 +10,7 @@ module Sheepsafe
     def self.load_config
       YAML.load_file(FILE)
     rescue Errno::ENOENT
-      raise "Unable to read ~/.sheepsafe.yml; please run sheepsafe-install"
+      raise "Unable to read ~/.sheepsafe/sheepsafe.yml; please run sheepsafe-install"
     end
 
     attr_reader :config

data/lib/sheepsafe/controller.rb

@@ -51,8 +51,8 @@ module Sheepsafe
             notified = false
             loop do
               require 'open-uri'
-              is_example_com = open("http://example.com") {|f| f.read[/(RFC 2606)/] == "RFC 2606"} rescue nil
-              break if is_example_com
+              is_google_com = open("http://www.google.com") {|f| f.meta['server'] == 'gws'} rescue nil
+              break if is_google_com
               notify_warning("Waiting for internet connection before switching") unless notified
               notified = true
               sleep 5
@@ -96,7 +96,7 @@ module Sheepsafe
             else
               direction
             end
-      Daemons.run_proc('.sheepsafe.proxy', :ARGV => [cmd], :dir_mode => :normal, :dir => ENV['HOME']) do
+      Daemons.run_proc('sheepsafe.proxy', :ARGV => [cmd], :dir_mode => :normal, :dir => "#{ENV['HOME']}/.sheepsafe") do
         pid = nil
         trap("TERM") do
           Process.kill("TERM", pid)
@@ -120,7 +120,7 @@ module Sheepsafe
     end
 
     def proxy_running?
-      File.exist?("#{ENV['HOME']}/.sheepsafe.proxy.pid") && File.read("#{ENV['HOME']}/.sheepsafe.proxy.pid").to_i > 0
+      File.exist?("#{ENV['HOME']}/.sheepsafe/sheepsafe.proxy.pid") && File.read("#{ENV['HOME']}/.sheepsafe/sheepsafe.proxy.pid").to_i > 0
     end
 
     def notify_ok(msg)

data/lib/sheepsafe/installer.rb

@@ -5,6 +5,7 @@ module Sheepsafe
     attr_reader :config, :network, :controller
 
     def initialize(config = nil, network = nil, controller = nil)
+      check_config_path
       require 'highline/import'
       @config  = config  || (File.readable?(Sheepsafe::Config::FILE) ? Sheepsafe::Config.new : Sheepsafe::Config.new({}))
       @network = network || Sheepsafe::Network.new(@config)
@@ -13,6 +14,7 @@ module Sheepsafe
     end
 
     def install
+      migrate_old_config_path
       intro_message
       config_prompts
       setup_network_location
@@ -22,6 +24,27 @@ module Sheepsafe
       announce_done
     end
 
+    def check_config_path
+      if !File.directory? "#{ENV['HOME']}/.sheepsafe/"
+        Dir.mkdir("#{ENV['HOME']}/.sheepsafe/")
+      end
+    end
+
+    def migrate_old_config_path
+      reinitialize = false
+      if File.exist?("#{ENV['HOME']}/.sheepsafe.log")
+        reinitialize = true
+        say "Moving old sheepsafe.log file to new directory."
+        system "mv ~/.sheepsafe.log ~/.sheepsafe/sheepsafe.log"
+      end
+      if File.exist?("#{ENV['HOME']}/.sheepsafe.yml")
+        reinitialize = true
+        say "Moving old sheepsafe.yml file to new directory."
+        system "mv ~/.sheepsafe.yml ~/.sheepsafe/sheepsafe.yml"
+      end
+      initialize if reinitialize
+    end
+
     def intro_message
       say(<<-MSG)
 Welcome to Sheepsafe!
@@ -133,7 +156,7 @@ PLIST
         system "launchctl unload #{PLIST_FILE}"
         File.unlink PLIST_FILE rescue nil
       end
-      Dir['~/.sheepsafe.*'].each {|f| File.unlink f rescue nil}
+      system "rm -r ~/.sheepsafe"
       say "Uninstall finished."
     end
 

data/lib/sheepsafe.rb

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

data/sheepsafe.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name              = 'sheepsafe'
-  s.version           = '0.3.1'
-  s.date              = '2011-05-09'
+  s.version           = '0.3.2'
+  s.date              = '2011-06-05'
 
   s.rubyforge_project = %q{caldersphere}
 
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
   s.executables = ["sheepsafe"]
-  s.default_executable = "sheepsafe"
 
   s.post_install_message = %[
 ===========================================================================

data/spec/sheepsafe_spec.rb

@@ -179,7 +179,7 @@ describe Sheepsafe::Installer do
   let(:config) { double("config").as_null_object }
   let(:network) { double("network", :up? => true, :ssid => "current", :bssid => "current_bssid") }
   let(:controller) { double "controller" }
-  let (:installer) do
+  let(:installer) do
     @messages = []
     @commands = []
     Sheepsafe::Installer.new(config, network, controller).tap do |ins|
@@ -203,6 +203,7 @@ describe Sheepsafe::Installer do
 
   before :each do
     $?.stub :success? => true
+    File.stub!(:exist?).and_return false
   end
 
   it "asks questions, runs commands, writes the config to disk and runs the controller" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sheepsafe
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Nick Sieger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 Z
+date: 2011-06-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline