karel-interpreter 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e536365aaca04663111b4b551fabe28846f3a850
-  data.tar.gz: 8884b11c61f588d982c07d45e6297b3b3ce7a7f4
+  metadata.gz: 52f8e76bad41ecb3e6b368a62547e525c59ca1fa
+  data.tar.gz: 7d2a7d4092fbf057cf20ccf4fd5aba78e06ca474
 SHA512:
-  metadata.gz: a27a642da2819853c99948a14e35dd00c8f719a3ea78eeb48bca40ba60e9839a7a2fcbe7aa5801d35fde63113b4b1b466481623ee322463f8544dee1486b3b55
-  data.tar.gz: b9709c9ab0c17d66cf350d5e1fa277231178a53d44621321b002bcb0e4fe635852606f12e1bb7b8394ae2aa56eb8c5cad8eb6f7e57b6cce6741116a5b7d5d5b1
+  metadata.gz: 2f385b6ca371bd7e2c40fd485eaaaf926d81959ea2487e1f8ed49f38a8fa834c01d263737e7d9e3b3b3f81e3ef69a7fd5917e5e0d62b1988df62f48a9ae49a01
+  data.tar.gz: e5a651d3758d6e277baf7161689887ef3927e419e0734f89be96670560a19f2c1961b11b6f2bb02d9008b6ba17b2433442ab4f8d4686ed82dbc2dc3bbbff5ee3

data/.gitignore

@@ -7,5 +7,8 @@
 /spec/reports/
 /tmp/
 
+Gemfile.lock
+*.gem
+
 # rspec failure tracking
 .rspec_status

data/CHANGELOG.txt

@@ -0,0 +1,7 @@
+Version 0.2.0, 2018-11-29
+-------------------------
+e60c95b Allow initialization of Karel board with command line option
+
+Version 0.1.0, 2018-11-26
+-------------------------
+17e434f Initial release

data/README.md

@@ -114,7 +114,7 @@ if token?
 end
 ```
 
-#### Example: nested `while`
+#### Example: a basic `while` statement
 
 ```
 # This will safely remove all tokens from a square.
@@ -125,8 +125,18 @@ end
 
 ### User-defined commands
 
-The Karel language supports user-defined commands, though these commands do not take
-arguments and do not return a value. Commands are defined as follows
+The Karel language supports user-defined commands. These commands do not take
+arguments and do not return a value. Commands are defined with the following syntax
+
+```
+def <command-name>
+  <statement-1>
+  <statement-2>
+  ...
+end
+```
+
+#### Example
 
 ```
 def turn_around

data/karel-interpreter.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "json", "~> 2.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/karel.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'json'
+
 require_relative 'karel/model/compass'
 require_relative 'karel/model/location'
 require_relative 'karel/model/token_container'
@@ -8,9 +10,13 @@ require_relative 'karel/utils/parser'
 module Karel
   def self.usage
     puts <<~USAGE
-      Usage: #{$0} file
+      Usage: #{$0} [options] file
       Interpret a Karel file and print the final state
 
+      Where options include
+          -i FILE  initalize the state of the Karel board before before
+                   executing the Karel program file
+
       Example:
       % #{$0} move-up.krl
       location: (10, 10)
@@ -20,19 +26,51 @@ module Karel
     USAGE
   end
 
+  def self.initial_state(file)
+    compass = Model::Compass.new(:up)
+    location = Model::Location.new(0, 0)
+    tokens = Model::TokenContainer.new
+    if file
+      raise "Initialization file '#{file}' not found" if !File.exist?(file)
+      File.readlines(file).each do |raw_line|
+        line = raw_line.chomp
+        match = line.match(/^tokens: (.*)$/)
+        if match
+          token_config = JSON.parse(match[1])
+          token_config.each do |token|
+            location_match = token['location'].match(/\((-?\d+), (-?\d+)\)/)
+            tokens.put(
+              Model::Location.new(location_match[1].to_i, location_match[2].to_i),
+              token['count']
+            )
+          end
+        end
+      end
+    end
+    [compass, location, tokens]
+  end
+
   def self.run(args)
-    if args.length != 1
+    init_file, karel_file = nil
+    while arg = args.shift
+      if arg == '-i'
+        init_file = args.shift
+      elsif karel_file.nil?
+        karel_file = arg
+      else
+        usage
+        exit(1)
+      end
+    end
+
+    if karel_file.nil?
       usage
       exit(1)
-    elsif !File.exist?(args.first)
-      puts "File '#{args.first}' not found"
+    elsif !File.exist?(karel_file)
+      raise "File '#{karel_file}' not found"
     else
-      program = Utils::Parser.parse(args.first)
-      response = program.execute(
-        Model::Compass.new(:up),
-        Model::Location.new(0, 0),
-        Model::TokenContainer.new
-      )
+      program = Utils::Parser.parse(karel_file)
+      response = program.execute(*initial_state(init_file))
       puts <<~STATE
         location: #{response.location.to_s}
         direction: #{response.compass.direction}

data/lib/karel/model/token_container.rb

@@ -19,9 +19,9 @@ module Model
       return self
     end
 
-    def put(location)
+    def put(location, value = 1)
       @tokens[location] ||= 0
-      @tokens[location] += 1
+      @tokens[location] += value
       return self
     end
 

data/lib/karel/version.rb

@@ -1,5 +1,5 @@
 module Karel
   module Interpreter
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: karel-interpreter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tom Collier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +77,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.txt
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt