smalruby 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9f0fcdd82c5f32169894f3c3979754c77e03366
-  data.tar.gz: b0bbd80816a9b8017334ae62a03ec9996499be10
+  metadata.gz: c653bf8bf1d484ba6a8eccc48d7a18808f620a48
+  data.tar.gz: 94dd489b31df228615620be1d3165d2c6868bafc
 SHA512:
-  metadata.gz: 81ac5d86f76812303ab7863e72afa328349a60c4b3bf4dc7087857db37e4589c8bde546303642a1abd4f29bbcdec8ed7c81a70900dd1969fd21cc03b8869619e
-  data.tar.gz: 114d5d1161bfd7a0cac06fa798a410597c1c325ea1bc1a3db6f0073e7dad79465e77ed0887681bf7d6f7e8be0ae308d4a36c2ed8afc71430595adea280b7389c
+  metadata.gz: 63f96b60b5be18287e21abc88b6ad9e2bfa22e471b7a69a4f0f7f81c25e1ccf9db5724fbe6a12006e239fa7370d3309f7c84ca38051a654664293c66441f4a56
+  data.tar.gz: a9ed2d45d22d54b61295cc36d361a8854996f249ed4515c05c82255cc7df777c447edc6e566c15bf9d20b87a25a9537169d105a154ea943627a1d2ff08ad3a97

data/.rubocop.yml

@@ -1,147 +1,109 @@
 AllCops:
-  Excludes:
+  Exclude:
     - tmp/**/*
     - vendor/**/*
     - work/**/*
     - samples/**/*
 
-# Offense count: 1
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Enabled: false
 
-# Offense count: 2
 Lint/HandleExceptions:
   Enabled: false
 
-# Offense count: 1
 Lint/RescueException:
   Enabled: false
 
-# Offense count: 2
 # Cop supports --auto-correct.
 Lint/UnusedMethodArgument:
   Enabled: false
 
-# Offense count: 17
 Metrics/AbcSize:
   Max: 58
 
-# Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 433
+  Max: 1000
 
-# 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
+  Max: 100
 
-# 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
 
-# Offense count: 2
-# Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Enabled: false
 
-# Offense count: 1
-# Cop supports --auto-correct.
 Style/PerlBackrefs:
   Enabled: false
 
-# Offense count: 4
-# Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
 Style/SpecialGlobalVars:
   Enabled: false
 
-# Offense count: 12
-# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/StringLiterals:
   Enabled: false
 
-# Offense count: 3
-# Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
 Style/SymbolProc:
   Enabled: false
 
-# Offense count: 6
-# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
 Style/TrailingComma:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
 Style/UnneededPercentQ:
   Enabled: false
+
+Style/NegatedIf:
+  Enabled: false

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 1.9.3
+  - 2.1.5
 
 env:
   AUDIODEV=null

data/lib/smalruby/character.rb

@@ -33,16 +33,26 @@ module Smalruby
         x: 0,
         y: 0,
         costume: nil,
+        costume_index: 0,
         angle: 0,
         visible: true,
         rotation_style: :free
       }
       opt = process_optional_arguments(option, defaults)
 
-      @costumes = [opt[:costume]].flatten.compact.map { |costume|
-        costume.is_a?(String) ? Image.load(asset_path(costume)) : costume
+      @costume_name__index = {}
+      @costumes = Array.wrap(opt[:costume]).compact.map.with_index { |costume, i|
+        if costume.is_a?(String)
+          md = /^(?:([^:]+):)?(.*)$/.match(costume)
+          name = md[1]
+          path = md[2]
+          costume = Image.load(asset_path(path))
+        end
+        name ||= "costume#{i + 1}"
+        @costume_name__index[name] = i
+        costume
       }
-      @costume_index = 0
+      @costume_index = opt[:costume_index]
       super(opt[:x], opt[:y], @costumes[@costume_index])
 
       @event_handlers = {}
@@ -297,8 +307,21 @@ module Smalruby
 
     # 次のコスチュームにする
     def next_costume
-      @costume_index += 1
-      @costume_index = @costume_index % @costumes.length
+      self.costume_index = @costume_index + 1
+    end
+
+    # コスチュームを(  )にする
+    def switch_costume(name)
+      if @costume_name__index.key?(name)
+        index = @costume_name__index[name]
+      else
+        index = 0
+      end
+      self.costume_index = index
+    end
+
+    def costume_index=(val)
+      @costume_index = val % @costumes.length
       self.image = @costumes[@costume_index]
     end
 
@@ -544,6 +567,7 @@ module Smalruby
     def asset_path(name)
       program_path = Pathname($PROGRAM_NAME).expand_path(Dir.pwd)
       paths = [Pathname("../#{name}").expand_path(program_path),
+               Pathname("../__assets__/#{name}").expand_path(program_path),
                Pathname("../../../assets/#{name}").expand_path(__FILE__)]
       paths.find { |path| path.file? }.to_s
     end

data/lib/smalruby/version.rb

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

data/samples/costume2.rb

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+require 'smalruby'
+
+car1 = Character.new(x: 0, y: 0, costume: 'extra_car2.png')
+
+car1.on(:start) do
+  loop do
+    move(5)
+    if reach_wall?
+      turn
+    end
+  end
+end

data/spec/lib/smalruby/character_spec.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe Smalruby::Character do
+  describe '#switch_costume' do
+    let(:character) {
+      described_class.new(costume: %w(car1.png char2:car2.png car3.png))
+    }
+
+    subject { character.costume_index }
+
+    name_to_index = {
+      "costume1" => 0,
+      "char2" => 1,
+      "costume3" => 2,
+    }
+
+    name_to_index.each do |name, index|
+      context "name is #{name}" do
+        _name, _index = name, index
+
+        let(:name) { name }
+        let(:index) { index }
+
+        before do
+          character.switch_costume(name)
+        end
+
+        it { expect(subject).to eq(index) }
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ Coveralls.wear!
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'smalruby'
+Smalruby.instance_variable_set("@started", true)
 
 Dir.glob(File.expand_path('../support/**/*.rb', __FILE__)).each do |path|
   require path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -274,6 +274,7 @@ files:
 - lib/smalruby/version.rb
 - lib/smalruby/world.rb
 - samples/.rubocop.yml
+- samples/__assets__/extra_car2.png
 - samples/canvas.rb
 - samples/canvas_color.rb
 - samples/car.rb
@@ -284,6 +285,7 @@ files:
 - samples/check_hardware_smalrubot_v3.rb
 - samples/console.rb
 - samples/costume.rb
+- samples/costume2.rb
 - samples/costumes.rb
 - samples/extra_car.png
 - samples/finding_cars.rb
@@ -304,6 +306,7 @@ files:
 - samples/piano.rb
 - samples/tree.rb
 - smalruby.gemspec
+- spec/lib/smalruby/character_spec.rb
 - spec/lib/smalruby/color_spec.rb
 - spec/lib/smalruby/world_spec.rb
 - spec/spec_helper.rb
@@ -332,6 +335,7 @@ signing_key:
 specification_version: 4
 summary: 2D game development library for kids.
 test_files:
+- spec/lib/smalruby/character_spec.rb
 - spec/lib/smalruby/color_spec.rb
 - spec/lib/smalruby/world_spec.rb
 - spec/spec_helper.rb