autoremote 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a342da83ca1bb192892e144c1c806745f60f1ec7
-  data.tar.gz: 0cda4445d977ff6c01143e5b19c8258ce36efbf6
+  metadata.gz: 5a7b2d0b7620a21484db8c002d2a295eebd59bda
+  data.tar.gz: 2825fff65839f16ce93cd35134185e22ebdec542
 SHA512:
-  metadata.gz: 069d130dcaaf0128597c61239e446c70ccda93d753f9b2fc03d1959773fe5375c54529ce3c4a438536a027c32bff741d43a8dbad808f8f9b7b6b8469c58c921c
-  data.tar.gz: f8e8184c36845b564dfc2536d7e8df6f404e2be9fbf69a0e04ff1e90c2222342daae357a9b34ec57ef6a26fb7df8b7ee383ac91d0bb1146673d0fc83fecdccd0
+  metadata.gz: f522bfb3c914254549b6f2bfcb1697098b7ec8d5575e3c539fcc08d5b9c7f3bd24bd17c0ab71d09ff0ba5022575c4500f578235263f5ddad7156a962419a5e8c
+  data.tar.gz: 9e06942d9472ea015fc22007920cc3fdafccb14cdee8a6f2fc32dc5c8cb4c55082bc69ecf45184bd19f0ecf5c16ae1f75fbfcb3550e845de8fed3258499dcc03

data/README.md

@@ -16,7 +16,8 @@ This project incudes both a library and an executable that uses the library.
 
 Devices are saved with sqlite3 in ~/.autoremote/devices.db
 
-If you don't know how to get your personal key [follow this link](http://joaoapps.com/autoremote/personal/)
+If you don't know how to get your personal key [follow this link](http://joaoapps.com/autoremote/personal/)  
+Since version 0.1.0 you can use the goo.gl url instead of the key when adding devices.  
 
 ## Installation
 
@@ -25,8 +26,9 @@ If you don't know how to get your personal key [follow this link](http://joaoapp
 ## Usage
 
 ### Executable
-    $ autoremote add NAME KEY            Save device
+    $ autoremote add NAME KEY|URL        Save device
     $ autoremote remove NAME             Removes device
+    $ autoremote delete NAME             Same as above
     $ autoremote list [WITHKEY]          Lists all devices. Displays keys if WITHKEY equals to true, t, yes, y, ja, j or 1
     $ autoremote message NAME MESSAGE    Send a message to a device
     $ autoremote register NAME HOST      Register this computer to the device
