smalruby 0.0.27-x86-mingw32 → 0.0.28-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa8c09967a7b2bbc4f20c9ed175e4cf0de7815c8
-  data.tar.gz: 44f19f82f887bd606f622ce377e826d8cf7c0735
+  metadata.gz: fbd593e1b2c6ceef1851955dd57c59590556bbfd
+  data.tar.gz: 86a88450d558dd10e9b80593f37d32def3488e25
 SHA512:
-  metadata.gz: 5c5ee978cdf45f04acd54f58d8d1fde907d858a34c5ea1f63f87db1c1aa8a2ab37dc4770505463c1655e136cacdfd42428edc9de2c312dbbb34b6f8ca7023885
-  data.tar.gz: 940819b7d174f5dfccebc7a48ed2b37b30d63e87a58ef518cb791ff758959b281cb15c4bed74d6098da56569bc189afba2af9499d80b65729d83c650cc5cfa68
+  metadata.gz: 77d75eaef5470b25ae4ee674b86e6c1776717bac511b1712a5d25bb961288fe6d8d453a3ca5a67e02c5590699020798210ca23c4a95fe7847692cb9a712725bc
+  data.tar.gz: 656430127324a91ea3f777fb695df73e3d36875ae1c4c223ef62764b3c775b720edfe764b7853cddb54d96997bdbb60c790b6872812d42b4a13d5bbc62a73bf8

data/lib/smalruby/hardware/null_hardware.rb

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+require 'smalruby/hardware'
+
+module Smalruby
+  module Hardware
+    # 何もしないハードウェアを表現するクラス
+    class NullHardware
+      def initialize(*_)
+      end
+
+      def method_missing(name)
+      end
+    end
+  end
+end

data/lib/smalruby/hardware.rb

@@ -8,6 +8,8 @@ module Smalruby
   module Hardware
     extend ActiveSupport::Autoload
 
+    autoload :NullHardware
+
     autoload :Pin
     autoload :Led
     autoload :RgbLedAnode
@@ -27,7 +29,6 @@ module Smalruby
     #   WindowsだとCOM1など
     def init(options = {})
       return if @initialized_hardware
-      fail 'already started.' if @started
 
       defaults = {
         device: nil,
@@ -42,10 +43,18 @@ module Smalruby
         txrx = Dino::TxRx.new
         txrx.io = opt[:device] if opt[:device]
       end
-      world.board = Dino::Board.new(txrx)
-      world.board.heart_rate = opt[:heart_rate]
+      begin
+        world.board = Dino::Board.new(txrx)
+        world.board.heart_rate = opt[:heart_rate]
+
+        @initialized_hardware = true
+      rescue Exception
+        Util.print_exception($!)
 
-      @initialized_hardware = true
+        canvas = Canvas.new(height: 32)
+        canvas.draw_font(string: 'ハードウェアの準備に失敗しました',
+                         color: 'red')
+      end
     end
 
     # ハードウェアを停止させる
@@ -66,6 +75,7 @@ module Smalruby
     # @param [String|Numeric] pin ピン番号
     # @return [Object] ハードウェアのインスタンス
     def create_hardware(klass, pin)
+      klass = NullHardware unless @initialized_hardware
       key = [klass, pin]
       @hardware_cache.synchronize do
         @hardware_cache[key] ||= klass.new(pin: pin)

data/lib/smalruby/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module Smalruby
-  VERSION =  '0.0.27'
+  VERSION =  '0.0.28'
 end

data/lib/smalruby.rb

@@ -46,8 +46,12 @@ module Smalruby
   end
 
   def await
-    @draw_mutex.synchronize do
-      @draw_cv.wait(@draw_mutex)
+    if Thread.current == Thread.main
+      sleep(1.0 / 15)
+    else
+      @draw_mutex.synchronize do
+        @draw_cv.wait(@draw_mutex)
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: x86-mingw32
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-13 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -259,6 +259,7 @@ files:
 - lib/smalruby/hardware/button.rb
 - lib/smalruby/hardware/dino/fix_gets.rb
 - lib/smalruby/hardware/led.rb
+- lib/smalruby/hardware/null_hardware.rb
 - lib/smalruby/hardware/pin.rb
 - lib/smalruby/hardware/rgb_led_anode.rb
 - lib/smalruby/hardware/rgb_led_cathode.rb