artoo 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0431129b36962326980dd7276fd60800b83920a
-  data.tar.gz: aff806d943afefb360b34d6f4cb8eff004c432a7
+  metadata.gz: b4ebe09e363260cba747ed083f76143e57540c58
+  data.tar.gz: d34f0a457be5ed505bcb2a4a7e9b8eef5b446c47
 SHA512:
-  metadata.gz: ce7fca914d9a2ec16eb3ff84d8c933b4860d585d86574e7019e3fc9560b658790ce286a49ebb9a292c58063b6a5007707dc411e30ab1b15b9660c352a6d03b9c
-  data.tar.gz: aab84f30e836e8cd97ae429163374098680b38bb5424adef4687142e1caba8239ac9e359c93d7a7a0d214904e690c196bc61e2e3ac6de302f04ee5ec26e67668
+  metadata.gz: ea9a2047e2e5924ef8f3e06a0c2d52741adacf63a0ad5c4190963e51732377e1c1c2ee53d5eb323f2ea0fe2faf0f5e3f89a145cc8c2c33e1c26983e8118eec46
+  data.tar.gz: 330b5a1e92edce1edfbf66448bb85c3fd2688edf065a8612cc63a160497b8a6b2fbdf3a3e17fc11b62a237acafa60e78f6e31291fbeb4be85f38180311d97ff3

data/.ruby-version

@@ -1 +1 @@
-rbx-2.0.0-rc1
+ruby-2.1.0

data/.travis.yml

@@ -1,12 +1,13 @@
 language: ruby
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3
-  - jruby-1.7.4
-  - rbx-19mode
+  - jruby-1.7.9
+  - rbx-2.1.1
 matrix:
   allow_failures:
-    - rvm: jruby-1.7.4
+    - rvm: jruby-1.7.9
 branches:
   except:
     - artoo.io

data/Gemfile

@@ -3,18 +3,6 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in artoo.gemspec
 gemspec
 
-# For the front end web application
-gem 'sass'
-gem 'coffee-script'
-gem 'sprockets'
-gem 'compass'
-gem 'bootstrap-sass'
-gem 'guard'
-gem 'guard-sprockets'
-gem 'guard-compass'
-gem 'rb-inotify', '~> 0.8.8'
-gem 'execjs'
-
 # For documentation
 gem 'yard'
 gem 'yard-sinatra'

data/Gemfile.lock

@@ -1,94 +1,52 @@
 PATH
   remote: .
   specs:
