smalruby 0.1.8-x86-mingw32 → 0.1.9-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4047befb22246c65270b46b52028d25e7aaed2d2
-  data.tar.gz: 6cc88b0af3c9f9d1e1e14d32ab21ebe6328cf0f1
+  metadata.gz: 7d8a9c5466d5791117a27f0ee81f345874327aae
+  data.tar.gz: 51d80e43ded60d8a33a85f3d07daf85a4f0cc85e
 SHA512:
-  metadata.gz: 3d74cb270bfba0bfe311fa1e8f5ade76f685f4eb34fa8f3b75341cbb9a2ca9f8e2b1728be1650910ccd8443033ffd27353f9f07ecd94a529d312f7f5ee04847c
-  data.tar.gz: b07782c40db851d7c5fc900a34a2e65c43a08253dd112ff23f28e8af1e82e2e89f0e29357d928c531f91a8d6f469b9b39209074a9d78a3a2fc97b157a8410df8
+  metadata.gz: 7d1c6bf30b3ba7d3da9867fca1afddc10f60357910fc80feca177df1446ec6aaaf512bc3cb55bac9463533549928ce7e6af9e51d77d51be65a249d112a2dc200
+  data.tar.gz: 7ebe348c294e7d117b58933438fb0d2872d274ad29dc1e1bbdad560a4d9bd326ba3597ecd15ba72c5d55cb95f2665fbc6b2c49ace540db875a8c725cfe38039d

data/.rubocop.yml

@@ -1,42 +1,147 @@
 AllCops:
-  Exclude:
-    - tmp/**
+  Excludes:
+    - tmp/**/*
+    - vendor/**/*
+    - work/**/*
+    - samples/**/*
 
-MethodLength:
+# Offense count: 1
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
   Enabled: false
 
-ClassLength:
+# Offense count: 2
+Lint/HandleExceptions:
   Enabled: false
 
-Documentation:
+# Offense count: 1
+Lint/RescueException:
   Enabled: false
 
-HandleExceptions:
+# Offense count: 2
+# Cop supports --auto-correct.
+Lint/UnusedMethodArgument:
   Enabled: false
 
-Blocks:
+# Offense count: 17
+Metrics/AbcSize:
+  Max: 58
+
+# Offense count: 3
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 433
+
+# Offense count: 3
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 4
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 162
+
+# Offense count: 22
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 37
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 170
+
+# Offense count: 1
+Metrics/PerceivedComplexity:
+  Max: 8
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Performance/ParallelAssignment:
+  Enabled: false
+
+# Offense count: 1
+Style/AccessorMethodName:
+  Enabled: false
+
+# Offense count: 160
+Style/AsciiComments:
+  Enabled: false
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+Style/BlockDelimiters:
+  Enabled: false
+
+# Offense count: 4
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 8
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
+Style/HashSyntax:
+  Enabled: false
+
+# Offense count: 11
+# Cop supports --auto-correct.
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/MultilineOperationIndentation:
   Enabled: false
 
-FavorUnlessOverNegatedIf:
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
   Enabled: false
 
-IfUnlessModifier:
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/PerlBackrefs:
   Enabled: false
 
-RedundantReturn:
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
   Enabled: false
 
-AsciiComments:
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/SpecialGlobalVars:
   Enabled: false
 
-CaseEquality:
+# Offense count: 12
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/StringLiterals:
   Enabled: false
 
-StringLiterals:
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
+Style/SymbolProc:
   Enabled: false
 
-EndOfLine:
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+Style/TrailingComma:
   Enabled: false
 
-TrailingComma:
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/UnneededPercentQ:
   Enabled: false

data/Rakefile

@@ -83,4 +83,4 @@ task :release do
   sh 'git push'
 end
 
-task :default => [:spec]
+task :default => [:rubocop, :spec]

data/lib/smalruby/character.rb

@@ -381,6 +381,11 @@ module Smalruby
       Hardware.create_hardware(Hardware::RgbLedCathode, pin)
     end
 
+    # マイコン内蔵RGB LED
+    def neo_pixel(pin)
+      Hardware.create_hardware(Hardware::NeoPixel, pin)
+    end
+
     # サーボモーター
     def servo(pin)
       Hardware.create_hardware(Hardware::Servo, pin)

data/lib/smalruby/hardware.rb

@@ -13,6 +13,7 @@ module Smalruby
     autoload :Led
     autoload :RgbLedAnode
     autoload :RgbLedCathode
+    autoload :NeoPixel
     autoload :Servo
     autoload :TwoWheelDriveCar
     autoload :MotorDriver

