artoo 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61bbb3f286d72755f95f57795cf0683aef11570a
-  data.tar.gz: dc0ff46b67e93f15b8b77fc857eacf11ac4ad620
+  metadata.gz: 8dada91f56c875c86f6f1f4a689a27417a65d760
+  data.tar.gz: c66e5a9aa2311d76d7af2648bf6a362a14b8ed48
 SHA512:
-  metadata.gz: 99bf08c9f0e74dcc39dfdde10e345120e0d81aa61ec491b9a59789b850c2f7663594613eb431586ddbd682c6e5c592c8b4dfbe60244294d6b264a2d1a574eecb
-  data.tar.gz: 264aba1fde9cc5cee419657502cf295bc861ecb8fa5f7981bef49a0f7b48992f4aae5770cbf17f709f9c05e4d1ef9b633114750015d4c8b6f76fb8c8259aed9b
+  metadata.gz: 4b6b2c71e48df2bba926db39e2561b9cd23b8ef6ea74852ee996e78b480c5a8f888c6aeae01099e192e5cf2ead9e1c07b6ab84afea4f1c6b40d03091da2796f0
+  data.tar.gz: 2fb9018b0178c87e21f6ae024564f0ea1ee51ee4293b6031bf65bfee2fcfb525e0e3f8be4e77e1d95a42ede9dbc2872330d33d84674b4db7d4cc2429cb2801a4

data/.ruby-gemset

@@ -0,0 +1 @@
+artoo

data/.ruby-version

@@ -0,0 +1 @@
+rbx-2.0.0-rc1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    artoo (1.0.0.rc2)
+    artoo (1.0.0.rc3)
       celluloid (~> 0.14.1)
       celluloid-io (~> 0.14.1)
       multi_json (~> 1.6)
@@ -62,7 +62,6 @@ GEM
       certified
       http_parser.rb
     http_parser.rb (0.5.3)
-    http_parser.rb (0.5.3-java)
     json (1.7.7)
     json (1.7.7-java)
     kramdown (1.1.0)
@@ -77,7 +76,6 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.7.7)
     nio4r (0.4.6)
-    nio4r (0.4.6-java)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)

data/README.md

@@ -212,12 +212,30 @@ Artoo has a Command Line Interface (CLI) so you can access important features ri
 ```
 $ artoo
 Commands:
-  artoo console ROBOT                # run a robot using the Robi console
+  artoo connect SUBCOMMAND ...ARGS   # Connects to device
+  artoo console ROBOT                # Run a robot using the Robi console
   artoo generate SUBCOMMAND ...ARGS  # Generates a new robot or adaptor
   artoo help [COMMAND]               # Describe available commands or one specific command
+  artoo install SUBCOMMAND ...ARGS   # Installs utility programs
+  artoo start ROBOT                  # Run a robot
   artoo version                      # Displays the current version
 ```
 
