smalruby-editor 0.1.15-x86-mingw32 → 0.1.16-x86-mingw32

data/app/models/concerns/ruby_to_block/block/hardware_two_wheel_drive_car.rb

@@ -3,7 +3,7 @@ module RubyToBlock
   module Block
     class HardwareTwoWheelDriveCar < CharacterMethodCall
       # rubocop:disable LineLength
-      blocknize '^\s*' + CHAR_RE + 'two_wheel_drive_car\("(D(?:[2-9]|10))"\).(forward|backward|turn_left|turn_right|stop)\s*$',
+      blocknize '^\s*' + CHAR_RE + 'two_wheel_drive_car\("(D(?:[2-9]|10))"\)\.(forward|backward|turn_left|turn_right|stop)\s*$',
                 statement: true
       # rubocop:enable LineLength
 

data/app/models/concerns/ruby_to_block/block/hardware_two_wheel_drive_car_commands.rb

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class HardwareTwoWheelDriveCarCommands < Value
+      blocknize '^\s*"(forward|backward|turn_left|turn_right|stop)"\s*$',
+                value: true, priority: 1
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+        context.add_value(new(fields: { COMMAND: md2[1] }))
+        true
+      end
+    end
+  end
+end

data/app/models/concerns/ruby_to_block/block/hardware_two_wheel_drive_car_run.rb

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class HardwareTwoWheelDriveCarRun < CharacterMethodCall
+      # rubocop:disable LineLength
+      blocknize '^\s*' + CHAR_RE + 'two_wheel_drive_car\("(D(?:[2-9]|10))"\)\.run\(command:\s*("[^"]*")\s*,\s*sec:\s*(\d+)\)\s*$',
+                statement: true, inline: true
+      # rubocop:enable LineLength
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+        add_character_method_call_block(context, md2[1],
+                                        new(fields: { PIN: md2[2] }),
+                                        SEC: md2[4], COMMAND: md2[3])
+        true
+      end
+    end
+  end
+end

data/app/models/concerns/ruby_to_block/block/motion_set_x.rb

@@ -7,32 +7,9 @@ module RubyToBlock
 
       def self.process_match_data(md, context)
         md2 = regexp.match(md[type])
-        block = add_character_method_call_block(context, md2[1], new,
-                                                X: md2[2])
-
-        md3 = MotionSetY.regexp.match(context.look_next_line)
-        process_motion_set_y(context, block, md3) if md3
-
+        add_character_method_call_block(context, md2[1], new, X: md2[2])
         true
       end
-
-      def self.process_motion_set_y(context, block, md)
-        if block.character == get_character(context, md[1])
-          process_value_string(context, block, md[2], :Y)
-          context.next_line
-        end
-      rescue
-        return
-      end
-      private_class_method :process_motion_set_y
-
-      def type
-        if @values.key?(:Y)
-          'motion_set_x_y'
-        else
-          super
-        end
-      end
     end
   end
 end

data/app/models/concerns/ruby_to_block/block/motion_set_x_y.rb

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class MotionSetXY < CharacterMethodCall
+      blocknize '^\s*' + CHAR_RE +
+                'position\s*=\s*\[\s*(\S+)\s*,\s*(\S+)\s*\]\s*$',
+                statement: true, inline: true
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+        add_character_method_call_block(context, md2[1], new,
+                                        X: md2[2], Y: md2[3])
+        true
+      end
+
+      def type
+        'motion_set_x_y'
+      end
+    end
+  end
+end

data/app/models/source_code.rb

@@ -4,6 +4,7 @@ require 'tempfile'
 require 'open3'
 require 'digest/sha2'
 require 'bundler'
+require 'smalruby_editor'
 silence_warnings do
   require_relative 'concerns/ruby_to_block'
 end
@@ -72,13 +73,15 @@ class SourceCode < ActiveRecord::Base
   end
 
   def ruby_cmd
-    path = Pathname('rsdl').expand_path(RbConfig::CONFIG['bindir'])
-    if path.exist?
-      path
-    else
-      Pathname(RbConfig::CONFIG['RUBY_INSTALL_NAME'])
-        .expand_path(RbConfig::CONFIG['bindir'])
+    if SmalrubyEditor.osx?
+      dirs = [RbConfig::CONFIG['bindir']] + ENV['PATH'].split(';')
+      dirs.each do |dir|
+        path = Pathname('rsdl').expand_path(dir)
+        return path if path.exist?
+      end
     end
