autoremote 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65f03c0bc3a9456d9a59737a15346bafffbdd567
-  data.tar.gz: cb47099496f1c2bb2990c9858061a2fe3a44fcdc
+  metadata.gz: a342da83ca1bb192892e144c1c806745f60f1ec7
+  data.tar.gz: 0cda4445d977ff6c01143e5b19c8258ce36efbf6
 SHA512:
-  metadata.gz: 6763d9e3e898fae41f26da4687f63d95c053fa6f0a3df8b691b25927345dce99918592762b0210ef4a298aff63c5ccc2af72689edaf043d37d0eba694f3fe8a0
-  data.tar.gz: be3d51e59593f49c8926a61418a89e9f4c48d5c121934524a96652c828b66d907ab2963801cec46c8b1baeb18e46b09322d19d35eca33797c6ca6a83734067ee
+  metadata.gz: 069d130dcaaf0128597c61239e446c70ccda93d753f9b2fc03d1959773fe5375c54529ce3c4a438536a027c32bff741d43a8dbad808f8f9b7b6b8469c58c921c
+  data.tar.gz: f8e8184c36845b564dfc2536d7e8df6f404e2be9fbf69a0e04ff1e90c2222342daae357a9b34ec57ef6a26fb7df8b7ee383ac91d0bb1146673d0fc83fecdccd0

data/bin/autoremote

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'autoremote'
+require 'rbconfig'
 
 def to_bool( string )
     return false if string.class == NilClass || string.empty? || string.downcase =~ (/^(false|f|no|n|nej|0)$/i)
@@ -61,6 +62,15 @@ elsif arg0 == "message" && ARGV[1] && ARGV[2]
     end
     
 elsif arg0 == "register" && ARGV[1] && ARGV[2]
+    if RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/i
+        puts "Are you sure you want to register a windows computer?"
+        print "You will need an SSH server on the computer. (y/n)"
+        if ! to_bool($stdin.gets.chomp)
+            puts "Registering interrupted"
+            exit
+        end
+    end
+    
     begin
         AutoRemote::registerOnDevice( ARGV[1], ARGV[2] )
         puts "Device registered successfully"

data/lib/autoremote.rb

@@ -3,6 +3,7 @@ require "autoremote/exceptions"
 require 'sqlite3'
 require 'active_record'
 require 'net/http'
+require 'socket'
 
 ## Establish the database connection
 ActiveRecord::Base.establish_connection(
@@ -23,7 +24,7 @@ ActiveRecord::Schema.define do
 end
 
 module AutoRemote
-    REGCMD = "curl \"http://autoremotejoaomgcd.appspot.com/registerpc?key=%YOUR_KEY%&name=%DISPLAY_NAME%&id=%UNIQUE_ID%&type=linux&publicip=%PUBLIC_HOST%&localip=$(sudo ifconfig eth0 |grep \"inet addr\" |awk '{print $2}' |awk -F: '{print $2}')\""
+    REGURL = "http://autoremotejoaomgcd.appspot.com/registerpc?key=%YOUR_KEY%&name=%DISPLAY_NAME%&id=%UNIQUE_ID%&type=linux&publicip=%PUBLIC_HOST%&localip=%IP_ADDRESS%"
     MSGURL = "http://autoremotejoaomgcd.appspot.com/sendmessage?key=%YOUR_KEY%&message=%MESSAGE%&sender=%SENDER_ID%"
     VALIDATIONURL = "http://autoremotejoaomgcd.appspot.com/sendmessage?key=%YOUR_KEY%"
     
@@ -104,10 +105,10 @@ module AutoRemote
     # @param device [Device, String] A device object or the name of the device
     # @param remotehost [String] The public hostname or ip-address
     # @raise [AutoRemote::DeviceNotFound] if the device didn't exits
+    # @raise [AutoRemote::UnsupportedAction] if running from windows
     # @raise [TypeError] if message isn't a string or less than 5 characters
     # @return [void]
     def AutoRemote::registerOnDevice( device, remotehost )
-        
         if ! device.kind_of?( Device ) && ! ( device = Device.find_by_name( device ) )
             raise self::DeviceNotFound
         elsif ! remotehost.kind_of?( String ) || remotehost.length < 5
@@ -115,14 +116,13 @@ module AutoRemote
         end
         
         hostname = `hostname`.strip
+        ipAddress = AutoRemote::getIpAddress.ip_address
         
         ## Perform the registration
-        cmd = REGCMD.sub( /%YOUR_KEY%/, device.key ).sub(/%DISPLAY_NAME%/, hostname ).sub(/%UNIQUE_ID%/, hostname ).sub(/%PUBLIC_HOST%/, remotehost )
-        result = system(cmd)
-        puts
+        result = self.urlRequest( REGURL.sub( /%YOUR_KEY%/, device.key ).sub(/%DISPLAY_NAME%/, hostname ).sub(/%UNIQUE_ID%/, hostname ).sub(/%PUBLIC_HOST%/, remotehost ).sub(/%IP_ADDRESS%/, ipAddress ) )
         
         ## Check result
-        if ! result
+        if result.body != "OK"
             raise self::AutoRemoteException, "Something went wrong when registering on the device"
         end
     end
@@ -136,6 +136,12 @@ module AutoRemote
     end
     
     private
+    # Gets the ip address of the system
+    # @return [String]
+    def AutoRemote::getIpAddress
+        return Socket.ip_address_list.detect{|ipInfo| ipInfo.ipv4_private?}
+    end
+    
     # Performs a http request
     # @param url [String]
     def AutoRemote::urlRequest( url )

data/lib/autoremote/version.rb

@@ -1,3 +1,3 @@
 module AutoRemote
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoremote
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - AltonV
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler