domotics-arduino 0.3.0 → 0.3.2

data/Rakefile

@@ -33,19 +33,23 @@ task :major, :commit_message do |t, args|
   update(args[:commit_message]){ |sv,i| i == MAJOR ? sv.succ : "0" }
 end
 
+
 def update(msg)
   # Update version
-  File.open "lib/domotics/arduino/version.rb", "r+" do |f|
+  File.open "./lib/domotics/arduino/version.rb", "r+" do |f|
     up = f.read.sub(/\d+.\d+.\d+/) { |ver| ver.split('.').map.with_index{ |sv, i| yield sv,i }.join('.') }
     f.seek 0
     f.write up
   end
+  puts "Changed version."
+  puts "Removed #{File.delete(*Dir['./*.gem'])} old gems"
+  Dir["./*.gemspec"].each { |spec| puts %x(gem build #{spec}) }
+  Dir["./*.gem"].each { |gem| puts %x(gem push #{gem}) }
   # add new files to repo
   %x(git add --all .)
   # commit
   if msg then %x(git commit -a -m "#{msg}")
   else %x(git commit -a --reuse-message=HEAD); end
-  # release
-  Rake::Task[:release].reenable
-  Rake::Task[:release].invoke
+  %x(git push)
+  puts "Pushed to github."
 end

data/domotics-arduino.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Goredar"]
   spec.email         = ["goredar@gmail.com"]
   spec.description   = %q{Arduino part of Domotics}
-  spec.summary       = %q{Arduino part of Domotics}
-  spec.homepage      = ""
+  spec.summary       = %q{Hardware drivers for arduino}
+  spec.homepage      = "https://dom.goredar.it"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/lib/domotics/arduino/arduino_base.rb

@@ -21,7 +21,7 @@ module Domotics
       SUCCESSREPRLY = 2
       FAILREPRLY = 3
       # Board events
-      EVENTS = {'0' => :pin_state_change}
+      EVENTS = {'0' => :pin_state_changed}
       # Commands for board
       SETPINMODE = 0
       GETDIGITAL = 1
@@ -65,6 +65,8 @@ module Domotics
           @pwm_pins = Array.new(12) { |index| 2+index } + [44,45,46]
         end
         @logger = args[:logger] || Logger.new(STDERR)
+        @timeout = args[:timeout] || 1
+        @retry_wait = args[:retry_wait] || 5
         # Not allow multiple command sends
         @command_lock = Mutex.new
         @reply = Queue.new
@@ -184,13 +186,13 @@ module Domotics
       private
 
       # Default event handler simple prints event.
-      def event_handler(hash)
-        raise hash[:e] if hash[:e].is_a? ArduinoError
+      def event_handler(event)
+        raise event[:e] if event[:e].is_a? ArduinoError
       end
 
       # Send command directly to board
       def send_command(command, pin = 0, value = 0)
-        Timeout.timeout(1) do
+        Timeout.timeout(@timeout) do
           @command_lock.synchronize do
             @board.puts("#{command} #{pin} #{value}")
             # Get reply
@@ -285,8 +287,8 @@ module Domotics
         tries = tries || 0
         tries += 1
         if tries <= 3
-          @logger.info { "Attempt #{tries}: try to reconnect in #{2**tries} seconds." }
-          sleep 2**tries
+          @logger.info { "Attempt #{tries}: try to reconnect in #{@retry_wait**tries} seconds." }
+          sleep @retry_wait**tries
           retry
         end
         @logger.error { "Board [#{@port_str}] malfunction. Automatic restart failed." }

data/lib/domotics/arduino/board_emulator.rb

@@ -0,0 +1,50 @@
+require 'pty'
+
+module Domotics
+  module Arduino
+
+    class BoardEmulator
+      attr_accessor :type, :state_list
+      def initialize(args = {})
+        success = ArduinoBase::SUCCESSREPRLY
+        @master, @slave = PTY.open
+        @type = args[:type] || :normal
+        @state_list = Hash.new(ArduinoBase::LOW)
+        Thread.new do
+          loop do
+            case @type
+            when :dead
+              terminate
+            when :crasy
+              @master.gets
+              @master.puts rand(4).times.map{ rand(10) }.join(' ')
+            when :disconnect
+              @master.gets
+              @slave.close
+              @master.close
+            else
+              message = @master.gets
+              command, pin, value = message.chomp.split(" ").map{ |m| m.to_i }
+              case command
+              when ArduinoBase::ECHOREPLY
+                @master.puts "#{value} #{pin}"
+              when ArduinoBase::SETDIGITAL
+                @state_list[pin] = value
+                @master.puts success
+              else
+                @master.puts success
+              end
+            end
+          end
+        end
+      end
+      def port
+        @slave.path
+      end
+      def toggle_pin(pin)
+        @state_list[pin] = @state_list[pin] == ArduinoBase::LOW ? ArduinoBase::HIGH : ArduinoBase::LOW
+        @master.puts "0 #{pin} #{@state_list[pin]}"
+      end
+    end
+  end
+end

data/lib/domotics/arduino/version.rb

@@ -1,5 +1,5 @@
 module Domotics
   module Arduino
-    VERSION = "0.3.0"
+    VERSION = "0.3.2"
   end
 end

data/test/test_arduino.rb

@@ -1,34 +1,45 @@
 require 'test/unit'
 require 'domotics/arduino'
-require 'board_emulator'
 
 class ArduinoTestBoard
+  attr_reader :last_event
   include Domotics::Arduino::ArduinoBase
+  def event_handler(event)
+    super
+    @last_event = event
+  end
 end
 
 class ArduinoTest < Test::Unit::TestCase
-  def asetup
-    @brd = ArduinoTestBoard.new(port: BoardEmulator.new.port)
+  def setup
+    #@brd = ArduinoTestBoard.new(port: Domotics::Arduino::BoardEmulator.new.port)
   end
   def test_dead_board
-    assert_raise Domotics::Arduino::ArduinoError do
-      ArduinoTestBoard.new(port: BoardEmulator.new(type: :dead).port)
-    end
+    assert_raise(Domotics::Arduino::ArduinoError) { emulate :dead }
   end
   def test_crasy_board
-    assert_raise Domotics::Arduino::ArduinoError do
-      ArduinoTestBoard.new(port: BoardEmulator.new(type: :crasy).port)
-    end
+    assert_raise(Domotics::Arduino::ArduinoError) { emulate :crasy }
   end
   def test_disconnected_board
-    assert_raise Domotics::Arduino::ArduinoError do
-      ArduinoTestBoard.new(port: BoardEmulator.new(type: :disconnect).port)
-    end
+    assert_raise(Domotics::Arduino::ArduinoError) { emulate :disconnect }
+  end
+  def test_set_digital
+    brd, emul = emulate
+    brd.set_digital(13, Domotics::Arduino::ArduinoBase::HIGH)
+    assert_equal Domotics::Arduino::ArduinoBase::HIGH, emul.state_list[13]
+  end
+  def test_watch
+    brd, emul = emulate
+    emul.toggle_pin (13)
+    sleep 0.1
+    assert_equal Hash[:event, :pin_state_changed, :pin, 13, :state, Domotics::Arduino::ArduinoBase::HIGH], brd.last_event
   end
-  def atest_set_pin_mode
-    @brd
+  def emulate(type = :normal)
+    emul = Domotics::Arduino::BoardEmulator.new :type => type
+    brd = ArduinoTestBoard.new port: emul.port, retry_wait: 1
+    [brd, emul]
   end
-  def ateardown
-    @brd.destroy
+  def teardown
+    #@brd.destroy
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: domotics-arduino
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -66,7 +66,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .Rakefile.kate-swp
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -75,6 +74,7 @@ files:
 - domotics-arduino.gemspec
 - lib/domotics/arduino.rb
 - lib/domotics/arduino/arduino_base.rb
+- lib/domotics/arduino/board_emulator.rb
 - lib/domotics/arduino/digital_pin.rb
 - lib/domotics/arduino/digital_pin/nc_sensor.rb
 - lib/domotics/arduino/digital_pin/no_sensor.rb
@@ -82,9 +82,8 @@ files:
 - lib/domotics/arduino/firmware/stepper.c
 - lib/domotics/arduino/pwm_pin.rb
 - lib/domotics/arduino/version.rb
-- test/board_emulator.rb
 - test/test_arduino.rb
-homepage: ''
+homepage: https://dom.goredar.it
 licenses:
 - MIT
 post_install_message: 
@@ -108,8 +107,7 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Arduino part of Domotics
+summary: Hardware drivers for arduino
 test_files:
-- test/board_emulator.rb
 - test/test_arduino.rb
 has_rdoc: 

data/test/board_emulator.rb

@@ -1,39 +0,0 @@
-require 'pty'
-
-class BoardEmulator
-  def initialize(args = {})
-    success = Domotics::Arduino::ArduinoBase::SUCCESSREPRLY
-    @master, @slave = PTY.open
-    type = args[:type] || :normal
-    Thread.new do
-      case type
-      when :dead
-        terminate
-      when :crasy
-        loop do
-          @master.gets
-          ans = rand(4).times.map{ rand(10) }.join(' ')
-          @master.puts ans
-        end
-      when :disconnect
-        @master.gets
-        @slave.close
-        @master.close
-      else
-        loop do
-          raise unless message = @master.gets
-          command, pin, value = message.chomp.split(" ").map{ |m| m.to_i }
-          case command
-          when Domotics::Arduino::ArduinoBase::ECHOREPLY
-            @master.puts "#{value} #{pin}"
-          else
-            @master.puts success
-          end
-        end
-      end
-    end
-  end
-  def port
-    @slave.path
-  end
-end