@@ -36,8 +38,10 @@ If you don't know how to get your personal key [follow this link](http://joaoapp
 ```ruby
 require 'autoremote'
 
-# This will save a device for use later
-AutoRemote.addDevice( name, key )
+# Adding devices can be done either with the key
+AutoRemote.addDevice( name, "A VERY LONG STRING OF CHARACTERS" )
+# Or with your 'goo.gl' address
+AutoRemote.addDevice( name, "http://goo.gl/XXXXXX" )
 
 # Removes a device
 AutoRemote.removeDevice( name )

data/autoremote.gemspec

@@ -6,8 +6,8 @@ require 'autoremote/version'
 Gem::Specification.new do |spec|
     spec.name          = "autoremote"
     spec.version       = AutoRemote::VERSION
-    spec.authors       = [ "AltonV" ]
-    spec.email         = [ "altonv@yurijware.com" ]
+    spec.authors       = [ "Magnus Smedberg" ]
+    spec.email         = [ "magnus.smedberg@yurijware.com" ]
     spec.summary       = %q{A library for interacting with autoremote devices http://joaoapps.com/autoremote/}
     spec.homepage      = "https://github.com/AltonV/autoremote"
     spec.license       = "MIT"
@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
     
     spec.add_runtime_dependency 'activerecord', '~> 4.2', '~> 4.2'
     spec.add_runtime_dependency 'sqlite3', '~> 1.3', '~> 1.3'
+    spec.add_runtime_dependency 'httparty', '~> 0.13', '~> 0.13'
 end

data/bin/autoremote

@@ -12,8 +12,9 @@ end
 def print_help
     puts "AutoRemote v" + AutoRemote::VERSION
     puts "\nArguments:"
-    puts "    add DEVICE KEY             Save device"
+    puts "    add DEVICE KEY|URL         Save device either with a 'goo.gl' url or personal key"
     puts "    remove DEVICE              Removes device"
+    puts "    delete DEVICE              Same as above"
     puts "    list [WITHKEY]             Lists all devices"
     puts "    message DEVICE MESSAGE     Send a message to a device"
     puts "    register DEVICE HOST       Register this computer to the device"
@@ -34,7 +35,7 @@ elsif arg0 == "add" && ARGV[1] && ARGV[2]
         puts "Error: #{e.message}"
     end
     
-elsif arg0 == "remove" && ARGV[1]
+elsif ( arg0 == "remove" || arg0 == "delete" ) && ARGV[1]
     puts "Removing device"
     begin
         AutoRemote.removeDevice( ARGV[1] )

data/lib/autoremote.rb

@@ -4,6 +4,7 @@ require 'sqlite3'
 require 'active_record'
 require 'net/http'
 require 'socket'
+require 'httparty'
 
 ## Establish the database connection
 ActiveRecord::Base.establish_connection(
@@ -30,25 +31,41 @@ module AutoRemote
     
     # Add a device
     # @param name [String] The name of the device
-    # @param key [String] The personal key of the device
+    # @param input [String] Can either be the 'goo.gl' url or the personal key of the device
     # @raise [AutoRemote::DeviceAlreadyExist] if the device already exits
+    # @raise [AutoRemote::InvalidKey] if the key or url is invalid
     # @return [void]
-    def AutoRemote::addDevice( name, key )
-        ## Check if the name is taken
-        if Device.find_by_name( name ) || Device.find_by_key(key)
-            raise self::DeviceAlreadyExist
-        end
+    def AutoRemote::addDevice( name, input )
         
-        ## Validate key
-        result = self.urlRequest( VALIDATIONURL.sub( /%YOUR_KEY%/, key ) )
+        ## Validation if input is a 'goo.gl' url
+        if input.match( /^(https?:\/{2})?(goo.gl\/[\S]*)$/i )
+            result = self.urlRequest( input )
+            
+            ## Get the key from the resulting url
+            begin
+                input = CGI.parse( result.request.last_uri.query )['key'][0]
+            rescue
+                raise self::InvalidKey
+            end
+            
+        ## If not a 'goo.gl' url, check if it is a valid key
+        else
+            ## Validate key
+            result = self.urlRequest( VALIDATIONURL.sub( /%YOUR_KEY%/, input ) )
+            
+            ## Check result
+            if result.body != "OK"
+                raise self::InvalidKey
+            end
+        end
         
-        ## Check result
-        if result.body != "OK"
-            raise self::InvalidKey
+        ## Check if the device already exist
+        if Device.find_by_name( name ) || Device.find_by_key( input )
+            raise self::DeviceAlreadyExist
         end
         
         ## Save the device
-        Device.create(:name => name, :key => key)
+        Device.create(:name => name, :key => input)
     end
     
     # Remove a specific device
@@ -145,10 +162,11 @@ module AutoRemote
     # Performs a http request
     # @param url [String]
     def AutoRemote::urlRequest( url )
-        url = URI.parse( url )
-        result = Net::HTTP.start(url.host, url.port) {|http|
-            http.request( Net::HTTP::Get.new( url.to_s ) )
-        }
-        return result
+        ## Add http:// to the url if not present
+        if ! url.match( /^https?:\/{2}/i )
+            url = "http://" + url
+        end
+        
+        return HTTParty.get( url )
     end
 end

data/lib/autoremote/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoremote
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
-- AltonV
+- Magnus Smedberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,9 +66,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
 description: 
 email:
-- altonv@yurijware.com
+- magnus.smedberg@yurijware.com
 executables:
 - autoremote
 extensions: []