data/lib/smalruby/hardware/neo_pixel.rb

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+require 'smalruby/hardware'
+require "set"
+
+module Smalruby
+  module Hardware
+    # Adafruit NeoPixel RGB LED class
+    class NeoPixel < Smalrubot::Components::BaseComponent
+      include Util
+
+      def initialize(options)
+        pin = Pin.smalruby_to_smalrubot(options[:pin])
+        case pin
+        when 3, 5, 6, 9, 10, 11
+          super(board: world.board, pin: pin)
+        else
+          fail "ピン番号が間違っています: {options[:pin]}"
+        end
+        @indexes = Set.new
+      end
+
+      # set color
+      def set(options)
+        defaults = {
+          index: 0,
+          color: "black",
+          show: true,
+        }
+        opts = process_options(options, defaults)
+        @indexes << opts[:index]
+        color = Color.smalruby_to_dxruby(opts[:color])
+        board.set_neo_pixel_color(opts[:index], *color)
+        if opts[:show]
+          show
+        end
+      end
+
+      # apply color settings
+      def show
+        board.show_neo_pixel
+      end
+
+      # turn off
+      def turn_off
+        if @indexes.length > 0
+          @indexes.each do |i|
+            board.set_neo_pixel_color(i, 0, 0, 0)
+          end
+          board.show_neo_pixel
+        end
+      end
+
+      # destruction
+      def stop
+        if @indexes.length > 0
+          turn_off
+          @indexes.clear
+        end
+      end
+
+      private
+
+      def after_initialize(_ = {})
+        board.set_neo_pixel_pin(pin)
+        board.show_neo_pixel
+      end
+    end
+  end
+end

data/lib/smalruby/version.rb

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

data/samples/hardware_neo_pixel.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+DESCRIPTION = <<EOS
+マイコン内蔵RGB LEDを制御します
+EOS
+
+# デジタルの5番ピンに接続してください。
+
+require 'smalruby'
+
+init_hardware
+
+stage1 = Stage.new(color: 'white')
+
+stage1.on(:start) do
+  loop do
+    Color::NAME_TO_CODE.keys.each do |color|
+      draw_font(string: "#{DESCRIPTION}#{color}", color: 'black')
+      neo_pixel('D5').set(color: color)
+      sleep(1)
+      fill(color: 'white')
+    end
+  end
+end

data/samples/hardware_neo_pixel2.rb

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+
+DESCRIPTION = <<EOS
+マイコン内蔵RGB LEDを制御します
+EOS
+
+# マイコン内蔵RGB LEDデジタルの5番ピンに、
+# スイッチをデジタルの3・4番ピンに接続してください。
+
+require 'smalruby'
+
+init_hardware
+
+stage1 = Stage.new(color: 'white')
+
+stage1.on(:start) do
+  color_codes = Color::NAME_TO_CODE.keys
+  index = 0
+  loop do
+    fill(color: 'white')
+    color = color_codes[index]
+    draw_font(string: "#{DESCRIPTION}#{index}:#{color}", color: 'black')
+    neo_pixel("D5").set(color: color)
+    until button("D3").pressed? || button("D4").pressed?
+      await
+    end
+    if button("D3").pressed?
+      index -= 1
+      if index < 0
+        index = 0
+      end
+    end
+    if button("D4").pressed?
+      index += 1
+      if index >= color_codes.length
+        index = color_codes.length - 1
+      end
+    end
+  end
+end

data/smalruby.gemspec

@@ -42,5 +42,5 @@ Gem::Specification.new do |spec|
   else
     spec.add_runtime_dependency 'dxruby_sdl', '~> 0.0.13'
   end
-  spec.add_runtime_dependency 'smalrubot', '~> 0.0.5'
+  spec.add_runtime_dependency 'smalrubot', '~> 0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: x86-mingw32
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 description: smalruby is a 2D game development library. This is part of "Smalruby"
   project that is a learning ruby programming environment for kids.
 email:
@@ -259,6 +259,7 @@ files:
 - lib/smalruby/hardware/button.rb
 - lib/smalruby/hardware/led.rb
 - lib/smalruby/hardware/motor_driver.rb
+- lib/smalruby/hardware/neo_pixel.rb
 - lib/smalruby/hardware/null_hardware.rb
 - lib/smalruby/hardware/pin.rb
 - lib/smalruby/hardware/rgb_led_anode.rb
@@ -289,6 +290,8 @@ files:
 - samples/hardware_button.rb
 - samples/hardware_led.rb
 - samples/hardware_motor_driver.rb
+- samples/hardware_neo_pixel.rb
+- samples/hardware_neo_pixel2.rb
 - samples/hardware_rgb_led_anode.rb
 - samples/hardware_rgb_led_cathode.rb
 - samples/hardware_sensor.rb