+    Pathname(RbConfig::CONFIG['RUBY_INSTALL_NAME'])
+      .expand_path(RbConfig::CONFIG['bindir'])
   end
 
   def open3_capture3_ruby_c

data/app/views/editor/_block_tab.html.haml

@@ -41,7 +41,9 @@
       .attributes
         X: {{- get('x') }} Y: {{- get('y') }}
         %br
-        向き: {{- get('angle') }}°
+        向き:
+        %i{class: "{{- rotationStyleIconName() }}"}
+        {{- get('angle') }}°
 
       %a.add-block-button
         %i.icon-folder-close-alt

data/app/views/editor/_character_modal.html.haml

@@ -21,27 +21,36 @@
             %label.control-label{:for => 'character_name'}<
               名前
             .controls
-              %input#character_name{:name => 'character[name]', :type => 'text', :placeholder => 'car1やball1など', :class => 'input-medium'}
+              %input#character_name{:name => 'character[name]', :type => 'text', :placeholder => 'car1やball1など', :class => 'input-large'}
           .control-group
             %label.control-label{:for => 'character_x'}<
               X座標
             .controls
-              %input#character_x{:name => 'character[x]', :type => 'range', :min => '0', :max => '639', :class => 'input-medium'}
+              %input#character_x{:name => 'character[x]', :type => 'range', :min => '0', :max => '639', :class => 'input-large'}
               %span#character_x_value{:class => 'character_value'}
                 300
           .control-group
             %label.control-label{:for => 'character_y'}<
               Y座標
             .controls
-              %input#character_y{:name => 'character[y]', :type => 'range', :min => '0', :max => '439', :class => 'input-medium'}
+              %input#character_y{:name => 'character[y]', :type => 'range', :min => '0', :max => '439', :class => 'input-large'}
               %span#character_y_value{:class => 'character_value'}
                 200
           .control-group
             %label.control-label{:for => 'character_angle'}<
               向き
             .controls
-              %input#character_angle{:name => 'character[angle]', :type => 'range', :min => '0', :max => '359', :class => 'input-medium'}
-              %span#character_angle_value{:class => 'character_value'}
+              #character_rotation_style.btn-group
+                %button#character_rotation_style_free.btn{type: "button", class: "btn-small", value: "free"}<
+                  %i.icon-repeat
+                %button#character_rotation_style_left_right.btn{type: "button", class: "btn-small", value: "left_right"}<
+                  %i.icon-resize-horizontal
+                %button#character_rotation_style_none.btn{type: "button", class: "btn-small", value: "none"}<
+                  %i.icon-arrow-right
+              %input#character_angle{:name => 'character[angle]', :type => 'range', :min => '0', :max => '359', :class => 'input-small', style: "margin-left: 4px;"}
+              %span#character_angle_vector{:class => 'character_value'}
+                →
+              %span#character_angle_value{:class => 'character_value', style: "margin-left: 4px;"}
                 100°
 
   .modal-footer

data/app/views/editor/_toolbox.html.haml

@@ -341,87 +341,100 @@
     %block{:type => "#{category}_p"}
 
   - category = 'hardware'
-  %category{:name => 'アクチュエータ'}
+  %category{:name => 'ハードウェア'}
     %category{:name => '準備'}
       -# ハードウェアを準備する
       %block{:type => "#{category}_init_hardware"}
 
