artoo 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99300043a8e0ea0151c2e11e169e417c3f5695f8
-  data.tar.gz: a9e775a2e51c7fc4ee9b2a3b0d6d55c24d2baae9
+  metadata.gz: 1e658b80b5b9aa14f41900900289cbd09888384b
+  data.tar.gz: a2613c23ca45cc5a48d93326d5da716c00df6f86
 SHA512:
-  metadata.gz: 73914f51e137d73d0a16911469b89d8f614df51c2806aafd339a0a54a06a8268b01021b77529e9fa110d5dfa46b201dc838bd34f89834add8633bf5193ff8b07
-  data.tar.gz: d3a6b329bd46dcd87e5ef586de3489e541064723a6961583d7c3a398b9aae8817cbdcb84d93ff50df59077a95eeb512c0f6a64b659f7316e6372a48138f00426
+  metadata.gz: d3199bf1714b0254bea7bd409c14441b33f077bacc6e05881257603f6a9982dd8acea58e02637f29b582c795e0c65d1b5146271086640f0a6132234274c89a48
+  data.tar.gz: 1825a2500d229156dfdd75cb59674b48e77815b8a053b891e8adcbca64262a059ff76f22d44ccdfb7879a6c0d23a08bd13cb3eae1ffd949884d315b8be235de2

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.0
+ruby-2.1.1

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    artoo (1.6.1)
+    artoo (1.6.2)
       celluloid (~> 0.15.0)
       celluloid-io (~> 0.15.0)
       multi_json (~> 1.6)
       pry (~> 0.9)
       rake
       reel (~> 0.4.0)
-      robeaux (~> 0.0.3)
+      robeaux (~> 0.0.4)
       thor (~> 0.18.1)
 
 GEM
@@ -21,6 +21,7 @@ GEM
       nio4r (>= 0.5.0)
     coderay (1.1.0)
     dotenv (0.9.0)
+    ffi (1.9.3-java)
     foreman (0.63.0)
       dotenv (>= 0.7)
       thor (>= 0.13.6)
@@ -30,6 +31,7 @@ GEM
     http (0.5.0)
       http_parser.rb
     http_parser.rb (0.6.0)
+    http_parser.rb (0.6.0-java)
     json (1.7.7)
     json (1.7.7-java)
     kramdown (1.2.0)
@@ -42,10 +44,16 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.8.4)
     nio4r (1.0.0)
+    nio4r (1.0.0-java)
     pry (0.9.12.4)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    pry (0.9.12.4-java)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      spoon (~> 0.0)
     rake (10.1.1)
     reel (0.4.0)
       celluloid (>= 0.15.1)
@@ -54,8 +62,10 @@ GEM
       http_parser.rb (>= 0.6.0.beta.2)
       websocket_parser (>= 0.1.4)
     ref (1.0.5)
-    robeaux (0.0.3)
+    robeaux (0.0.4)
     slop (3.4.7)
+    spoon (0.0.4)
+      ffi
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
       ref

data/artoo.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rake'
   s.add_runtime_dependency 'pry', '~> 0.9'
   s.add_runtime_dependency 'thor', '~> 0.18.1'
-  s.add_runtime_dependency 'robeaux', '~> 0.0.3'
+  s.add_runtime_dependency 'robeaux', '~> 0.0.4'
 end

data/bin/artoo

@@ -3,10 +3,12 @@ require 'rubygems'
 require 'thor'
 require 'thor/group'
 require 'artoo/robot'
-require 'artoo/commands/commands'
 require 'artoo/commands/generate'
-require 'artoo/commands/connect'
+require 'artoo/commands/commands'
 require 'artoo/commands/install'
+require 'artoo/commands/scan'
+require 'artoo/commands/socket'
+require 'artoo/commands/bluetooth'
 
 Celluloid.logger = nil
 
@@ -34,15 +36,17 @@ module CLI
       run("ruby #{robot}")
     end
 
-    desc "generate SUBCOMMAND ...ARGS", "Generates a new robot or adaptor"
+    desc "generate <SUBCOMMAND> ...ARGS", "Generates a new robot or adaptor"
     subcommand "generate", Artoo::Commands::Generate
 
-    desc "connect SUBCOMMAND ...ARGS", "Connects to device"
-    subcommand "connect", Artoo::Commands::Connect
+    desc "bluetooth <SUBCOMMAND> ...ARGS", "Scans, pairs and Connects to a bluetooth device"
+    subcommand "bluetooth", Artoo::Commands::Bluetooth
 
-    desc "install SUBCOMMAND ...ARGS", "Installs utility programs"
+    desc "install <SUBCOMMAND> ...ARGS", "Installs utility programs, like socat"
     subcommand "install", Artoo::Commands::Install
 
