artoo 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6059ccad349f757c75b1bba40c3258056bc690cb
-  data.tar.gz: ee353f9752cef6a52bd28129568e33bcebe318b1
+  metadata.gz: de6e726dc7a4d253d4acfb870173fd4928a8734c
+  data.tar.gz: f6ede2be821e79a2711f6f0cb8f67e5d511ce706
 SHA512:
-  metadata.gz: 59dff9b9afe24d635cdcb911a8a3422c0e08a2c5dcf470ae36d9a989dcbd0ed2e89dc4c0e9606ea7d24dcb5708a813da60fa6842d313dc638944c871f9882cc7
-  data.tar.gz: 6450d8ebc3ebe3c150ec1e0789c622395cd60a2ea34622fb21d23e4f042542686f34a1aa3e26b5a804741b8796c85858842fa53ca71b58ceda225f6123b9a91a
+  metadata.gz: 247a5ea51e36972fdab99d623f74089d6ed66fc6ad43aa400055cb7a0ea3d4229b21c577fe702b35a5c83b0ead2ea15641df1ff525b9773b931898122c7e75d6
+  data.tar.gz: 00b1db0bf425d8519bfc5efb30e64c71f5dfcc34898122a7acdd4f15c5930215b8c94336c8eea492fd9149500b356cd02faa8cc40f401ccb253e4a0bd1c9cc9e

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    artoo (1.1.1)
+    artoo (1.2.0)
       celluloid (~> 0.15.0)
       celluloid-io (~> 0.15.0)
       multi_json (~> 1.6)
       pry (~> 0.9)
       rake (~> 10.0)
-      reel (~> 0.4.0.pre)
+      reel (~> 0.4.0)
       thor (~> 0.18.1)
 
 GEM
@@ -15,12 +15,11 @@ GEM
   specs:
     bootstrap-sass (2.3.2.1)
       sass (~> 3.2)
-    celluloid (0.15.0)
+    celluloid (0.15.1)
       timers (~> 1.1.0)
     celluloid-io (0.15.0)
       celluloid (>= 0.15.0)
       nio4r (>= 0.5.0)
-    certified (0.1.1)
     chunky_png (1.2.8)
     coderay (1.0.9)
     coffee-script (2.2.0)
@@ -58,10 +57,9 @@ GEM
       guard (>= 1.1.0)
       sprockets (~> 2.0)
     hike (1.2.3)
-    http (0.4.0)
-      certified
+    http (0.5.0)
       http_parser.rb
-    http_parser.rb (0.5.3)
+    http_parser.rb (0.6.0.beta.2)
     json (1.7.7)
     json (1.7.7-java)
     kramdown (1.1.0)
@@ -89,12 +87,12 @@ GEM
     rake (10.1.0)
     rb-inotify (0.8.8)
       ffi (>= 0.5.0)