+### Connect:
+
+Artoo makes it a lot easier to connect TCP Socket to Bluetooth and serial port devices using the command line interface:
+
+```
+$ artoo connect
+Commands:
+  artoo connect bind            # bind [ADDRESS] [NAME] binds a device to some connected hardware
+  artoo connect help [COMMAND]  # Describe subcommands or one specific subcommand
+  artoo connect scan            # scan for connected devices
+  artoo connect socat           # socat [PORT] [NAME] use socat to connect a socket to a serial device by name
+```
+
+You can scan your computer for paired Bluetooth devices, bind them to unix ports, and connect socket to serial interfaces, easily from the command line!
+
 ### Console:
 
 Artoo includes Robi, a console based on Pry (http://pryrepl.org/) to allow you to interactively debug and control your robot.

data/bin/artoo

@@ -23,6 +23,15 @@ module CLI
       run("robi #{robot}")
     end
 
+    desc "start ROBOT", "Run a robot"
+    option :delay, :default => 0, :desc => "Number of seconds to wait for connections"
+    def start(robot)
+      say "Starting robot..."
+      delay = options[:delay].to_i
+      sleep(delay) if delay > 0
+      run("ruby #{robot}")
+    end
+
     desc "generate SUBCOMMAND ...ARGS", "Generates a new robot or adaptor"
     subcommand "generate", Artoo::Commands::Generate
 

data/lib/artoo/commands/connect.rb

@@ -21,10 +21,12 @@ module Artoo
 
       desc "bind", "bind [ADDRESS] [NAME] binds a device to some connected hardware"
       option :comm, :default => 0, :desc => "Comm number"
-      def bind(address, name, hcix=nil)
+      option :radio, :default => "hci0", :desc => "Bluetooth radio address"
+      def bind(address, name)
         case os
         when :linux
-          run("bundle exec ./bin/artoo_bind.sh #{comm} #{address} #{name}")
+          run("rfcomm -i #{options[:radio]} bind /dev/rfcomm#{options[:comm]} #{address} 1")
+          run("sudo ln -s /dev/rfcomm#{options[:comm]} /dev/#{name}")
         when :macosx
           say "OSX binds devices on its own volition."
         else
@@ -32,13 +34,28 @@ module Artoo
         end
       end
 
-      desc "socat", "socat [PORT] [NAME] use socat to connect a socket to a device by name"
+      desc "socat", "socat [PORT] [NAME] use socat to connect a socket to a serial device by name"
+      option :retries, :default => 0, :desc => "Number of times to retry connecting on failure"
       def socat(port, name)
+        attempts = 1 + options[:retries].to_i
+        
         case os
         when :linux
-          run("bundle exec ./bin/artoo_socat_linux.sh #{port} #{name}")
+          run("sudo chmod a+rw /dev/#{name}")
+          
+          while(attempts > 0) do
+            run("socat -d -d FILE:/dev/#{name},nonblock,raw,b115200,echo=0 TCP-LISTEN:#{port},fork")
+            break unless $? == 1
+            attempts -= 1
+          end
+
         when :macosx
-          run("bundle exec ./bin/artoo_socat_osx.sh #{port} #{name}")          
+          while(attempts > 0) do
+            run("socat -d -d FILE:/dev/#{name},nonblock,raw,echo=0 TCP-LISTEN:#{port},fork")
+            break unless $? == 1
+            attempts -= 1
+          end
+
         else
           say "OS not yet supported..."
         end

data/lib/artoo/version.rb

@@ -1,5 +1,5 @@
 module Artoo
   unless const_defined?('VERSION')
-    VERSION = "1.0.0.rc2"
+    VERSION = "1.0.0.rc3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artoo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Ron Evans
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -117,14 +117,13 @@ email:
 - artoo@hybridgroup.com
 executables:
 - artoo
-- artoo_bind.sh
-- artoo_socat_linux.sh
-- artoo_socat_osx.sh
 - robi
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - .yardopts
 - CONTRIBUTORS.md
@@ -165,9 +164,6 @@ files:
 - api/public/partials/robot-index.html
 - artoo.gemspec
 - bin/artoo
-- bin/artoo_bind.sh
-- bin/artoo_socat_linux.sh
-- bin/artoo_socat_osx.sh
 - bin/robi
 - examples/ardrone.rb
 - examples/ardrone_multi.rb

data/bin/artoo_bind.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# This will create a connection bound to a device located at /dev/<devicename>
-#
-# Requires sudo or ran as root
-#
-# $1 = unbound /dev/rfcommXX
-# $2 = device hardware address from scan
-# $3 = device name
-#
-# Optional parameter
-# $4 = bluetooth radio hcix
-# 
-# Example
-#
-# sudo ./artoo_bind.sh 1 00:06:66:4A:43:23 pebble hci1
-#
-#
-if [ -z "$4" ]; then
-  addr="hci0"
-else
-  addr=$4
-fi
-rfcomm -i $addr bind /dev/rfcomm$1 $2 1
-sudo ln -s /dev/rfcomm$1 /dev/$3

data/bin/artoo_socat_linux.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-sudo chmod 666 /dev/$2
-
-NEXT_WAIT_TIME=0
-COMMAND="socat -d -d FILE:/dev/$2,nonblock,raw,b115200,echo=0 TCP-LISTEN:$1,fork"
-until $COMMAND || [ $NEXT_WAIT_TIME -eq 4 ]; do
-  echo "retry..."
-  sleep $(( NEXT_WAIT_TIME++ ))
-done

data/bin/artoo_socat_osx.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-NEXT_WAIT_TIME=0
-COMMAND="socat -d -d FILE:/dev/$2,nonblock,raw,echo=0 TCP-LISTEN:$1,fork"
-until $COMMAND || [ $NEXT_WAIT_TIME -eq 4 ]; do
-  echo "retry..."
-  sleep $(( NEXT_WAIT_TIME++ ))
-done