artoo 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e2af8475fd6bcbc50ddb13d80d3d4c1c47a2d8e
-  data.tar.gz: 3ff802dd20f87a526d428bdaf8d66244233ecc99
+  metadata.gz: 2bd5f19df7614902b2db851504c69b84c62802bf
+  data.tar.gz: 553d99621d690f7dd34c6d44f3f5e00558a80ac4
 SHA512:
-  metadata.gz: 3edc56e7a01c5fc920e4e89c6fce98b67a8ae507e7b783599b26e9831fd56b1d1655a79d42251602af1235a6f66ef313b47cc11444320cb7c2ec95e582aca0ba
-  data.tar.gz: cb17d7f5f705d318155359101445274669fdd81ab2ee77b627a153ed0392e0dc62ed3880e4222e722922e85c500eaea9e170eebb5de0c0a8faac4f4f4d26e90d
+  metadata.gz: 846e9655c178b18fa55325cf11f8d857683a1fedd4951844c242a64f7193ce239a2947e04d87abe3ed14dc3df63e7fe066b5067071f7c5fec28810dbb278aa2c
+  data.tar.gz: 5a5adc204d4196683e0ceb275d395d39d91ee77b48cd6e940e6ee8b86c8c7fd9cfce8752a3e3cf404e5b4708261480a61d4d6da3f5f35932fe96b127a626a86f

data/.ruby-version

@@ -1 +1,3 @@
-ruby-2.1.1
+2.1.1
+2.1.1
+

data/.travis.yml

@@ -1,7 +1,8 @@
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
+  - 2.2
   - ruby-head
   - jruby
   - jruby-head

data/CONTRIBUTING.md

@@ -0,0 +1 @@
+To get started, <a href="https://thg-clahub.herokuapp.com/agreements/clahub">Sign the Contributor License Agreement</a>

data/Gemfile

@@ -13,7 +13,7 @@ gem "minitest", "~> 5.0.1"
 gem "minitest-happy"
 gem "mocha", '~> 0.14.0', :require => false
 
-gem 'json', '~> 1.7.7'
+gem 'json', '~> 1.8.2'
 gem "foreman"
 
 platforms :jruby do

data/README.md

@@ -106,7 +106,7 @@ Artoo has a extensible system for connecting to hardware devices. The following
   - [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)