-    %category{:name => 'LED'}
-      -# LED[▼ピン]をオンにする
-      %block{:type => "#{category}_led_on"}
-
-      -# LED[▼ピン]をオフにする
-      %block{:type => "#{category}_led_off"}
-
-    %category{:name => 'RGB LED'}
-      -# RGB LED[▼アノード]コモン[▼ピン]を[カラー]にする
-      %block{:type => "#{category}_rgb_led_on"}
-
-      -# RGB LED[▼アノード]コモン[▼ピン]をオフにする
-      %block{:type => "#{category}_rgb_led_off"}
-
-    -#%category{:name => '7セグディスプレイ'}
-    -#  -# 7セグディスプレイに[▼0-9]を表示する
-    -#  %block{:type => "#{category}_seven_segment_display_show"}
-    -#
-    -#  -# 7セグディスプレイをオフにする
-    -#  %block{:type => "#{category}_seven_segment_display_off"}
-
-    -#%category{:name => 'LCD'}
-    -#  -# LCDに(　)を表示する
-    -#  %block{:type => "#{category}_lcd_puts"}
-    -#    = toolbox_text_value('TEXT', 'Hello')
-    -#
-    -#  -# LCDをクリアする
-    -#  %block{:type => "#{category}_lcd_clear"}
-
-    -#%category{:name => 'サーボ'}
-    -#  -# サーボ[▼ピン]を(　)度(5～180)にする
-    -#  %block{:type => "#{category}_servo_set_position"}
-    -#    = toolbox_number_value('POS', 90)
-
-    %category{:name => '車'}
-      -# 「2WD車[▼ピン]を進める」ブロック
-      %block{:type => "#{category}_two_wheel_drive_car_forward"}
-        %field{:name => 'PIN'}<
-          D6
-
-      -# 「2WD車[▼ピン]をバックさせる」ブロック
-      %block{:type => "#{category}_two_wheel_drive_car_backward"}
-        %field{:name => 'PIN'}<
-          D6
-
-      -# 「2WD車[▼ピン]を左に曲げる」ブロック
-      %block{:type => "#{category}_two_wheel_drive_car_turn_left"}
-        %field{:name => 'PIN'}<
-          D6
-
-      -# 「2WD車[▼ピン]を右に曲げる」ブロック
-      %block{:type => "#{category}_two_wheel_drive_car_turn_right"}
-        %field{:name => 'PIN'}<
-          D6
-
-      -# 「2WD車[▼ピン]を止める」ブロック
-      %block{:type => "#{category}_two_wheel_drive_car_stop"}
-        %field{:name => 'PIN'}<
-          D6
+    %category{:name => 'アクチュエータ'}
+      %category{:name => 'LED'}
+        -# LED[▼ピン]をオンにする
+        %block{:type => "#{category}_led_on"}
+
+        -# LED[▼ピン]をオフにする
+        %block{:type => "#{category}_led_off"}
+
+        -# RGB LED[▼アノード]コモン[▼ピン]を[カラー]にする
+        -#%block{:type => "#{category}_rgb_led_on"}
+
+        -# RGB LED[▼アノード]コモン[▼ピン]をオフにする
+        -#%block{:type => "#{category}_rgb_led_off"}
+
+        -# 7セグディスプレイに[▼0-9]を表示する
+        -#%block{:type => "#{category}_seven_segment_display_show"}
+
+        -# 7セグディスプレイをオフにする
+        -#%block{:type => "#{category}_seven_segment_display_off"}
+
+      -#%category{:name => 'LCD'}
+        -# LCDに(　)を表示する
+        %block{:type => "#{category}_lcd_puts"}
+          = toolbox_text_value('TEXT', 'Hello')
+
+        -# LCDをクリアする
+        %block{:type => "#{category}_lcd_clear"}
+
+      -#%category{:name => 'サーボ'}
+        -# サーボ[▼ピン]を(　)度(5～180)にする
+        %block{:type => "#{category}_servo_set_position"}
+          = toolbox_number_value('POS', 90)
+
+      - subcategory = 'two_wheel_drive_car'
+      %category{:name => '車'}
+        -# 2WD車[▼ピン]を（　）秒[▼コマンド]
+        %block{:type => "#{category}_#{subcategory}_run"}
+          %field{:name => 'PIN'}<
+            D6
+          = toolbox_number_value('SEC', 1)
+          %value{:name => 'COMMAND'}
+            %block{:type => "#{category}_#{subcategory}_commands"}
+
+        -# [▼コマンド]
+        %block{:type => "#{category}_#{subcategory}_commands"}
+          %field{:name => 'COMMAND'}<
+            forward
+
+        -# 2WD車[▼ピン]を進める
+        %block{:type => "#{category}_#{subcategory}_forward"}
+          %field{:name => 'PIN'}<
+            D6
+
+        -# 2WD車[▼ピン]をバックさせる
+        %block{:type => "#{category}_#{subcategory}_backward"}
+          %field{:name => 'PIN'}<
+            D6
+
+        -# 2WD車[▼ピン]を左に曲げる
+        %block{:type => "#{category}_#{subcategory}_turn_left"}
+          %field{:name => 'PIN'}<
+            D6
+
+        -# 2WD車[▼ピン]を右に曲げる
+        %block{:type => "#{category}_#{subcategory}_turn_right"}
+          %field{:name => 'PIN'}<
+            D6
+
+        -# 2WD車[▼ピン]を止める
+        %block{:type => "#{category}_#{subcategory}_stop"}
+          %field{:name => 'PIN'}<
+            D6
+
+    %category{:name => 'センサー'}
+      -# センサー[▼PIN]
+      %block{:type => "#{category}_sensor_value"}
+
+      -# センサー[▼PIN]が変化したとき
+      %block{:type => "#{category}_on_sensor_change"}
 
     -#%category{:name => 'ボタン'}
