ceml 0.7.1 → 0.7.2

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/ceml.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ceml}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Edelman"]

data/lib/ceml/confluence.rb

@@ -24,7 +24,7 @@ module CEML
     end
 
     def stage_with_candidate candidate
-      return :uninterested if @roles_to_cast.any?{ |r| r.casted.any?{ |guy| guy[:id] == candidate[:id] } }
+      return :uninterested if cast_with?(candidate)
       best_role = best_role_for(candidate)
       return :uninterested unless best_role
       return :joinable if launched?
@@ -44,6 +44,18 @@ module CEML
       @roles_to_cast.all?{ |role| role.allowed == 0 }
     end
 
+    def over?
+      @roles_to_cast.any?{ |r| r.over?(star) }
+    end
+
+    def cast_with?(candidate)
+      @roles_to_cast.any?{ |r| r.casted.any?{ |guy| guy[:id] == candidate[:id] } }
+    end
+
+    def live_with?(candidate)
+      launched? and cast_with?(candidate)
+    end
+
     def cast
       @roles_to_cast.map{ |r| r.casted }.flatten
     end

data/lib/ceml/driver.rb

@@ -62,8 +62,15 @@ module CEML
     def ping script_collection_id, roleset, candidate
       return unless roleset.any?{ |r| r.fits? candidate }
       candidate[:ts] = CEML.clock
+      already_launched_with = nil
 
       with_confluences script_collection_id, roleset do |confluences|
+        live_with = confluences.select{ |c| c.live_with?(candidate) }
+        if not live_with.empty?
+          already_launched_with = live_with.incident_id
+          break
+        end
+
         locs = confluences.group_by{ |l| l.stage_with_candidate(candidate) }
         if locs[:joinable]
           log "joining..."
@@ -95,7 +102,11 @@ module CEML
           end
           confluences << c
         end
-        confluences.delete_if(&:full?)
+        confluences.delete_if(&:over?)
+      end
+
+      if already_launched_with
+        push already_launched_with, nil, candidate
       end
     end
 

data/lib/ceml/role.rb

@@ -29,6 +29,11 @@ module CEML
     def needed; [range.min - casted.size, 0].max; end
     def allowed; [range.max - casted.size, 0].max; end
 
+    def over?(star)
+      return unless criteria.timewindow and star
+      CEML.clock - star[:ts] > criteria.timewindow
+    end
+
     def fits?(candidate, star = nil)
       return false unless criteria =~ candidate
       return false if casted.size >= range.max

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Joe Edelman