-    reel (0.4.0.pre)
-      celluloid-io (>= 0.8.0)
-      http (>= 0.2.0)
-      http_parser.rb (>= 0.5.3)
-      rack (>= 1.4.0)
-      websocket_parser (>= 0.1.2)
+    reel (0.4.0)
+      celluloid (>= 0.15.1)
+      celluloid-io (>= 0.15.0)
+      http (>= 0.5.0)
+      http_parser.rb (>= 0.6.0.beta.2)
+      websocket_parser (>= 0.1.4)
     ref (1.0.5)
     sass (3.2.9)
     slop (3.4.5)

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)
+  - [Digispark](http://digistump.com/products/1) <=> [Adaptor](https://github.com/hybridgroup/artoo-digispark)
   - [Leap Motion](https://www.leapmotion.com/) <=> [Adaptor](https://github.com/hybridgroup/artoo-leapmotion)
   - [Pebble](http://getpebble.com/) <=> [Adaptor](https://github.com/hybridgroup/artoo-pebble)
   - [Raspberry Pi](http://www.raspberrypi.org/) <=> [Adaptor](https://github.com/hybridgroup/artoo-raspi)
@@ -96,6 +97,10 @@ Artoo has a extensible system for connecting to hardware devices. The following
 
 More platforms are coming soon!
 
+Artoo also has support for devices that can work across multiple hardware platforms.
+  - GPIO (General Purpose Input/Output) devices <=> [Drivers](https://github.com/hybridgroup/artoo-gpio)
+  - i2c devices <=> [Drivers](https://github.com/hybridgroup/artoo-i2c)
+
 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:

data/artoo.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'celluloid', '~> 0.15.0'
   s.add_runtime_dependency 'celluloid-io', '~> 0.15.0'
-  s.add_runtime_dependency 'reel', '~> 0.4.0.pre'
+  s.add_runtime_dependency 'reel', '~> 0.4.0'
   s.add_runtime_dependency 'multi_json', '~> 1.6'
   s.add_runtime_dependency 'rake', '~> 10.0'
   s.add_runtime_dependency 'pry', '~> 0.9'

data/bin/artoo

@@ -10,6 +10,7 @@ require 'artoo/commands/install'
 
 Celluloid.logger = nil
 
+# load main commands
 module CLI
   class Root < Thor
     include Thor::Actions
@@ -44,4 +45,7 @@ module CLI
   end
 end
 
+# require any custom commands installed by artoo adaptor or driver gems
+Dir["#{Artoo::Commands::Commands.install_dir}/*.rb"].each {|file| require file }
+
 CLI::Root.start

data/lib/artoo/commands/commands.rb

@@ -10,6 +10,10 @@ module Artoo
       def self.banner(command, namespace = nil, subcommand = false)
         "#{basename} #{@package_name} #{command.usage}"
       end
+
+      def self.install_dir
+        ENV['GEM_HOME'] + "/.artoo/commands"
+      end
     end
   end
 end

data/lib/artoo/commands/install.rb

@@ -1,5 +1,6 @@
-require 'thor'
-require 'thor/group'
+require 'artoo/utility'
+require 'artoo/commands/commands'
+require 'fileutils'
 
 module Artoo
   module Commands
@@ -19,6 +20,12 @@ module Artoo
           say "OS not yet supported..."
         end
       end
+
+      desc "command [FILENAME]", "Installs artoo command extension files"
+      def command(file)
+        empty_directory Install.install_dir
+        FileUtils.cp(file, Install.install_dir)
+      end
     end
   end
 end

data/lib/artoo/drivers/device_info.rb

@@ -5,6 +5,14 @@ module Artoo
     # DeviceInfo driver behaviors
     class DeviceInfo < Driver
       COMMANDS = [:firmware_name, :version, :connect].freeze
+
+      def firmware_name
+        connection.firmware_name
+      end
+
+      def version
+        connection.version
+      end
     end
   end
 end

data/lib/artoo/exceptions.rb

@@ -1,3 +1,4 @@
 module Artoo
   class RobotNotFound < StandardError; end # unable to find a robot by name in master
+  class InvalidPin < StandardError; end # this pin is not validd for this operation
 end

data/lib/artoo/ext/numeric.rb

@@ -0,0 +1,32 @@
+# Adds syntactic suger for seconds
+class Integer < Numeric
+  # @return [Integer] Plain number, actually does nothing
+  # @example 20.seconds => 20
+  def seconds
+    return self
+  end
+
+  # @return [Integer] Plain number, actually does nothing
+  # @example 1.second => 1
+  def second
+    return self
+  end
+end
+
+# helpful conversions
+class Fixnum
+  # convert to PWM value from analog reading
+  def to_pwm
+    ((255.0 / 1023.0) * self.to_f).round
+  end
+
+  # convert to PWM value from analog reading
+  def to_pwm_reverse
+    ((255.0 / 1023.0) * (1023 - self.to_f)).round
+  end
+
+  # convert value from old scale (min to max) to new scale (0 to new_max)
+  def to_scale(min, max, new_scale)
+    (((self.to_f - min) / (max - min)) * new_max).round
+  end
+end

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

@@ -26,6 +26,18 @@ module Artoo
         super
       end
 
+      # Name of device
+      # @return [String]
+      def name
+        "<%= adaptor_name %>"
+      end
+
+      # Version of device
+      # @return [String]
+      def version
+        Artoo::<%= adaptor_class_name %>::VERSION
+      end
+
       # Uses method missing to call device actions
       # @see device documentation
       def method_missing(method_name, *arguments, &block)

data/lib/artoo/utility.rb

@@ -1,4 +1,5 @@
 require 'rbconfig'
+require 'artoo/ext/numeric'
 
 module Artoo
   # Utility methods used for various important things
@@ -86,18 +87,3 @@ module Artoo
     end
   end
 end
-
-# Adds syntactic suger for seconds
-class Integer < Numeric
-  # @return [Integer] Plain number, actually does nothing
-  # @example 20.seconds => 20
-  def seconds
-    return self
-  end
-
-  # @return [Integer] Plain number, actually does nothing
-  # @example 1.second => 1
-  def second
-    return self
-  end
-end

data/lib/artoo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artoo
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ron Evans
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -48,14 +48,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0.pre
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0.pre
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,7 @@ files:
 - lib/artoo/events.rb
 - lib/artoo/exceptions.rb
 - lib/artoo/ext/actor.rb
+- lib/artoo/ext/numeric.rb
 - lib/artoo/generators/adaptor.rb
 - lib/artoo/generators/adaptor/Gemfile.tt
 - lib/artoo/generators/adaptor/LICENSE