artoo 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd71026c937b88a49c8386760572abc6744fb74c
-  data.tar.gz: 0d9006bcde225de347974ca52d3a961c45af4e9b
+  metadata.gz: 61bbb3f286d72755f95f57795cf0683aef11570a
+  data.tar.gz: dc0ff46b67e93f15b8b77fc857eacf11ac4ad620
 SHA512:
-  metadata.gz: 28dad43c2ea5426571f389b3198777c13495794dde7ae09b2868614206889d2dfd295a69b041ea2b038b7d4b7a76dae8779cf773b0969153d5894c008a08004b
-  data.tar.gz: 63c0b5190bc20dc0508128aca8178f6a8f537e4a6ea522abb81a6f2c661c584b347b3c6af23b8edbaf957c06dd7f73bc839649fa015f64d9c8541086f521df0c
+  metadata.gz: 99bf08c9f0e74dcc39dfdde10e345120e0d81aa61ec491b9a59789b850c2f7663594613eb431586ddbd682c6e5c592c8b4dfbe60244294d6b264a2d1a574eecb
+  data.tar.gz: 264aba1fde9cc5cee419657502cf295bc861ecb8fa5f7981bef49a0f7b48992f4aae5770cbf17f709f9c05e4d1ef9b633114750015d4c8b6f76fb8c8259aed9b

data/Gemfile

@@ -15,12 +15,6 @@ gem 'guard-compass'
 gem 'rb-inotify', '~> 0.8.8'
 gem 'execjs'
 
-if RUBY_PLATFORM =~ /java/
-  gem 'therubyrhino'
-else
-  gem 'therubyracer'
-end
-
 # For documentation
 gem 'yard'
 gem 'yard-sinatra'
@@ -28,7 +22,16 @@ gem 'kramdown'
 
 # For tests
 gem "minitest", "~> 5.0.1"
+gem "minitest-happy"
 gem "mocha", '~> 0.14.0', :require => false
 
 gem 'json', '~> 1.7.7'
 gem "foreman"
+
+platforms :jruby do
+  gem 'therubyrhino'
+end
+
+platforms :ruby do
+  gem 'therubyracer'
+end

data/Gemfile.lock

@@ -1,18 +1,19 @@
 PATH
   remote: .
   specs:
-    artoo (1.0.0.rc1)
+    artoo (1.0.0.rc2)
       celluloid (~> 0.14.1)
       celluloid-io (~> 0.14.1)
       multi_json (~> 1.6)
       pry (~> 0.9)
       rake (~> 10.0)
       reel (~> 0.4.0.pre)
+      thor (~> 0.18.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    bootstrap-sass (2.3.1.0)
+    bootstrap-sass (2.3.2.1)
       sass (~> 3.2)
     celluloid (0.14.1)
       timers (>= 1.0.0)
@@ -25,16 +26,16 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
+    coffee-script-source (1.6.3)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    dotenv (0.7.0)
+    dotenv (0.8.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    ffi (1.8.1)
-    ffi (1.8.1-java)
+    ffi (1.9.0)
+    ffi (1.9.0-java)
     foreman (0.63.0)
       dotenv (>= 0.7)
       thor (>= 0.13.6)
@@ -56,25 +57,27 @@ GEM
       execjs (~> 1.0)
       guard (>= 1.1.0)
       sprockets (~> 2.0)
-    hike (1.2.2)
+    hike (1.2.3)
     http (0.4.0)
       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.0.2)
+    kramdown (1.1.0)
     libv8 (3.11.8.17)
     listen (0.7.3)
-    lumberjack (1.0.3)
+    lumberjack (1.0.4)
     metaclass (0.0.1)
     method_source (0.8.1)
-    minitest (5.0.1)
+    minitest (5.0.6)
     minitest-happy (1.0.0)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.3)
+    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)
@@ -85,7 +88,7 @@ GEM
       slop (~> 3.4)
       spoon (~> 0.0)
     rack (1.5.2)