+    desc "scan <type> ...ARGS", "Installs utility programs"
+    subcommand "scan", Artoo::Commands::Scan
   end
 end
 

data/lib/artoo/commands/bluetooth.rb

@@ -0,0 +1,74 @@
+require 'thor'
+require 'thor/group'
+
+module Artoo
+  module Commands
+    class Bluetooth < Commands
+      package_name "bluetooth"
+
+      desc "scan", "Scan for bluetooth devices"
+      def scan
+        Artoo::Commands::Scan.new().bluetooth()
+      end
+
+      desc "bind [ADDRESS] [NAME]", "Binds a Bluetooth device to a serial port"
+      option :comm, :aliases => "-c", :default => 0, :desc => "Comm number"
+      option :radio, :aliases => "-r", :default => "hci0", :desc => "Bluetooth radio address"
+      def bind(address, name)
+        case os
+        when :linux
+          run("sudo 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
+          say "OS not yet supported..."
+        end
+      end
+
+      desc "unbind [ADDRESS] [NAME]", "Unbinds a Bluetooth device from a serial port"
+      def unbind(address, name)
+        case os
+        when :linux
+          run("sudo rfcomm unbind #{address}")
+          run("sudo rm /dev/#{name}")
+        when :macosx
+          say "OSX binds devices on its own volition."
+        else
+          say "OS not yet supported..."
+        end
+      end
+
+      desc "connect [NAME] [PORT]", "Connect a serial device to a TCP socket using socat"
+      option :retries, :aliases => "-r", :default => 0, :desc => "Number of times to retry connecting on failure"
+      option :baudrate, :aliases => "-b", :default => 57600, :desc => "Baud rate to use to connect to the serial device"
+      def connect(name, port)
+        Artoo::Commands::Socket.new().connect(name, port, options[:retries], options[:baudrate])
+      end
+
+      desc "pair [ADDRESS]", "Pairs a Bluetooth device"
+      def pair(address)
+        case os
+        when :linux
+          run("bluez-simple-agent hci0 #{ address }")
+        when :macosx
+          say "OS X manages Bluetooth pairing itself."
+        else
+          say "OS not yet supported..."
+        end
+      end
+
+      desc "unpair [ADDRESS]", "Unpairs a Bluetooth device"
+      def unpair(address)
+        case os
+        when :linux
+          run("bluez-simple-agent hci0 #{ address } remove")
+        when :macosx
+          say "OS X manages Bluetooth unpairing itself."
+        else
+          say "OS not yet supported..."
+        end
+      end
+    end
+  end
+end

data/lib/artoo/commands/commands.rb

@@ -17,7 +17,7 @@ module Artoo
       end
 
       def self.install_path
-        ENV["GEM_HOME"] || ENV["RBENV_ROOT"] || Dir.home(Etc.getlogin)
+        ENV["GEM_HOME"] || ENV["RBENV_ROOT"] || Dir.home(Etc.getlogin)
       end
     end
   end

data/lib/artoo/commands/scan.rb

@@ -0,0 +1,42 @@
+require 'thor'
+require 'thor/group'
+
+module Artoo
+  module Commands
+    class Scan < Commands
+      package_name "scan"
+
+      desc "serial", "Scan for connected serial devices"
+      def serial
+        case os
+        when :linux
+          run("ls /dev/tty*")
+        when :macosx
+          run("ls /dev/{tty,cu}.*")
+        else
+          say("OS not yet supported...")
+        end
+      end
+
+      desc "usb", "Scan for connected usb devices"
+      def usb
+        case os
+        when :linux
+          run("lsusb")
+        else
+          say "OS not yet supported..."
+        end
+      end
+
+      desc "bluetooth", "Scan for bluetooth devices"
+      def bluetooth
+        case os
+        when :linux
+          run("hcitool scan")
+        else
+          say "OS not yet supported..."
+        end
+      end
+    end
+  end
+end

data/lib/artoo/commands/socket.rb

@@ -0,0 +1,43 @@
+module Artoo
+  module Commands
+    class Socket < Commands
+
+      desc "connect [NAME] [PORT]", "Connect a serial device to a TCP socket using socat"
+      option :retries, :aliases => "-r", :default => 0, :desc => "Number of times to retry connecting on failure"
+      option :baudrate, :aliases => "-b", :default => 57600, :desc => "Baud rate to use to connect to the serial device"
+      def connect(name, port, retries = nil, baudrate = nil)
+        retries |= (1 + options[:retries].to_i)
+        baudrate |= options[:baudrate].to_i
+
+        # check that Socat is installed
+        system("socat -V &> /dev/null")
+        unless $?.success?
+          say "Socat not installed. Cannot bind serial to TCP."
+          say "Please install with 'artoo install socat' and try again."
+          return
+        end
+
+        case os
+        when :linux
+          run("sudo chmod a+rw /dev/#{name}")
+
+          while(retries > 0) do
+            run("socat -d -d FILE:/dev/#{name},nonblock,raw,b#{ baudrate },echo=0 TCP-LISTEN:#{port},fork")
+            break unless $? == 1
+            retries -= 1
+          end
+
+        when :macosx
+          while(retries > 0) do
+            run("socat -d -d -b#{ baudrate } FILE:/dev/#{name},nonblock,raw,echo=0 TCP-LISTEN:#{port},fork")
+            break unless $? == 1
+            retries -= 1
+          end
+
+        else
+          say "OS not yet supported..."
+        end
+      end
+    end
+  end
+end

data/lib/artoo/version.rb

@@ -1,5 +1,5 @@
 module Artoo
   unless const_defined?('VERSION')
-    VERSION = "1.6.1"
+    VERSION = "1.6.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artoo
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Ron Evans
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -118,14 +118,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 description: Ruby-based microframework for robotics
 email:
 - artoo@hybridgroup.com
@@ -192,10 +192,12 @@ files:
 - lib/artoo/api/device_event_client.rb
 - lib/artoo/api/route_helpers.rb
 - lib/artoo/basic.rb
+- lib/artoo/commands/bluetooth.rb
 - lib/artoo/commands/commands.rb
-- lib/artoo/commands/connect.rb
 - lib/artoo/commands/generate.rb
 - lib/artoo/commands/install.rb
+- lib/artoo/commands/scan.rb
+- lib/artoo/commands/socket.rb
 - lib/artoo/connection.rb
 - lib/artoo/delegator.rb
 - lib/artoo/device.rb
@@ -266,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: artoo
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby-based microframework for robotics

data/lib/artoo/commands/connect.rb

@@ -1,83 +0,0 @@
-require 'thor'
-require 'thor/group'
-
-module Artoo
-  module Commands
-    class Connect < Commands
-      package_name "connect"
-
-      desc "scan", "Scan for connected devices"
-      option :type, :aliases => "-t", :default => "bluetooth", :desc => "type of scan [bluetooth, serial]"
-      def scan
-        case os
-        when :linux
-          case options[:type]
-          when 'bluetooth'
-            run("hcitool scan")
-          when 'serial'
-            run("ls /dev/tty*")
-          when 'usb'
-            run("lsusb")
-          else
-            say "ERROR: scan type '#{options[:type]}' not supported!"
-          end
-        when :macosx
-          run("ls /dev/tty*")
-        else
-          say "OS not yet supported..."
-        end
-      end
-
-      desc "bind [ADDRESS] [NAME]", "Binds a Bluetooth device to some connected hardware"
-      option :comm, :aliases => "-c", :default => 0, :desc => "Comm number"
-      option :radio, :aliases => "-r", :default => "hci0", :desc => "Bluetooth radio address"
-      def bind(address, name)
-        case os
-        when :linux
-          run("sudo 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
-          say "OS not yet supported..."
-        end
-      end
-
-      desc "serial [NAME] [PORT]", "Connect a serial device to a TCP socket using socat"
-      option :retries, :aliases => "-r", :default => 0, :desc => "Number of times to retry connecting on failure"
-      option :baudrate, :aliases => "-b", :default => 57600, :desc => "Baud rate to use to connect to the serial device"
-      def serial(name, port)
-        attempts = 1 + options[:retries].to_i
-
-        # check that Socat is installed
-        system("socat -V &> /dev/null")
-        unless $?.success?
-          say "Socat not installed. Cannot bind serial to TCP."
-          say "Please install with 'artoo install socat' and try again."
-          return
-        end
-
-        case os
-        when :linux
-          run("sudo chmod a+rw /dev/#{name}")
-
-          while(attempts > 0) do
-            run("socat -d -d FILE:/dev/#{name},nonblock,raw,b#{options[:baudrate]},echo=0 TCP-LISTEN:#{port},fork")
-            break unless $? == 1
-            attempts -= 1
-          end
-
-        when :macosx
-          while(attempts > 0) do
-            run("socat -d -d -b#{options[:baudrate]} FILE:/dev/#{name},nonblock,raw,echo=0 TCP-LISTEN:#{port},fork")
-            break unless $? == 1
-            attempts -= 1
-          end
-
-        else
-          say "OS not yet supported..."
-        end
-      end
-    end
-  end
-end