-    artoo (1.5.0)
+    artoo (1.6.0)
       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)
       thor (~> 0.18.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    bootstrap-sass (2.3.2.2)
-      sass (~> 3.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     celluloid-io (0.15.0)
       celluloid (>= 0.15.0)
       nio4r (>= 0.5.0)
-    chunky_png (1.2.8)
-    coderay (1.0.9)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.6.3)
-    compass (0.12.2)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
+    coderay (1.1.0)
     dotenv (0.9.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    ffi (1.9.0)
-    ffi (1.9.0-java)
     foreman (0.63.0)
       dotenv (>= 0.7)
       thor (>= 0.13.6)
     foreman (0.63.0-java)
       dotenv (>= 0.7)
       thor (>= 0.13.6)
-    formatador (0.2.4)
-    fssm (0.2.10)
-    guard (1.7.0)
-      formatador (>= 0.2.4)
-      listen (>= 0.6.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-compass (0.0.6)
-      compass (>= 0.10.5)
-      guard (>= 0.2.1)
-    guard-sprockets (0.4.3)
-      execjs (~> 1.0)
-      guard (>= 1.1.0)
-      sprockets (~> 2.0)
-    hike (1.2.3)
     http (0.5.0)
       http_parser.rb
-    http_parser.rb (0.6.0.beta.2)
-    http_parser.rb (0.6.0.beta.2-java)
+    http_parser.rb (0.6.0)
     json (1.7.7)
     json (1.7.7-java)
     kramdown (1.2.0)
     libv8 (3.16.14.3)
-    listen (0.7.3)
-    lumberjack (1.0.4)
     metaclass (0.0.1)
     method_source (0.8.2)
     minitest (5.0.8)
     minitest-happy (1.0.0)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.0)
-    nio4r (0.5.0)
-    nio4r (0.5.0-java)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    multi_json (1.8.4)
+    nio4r (1.0.0)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry (0.9.12.2-java)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-      spoon (~> 0.0)
-    rack (1.5.2)
-    rake (10.1.0)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
+    rake (10.1.1)
     reel (0.4.0)
       celluloid (>= 0.15.1)
       celluloid-io (>= 0.15.0)
@@ -96,15 +54,8 @@ GEM
       http_parser.rb (>= 0.6.0.beta.2)
       websocket_parser (>= 0.1.4)
     ref (1.0.5)
-    sass (3.2.10)
-    slop (3.4.6)
-    spoon (0.0.4)
-      ffi
-    sprockets (2.10.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+    robeaux (0.0.3)
+    slop (3.4.7)
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
       ref
@@ -112,9 +63,8 @@ GEM
       therubyrhino_jar (>= 1.7.3)
     therubyrhino_jar (1.7.4)
     thor (0.18.1)
-    tilt (1.4.1)
     timers (1.1.0)
-    websocket_parser (0.1.4)
+    websocket_parser (0.1.5)
       http
     yard (0.8.7.2)
     yard-sinatra (1.0.0)
@@ -126,22 +76,12 @@ PLATFORMS
 
 DEPENDENCIES
   artoo!
-  bootstrap-sass
-  coffee-script
-  compass
-  execjs
   foreman
-  guard
-  guard-compass
-  guard-sprockets
   json (~> 1.7.7)
   kramdown
   minitest (~> 5.0.1)
   minitest-happy
   mocha (~> 0.14.0)
-  rb-inotify (~> 0.8.8)
-  sass
-  sprockets
   therubyracer
   therubyrhino
   yard

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012, 2013 The Hybrid Group
+Copyright (c) 2012-2014 The Hybrid Group
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -8,6 +8,8 @@ Artoo provides a simple, yet powerful Domain-Specific Language (DSL) for robotic
 
 Want to use JavaScript on robots? Check out our sister project Cylon.js (http://cylonjs.com)
 
+Want to use the Go programming language to power your robots? Check out our sister project Gobot (http://gobot.io).
+
 [![Code Climate](https://codeclimate.com/github/hybridgroup/artoo.png)](https://codeclimate.com/github/hybridgroup/artoo) [![Build Status](https://travis-ci.org/hybridgroup/artoo.png?branch=master)](https://travis-ci.org/hybridgroup/artoo)
 
 ## Examples:
@@ -75,12 +77,12 @@ SPHEROS.each {|p|
 SpheroRobot.work!(robots)
 ```
 
-Ruby versions supported: Ruby 2.0, Ruby 1.9.3, JRuby 1.7.4, and Rubinius 2.0.
+Ruby versions supported: Ruby 2.0, Ruby 1.9.3, JRuby 1.7.4+, and Rubinius 2.0+
 
 Rubinius requires 1.9 mode, to install Rubinius in 1.9 mode using rvm
 
 ```
-rvm get head && rvm install rbx-2.0.0 --1.9
+rvm get head && rvm install rbx-2.1.1 --1.9
 ```
 
 Artoo is conceptualy influenced by [Sinatra](https://github.com/sinatra/sinatra) as well as borrowing some code from it.
@@ -99,11 +101,13 @@ Artoo has a extensible system for connecting to hardware devices. The following
   - [Crazyflie](http://www.bitcraze.se/) <=> [Adaptor](https://github.com/hybridgroup/artoo-crazyflie)
   - [Digispark](http://digistump.com/products/1) <=> [Adaptor](https://github.com/hybridgroup/artoo-digispark)
   - [Joystick](http://www.libsdl.org/) <=> [Adaptor](https://github.com/hybridgroup/artoo-joystick)
+  - [Keyboard](http://en.wikipedia.org/wiki/Computer_keyboard) <=> [Adaptor](https://github.com/hybridgroup/artoo-keyboard)
   - [Leap Motion](https://www.leapmotion.com/) <=> [Adaptor](https://github.com/hybridgroup/artoo-leapmotion)
   - [OpenCV](http://opencv.org/) <=> [Adaptor](https://github.com/hybridgroup/artoo-opencv)
   - [Pebble](http://getpebble.com/) <=> [Adaptor](https://github.com/hybridgroup/artoo-pebble)
   - [Raspberry Pi](http://www.raspberrypi.org/) <=> [Adaptor](https://github.com/hybridgroup/artoo-raspi)
   - [Roomba](http://www.irobot.com/us/robots/Educators/Create.aspx) <=> [Adaptor](https://github.com/hybridgroup/artoo-roomba)
+  - [Spark Core](http://www.spark.io/) <=> [Adaptor](https://github.com/hybridgroup/artoo-spark)
   - [Sphero](http://www.gosphero.com/) <=> [Adaptor](https://github.com/hybridgroup/artoo-sphero)
 
 More platforms are coming soon!
@@ -330,10 +334,17 @@ Need more help? Just want to say "Hello"? Come visit us on IRC freenode #artoo
 
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+* All patches must be provided under the Apache 2.0 License
+* Please use the -s option in git to "sign off" that the commit is your work and you are providing it under the Apache 2.0 License
+* Submit a Github Pull Request to the appropriate branch and ideally discuss the changes with us in IRC.
+* We will look at the patch, test it out, and give you feedback.
+* Avoid doing minor whitespace changes, renamings, etc. along with merged content. These will be done by the maintainers from time to time but they can complicate merges and should be done seperately.
+* Take care to maintain the existing coding style.
+* Add unit tests for any new or changed functionality.
+* All pull requests should be "fast forward"
+  * If there are commits after yours use “git rebase -i <new_head_branch>”
+  * If you have local changes you may need to use “git stash”
+  * For git help see [progit](http://git-scm.com/book) which is an awesome (and free) book on git
+
 
-(c) 2012-2013 The Hybrid Group
+(c) 2012-2014 The Hybrid Group

data/artoo.gemspec

@@ -27,4 +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'
 end

data/bin/artoo

@@ -14,7 +14,7 @@ Celluloid.logger = nil
 module CLI
   class Root < Thor
     include Thor::Actions
-    
+
     desc 'version', 'Displays the current version'
     def version
       say Artoo::VERSION
@@ -42,6 +42,7 @@ module CLI
 
     desc "install SUBCOMMAND ...ARGS", "Installs utility programs"
     subcommand "install", Artoo::Commands::Install
+
   end
 end
 

data/examples/hello.rb

@@ -2,11 +2,14 @@ require 'artoo'
 
 connection :loop
 
+name "Johnny"
+
 work do
   every(3.seconds) do
-    puts "hello"
+    puts "Hello. My name is #{name}."
   end
+
   after(10.seconds) do
-  	puts "wow"
+    puts "Wow."
   end
-end
+end

data/lib/artoo/adaptors/adaptor.rb

@@ -9,7 +9,7 @@ module Artoo
     class Adaptor
       include Celluloid::IO
       finalizer :finalize
-      
+
       attr_reader :parent, :port, :additional_params
 
       # Initialize an adaptor
@@ -69,7 +69,7 @@ module Artoo
       def connect_to_tcp
         @socket ||= TCPSocket.new(port.host, port.port)
       end
-      
+
       # @return [UDPSocket] UDP socket connection
       def connect_to_udp
         @udp_socket ||= UDPSocket.new

data/lib/artoo/api/api.rb

@@ -21,6 +21,10 @@ module Artoo
       def on_connection(connection)
         while request = connection.request
           dispatch!(connection, request)
+          if request.websocket?
+            connection.detach
+            return 
+          end
         end
       end
 
@@ -77,7 +81,7 @@ module Artoo
       # Subscribte to robot device events
       # @return [nil]
       get_ws '/robots/:robotid/devices/:deviceid/events' do
-        DeviceEventClient.new(@req, device(@params['robotid'], @params['deviceid']).event_topic_name('update'))
+        DeviceEventClient.new(@req.websocket, device(@params['robotid'], @params['deviceid']).event_topic_name('update'))
         return nil
       end
 
@@ -106,15 +110,7 @@ module Artoo
       def command_params
         if @req.body.to_s != ""
           data = MultiJson.load(@req.body.to_s, :symbolize_keys => true)
-          if data
-            params = []
-            data.each {|key, value|
-              params << value
-            }
-            params
-          else
-            nil
-          end
+          data.values
         end
       end
     end

data/lib/artoo/api/route_helpers.rb

@@ -7,7 +7,7 @@ module Artoo
 
         # Path to api/public directory
         # @return [String] static path
-        def static_path(default=File.join(File.dirname(__FILE__), "..", "..", "..","api/public"))
+        def static_path(default = Gem.loaded_specs['robeaux'].full_gem_path)
           @static_path ||= default
         end
 
@@ -140,10 +140,10 @@ module Artoo
             route!      connection, req
           end
           if resp && !resp.nil?
-            return if req.is_a?(Reel::WebSocket)
+            return if req.websocket?
             status, body = resp
             begin
-              req.respond status, body
+              req.respond status, body 
             rescue Errno::EAGAIN
               retry
             end

data/lib/artoo/commands/connect.rb

@@ -17,12 +17,12 @@ module Artoo
           when 'serial'
             run("ls /dev/tty*")
           when 'usb'
-            run("lsusb")            
+            run("lsusb")
           else
             say "ERROR: scan type '#{options[:type]}' not supported!"
           end
         when :macosx
-          run("ls /dev/tty*")          
+          run("ls /dev/tty*")
         else
           say "OS not yet supported..."
         end
@@ -48,11 +48,19 @@ module Artoo
       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

data/lib/artoo/commands/install.rb

@@ -6,10 +6,10 @@ module Artoo
   module Commands
     class Install < Commands
       package_name "install"
-      
+
       desc "socat", "Install the socat serial to socket utility program"
       def socat
-        case os 
+        case os
         when :linux
           run("sudo apt-get update && sudo apt-get install socat")
         when :macosx