rest_connection 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/git_hooks/pre-commit

@@ -31,17 +31,28 @@ MMMN              NMM$                           MMM               MMM
 EOS
 }
 
+mac_unix_name=Darwin
+uname_returned=`uname -a`
+unix_name=${uname_returned:0:${#mac_unix_name}}
+if [ "$unix_name" = "$mac_unix_name" ]; then
+  echo "MAC OS \"$mac_unix_name\" detected so whitespace modification logic suppressed..."
+else
+  echo "non-MAC OS detected..."
+fi
+
 whitespace=""
 echo "Checking for syntax errors..."
 for FILE in `git diff-index --name-only HEAD --` ; do
   if test -f $FILE; then
-    filetype=`file -b $FILE`
-    if [[ "$filetype" =~ "text" ]]; then
-      if [[ -n `grep "\\s\\s*$" $FILE` ]]; then whitespace="$whitespace $FILE"; fi
-      # Remove trailing whitespace
-      sed -i "s/\\s\\s*$//g" $FILE
-      # Remove tabs
-      sed -i "s/\t/  /g" $FILE
+    if [ "$unix_name" != "$mac_unix_name" ]; then
+      filetype=`file -b $FILE`
+      if [[ "$filetype" =~ "text" ]]; then
+        if [[ -n `grep "\\s\\s*$" $FILE` ]]; then whitespace="$whitespace $FILE"; fi
+        # Remove trailing whitespace
+        sed -i "s/\\s\\s*$//g" $FILE
+        # Remove tabs
+        sed -i "s/\t/  /g" $FILE
+      fi
     fi
 
     # If a file is ruby, check for syntax errors using ruby
@@ -107,10 +118,12 @@ if [[ "$fail" -ne 0 && -n "$fail" ]]; then
   exit 1
 fi
 
-for FILE in $whitespace; do
-  echo "Whitespace problem fixed. Please re-add '$FILE' to your commit"
-done
-if [[ -n "$whitespace" ]]; then lod_message; exit 1; fi
+if [ "$unix_name" != "$mac_unix_name" ]; then
+  for FILE in $whitespace; do
+    echo "Whitespace problem fixed. Please re-add '$FILE' to your commit"
+  done
+  if [[ -n "$whitespace" ]]; then lod_message; exit 1; fi
+fi
 
 # Check that project metadata files exist
 for FILE in "README.rdoc" "VERSION" ".gitignore" "Rakefile"; do

data/lib/rest_connection/ssh_hax.rb

@@ -153,7 +153,7 @@ module SshHax
   # returns hash of exit_status and output from command
   def spot_check_command(command, ssh_key=nil, host_dns=self.reachable_ip, do_not_log_result=false)
     raise "FATAL: spot_check_command called on a server with no reachable_ip. You need to run .settings on the server to populate this attribute." unless host_dns
-    connection.logger "SSHing to #{host_dns} using key(s) #{ssh_key_config(ssh_key)}"
+    connection.logger "SSHing to #{host_dns} using key(s) #{ssh_key_config(ssh_key).inspect}"
     status = nil
     output = ""
     success = false
@@ -163,7 +163,7 @@ module SshHax
         # Test for ability to connect; Net::SSH.start sometimes hangs under certain server-side sshd configs
         test_ssh = ""
         [5, 15, 60].each { |timeout_max|
-          test_ssh = `ssh -o \"BatchMode=yes\" -o \"ConnectTimeout #{timeout_max}\" root@#{host_dns} -C \"exit\" 2>&1`.chomp
+          test_ssh = `ssh -o \"BatchMode=yes\" -o \"StrictHostKeyChecking=no\" -o \"ConnectTimeout #{timeout_max}\" root@#{host_dns} -C \"exit\" 2>&1`.chomp
           break if test_ssh =~ /permission denied/i or test_ssh.empty?
         }
         raise test_ssh unless test_ssh =~ /permission denied/i or test_ssh.empty?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest_connection
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Jeremy Deininger
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-16 00:00:00 Z
+date: 2012-03-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Modular RESTful API library