-    rake (10.0.4)
+    rake (10.1.0)
     rb-inotify (0.8.8)
       ffi (>= 0.5.0)
     reel (0.4.0.pre)
@@ -99,7 +102,7 @@ GEM
     slop (3.4.5)
     spoon (0.0.4)
       ffi
-    sprockets (2.9.3)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -107,12 +110,15 @@ GEM
     therubyracer (0.11.4)
       libv8 (~> 3.11.8.12)
       ref
+    therubyrhino (2.0.2)
+      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)
       http
-    yard (0.8.6.1)
+    yard (0.8.6.2)
     yard-sinatra (1.0.0)
       yard (~> 0.7)
 
@@ -139,5 +145,6 @@ DEPENDENCIES
   sass
   sprockets
   therubyracer
+  therubyrhino
   yard
   yard-sinatra

data/README.md

@@ -88,6 +88,7 @@ Artoo has a extensible system for connecting to hardware devices. The following
 
   - Arduino (http://www.arduino.cc/) adaptor (https://github.com/hybridgroup/artoo-arduino)
   - ARDrone (http://ardrone2.parrot.com/) adaptor (https://github.com/hybridgroup/artoo-ardrone)
+  - Pebble (http://getpebble.com/) adaptor (https://github.com/hybridgroup/artoo-pebble)
   - Roomba (http://www.irobot.com/us/robots/Educators/Create.aspx) adaptor (https://github.com/hybridgroup/artoo-roomba)
   - Sphero (http://www.gosphero.com/) adaptor (https://github.com/hybridgroup/artoo-sphero)
 
@@ -95,6 +96,39 @@ More platforms are coming soon!
 
 Do you have some hardware that is not yet supported by Artoo? We want to help you, help us, help them! Get in touch...
 
+## Getting Started:
+
+### Installation
+
+```ruby
+gem install artoo
+```
+
+Then install the gems required by the hardware you want to use. For example, if you wanted to integrate a Wiiclassic controller connected to an Arduino to fly your ARDrone:
+
+```ruby
+gem install artoo-arduino
+gem install artoo-ardrone
+```
+
+If you will be using socket to serial commuication (required if you will use JRuby or Rubinius), you are ready to start programming your hardware. 
+
+If you want to connect via serial port directly, and are using MRI, install the hybridgroup-serialport gem:
+
+```ruby
+gem install hybridgroup-serialport
+```
+
+### Writing your robot code:
+
+Now you are ready to write your own code. Take a look at the examples directory for a whole bunch of code you can use to help get started. We recommend using TDR (Test-Driven Robotics) with your preferred test frameworks.
+
+### Running your robot:
+
+```ruby
+ruby myrobot.rb
+```
+
 ## API:
 
 Artoo includes a RESTful API to query the status of any robot running within a group, including the connection and device status, and device streaming data via websockets.
@@ -171,63 +205,59 @@ work do
 end
 ```
 
-## Console:
+## CLI
+
+Artoo has a Command Line Interface (CLI) so you can access important features right from the command line.
+
+```
+$ artoo
+Commands:
+  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 version                      # Displays the current version
+```
+
+### Console:
 
 Artoo includes Robi, a console based on Pry (http://pryrepl.org/) to allow you to interactively debug and control your robot.
 
 ```
-$ robi ./examples/hello.rb 
-I, [2013-05-21T18:09:05.179630 #8752]  INFO -- : Registering connection 'loop'...
-I, [2013-05-21T18:09:05.180681 #8752]  INFO -- : Preparing work...
+$ artoo console ./examples/hello.rb 
+         run  robi ./examples/hello.rb from "."
+I, [2013-07-03T17:11:35.793913 #5527]  INFO -- : Registering connection 'loop'...
+I, [2013-07-03T17:11:35.794939 #5527]  INFO -- : Preparing work...
 robi> start
 Starting main robot...
-I, [2013-05-21T18:09:37.086550 #8752]  INFO -- : Initializing connection loop...
-I, [2013-05-21T18:09:37.092231 #8752]  INFO -- : Starting work...
-I, [2013-05-21T18:09:37.092691 #8752]  INFO -- : Connecting to 'loop' on port '#<Artoo::Port:0x104e4>'...
+I, [2013-07-03T17:11:48.950888 #5527]  INFO -- : Initializing connection loop...
+I, [2013-07-03T17:11:48.955804 #5527]  INFO -- : Starting work...
+I, [2013-07-03T17:11:48.956152 #5527]  INFO -- : Connecting to 'loop' on port '#<Artoo::Port:0xfea0>'...
+robi> list
+#<Artoo::MainRobot:0x100c0>
 robi> hello
 hello
+hello
 robi> stop
 Stopping robots...
 robi> exit
-D, [2013-05-21T18:09:53.507709 #8752] DEBUG -- : Terminating 7 actors...
-D, [2013-05-21T18:09:53.508622 #8752] DEBUG -- : Shutdown completed cleanly
-```
-
-## Getting Started:
-
-### Installation
-
-```ruby
-gem install artoo
-```
-
-Then install the gems required by the hardware you want to use. For example, if you wanted to integrate a Wiiclassic controller connected to an Arduino to fly your ARDrone:
-
-```ruby
-gem install artoo-arduino
-gem install artoo-ardrone
+D, [2013-07-03T17:12:04.413060 #5527] DEBUG -- : Terminating 7 actors...
+D, [2013-07-03T17:12:04.414300 #5527] DEBUG -- : Shutdown completed cleanly
 ```
 
-If you will be using socket to serial commuication (required if you will use JRuby or Rubinius), you are ready to start programming your hardware. 
-
-If you want to connect via serial port directly, and are using MRI, install the hybridgroup-serialport gem:
-
-```ruby
-gem install hybridgroup-serialport
-```
-
-### Writing your robot code:
+### Generator
 
-Now you are ready to write your own code. Take a look at the examples directory for a whole bunch of code you can use to help get started. We recommend using TDR (Test-Driven Robotics) with your preferred test frameworks.
-
-### Running your robot:
-
-```ruby
-ruby myrobot.rb
-```
+Want to integrate a new kind of hardware devices for which there is not an Artoo adaptor yet? You can easily generate a new skeleton Artoo adaptor to help you get started! Simply run the 'artoo generate adaptor' command, and the generator will create a new directory with all of the files in place for your new adaptor gem.
 
 ## Wiki
 
 Check out our [wiki](https://github.com/hybridgroup/artoo/wiki) for more docs
 
+## 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
+
 (c) 2012-2013 The Hybrid Group

data/artoo.gemspec

@@ -25,7 +25,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'multi_json', '~> 1.6'
   s.add_runtime_dependency 'rake', '~> 10.0'
   s.add_runtime_dependency 'pry', '~> 0.9'
-  s.add_development_dependency 'minitest', '~> 5.0'
-  s.add_development_dependency 'minitest-happy'
-  s.add_development_dependency 'mocha', '~> 0.14.0'
+  s.add_runtime_dependency 'thor', '~> 0.18.1'
 end

data/bin/artoo

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'thor'
+require 'thor/group'
+require 'artoo/robot'
+require 'artoo/commands/generate'
+require 'artoo/commands/connect'
+require 'artoo/commands/install'
+
+Celluloid.logger = nil
+
+module CLI
+  class Root < Thor
+    include Thor::Actions
+    
+    desc 'version', 'Displays the current version'
+    def version
+      say Artoo::VERSION
+    end
+
+    desc "console ROBOT", "Run a robot using the Robi console"
+    def console(robot)
+      run("robi #{robot}")
+    end
+
+    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 "install SUBCOMMAND ...ARGS", "Installs utility programs"
+    subcommand "install", Artoo::Commands::Install
+  end
+end
+
+CLI::Root.start

data/bin/artoo_bind.sh

@@ -0,0 +1,25 @@
+#!/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

@@ -0,0 +1,10 @@
+#!/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/{retry.sh → artoo_socat_osx.sh}

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 NEXT_WAIT_TIME=0
-COMMAND="socat PIPE:/dev/tty.Sphero-$1-RN-SPP,nonblock TCP-LISTEN:$2,fork"
+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++ ))

data/lib/artoo/api/api.rb

@@ -57,7 +57,7 @@ module Artoo
       # Execute robot command
       # @return [JSON] command
       post '/robots/:robotid/devices/:deviceid/commands/:commandid' do
-        result = device(@params['robotid'], @params['deviceid']).command(@params['commandid'], command_params)
+        result = device(@params['robotid'], @params['deviceid']).command(@params['commandid'], *command_params)
         return MultiJson.dump({'result' => result})
       end
 

data/lib/artoo/commands/connect.rb

@@ -0,0 +1,48 @@
+require 'thor'
+require 'thor/group'
+
+module Artoo
+  module Commands
+    class Connect < Thor
+      include Thor::Actions
+      include Artoo::Utility
+
+      desc "scan", "scan for connected devices"
+      def scan
+        case os
+        when :linux
+          run("hcitool scan")
+        when :macosx
+          run("ls /dev/tty.*")          
+        else
+          say "OS not yet supported..."
+        end
+      end
+
+      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)
+        case os
+        when :linux
+          run("bundle exec ./bin/artoo_bind.sh #{comm} #{address} #{name}")
+        when :macosx
+          say "OSX binds devices on its own volition."
+        else
+          say "OS not yet supported..."
+        end
+      end
+
+      desc "socat", "socat [PORT] [NAME] use socat to connect a socket to a device by name"
+      def socat(port, name)
+        case os
+        when :linux
+          run("bundle exec ./bin/artoo_socat_linux.sh #{port} #{name}")
+        when :macosx
+          run("bundle exec ./bin/artoo_socat_osx.sh #{port} #{name}")          
+        else
+          say "OS not yet supported..."
+        end
+      end
+    end
+  end
+end

data/lib/artoo/commands/generate.rb

@@ -0,0 +1,11 @@
+require 'thor'
+require 'thor/group'
+require 'artoo/generators/adaptor'
+
+module Artoo
+  module Commands
+    class Generate < Thor
+      register Artoo::Generator::Adaptor, 'adaptor', 'adaptor [NAME]', 'Generates a new adaptor'
+    end
+  end
+end

data/lib/artoo/commands/install.rb

@@ -0,0 +1,25 @@
+require 'thor'
+require 'thor/group'
+
+module Artoo
+  module Commands
+    class Install < Thor
+      include Thor::Actions
+      include Artoo::Utility
+      
+      desc "socat", "install socat utility program"
+      def socat
+        case os 
+        when :linux
+          run("sudo apt-get update && sudo apt-get install socat")
+        when :macosx
+          Bundler.with_clean_env do
+            run("brew install socat")
+          end
+        else
+          say "OS not yet supported..."
+        end
+      end
+    end
+  end
+end

data/lib/artoo/generators/adaptor.rb

@@ -0,0 +1,37 @@
+require 'thor'
+require 'thor/group'
+require 'artoo/version'
+
+module Artoo
+  module Generator
+    class Adaptor < Thor::Group
+      include Thor::Actions
+      include Artoo::Utility
+
+      argument :adaptor_name
+
+      def self.source_root
+        File.dirname(__FILE__)
+      end
+
+      def adaptor_class_name
+        classify(adaptor_name)
+      end
+
+      def artoo_version
+        Artoo::VERSION
+      end
+
+      def artoo_adaptor_name
+        "artoo-#{adaptor_name}"
+      end
+
+      def copy_adaptor_directory
+        say "Creating #{artoo_adaptor_name} adaptor..."
+        empty_directory artoo_adaptor_name
+        directory "adaptor", artoo_adaptor_name, :recursive => true
+        say "Done!"
+      end
+    end
+  end
+end

data/lib/artoo/generators/adaptor/Gemfile.tt

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in artoo-<%= adaptor_name %>.gemspec
+gemspec

data/lib/artoo/generators/adaptor/LICENSE

@@ -0,0 +1,2 @@
+
+# TODO: put your license file here

data/lib/artoo/generators/adaptor/README.md.tt

@@ -0,0 +1,13 @@
+# Artoo Adaptor For <%= adaptor_class_name %>
+
+This repository contains the Artoo (http://artoo.io/) adaptor for <%= adaptor_class_name %>.
+
+Artoo is a open source micro-framework for robotics using Ruby.
+
+For more information abut Artoo, check out our repo at https://github.com/hybridgroup/artoo
+
+## Installing
+
+```
+gem install artoo-<%= adaptor_name %>
+```

data/lib/artoo/generators/adaptor/Rakefile

@@ -0,0 +1,10 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.pattern = "test/**/*_test.rb"
+end
+
+task :default => :test

data/lib/artoo/generators/adaptor/artoo-%adaptor_name%.gemspec.tt

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "artoo-<%= adaptor_name %>/version"
+
+Gem::Specification.new do |s|
+  s.name        = "artoo-<%= adaptor_name %>"
+  s.version     = Artoo::<%= adaptor_class_name %>::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Your name here"]
+  s.email       = ["your email here"]
+  s.homepage    = "Your homepage here"
+  s.summary     = %q{Artoo adaptor and driver for <%= adaptor_class_name %>}
+  s.description = %q{Artoo adaptor and driver for <%= adaptor_class_name %>}
+
+  s.rubyforge_project = "artoo-<%= adaptor_name %>"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_runtime_dependency 'artoo', '~> <%= artoo_version %>'
+  # TODO: add your development dependencies here
+  # EXAMPLE:
+  # s.add_development_dependency 'minitest', '~> 5.0'
+  # s.add_development_dependency 'minitest-happy'
+  # s.add_development_dependency 'mocha', '~> 0.14.0'
+end

data/lib/artoo/generators/adaptor/lib/artoo-%adaptor_name%.rb.tt

@@ -0,0 +1,3 @@
+require 'lib/artoo/adaptors/<%= adaptor_name %>'
+require 'lib/artoo/drivers/<%= adaptor_name %>'
+require 'lib/artoo-<%= adaptor_name %>/version'

data/lib/artoo/generators/adaptor/lib/artoo-%adaptor_name%/version.rb.tt

@@ -0,0 +1,5 @@
+module Artoo
+  module <%= adaptor_class_name %>
+    VERSION = '0.0.1'
+  end
+end

data/lib/artoo/generators/adaptor/lib/artoo/adaptors/%adaptor_name%.rb.tt

@@ -0,0 +1,35 @@
+require 'artoo/adaptors/adaptor'
+
+module Artoo
+  module Adaptors
+    # Connect to a <%= adaptor_name %> device
+    # @see device documentation for more information
+    class <%= adaptor_class_name %> < Adaptor
+      finalizer :finalize
+      attr_reader :device
+
+      # Closes connection with device if connected
+      # @return [Boolean]
+      def finalize
+      end
+
+      # Creates a connection with device
+      # @return [Boolean]
+      def connect
+        super
+      end
+
+      # Closes connection with device
+      # @return [Boolean]
+      def disconnect
+        super
+      end
+
+      # Uses method missing to call device actions
+      # @see device documentation
+      def method_missing(method_name, *arguments, &block)
+        device.send(method_name, *arguments, &block)
+      end
+    end
+  end
+end

data/lib/artoo/generators/adaptor/lib/artoo/drivers/%adaptor_name%.rb.tt

@@ -0,0 +1,28 @@
+require 'artoo/drivers/driver'
+
+module Artoo
+  module Drivers
+    # The <%= adaptor_name %> driver behaviors
+    class <%= adaptor_class_name %> < Driver
+
+      # Start driver and any required connections
+      def start_driver
+        begin
+          every(interval) do
+            handle_message_events
+          end
+
+          super
+        rescue Exception => e
+          Logger.error "Error starting <%= adaptor_class_name %> driver!"
+          Logger.error e.message
+          Logger.error e.backtrace.inspect
+        end
+      end
+
+      def handle_message_events         
+      end
+
+    end
+  end
+end

data/lib/artoo/generators/adaptor/test/adaptors/%adaptor_name%_adaptor_test.rb.tt

@@ -0,0 +1,4 @@
+require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
+require 'artoo/adaptors/<%= adaptor_name %>'
+
+# TODO: test for your adaptor goes here...

data/lib/artoo/generators/adaptor/test/drivers/%adaptor_name%_driver_test.rb.tt

@@ -0,0 +1,4 @@
+require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
+require 'artoo/drivers/<%= adaptor_name %>'
+
+# TODO: test for your driver goes here...

data/lib/artoo/generators/adaptor/test/test_helper.rb

@@ -0,0 +1,5 @@
+require 'artoo/robot'
+
+require 'minitest/autorun'
+
+Celluloid.logger = nil

data/lib/artoo/utility.rb

@@ -1,5 +1,7 @@
+require 'rbconfig'
+
 module Artoo
-  # Utility methods used for convertions
+  # Utility methods used for various important things
   module Utility
 
     # Converts camel_cased_word to constant
@@ -64,6 +66,24 @@ module Artoo
     def current_class
       Celluloid::Actor.current.class
     end
+
+    def os
+      @os ||= (
+        host_os = RbConfig::CONFIG['host_os']
+        case host_os
+        when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+          :windows
+        when /darwin|mac os/
+          :macosx
+        when /linux/
+          :linux
+        when /solaris|bsd/
+          :unix
+        else
+          raise Error::WebDriverError, "unknown os: #{host_os.inspect}"
+        end
+      )
+    end
   end
 end
 

data/lib/artoo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artoo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Ron Evans
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -99,52 +99,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: minitest-happy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :development
+        version: 0.18.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.18.1
 description: Ruby-based microframework for robotics
 email:
 - artoo@hybridgroup.com
 executables:
-- retry.sh
+- artoo
+- artoo_bind.sh
+- artoo_socat_linux.sh
+- artoo_socat_osx.sh
 - robi
 extensions: []
 extra_rdoc_files: []
@@ -189,7 +164,10 @@ files:
 - api/public/partials/robot-device-detail.html
 - api/public/partials/robot-index.html
 - artoo.gemspec
-- bin/retry.sh
+- 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
@@ -230,6 +208,9 @@ files:
 - lib/artoo/api/device_event_client.rb
 - lib/artoo/api/route_helpers.rb
 - lib/artoo/basic.rb
+- lib/artoo/commands/connect.rb
+- lib/artoo/commands/generate.rb
+- lib/artoo/commands/install.rb
 - lib/artoo/connection.rb
 - lib/artoo/delegator.rb
 - lib/artoo/device.rb
@@ -242,6 +223,19 @@ files:
 - lib/artoo/events.rb
 - lib/artoo/ext/actor.rb
 - lib/artoo/ext/timers.rb
+- lib/artoo/generators/adaptor.rb
+- lib/artoo/generators/adaptor/Gemfile.tt
+- lib/artoo/generators/adaptor/LICENSE
+- lib/artoo/generators/adaptor/README.md.tt
+- lib/artoo/generators/adaptor/Rakefile
+- lib/artoo/generators/adaptor/artoo-%adaptor_name%.gemspec.tt
+- lib/artoo/generators/adaptor/lib/artoo-%adaptor_name%.rb.tt
+- lib/artoo/generators/adaptor/lib/artoo-%adaptor_name%/version.rb.tt
+- lib/artoo/generators/adaptor/lib/artoo/adaptors/%adaptor_name%.rb.tt
+- lib/artoo/generators/adaptor/lib/artoo/drivers/%adaptor_name%.rb.tt
+- lib/artoo/generators/adaptor/test/adaptors/%adaptor_name%_adaptor_test.rb.tt
+- lib/artoo/generators/adaptor/test/drivers/%adaptor_name%_driver_test.rb.tt
+- lib/artoo/generators/adaptor/test/test_helper.rb
 - lib/artoo/main.rb
 - lib/artoo/master.rb
 - lib/artoo/port.rb