+  - [Roomba](http://www.irobot.com/About-iRobot/STEM.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)
 
@@ -319,7 +319,6 @@ If you want to help us with some documentation on the site, you can go to [artoo
 Need more help? Just want to say "Hello"? Come visit us on IRC freenode #artoo
 
 ## Contributing
-* All active development is in the dev branch. New or updated features must be added to the dev branch. Hotfixes will be considered on the master branch in situations where it does not alter behaviour or features, only fixes a bug.
 * 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.
@@ -333,4 +332,4 @@ Need more help? Just want to say "Hello"? Come visit us on IRC freenode #artoo
   * For git help see [progit](http://git-scm.com/book) which is an awesome (and free) book on git
 
 
-(c) 2012-2014 The Hybrid Group
+(c) 2012-2015 The Hybrid Group

data/artoo.gemspec

@@ -20,13 +20,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'celluloid', '>= 0.16.0.pre'
-  s.add_runtime_dependency 'celluloid-io', '>= 0.16.0.pre'
+  s.add_runtime_dependency 'celluloid', '~> 0.16.0'
+  s.add_runtime_dependency 'celluloid-io', '~> 0.16.0'
   s.add_runtime_dependency 'http', '~> 0.6.1'
   s.add_runtime_dependency 'reel', '~> 0.5.0'
   s.add_runtime_dependency 'multi_json', '~> 1.10.1'
   s.add_runtime_dependency 'rake'
   s.add_runtime_dependency 'pry', '~> 0.9.0'
   s.add_runtime_dependency 'thor', '~> 0.19.1'
-  s.add_runtime_dependency 'robeaux', '0.2.0'
+  s.add_runtime_dependency 'robeaux', '0.4.1'
 end

data/lib/artoo/adaptors/io/digital_pin.rb

@@ -50,14 +50,17 @@ module Artoo
           @mode = mode
 
           if mode == 'w'
-            File.open("#{ GPIO_PATH }/gpio#{ pin_num }/direction", "w") { |f| f.write(GPIO_DIRECTION_WRITE) }
-            @pin_file = File.open("#{ GPIO_PATH }/gpio#{ pin_num }/value", "w")
+            set_pin(mode: 'w', direction: GPIO_DIRECTION_WRITE)
           elsif mode =='r'
-            File.open("#{ GPIO_PATH }/gpio#{ pin_num }/direction", "w") { |f| f.write(GPIO_DIRECTION_READ) }
-            @pin_file = File.open("#{ GPIO_PATH }/gpio#{pin_num}/value", "r")
+            set_pin(mode: 'r', direction: GPIO_DIRECTION_READ)
           end
         end
 
+        def set_pin(mode:, direction:)
+          File.open("#{ GPIO_PATH }/gpio#{ pin_num }/direction", "w") { |f| f.write(direction) }
+          @pin_file = File.open("#{ GPIO_PATH }/gpio#{ pin_num }/value", mode)
+        end
+
         def on?
           (@status == 'high') ? true : false
         end
@@ -78,6 +81,7 @@ module Artoo
 
         # Unexports the pin in GPIO to leave it free
         def close
+          off! if @mode == 'w'
           File.open("#{ GPIO_PATH }/unexport", "w") { |f| f.write("#{pin_num}") }
         end
       end

data/lib/artoo/robot.rb

@@ -186,23 +186,29 @@ module Artoo
 
     def initialize_connections(params={})
       @connections = {}
-      connection_types.each {|ct|
-        Logger.info "Initializing connection #{ct[:name].to_s}..."
-        cp = params[ct[:name]] || {}
-        c = Connection.new(ct.merge(cp).merge(:parent => current_instance))
-        @connections[ct[:name]] = c
-      }
+      connection_types.each {|type| initialize_connection(params, type, @connections)}
     end
 
     def initialize_devices(params={})
       @devices = {}
-      device_types.each {|d|
-        Logger.info "Initializing device #{d[:name].to_s}..."
-        dp = params[d[:name]] || {}
-        d = Device.new(d.merge(dp).merge(:parent => current_instance))
-        instance_eval("def #{d.name}; return devices[:#{d.name}]; end")
-        @devices[d.name.intern] = d
-      }
+      device_types.each {|type| initialize_device(params, type, @devices)}
+    end
+
+    def initialize_connection(params, type, connections)
+      connection = initialize_object(Connection, params, type)
+      @connections[type[:name]] = connection
+    end
+
+    def initialize_device(params, type, devices)
+      type = initialize_object(Device, params, type)
+      instance_eval("def #{type.name}; return devices[:#{type.name}]; end")
+      @devices[type.name.intern] = type
+    end
+
+    def initialize_object(klass, params, type)
+      Logger.info "Initializing #{klass.to_s.downcase} #{type[:name].to_s}..."
+      param = params[type[:name]] || {}
+      klass.new(type.merge(param).merge(:parent => current_instance))
     end
 
     def execute_startup(things, &block)

data/lib/artoo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artoo
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Ron Evans
@@ -12,36 +12,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.1
 description: Ruby-based microframework for robotics
 email:
 - artoo@hybridgroup.com
@@ -154,6 +154,7 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - ".yardopts"
+- CONTRIBUTING.md
 - CONTRIBUTORS.md
 - Gemfile
 - LICENSE
@@ -288,22 +289,5 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby-based microframework for robotics
-test_files:
-- test/adaptors/adaptor_test.rb
-- test/adaptors/loopback_test.rb
-- test/api/api_routes_test.rb
-- test/api/api_test.rb
-- test/artoo_test.rb
-- test/connection_test.rb
-- test/delegator_test.rb
-- test/device_test.rb
-- test/drivers/driver_test.rb
-- test/ext/numeric_test.rb
-- test/interfaces/interface_test.rb
-- test/master_test.rb
-- test/port_test.rb
-- test/robot_test.rb
-- test/test_helper.rb
-- test/utility_test.rb
-- test/utility_test_cases.rb
+test_files: []
 has_rdoc: