lomic 0.0.2 → 0.1.0

data/Manifest

@@ -15,7 +15,7 @@ lib/lomic.rb
 lib/lomic/Event.rb
 lib/lomic/EventEngine.rb
 lib/lomic/GameState.rb
-lib/lomic/Lomic.rb
+lib/lomic/LomicBase.rb
 lib/lomic/LomicParser.rb
 lib/lomic/Rule.rb
 lomic.gemspec

data/Rakefile

@@ -10,7 +10,9 @@ begin
     gem.email = "gilbertbgarza@gmail.com"
     gem.homepage = "http://github.com/mindeavor/lomic"
     gem.authors = ["Gilbert B Garza"]
+    gem.add_development_dependency "commander", ">= 4.0.3"
     gem.add_development_dependency "cucumber", ">= 0.8.0"
+    gem.add_development_dependency "json", ">= 1.4.3"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :build: 
-:minor: 0
-:patch: 2
+:minor: 1
+:patch: 0

data/bin/lomic

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+require 'commander/import'
+require 'jeweler'
+# $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+dir = File.join(File.dirname(__FILE__), '..')
+
+program :version, Jeweler::VersionHelper.new(dir).to_s
+program :description, 'Starts up an instance of lomic'
+
+global_option '--verbose'
+
+command :start do |c|
+  c.syntax = 'lomic start <address:port> <rule file>'
+  c.description = 'Starts an instance of lomic that listens to <address:port> and populates its rules with <rule file>.'
+  c.action do |args,options|
+    address,rfilename = args
+    ip,port = address.split(':')
+    # TODO: fancy error checking
+    require 'socket'
+    require 'lomic'
+    socket = TCPSocket::open(ip,port)
+    puts "\nLomic started, listening for first event on: #{args.inspect}"
+    Lomic.verbose = options.verbose
+    Lomic.new_game(socket,rfilename)
+  end
+end
+

data/examples/listen_path.rb

@@ -0,0 +1,15 @@
+
+rule 101 do |g|
+  event "game:start" do
+    puts 'Game starting'
+    listen 'path:left', 'path:right'
+  end
+  
+  event "path:left" do
+    puts 'Took the LEFT path!'
+  end
+  
+  event "path:right" do
+    puts 'Took the RIGHT path!'
+  end
+end

data/examples/nomic_initial_rules.rb

@@ -1,9 +1,9 @@
-class Player < Lomic
+class Player < LomicBase
   var :number
 end
 
 # global data: all lomic functions search exclusively in this class for global variables
-class Globals < Lomic
+class Globals < LomicBase
   var :currentRule # Rule is a built-in class type
   var :ruleChangeType =>  ""
 

data/examples/priority.rb

@@ -1,4 +1,4 @@
-class Globals < Lomic
+class Globals < LomicBase
   var :number => 100
 end
 

data/examples/simple.rb

@@ -1,4 +1,4 @@
-class Globals < Lomic
+class Globals < LomicBase
   var :didiwin => 'No...'
 end
 

data/lib/lomic.rb

@@ -0,0 +1,28 @@
+$:.push File.expand_path(File.dirname(__FILE__) + '/lib')
+require 'lomic/Event'
+require 'lomic/EventEngine'
+require 'lomic/GameState'
+require 'lomic/LomicBase'
+require 'lomic/Rule'
+require 'lomic/LomicParser'
+
+module Lomic
+  @@verbose = false
+  require 'json'
+  
+  def self.new_game(socket,filename)
+    gstate = LomicParser.load_source(filename)
+    puts 'Waiting for response from server...'
+    first_event = socket.gets.strip!
+    puts "Received first event: #{first_event}" if verbose?
+    gstate.run(first_event,socket)
+  end
+  
+  def self.verbose?
+    @@verbose
+  end
+  
+  def self.verbose=(new_val)
+    @@verbose = new_val
+  end
+end

data/lib/lomic/EventEngine.rb

@@ -7,10 +7,11 @@ class EventEngine
     @counter = 0 # the number of event code blocks executed
   end
   
-  def run(event_name, rules)
+  def run(event_name, rules, socket)
+    @socket = socket
     add_sort_events rules
     @next_event = event_name
-    
+
     begin
       event_name = @next_event
       @next_event = nil
@@ -21,6 +22,19 @@ class EventEngine
     end while @next_event.nil? == false
   end
   
+  def listen(*valid_events)
+    puts "Listening for valid events: #{valid_events.inspect}" if Lomic.verbose?
+    res = @socket.gets.strip!
+    if not valid_events.include? res
+      result = {:status => 'fail', :reason => 'invalid event'}.to_json
+      @socket.puts result
+    else
+      result = {:status => 'ok'}.to_json
+      @socket.puts result
+    end
+    set_next res
+  end
+  
   def set_next(event_name)
     @next_event = event_name
   end

