artoo-arduino 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc032976383aac9fc633e0d97d13e0de36e36709
-  data.tar.gz: 025d42555f25ace515f6c78f2648282f4d7c4119
+  metadata.gz: 34a20ea820138830b5aa01b4e559cee10d2b10d2
+  data.tar.gz: 7022e24bc2f4ee5a0466d0b4f79293a437a4b4ac
 SHA512:
-  metadata.gz: 3c43b02b6ce8430db74737a71525bf27a3a62b457d3e12ab131ac47bf63fc8e48664d707e971b878176a07081ee8180a51f4e7a87c2f760564b7e3efc3636cb8
-  data.tar.gz: 2d58f47a05b165037af96a41abfa9b260d7a791d87808dbfa3641bd011cdd11290fe348f175b0bbcd71a7a5afe7d559dddc2708f0612f3f991198280b2c3cae9
+  metadata.gz: b65a4fb5ece3630cecd8a844f38cf2521d40dd08ec1f7afe8227433ce0cfd9217e8f14a32605a476856808fa48d75dd4b63e717d30060739249708695d153b31
+  data.tar.gz: c91d5c144a7c1ad45e3fa1a336afbd7fef05f8aae45eebe1dd86556ca288a3dc8cd105b8dead782e96389577ebd8bf63772ef164572d6d810dd2fd95225c2301

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    artoo-arduino (1.4.1)
+    artoo-arduino (1.4.2)
       artoo (>= 1.6.0)
       artoo-gpio
       artoo-i2c
@@ -17,7 +17,7 @@ GEM
       pry (~> 0.9)
       rake
       reel (~> 0.4.0)
-      robeaux (~> 0.0.4)
+      robeaux (~> 0.0.3)
       thor (~> 0.18.1)
     artoo-gpio (0.4.0)
       artoo (>= 1.6.0)

data/ext/Rakefile

@@ -5,5 +5,6 @@ task :default => :install_commands
 task :install_commands do
   @install = Artoo::Commands::Install.new
   @install.command(File.expand_path(File.dirname(__FILE__) + "/../lib/artoo/commands/firmata.rb"))
+  @install.command(File.expand_path(File.dirname(__FILE__) + "/../lib/artoo/commands/arduino.rb"))
   @install.command(File.expand_path(File.dirname(__FILE__) + "/../lib/artoo/commands/hex/StandardFirmata.cpp.hex"))
 end

data/lib/artoo-arduino/version.rb

@@ -1,5 +1,5 @@
 module Artoo
   module Arduino
-    VERSION = '1.4.1'
+    VERSION = '1.4.2'
   end
 end

data/lib/artoo/commands/arduino.rb

@@ -0,0 +1,38 @@
+module Artoo
+  module Commands
+    class Arduino < Artoo::Commands::Firmata
+      package_name "arduino"
+
+      desc "scan", "Scan for connected arduino devices"
+      def scan
+        Artoo::Commands::Scan.new().serial()
+      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
+    end
+  end
+end
+
+# We need to register the commands in the main artoo CLI so they
+# can be picked up when this command file is required.
+# The steps needed to register new CLI commands from outside
+# artoo are:
+# 1. External command files (not in artoo main gem) need to be copied to the
+#    artoo installed commands.
+# 2. We do this with a rake task that is triggered when the gem is installed
+#    (see .gemspec file and look for extensions, ext/Rakefile), in the Rakefile
+#    we defined a new default class that makes use of an artoo helper class/method
+#    Artoo::Commands::Install helper method '.command'; see ext/Rakefile for details.
+# 3. Finally in our main command file (THIS FILE) we open the artoo CLI::Root class to register
+#    the new commands.
+module CLI
+  class Root
+    desc "arduino SUBCOMMAND <serial_port>", "Installs avrdude, uploads firmata to the arduino and connects serial to socket"
+    subcommand "arduino", Artoo::Commands::Arduino
+  end
+end

data/lib/artoo/commands/firmata.rb

@@ -29,6 +29,7 @@ module Artoo
         when :linux
           run('sudo apt-get install avrdude')
         when :macosx
+          require 'bundler' unless defined?(Bundler)
           Bundler.with_clean_env do
             run("brew install avrdude")
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artoo-arduino
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Ron Evans
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo
@@ -148,6 +148,7 @@ files:
 - lib/artoo-arduino.rb
 - lib/artoo-arduino/version.rb
 - lib/artoo/adaptors/firmata.rb
+- lib/artoo/commands/arduino.rb
 - lib/artoo/commands/firmata.rb
 - lib/artoo/commands/hex/StandardFirmata.cpp.hex
 - test/adaptors/firmata_test.rb
@@ -177,4 +178,3 @@ signing_key:
 specification_version: 4
 summary: Artoo adaptor and driver for Arduino
 test_files: []
-has_rdoc: