projectsimulator 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7498ee0529a8c6caa6f82119db104e656f17da58655bb6258fbca979af7819d8
-  data.tar.gz: 66fe74f176dfe6aac2c00de2c2451dea44955be5a7c88bb1e8369207bc8ce787
+  metadata.gz: 024bbe43574b19e2cef1d32997464cb570ae9828559842a47980069503d4ccd4
+  data.tar.gz: ac1aac4437f90007c016ef61e7b6bf89673d6d1310929e9557e1f334e730198d
 SHA512:
-  metadata.gz: 2bb64a67834ac13c34698f12ccd95a98b9f7dd8c70b313623c6e3c1b164c3d68e0d56d395113e29aac7b697c38e4b0fbbe2c0da5baedb5015c52d8f84b5edf03
-  data.tar.gz: 4a11a714877afd064f3b414662a9d19ad2dd34f7e86eaab63cb43e9fb54c13f797fa0d442029bfbfb11fc4bf4faaaf24ca0c713147180444b3b4c4516327b86f
+  metadata.gz: c18c8f2422750ffa91db344a0d9845633be16d23447599e9c73404bf2203335a110f0fa56f45cf5e552aa2ef66740c18d4d1de3ee9cdbca72d4602aaa203528b
+  data.tar.gz: 349887e64fcd35c9bfadbb113e52cea58a7f781b58896e1888dd9763e064d9b38a4917e6622f9bee7334a1ebb186d1abda4048bfa4c154b448a6953507000892

data/lib/projectsimulator.rb

@@ -162,15 +162,31 @@ module ProjectSimulator
       @messages = []
       
       h = {motion: MotionTrigger}
-      if @triggers.any? {|x| x.is_a? h[trigger.to_sym] and x.match } and \
-          @constraints.all?(&:match) then
+      
+      if @triggers.any? {|x| x.is_a? h[trigger.to_sym] and x.match } then
+        
+        if @constraints.all?(&:match) then
         
-        @messages = @actions.map(&:call)
+          @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
+    
   end
 
   class Action
@@ -291,6 +307,10 @@ module ProjectSimulator
       get /^(after .*)/i do |s|
         TimeConstraint.new(s, time: @time)
       end      
+      
+      get /^once only/i do |s|
+        FrequencyConstraint.new(1, debug: @debug)
+      end        
 
     end
 
@@ -340,15 +360,46 @@ module ProjectSimulator
 
   end
 
-  class TimeConstraint
+  class TimeConstraint    
     
-    attr_reader :match
+    attr_accessor :time
     
     def initialize(times, time: nil)
-      @match = ChronicBetween.new(times).within?(time)
+      @times, @time = times, time
+    end
+    
+    def match()
+      ChronicBetween.new(@times).within?(@time)
     end
         
-  end  
+  end
+
+  class FrequencyConstraint      
+      
+    def initialize(freq, 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
+@foo = 0      
+@counter = 0
+    end
+    
+  end
 
   class Controller
     
@@ -366,16 +417,29 @@ module ProjectSimulator
 
     end
     
+    def time=(val)
+      @time = val
+      @events.each {|event| event.time = val }
+    end
+    
     def trigger(name, location: '')
       
       events = @events.select do |event|
         
         puts 'event: '  + event.inspect if @debug
 
-        event.match(trigger: 'motion', location: location='kitchen')
+        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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: projectsimulator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   2GrtfOXGVOS+2jvmCQC6vU+ew9WBxiDUbebI95TeTwMs2o0cs3IASXX5rIn4TPcz
   SCccB3fVg2yfsy5DivaWaZwg
   -----END CERTIFICATE-----
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rowx