-    -#  -# 条件:ボタン[▼]を押している
-    -#  %block{:type => "#{category}_button_down"}
-    -#
-    -#  -# 条件:ボタン[▼]を離している
-    -#  %block{:type => "#{category}_button_up"}
-    -#
-    -#  -# ボタン[▼]を押したとき
-    -#  %block{:type => "#{category}_on_button_down"}
-    -#
-    -#  -# ボタン[▼]を離したとき
-    -#  %block{:type => "#{category}_on_button_up"}
-
-  %category{:name => 'センサー'}
-    -# センサー[▼PIN]
-    %block{:type => "#{category}_sensor_value"}
-
-    -# センサー[▼PIN]が変化したとき
-    %block{:type => "#{category}_on_sensor_change"}
+      -# 条件:ボタン[▼]を押している
+      %block{:type => "#{category}_button_down"}
+
+      -# 条件:ボタン[▼]を離している
+      %block{:type => "#{category}_button_up"}
+
+      -# ボタン[▼]を押したとき
+      %block{:type => "#{category}_on_button_down"}
+
+      -# ボタン[▼]を離したとき
+      %block{:type => "#{category}_on_button_up"}

data/bin/smalruby-editor

@@ -84,6 +84,21 @@ end
 Rails::Server.new.tap do |server|
   require APP_PATH
   Dir.chdir(Rails.application.root)
+  if (pid_path = Pathname(server.default_options[:pid])).exist?
+    if SmalrubyEditor.windows?
+      pid = pid_path.read.to_i
+      require 'csv'
+      s = `tasklist /FI "IMAGENAME eq ruby.exe" /FO csv`
+      s.force_encoding('CP932')
+      csv = CSV.parse(s)
+      csv.shift # ヘッダを除去
+      pids = csv.map { |row| row[1].to_i }
+      if pids.include?(pid)
+        Process.kill('KILL', pid)
+      end
+      pid_path.unlink
+    end
+  end
   server.start
 end
 # rubocop:enable all

data/lib/smalruby_editor.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'smalruby_editor/version'
 
 module SmalrubyEditor
@@ -12,6 +13,42 @@ module SmalrubyEditor
   end
   module_function :create_home_directory
 
+  # Raspberry Piかどうかを返す
+  def raspberrypi?
+    if Rails.env != 'test' &&
+        (ENV['SMALRUBY_EDITOR_RASPBERRYPI_MODE'] ||
+         File.exist?(Rails.root.join('tmp', 'raspberrypi')))
+      true
+    else
+      RbConfig::CONFIG['arch'] == 'armv6l-linux-eabihf'
+    end
+  end
+  module_function :raspberrypi?
+
+  # Mac OS Xかどうかを返す
+  def osx?
+    if Rails.env != 'test' &&
+        (ENV['SMALRUBY_EDITOR_OSX_MODE'] ||
+         File.exist?(Rails.root.join('tmp', 'osx')))
+      true
+    else
+      /darwin/ =~ RbConfig::CONFIG['arch']
+    end
+  end
+  module_function :osx?
+
+  # Windowsかどうかを返す
+  def windows?
+    if Rails.env != 'test' &&
+        (ENV['SMALRUBY_EDITOR_WINDOWS_MODE'] ||
+         File.exist?(Rails.root.join('tmp', 'windows')))
+      true
+    else
+      /windows|mingw|cygwin/i.match(RbConfig::CONFIG['arch'])
+    end
+  end
+  module_function :windows?
+
   class << self
     private
 
@@ -36,10 +73,8 @@ standalone:
     def create_database_yml(home_dir)
       database_yml_path = home_dir.join('config', 'database.yml')
       db_path = home_dir.join('db', 'standalone.sqlite3')
-      unless File.exist?(database_yml_path)
-        File.open(database_yml_path, 'w') do |f|
-          f.write(DATABASE_YML_TEMPLATE.gsub(/%db_path%/, db_path.to_s))
-        end
+      File.open(database_yml_path, 'w') do |f|
+        f.write(DATABASE_YML_TEMPLATE.gsub(/%db_path%/, db_path.to_s))
       end
     end
   end