logonxc 0.1.0 → 0.2.0

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem "erubis"
+gem 'rake', '0.8.7'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -10,7 +10,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.9.2)
+    rake (0.8.7)
     rcov (0.9.10)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
@@ -28,5 +28,6 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   erubis
   jeweler (~> 1.6.4)
+  rake (= 0.8.7)
   rcov
   rspec (~> 2.3.0)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/logonxc.rb

@@ -13,6 +13,12 @@ class LogoNxc
     output = ""
     text.each_line do |line|
       case
+      when line =~ /print\s+["']([^"']+)["']/
+        output << "print(\"#{$1}\");\n"
+      when line =~ /sleep\s+(\d+)/
+        output << "wait(#{$1});\n"
+      when line =~ /beep/
+        output << "beep();\n"
       when line =~ /repeat\s+(\d+)\s+\[/
         output << "repeat(#{$1}) {\n"
       when line =~ /(?:right|rt)\s*(\d+)/

data/logonxc.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "logonxc"
-  s.version = "0.1.0"
+  s.name = %q{logonxc}
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Deb Bassett"]
-  s.date = "2011-10-02"
-  s.description = "Parse basic logo and output NXC for Lego Mindstorms"
-  s.email = "deb@urbanwide.com"
+  s.date = %q{2011-11-18}
+  s.description = %q{Parse basic logo and output NXC for Lego Mindstorms}
+  s.email = %q{deb@urbanwide.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -31,23 +31,25 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "templates/logonxc.erb"
   ]
-  s.homepage = "http://github.com/urbanwide/logonxc"
+  s.homepage = %q{http://github.com/urbanwide/logonxc}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "Logo to Lego NXC"
+  s.rubygems_version = %q{1.5.3}
+  s.summary = %q{Logo to Lego NXC}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<erubis>, [">= 0"])
+      s.add_runtime_dependency(%q<rake>, ["= 0.8.7"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<erubis>, [">= 0"])
+      s.add_dependency(%q<rake>, ["= 0.8.7"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -55,6 +57,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<erubis>, [">= 0"])
+    s.add_dependency(%q<rake>, ["= 0.8.7"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/spec/logonxc_spec.rb

@@ -14,6 +14,10 @@ describe "LogoNxc" do
       fd 200
       back 10
       bk 200
+      print "thing"
+      print 'other thing'
+      sleep 1000
+      beep
     TEXT
   end
 
@@ -52,6 +56,18 @@ describe "LogoNxc" do
     it "should translate bk" do
       @output[9].should == "back(200);"
     end
+    it "should translate print with double quotes" do
+      @output[10].should == 'print("thing");'
+    end
+    it "should translate print with single quotes" do
+      @output[11].should == 'print("other thing");'
+    end
+    it "should translate sleep" do
+      @output[12].should == 'wait(1000);'
+    end
+    it "should translate beep" do
+      @output[13].should == 'beep();'
+    end
   end
 
   describe ".nxc" do

data/templates/logonxc.erb

@@ -1,52 +1,88 @@
-#define POWER 50 // was 50
-#define TURN_TIME_90 1800 // was 1670
-#define PACE_TIME 100 // was 1000
+#define POWER 50
+#define PACE_ROTATION_DEGREES 516
+#define TURN_90_ROTATION_DEGREES 506
+
+int wait_time = 100;
+bool beeping = true;
 
 sub print(string text) {
   ClearScreen();
   TextOut(0,0, text);
 }
 
-inline int degrees_to_turn_time(int degrees) {
-  float one_degree_time = TURN_TIME_90 / 90.0;
-  int turn_time = one_degree_time * degrees;
-  return turn_time;
+sub wait(int ms) {
+  Wait(ms);
+}
+
+sub beep() {
+  PlaySound(SOUND_FAST_UP);
 }
 
-sub turn(int degrees) {
-  if (degrees < 0) {
-    degrees = degrees * -1;
-    OnRev(OUT_C, POWER);
-    OnFwd(OUT_B, POWER);
-  } else {
-    OnFwd(OUT_C, POWER);
-    OnRev(OUT_B, POWER);
+sub move_wait() {
+  wait(wait_time);
+}
+
+sub move_beep() {
+  if (beeping == true) {
+    beep();
   }
-  Wait(degrees_to_turn_time(degrees));
-  Off(OUT_BC);
-  Wait(1000);
+}
+
+sub move_end() {
+  move_beep();
+  move_wait();
+}
+
+sub set_move_wait(int ms) {
+  wait_time = ms;
+}
+
+sub set_move_beep(bool val) {
+  beeping = val;
+}
+
+inline int degrees_to_rotation_degrees(int degrees) {
+  float one_degree_time = TURN_90_ROTATION_DEGREES / 90.0;
+  int rotation_degrees = one_degree_time * degrees;
+  return rotation_degrees;
 }
 
 sub right(int degrees) {
-  turn(degrees);
+  RotateMotorEx(OUT_BC, POWER, degrees_to_rotation_degrees(degrees), 100, true, true);
+  move_end();
 }
 
 sub left(int degrees) {
-  turn(-degrees);
+  RotateMotorEx(OUT_BC, POWER, degrees_to_rotation_degrees(degrees), -100, true, true);
+  move_end();
 }
 
 sub forward(int paces) {
-  OnFwd(OUT_BC, POWER);
-  Wait(paces * PACE_TIME);
+  RotateMotor(OUT_BC, POWER, (PACE_ROTATION_DEGREES * paces));
+  move_end();
 }
 
 sub back(int paces) {
-  OnRev(OUT_BC, POWER);
-  Wait(paces * PACE_TIME);
+  RotateMotor(OUT_BC, POWER, (-PACE_ROTATION_DEGREES * paces));
+  move_end();
+}
+
+task maze() {
+  <%= nxc_block %>
+  wait(2000);
+}
+
+task red() {
+  SetSensorColorFull(IN_1); // initialize the color sensor
+  while(true) {
+    if(Sensor(IN_1) == INPUT_REDCOLOR) {
+      PlayToneEx (400, 100, 4, false);
+    }
+  }
 }
 
 task main() {
 
-  <%= nxc_block %>
+  Precedes(red, maze);
 
-}
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logonxc
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Deb Bassett
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-02 00:00:00 Z
+date: 2011-11-18 00:00:00 +00:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: erubis
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -27,12 +29,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
-  name: erubis
   prerelease: false
   type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  prerelease: false
+  type: :runtime
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: rspec
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -43,12 +61,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id002
-  name: rspec
   prerelease: false
   type: :development
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: bundler
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -59,12 +77,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id003
-  name: bundler
   prerelease: false
   type: :development
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: jeweler
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,12 +93,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  version_requirements: *id004
-  name: jeweler
   prerelease: false
   type: :development
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: rcov
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,10 +107,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
-  name: rcov
   prerelease: false
   type: :development
+  requirement: *id006
 description: Parse basic logo and output NXC for Lego Mindstorms
 email: deb@urbanwide.com
 executables: []
@@ -116,6 +133,7 @@ files:
 - spec/logonxc_spec.rb
 - spec/spec_helper.rb
 - templates/logonxc.erb
+has_rdoc: true
 homepage: http://github.com/urbanwide/logonxc
 licenses: 
 - MIT
@@ -145,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Logo to Lego NXC