projectsimulator 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 004c088ecb944c24b758301d5cd41fe5a9135b6401b5c489bbac794a951ad17e
-  data.tar.gz: d5ce967f78e745769888e57b0f3342f1c2669280923bbd699f55a066f84fc5de
+  metadata.gz: 7e70e7f4a42e34c20b395b0fab1113c1ed59bbb00c2e0b0b117b201708d8578c
+  data.tar.gz: 3c9431a5a680b62c1070023a2b32f4b540530145d0eb896af6bc629105643d2f
 SHA512:
-  metadata.gz: 35fbc194fa72f2fa1b8081259504e62abe03b47336b8bbf952957b172f2d19276296278406a0db710a8dca39e9d798bb4514de397d429cabcf981085a7272c53
-  data.tar.gz: 5de28c8c32f433c3efe1cad7b90cd0111ac69025fa40ed4d28e75cd14ae35c52a755feb3ce899ccd27836bc6c61218292cf0789def2baa6812c644c0d219a0c3
+  metadata.gz: '0683c9527e84ffa413551d16b9d9fff3805fe9042a7068b3bdbf8b7c6ede26894aa6d2ce26a7cef07144abfa7501c577f0db9aa13418fe40f5283c283563be46'
+  data.tar.gz: a64eb0b3ba73be9163927edcdb8f202f955fc29474a9c65539a456a3f4e70f3612cbe97c9892a996b62d529436485319183cce26c80f37883f6b162fd204b443

data/lib/projectsimulator.rb

@@ -2,556 +2,35 @@
 
 # file: projectsimulator.rb
 
-require 'rowx'
+
 require 'easydom'
+require 'unichron'
 require 'app-routes'
-require 'chronic_between'
 
 
 module ProjectSimulator
 
-  class Model
-    include AppRoutes
-
-    def initialize(obj=nil, root: 'building1')
-
-      super()
-      @root = root
-      @location = nil
-      build(obj, root: root) if obj
-
-    end
-
-    def build(raw_requests, root: @root)
-
-      @ed = EasyDom.new(debug: false, root: root)
-      raw_requests.lines.each {|line| request(line) }
-
-    end
-    
-    def get_device(h)
-      
-      a = h[:location].split(/ /)
-      a << h[:device]
-      status = a.inject(@ed) {|r,x| r.send(x)}.send(h[:action])
-      "The %s %s is %s." % [h[:location], h[:device], status]
-      
-    end    
-
-    def op()
-      @ed
-    end
-
-    def query(s)
-      @ed.e.element(s)
-    end
-    
-    def request(s)
-
-      params = {request: s}
-      requests(params)
-      h = find_request(s)
-
-      method(h.first[-1]).call(h)
-      
-    end      
+  class Server
     
-    def set_device(h)
-      
-      a = h[:location].split(/ /)
-      a << h[:device]
-      a.inject(@ed) {|r,x| r.send(x)}.send(h[:action], h[:value])
-      
-    end
-
-    def to_sliml()
-      @ed.to_sliml
-    end
-
-    def xml(options=nil)
-      @ed.xml(pretty: true).gsub(' style=\'\'','')
-    end
-
-    protected      
-
-    def requests(params) 
-
-      # e.g. switch the livingroom gas_fire off
-      #
-      get /(?:switch|turn) the ([^ ]+) +([^ ]+) +(on|off)$/ do |location, device, onoff|
-        {type: :set_device, action: 'switch=', location: location, device: device, value: onoff}
-      end
+    def initialize(macros_package, drb_host: '127.0.0.1', devices: nil, 
+                   debug: false)
       
-      # e.g. switch the gas _fire off
-      #
-      get /(?:switch|turn) the ([^ ]+) +(on|off)$/ do |device, onoff|
-        location = dev_location(device)
-        {type: :set_device, action: 'switch=', location: location, device: device, value: onoff}
-      end      
+      rdc = ProjectSimulator::Controller.new(macros_package, devices: devices, 
+                                        debug: debug)
+      @drb = OneDrb::Server.new host: drb_host, port: '5777', obj: rdc
       
