hybridgroup-firmata 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab2e9e722ee32499c3449e9175a1f6d04ff9c2b8
-  data.tar.gz: 0b80324eb47738f6aaf34d57845bf3e12fb63b3f
+  metadata.gz: 2ba95efafd486c6832d30cddf13dc3357d6c91fd
+  data.tar.gz: cbe87f61f453cd14d53a2edec6b945f01ee1848f
 SHA512:
-  metadata.gz: 5f42be2a6835ca1e0232a738f15db5d0629538ffe74600c394bc939182f1fd1738374825f402eb40c1488e4fb8aeb95baf726fd2989f82a1356d7f1fb180eee9
-  data.tar.gz: 63903ae5e366692fbb747936e89e06ffca16a7c7162d058e8fb2c6b2d3a2dfdcd8ed096c081c379666ef6b6d8d264baf9d1c4baaaf2e628384f873863fe6efb8
+  metadata.gz: c11c81e46fbeb18a3bbd7f3f9061b2b1b8a314c134b48eac5c4b1bc96c8ccbc8e0da3bf56defc7f2dc0d563342d9aba4843c91c3ef23058979ab831788c2789e
+  data.tar.gz: 50e6bdddb92137c12fbb9f21f4743b9b0800a130a850fa08a204690290c215e7fc4787f537f1ed99ee541568b5f3ec410cb48b3fe9d6d57d426d1308c5358de5

data/.gitignore

@@ -15,4 +15,5 @@ test/tmp
 test/version_tmp
 tmp
 .rvmrc
-harness.rb
+harness.rb
+Gemfile.lock

data/.travis.yml

@@ -1,6 +1,10 @@
 language: ruby
 rvm:
   - 2.0.0
+  - 2.1.0
   - 1.9.3
-  - jruby-19mode
-  - rbx-19mode
+  - jruby
+  - rbx-2.2.10
+script:
+  - bundle install
+  - bundle exec rake test

data/examples/blink_led.rb

@@ -4,7 +4,7 @@ require 'socket'
 
 #sp = 'COM3' # windows
 #sp = '/dev/ttyACM0' #linux
-sp = '/dev/tty.usbmodemfa131' #mac
+sp = '/dev/cu.usbmodem1451' #mac
 
 board = Firmata::Board.new(sp)
 

data/firmata.gemspec

@@ -15,9 +15,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Firmata::VERSION
 
-  gem.add_development_dependency("rake")
-  gem.add_development_dependency("pry")
-  gem.add_development_dependency("minitest")
+  gem.add_development_dependency "rake", "~>10.1.0"
+  gem.add_development_dependency "pry", "~>0.9.12.2"
+  gem.add_development_dependency "minitest", "~>5.0.6"
 
-  gem.add_runtime_dependency("event_emitter")
+  gem.add_runtime_dependency "event_emitter", "~>0.2.5"
+  gem.add_runtime_dependency "rubyserial", "~>0.1.1"
 end

data/lib/firmata/board.rb

@@ -1,5 +1,6 @@
 require 'stringio'
 require 'event_emitter'
+require 'rubyserial'
 
 module Firmata
   class Board
@@ -24,9 +25,7 @@ module Firmata
     # port - a String port or an Object that responds to read and write.
     def initialize(port)
       if port.is_a?(String)
-        require 'serialport'
-        @serial_port = SerialPort.new(port, 57600, 8, 1, SerialPort::NONE)
-        @serial_port.read_timeout = 2
+        @serial_port = Serial.new(port, 57600, 8)
       else
         @serial_port = port
       end
@@ -41,8 +40,6 @@ module Firmata
       @async_events = []
 
       trap_signals 'INT', 'KILL', 'TERM'
-    rescue LoadError
-      puts "Please 'gem install hybridgroup-serialport' for serial port support."
     end
 
     # Public: Check if a connection to Arduino has been made.
@@ -63,7 +60,7 @@ module Firmata
         catch(:initialized) do
           loop do
             query_report_version #unless @major_version.zero?
-            sleep 0.1
+            sleep 1
             read_and_process
           end
         end
@@ -242,6 +239,7 @@ module Firmata
       ret.push(END_SYSEX)
       write(*ret)
     end
+
     # Public: Set i2c config.
     #   I2C config
     # 0  START_SYSEX (0xF0) (MIDI System Exclusive)
@@ -289,16 +287,14 @@ module Firmata
     #
     # Returns nothing.
     def write(*commands)
-      serial_port.write_nonblock(commands.map(&:chr).join)
+      serial_port.write(commands.map(&:chr).join)
     end
 
     # Internal: Read data from the underlying serial port.
     #
     # Returns String data read for serial port.
     def read
-      return serial_port.read_nonblock(1024)
-    rescue EOFError
-    rescue Errno::EAGAIN
+      return serial_port.read(1024)
     end
 
     # Internal: Process a series of bytes.

data/lib/firmata/version.rb

@@ -1,3 +1,3 @@
 module Firmata
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

data/test/board_test.rb

@@ -16,7 +16,7 @@ module Firmata
         yield mock_port
       else
         expected = args.map(&:chr).join
-        mock_port.expect(:write_nonblock, 1, [expected])
+        mock_port.expect(:write, 1, [expected])
       end
 
       mock_port
@@ -131,7 +131,7 @@ module Firmata
 
     def test_toggling_pin_reporting
       mock_sp = mock_serial_port do |mock|
-        mock.expect(:write_nonblock, 2, [[Board::REPORT_DIGITAL | 13, 1].map(&:chr).join])
+        mock.expect(:write, 2, [[Board::REPORT_DIGITAL | 13, 1].map(&:chr).join])
       end
 
       board = Board.new(mock_sp)
@@ -139,7 +139,7 @@ module Firmata
       board.toggle_pin_reporting(13)
       mock_sp.verify
 
-      mock_sp.expect(:write_nonblock, 2, [[Board::REPORT_DIGITAL | 13, 0].map(&:chr).join])
+      mock_sp.expect(:write, 2, [[Board::REPORT_DIGITAL | 13, 0].map(&:chr).join])
       board.toggle_pin_reporting(13, 0)
       mock_sp.verify
 

data/test/fake_serial_port.rb

@@ -39,7 +39,6 @@ module Firmata
       @buffer << val
       val.length
     end
-    alias_method :write_nonblock, :write
 
     def bytes
       bytes = StringIO.new(@buffer).bytes

metadata

@@ -1,72 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: hybridgroup-firmata
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
-- '''Mike Breen'', ''Adrian Zankich'', ''Ron Evans'', ''Isaac A. Murchie'', ''Rafael
-  Magaña'''
+- "'Mike Breen', 'Adrian Zankich', 'Ron Evans', 'Isaac A. Murchie', 'Rafael Magaña'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.12.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.6
 - !ruby/object:Gem::Dependency
   name: event_emitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.5
+- !ruby/object:Gem::Dependency
+  name: rubyserial
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: A lib for working with the Firmata protocol in Ruby.
 email:
 - info@hybridgroup.com
@@ -74,10 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -104,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ''

data/Gemfile.lock

@@ -1,28 +0,0 @@
-PATH
-  remote: .
-  specs:
-    hybridgroup-firmata (0.4.5)
-      event_emitter
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    coderay (1.0.9)
-    event_emitter (0.2.5)
-    method_source (0.8.2)
-    minitest (5.0.6)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rake (10.1.0)
-    slop (3.4.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  hybridgroup-firmata!
-  minitest
-  pry
-  rake