data/lib/lomic/GameState.rb

@@ -27,8 +27,8 @@ class GameState
     @rules.push(rule)
   end
   
-  def emit(event_name)
-    @em.run(event_name,@globals.rules)
+  def run(event_name,socket)
+    @em.run(event_name,@globals.rules,socket)
   end
 end
 

data/lib/lomic/{Lomic.rb → LomicBase.rb}

@@ -1,9 +1,10 @@
 module Lomic
 
 ### This class helps clean up in-game class definitions
-class Lomic
+class LomicBase
   class << self
     public :define_method, :remove_method
+    public :class_variable_get
   end
   
   def self.var(symbols)
@@ -81,10 +82,12 @@ class Lomic
   
   def initialize
     @init_used = {}
-    inits = self.class.class_eval "@@__#{className}_inits__"
-    inits.each do |var,val|
-      instance_variable_set "@#{var}", val
-      @init_used[var] = true
+    if self.class.class_variable_defined? "@@__#{className}_inits__"
+      inits = self.class.class_variable_get "@@__#{className}_inits__"
+      inits.each do |var,val|
+        instance_variable_set "@#{var}", val
+        @init_used[var] = true
+      end
     end
   end
   

data/lib/lomic/LomicParser.rb

@@ -14,7 +14,14 @@ class LomicParser
     # TODO: ensure number is int
     @currentRule = Rule.new(number)
     if @first_rule
-      @state.globals = instance_eval 'Globals.new'
+      begin
+        @state.globals = instance_eval 'Globals.new'
+      rescue
+        # No Globals class was declared. Create one
+        instance_eval "class Globals < LomicBase
+                       end"
+        @state.globals = instance_eval 'Globals.new'
+      end
       @first_rule = false
     end
     
@@ -35,7 +42,6 @@ class LomicParser
   def self.load_source(filename)
     dsl = new
     dsl.instance_eval(File.read(filename),filename)
-    # dsl.gamestate.globals = (dsl.instance_eval 'Globals.new')
     dsl.gamestate
   end
 end

data/lib/lomic/Rule.rb

@@ -1,6 +1,6 @@
 module Lomic
 
-class Rule < Lomic
+class Rule < LomicBase
   def initialize(number)
     @number = number
     @event_bag = {} # "event_name" => [Event]

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Gilbert B Garza
@@ -15,13 +15,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-12 00:00:00 -05:00
-default_executable: 
+date: 2010-06-15 00:00:00 -05:00
+default_executable: lomic
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: commander
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 4
+        - 0
+        - 3
+        version: 4.0.3
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,11 +49,27 @@ dependencies:
         - 0
         version: 0.8.0
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 4
+        - 3
+        version: 1.4.3
+  type: :development
+  version_requirements: *id003
 description: Lomic is a Domain Specific Language (DSL) intended to be used for Pomic, a programming version of the game Nomic.
 email: gilbertbgarza@gmail.com
-executables: []
-
+executables: 
+- lomic
 extensions: []
 
 extra_rdoc_files: 
@@ -51,6 +83,7 @@ files:
 - Rakefile
 - TODO
 - VERSION.yml
+- examples/listen_path.rb
 - examples/nomic_initial_rules.rb
 - examples/priority.rb
 - examples/simple.rb
@@ -58,13 +91,14 @@ files:
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - features/var_init.feature
-- lib/Lomic.rb
+- lib/lomic.rb
 - lib/lomic/Event.rb
 - lib/lomic/EventEngine.rb
 - lib/lomic/GameState.rb
-- lib/lomic/Lomic.rb
+- lib/lomic/LomicBase.rb
 - lib/lomic/LomicParser.rb
 - lib/lomic/Rule.rb
+- bin/lomic
 has_rdoc: true
 homepage: http://github.com/mindeavor/lomic
 licenses: []
@@ -100,6 +134,7 @@ signing_key:
 specification_version: 3
 summary: A Ruby DSL for the game Nomic
 test_files: 
+- examples/listen_path.rb
 - examples/nomic_initial_rules.rb
 - examples/priority.rb
 - examples/simple.rb

data/lib/Lomic.rb

@@ -1,16 +0,0 @@
-$:.push File.expand_path(File.dirname(__FILE__) + '/lib')
-require 'lomic/Event'
-require 'lomic/EventEngine'
-require 'lomic/GameState'
-require 'lomic/Lomic'
-require 'lomic/Rule'
-require 'lomic/LomicParser'
-
-module Lomic
-  VERSION = '0.0.1'
-  
-  def self.parse(filename, start_event="game:start")
-    gstate = LomicParser.load_source(filename)
-    gstate.emit start_event
-  end
-end