-      # e.g. is the livingroom gas_fire on?
-      #
-      get /is the ([^ ]+) +([^ ]+) +(?:on|off)\??$/ do |location, device|
-        {type: :get_device, action: 'switch', location: location, device: device}
-      end
-
-      # e.g. is the gas_fire on?
-      #
-      get /is the ([^ ]+) +(?:on|off)\??$/ do |device|
-        location = dev_location(device)        
-        {type: :get_device, action: 'switch', location: location, device: device}
-      end            
-      
-      # e.g. fetch the livingroom temperature reading
-      #
-      get /fetch the ([^ ]+) +([^ ]+) +(?:reading)$/ do |location, device|
-        {type: :get_device, action: 'reading', location: location, device: device}
-      end
-
-      # e.g. fetch the temperature reading
-      #
-      get /fetch the ([^ ]+) +(?:reading)$/ do |device|
-        location = dev_location(device)        
-        {type: :get_device, action: 'reading', location: location, device: device}
-      end          
-
     end
     
-    private
-    
-    def dev_location(device)
-      a = query('//'+ device).backtrack.to_xpath.split('/')
-      a[1..-2].join(' ')            
+    def start
+      @drb.start
     end
-        
-    alias find_request run_route    
 
   end
   
   
-  class Event
-
-    attr_accessor :title
-    attr_reader :triggers, :actions, :constraints, :messages
-
-    def initialize(e, time: nil, title: '', debug: false)
-
-      @time, @debug = time, debug
-      @title = e.text('event')
-      @actions = []
-      @triggers = []
-      @constraints = []
-
-      e.xpath('trigger').each do |x| 
-        @triggers << Trigger.new(x.text().strip, time: time, debug: debug)\
-            .to_type
-      end
-
-      e.xpath('action').each do |x|
-        @actions << Action.new(x.text().strip, debug: debug).to_type
-      end
-
-      e.xpath('constraint').each do |x|
-        puts 'before Constraints.new'
-        @constraints << Constraint.new(x.text().strip, \
-                                       time: time, debug: debug).to_type
-      end
-
-    end
-    
-    def match(trigger: nil, location: '')
-      
-      @messages = []
-      
-      h = {motion: MotionTrigger}
-      
-      if @triggers.any? {|x| x.is_a? h[trigger.to_sym] and x.match } then
-        
-        if @constraints.all?(&:match) then
-        
-          @messages = @actions.map(&:call)
-          
-        else
-          
-          puts 'else reset?' if @debug
-          a = @constraints.select {|x| x.is_a? FrequencyConstraint }
-          puts 'a:' + a.inspect if @debug
-          a.each {|x| x.reset if x.counter > 0 }
-          return false
-        end
-        
-      end
-      
-    end
-    
-    def time=(val)
-      @time = val
-      @constraints.each {|x| x.time = val if x.is_a? TimeConstraint }
-    end
-    
-    def to_node()
-      
-      e = Rexle::Element.new(:event, attributes: {title: @title})
-      
-      e.add node_collection(:triggers, @triggers)
-      e.add node_collection(:actions, @actions)
-      e.add node_collection(:constraints, @constraints)
-      
-      return e
-    end
-    
-    def to_rowx()
-      
-      s = "event: %s\n\n" % @title
-      s + [@triggers, @actions, @constraints]\
-          .map {|x| x.collect(&:to_rowx).join("\n")}.join("\n")
-    end
-    
-    private
-    
-    def node_collection(name, a)
-      
-      e = Rexle::Element.new(name)
-      a.each {|x| e.add x.to_node}
-      return e
-      
-    end
-    
-  end
-
-  class Action
-    include AppRoutes
-
-    attr_reader :to_type
-
-    def initialize(s, event: '', debug: false)
-
-      super()
-      @debug = debug
-      params = {s: s, event: event}
-      actions(params)
-      @to_type = find_action(s) || {}
-
-    end
-
-    protected
-
-    def actions(params) 
-
-      puts 'inside actions'
-      # e.g. Say 'Good morning'
-      #
-      get /say ['"]([^'"]+)/i do |s|
-        puts 's: ' + s.inspect if @debug
-        SayAction.new(s)
-      end
-      
-      # e.g. webhook entered_kitchen
-      #
-      get /webhook (.*)/i do |name|
-        WebhookAction.new(name)
-      end      
-      
-      get /.*/ do
-        puts 'action unknown' if @debug
-        {}
-      end
-
-    end
-
-    private
-
-    alias find_action run_route
-
-  end
-
-  class Trigger
-    include AppRoutes
-
-    attr_reader :to_type
-
-    def initialize(s, time: nil, debug: false)
-
-      super()
-      @time, @debug = time, debug
-      params = {s: s}
-      puts 'inside Trigger'
-      puts 'params: ' + params.inspect
-      triggers(params)
-      @to_type = find_trigger(s)
-
-    end
-
-    protected
-
-    def triggers(params) 
-      
-      puts 'inside triggers'
-
-      # e.g. Motion detected in the kitchen
-      #
-      get /motion detected in the (.*)/i do |location|
-        puts 'motion detection trigger'
-        MotionTrigger.new(location)
-      end
-
-    end
-
-    private
-
-    alias find_trigger run_route
-
-  end
-  
-  class Constraint
-    include AppRoutes
-    
-    attr_reader :to_type
-    
-    def initialize(s, time: nil, debug: false)
-      
-      super()
-      @time, @debug = time, debug
-      
-      params = {s: s }
-      constraints(params)
-      @to_type = find_constraint(s)
-      
-    end
-    
-    protected
-
-    def constraints(params) 
-
-      puts 'inside constraints' if @debug
-      # e.g. Between 8am and 10am
-      #
-      get /^between (.*)/i do |s|
-        TimeConstraint.new(s, time: @time)
-      end
-      
-      get /^on a (.*)/i do |s|
-        TimeConstraint.new(s, time: @time)
-      end
-      
-      get /^(after .*)/i do |s|
-        TimeConstraint.new(s, time: @time)
-      end      
-      
-      get /^once only|only once|once|one time|1 time$/i do |s|
-        FrequencyConstraint.new(1, debug: @debug)
-      end
-      
-      get /^twice only|only twice|twice|two times|2 times$/i do |s|
-        FrequencyConstraint.new(2, debug: @debug)
-      end
-      
-      get /^(Maximum|Max|Up to) ?three times|3 times$/i do |s|
-        FrequencyConstraint.new(3, debug: @debug)
-      end                    
-      
-      get /^(Maximum|Max|Up to) ?four times|4 times$/i do |s|
-        FrequencyConstraint.new(4, debug: @debug)
-      end                          
-
-    end
-
-    private
-
-    alias find_constraint run_route    
-  end
-
-  class MotionTrigger
-
-    attr_reader :location
-    
-    def initialize(locationx, location: locationx)
-      @location = location
-    end
-
-    def match()
-      @location.downcase == location.downcase
-    end
-    
-    def to_node()
-      Rexle::Element.new(:trigger, \
-                         attributes: {type: :motion, location: @location})
-    end
-    
-    def to_rowx()
-      "trigger: Motion detected in the %s" %  @location
-    end        
-
-  end
-
-  class SayAction
-
-    def initialize(s, text: s)
-      @s = s
-    end
-    
-    def call()
-      "say: %s" % @s
-    end
-    
-    def to_node()
-      Rexle::Element.new(:action, attributes: {type: :say, text: @s})
-    end        
-    
-    def to_rowx()
-      "action: say %s" %  @s
-    end    
-
-  end
-  
-  class WebhookAction
-    
-    attr_accessor :url
-
-    def initialize(namex, name: namex, url: '127.0.0.1')
-      @name = name
-      @url = url
-    end
-    
-    def call()
-      "webhook: %s" % @url
-    end
-    
-    def to_node()
-      Rexle::Element.new(:action, \
-                         attributes: {type: :webhook, name: @name, url: @url})
-    end    
-    
-    def to_rowx()
-      s = "action: webhook %s" %  @name
-      s += "\n  url: %s" % @url
-    end
-
-  end
-
-  class TimeConstraint    
-    
-    attr_accessor :time
-    
-    def initialize(timesx, times: timesx, time: nil)
-      @times, @time = times, time
-    end
-    
-    def match()
-      ChronicBetween.new(@times).within?(@time)
-    end
-    
-    def to_node()
-      Rexle::Element.new(:constraint, \
-                         attributes: {type: :time, times: @times})      
-    end    
-    
-    def to_rowx()            
-      "constraint: %s" %  @times
-    end    
-        
-  end
-
-  class FrequencyConstraint      
-      
-    def initialize(freqx, freq: freqx, debug: false)
-      @freq, @debug = freq, debug
-      @counter = 0
-    end
-    
-    def counter()
-      @counter
-    end
-    
-    def increment()
-      @counter += 1
-    end
-    
-    def match()
-      @counter < @freq
-    end
-    
-    def reset()
-      puts 'resetting' if @debug
-      @counter = 0
-    end
-    
-    def to_node()
-      Rexle::Element.new(:constraint, \
-                         attributes: {type: :frequency, freq: @freq})      
-    end
-    
-    def to_rowx()
-      
-      freq = case @freq
-      when 1
-        'Once'
-      when 2
-        'Twice'
-      else
-        "Maximum %s times" % @freq
-      end
-      
-      "constraint: %s" %  freq
-
-    end
-    
-  end
-
-  class Controller
-    
-    attr_reader :events
-    attr_accessor :time
-
-    def initialize(s, time: Time.now, debug: false)
-      
-      @time, @debug = time, debug
-
-      doc = Rexle.new(RowX.new(s).to_xml)
-
-      @events = doc.root.xpath('item')\
-          .map {|e| Event.new(e, time: @time, debug: debug) }
-
-    end
-    
-    def time=(val)
-      @time = val
-      @events.each {|event| event.time = val }
-    end
-    
-    def to_doc()
-      
-      doc = Rexle.new('<events/>')      
-      @events.each {|event| doc.root.add event.to_node }
-      return doc
-      
-    end
-    
-    def to_rowx()
-      @events.collect(&:to_rowx).join("\n\n#{'-'*50}\n\n")
-    end
-    
-    def trigger(name, location: '')
-      
-      events = @events.select do |event|
-        
-        puts 'event: '  + event.inspect if @debug
+end
 
-        event.match(trigger: 'motion', location: location)
-        
-      end
-      
-      puts 'events: ' + events.inspect if @debug
-      
-      events.each do |event|
-        c = event.constraints.select {|x| x.is_a? FrequencyConstraint }
-        puts 'c:' + c.inspect
-        c.each(&:increment)
-      end
-      
-      events.flat_map(&:messages)
-      
-    end
 
-  end  
-end
+require 'projectsimulator/model'
+require 'projectsimulator/controller'
+require 'projectsimulator/client'

data/lib/projectsimulator/controller.rb

@@ -0,0 +1,116 @@
+#!/usr/bin/env ruby
+
+# file: projectsimulator/controller.rb
+
+
+module ProjectSimulator
+    
+  class Controller
+    
+    attr_reader :macros, :model
+    attr_accessor :title, :speed
+
+    def initialize(mcs, model=nil, time: Time.now, speed: 1, debug: false)
+      
+      @debug = debug
+      @syslog = []
+            
+      @macros = mcs.macros
+      
+      if model then
+        @model = Model.new(model)
+      end
+      
+      @state = :stop
+      @speed = speed
+      
+      @qt = UnichronUtils::Quicktime.new time: time, speed: @speed
+      @qt.start
+      @qt.pause
+
+    end
+
+    # Object Property (op)
+    # Helpful for accessing properites in dot notation 
+    # e.g. op.livingroom.light.switch = 'off'
+    #    
+    def op()
+      @model.op if @model
+    end
+    
+    def pause()
+      @state = :pause
+      @qt.pause
+    end
+    
+    def play()
+      @state = :play
+      @qt.play
+    end
+    
+    def request(s)
+      @model.request s
+    end
+    
+    def start()
+      
+
+      Thread.new do
+        
+        old_time = @qt.time - 1
+        
+        loop do
+          
+          interval = (1 / (2.0 * @speed))
+          (sleep interval; next) if @state != :play or old_time == @qt.time
+          #puts Time.now.inspect if @debug
+          r = self.trigger :timer, {time: @qt.time}
+          
+          yield(r) if r.any?
+          
+          puts 'r: ' + r.inspect if @debug and r.any?
+          sleep interval
+          old_time  = @qt.time
+        end
+        
+      end
+    end
+    
+    def stop()
+      @state = :stop
+      @qt.pause
+    end
+    
+    def time()
+      @qt.time
+    end
+    
+    def trigger(name, detail={})
+      
+      macros = @macros.select do |macro|
+        
+        #puts 'macro: '  + macro.inspect if @debug
+
+        # fetch the associated properties from the model if possible and 
+        # merge them into the detail.
+        #
+        valid_trigger = macro.match?(name, detail, op())
+        
+        #puts 'valid_trigger: ' + valid_trigger.inspect if @debug
+        
+        if valid_trigger then
+          @syslog << [Time.now, :trigger, name] 
+          @syslog << [Time.now, :macro, macro.title]
+        end
+                     
+        valid_trigger
+        
+      end
+      
+      #puts 'macros: ' + macros.inspect if @debug
+      
+      macros.flat_map(&:run)
+    end
+
+  end
+end

data/lib/projectsimulator/model.rb

@@ -0,0 +1,232 @@
+#!/usr/bin/env ruby
+
+# file: projectsimulator/controller.rb
+
+
+module ProjectSimulator
+    
+  class Model
+    include AppRoutes
+
+    def initialize(obj=nil, root: 'building1', debug: false)
+
+      super()
+      @root, @debug = root, debug
+      @location = nil
+      
+      if obj then
+        
+        s = obj.strip
+        
+        puts 's: ' + s.inspect if @debug
+        
+        if s[0] == '<' or s.lines[1][0..1] == '  ' then
+          
+          puts 'before easydom' if @debug
+          
+          s2 = if s.lines[1][0..1] == '  ' then
+          
+            lines = s.lines.map do |line|
+              line.sub(/(\w+) +is +(\w+)$/) {|x| "#{$1} {switch: #{$2}}" }
+            end
+            
+            lines.join
+            
+          else
+            s
+          end
+          
+          @ed = EasyDom.new(s2)
+        else
+          build(s, root: root) 
+        end
+
+      end
+
+    end
+
+    def build(raw_requests, root: @root)
+
+      @ed = EasyDom.new(debug: false, root: root)
+      raw_requests.lines.each {|line| request(line) }
+
+    end
+    
+    
+    def get_thing(h)
+      
+      h[:thing].gsub!(/ /,'_')
+      
+      if not h.has_key? :location then
+        location = false
+        h[:location] = find_path(h[:thing]) 
+      else
+        location = true
+      end
+      
+      puts 'h: ' + h.inspect if @debug
+      
+      a = []
+      a += h[:location].split(/ /)
+      a << h[:thing]
+      status = a.inject(@ed) {|r,x| r.send(x)}.send(h[:action])
+      
+      if location then
+        "The %s %s is %s." % [h[:location], h[:thing], status]
+      else
+        "%s is %s." % [h[:thing].capitalize, status]
+      end
+      
+    end          
+
+    # Object Property (op)
+    # Helpful for accessing properites in dot notation 
+    # e.g. op.livingroom.light.switch = 'off'
+    #
+    def op()
+      @ed
+    end
+
+    def query(s)
+      @ed.e.element(s)
+    end
+    
+    # request accepts a string in plain english 
+    # e.g. request 'switch the livingroom light on'
+    #
+    def request(s)
+
+      params = {request: s}
+      requests(params)
+      h = find_request(s)
+
+      method(h.first[-1]).call(h).gsub(/_/,' ')
+      
+    end      
+    
+    def set_thing(h)
+
+      h[:thing].gsub!(/ /,'_')
+      h[:location] = find_path(h[:thing]) unless h.has_key? :location
+      
+      a = []
+      a += h[:location].split(/ /)
+      a << h[:thing]
+      
+      a.inject(@ed) {|r,x| r.send(x)}.send(h[:action], h[:value])
+      
+    end       
+
+    def to_sliml(level: 0)
+      
+      s = @ed.to_sliml
+
+      return s if level.to_i > 0
+      
+      lines = s.lines.map do |line|
+        
+        line.sub(/\{[^\}]+\}/) do |x|
+          
+          a = x.scan(/\w+: +[^ ]+/)
+          if a.length == 1 and x[/switch:/] then
+
+            val = x[/(?<=switch: ) *["']([^"']+)/,1]
+            'is ' + val
+          else
+            x
+          end
+
+        end
+      end
+      
+      lines.join
+      
+    end
+
+    def to_xml(options=nil)
+      @ed.xml(pretty: true).gsub(' style=\'\'','')
+    end
+    
+    alias xml to_xml
+    
+    # to_xml() is the preferred method
+
+    protected      
+
+    def requests(params) 
+
+      # e.g. switch the livingroom gas_fire off
+      #
+      get /(?:switch|turn) the ([^ ]+) +([^ ]+) +(on|off)$/ do |location, device, onoff|
+        {type: :set_thing, action: 'switch=', location: location, thing: device, value: onoff}
+      end
+      
+      # e.g. switch the gas _fire off
+      #
+      get /(?:switch|turn) the ([^ ]+) +(on|off)$/ do |device, onoff|
+        {type: :set_thing, action: 'switch=', thing: device, value: onoff}
+      end            
+      
+      # e.g. is the livingroom gas_fire on?
+      #
+      get /is the ([^ ]+) +([^ ]+) +(?:on|off)\??$/ do |location, device|
+        {type: :get_thing, action: 'switch', location: location, thing: device}
+      end
+      
+      # e.g. enable airplane mode
+      #
+      get /((?:dis|en)able) ([^$]+)$/ do |state, service|
+        {type: :set_thing, action: 'switch=', thing: service, value: state + 'd'}
+      end
+      
+      # e.g. switch airplane mode off
+      #
+      get /switch (.*) (on|off)/ do |service, rawstate|        
+        
+        state = rawstate == 'on' ? 'enabled' : 'disabled'
+        {type: :set_thing, action: 'switch=', thing: service, value: state}
+        
+      end               
+      
+      # e.g. is airplane mode enabed?
+      #
+      get /is (.*) +(?:(?:dis|en)abled)\??$/ do |service|
+        {type: :get_thing, action: 'switch', thing: service.gsub(/ /,'_')}
+      end      
+
+      # e.g. is the gas_fire on?
+      #
+      get /is the ([^ ]+) +(?:on|off)\??$/ do |device|
+        location = find_path(device)        
+        {type: :get_thing, action: 'switch', location: location, thing: device}
+      end            
+      
+      # e.g. fetch the livingroom temperature reading
+      #
+      get /fetch the ([^ ]+) +([^ ]+) +(?:reading)$/ do |location, device|
+        {type: :get_thing, action: 'reading', location: location, thing: device}
+      end
+
+      # e.g. fetch the temperature reading
+      #
+      get /fetch the ([^ ]+) +(?:reading)$/ do |device|
+        location = find_path(device)        
+        {type: :get_thing, action: 'reading', location: location, thing: device}
+      end          
+
+    end
+    
+    private
+    
+    def find_path(s)
+      puts 'find_path s: ' + s.inspect if @debug
+      found = query('//'+ s)
+      return unless found
+      a = found.backtrack.to_xpath.split('/')
+      a[1..-2].join(' ')            
+    end
+        
+    alias find_request run_route    
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: projectsimulator
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,28 +35,28 @@ cert_chain:
   2GrtfOXGVOS+2jvmCQC6vU+ew9WBxiDUbebI95TeTwMs2o0cs3IASXX5rIn4TPcz
   SCccB3fVg2yfsy5DivaWaZwg
   -----END CERTIFICATE-----
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rowx
+  name: unichron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: easydom
   requirement: !ruby/object:Gem::Requirement
@@ -97,26 +97,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.19
-- !ruby/object:Gem::Dependency
-  name: chronic_between
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -124,6 +104,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/projectsimulator.rb
+- lib/projectsimulator/controller.rb
+- lib/projectsimulator/model.rb
 homepage: https://github.com/jrobertson/projectsimulator
 licenses:
 - MIT