ceml 0.7.11 → 0.7.13

data/VERSION

@@ -1 +1 @@
-0.7.11
+0.7.13

data/ceml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ceml}
-  s.version = "0.7.11"
+  s.version = "0.7.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Edelman"]
-  s.date = %q{2011-02-12}
+  s.date = %q{2011-02-24}
   s.description = %q{a language for coordinating real world events}
   s.email = %q{joe@citizenlogistics.com}
   s.extra_rdoc_files = [

data/lib/ceml/confluence.rb

@@ -24,12 +24,8 @@ module CEML
     end
 
     def stage_with_candidate candidate
-      if cast_with?(candidate)
-        puts "CEML: CAST WITH"
-        return :inside
-      end
+      return :uninterested if cast_with?(candidate)
       best_role = best_role_for(candidate)
-      puts "CEML: MADE THRU: #{best_role.inspect}"
       return :uninterested unless best_role
       return :joinable if launched?
       other_roles = @roles_to_cast - [best_role]

data/lib/ceml/driver.rb

@@ -81,21 +81,19 @@ module CEML
     end
 
     def ping script_collection_id, roleset, candidate, involvement = :sticky
-      puts "CEML: TOP PING: #{candidate.inspect}"
       return unless roleset.any?{ |r| r.fits? candidate }
       candidate[:ts] = CEML.clock
       already_launched_with = nil
       run_after = []
 
-      puts "CEML: INSIDE PING"
       with_confluences script_collection_id, roleset do |confluences|
-        live_with = confluences.select{ |c| c.live_with?(candidate) }
-        if not live_with.empty?
-          puts "CEML: LIVE WITH DETECTED"
-          already_launched_with = live_with.first.incident_id
-          live_with.each{ |c| c.rm candidate } if involvement != :sticky
-          break if involvement != :released
-        end
+        already_launched_with = nil
+        # live_with = confluences.select{ |c| c.live_with?(candidate) }
+        # if not live_with.empty?
+        #   already_launched_with = live_with.first.incident_id
+        #   live_with.each{ |c| c.rm candidate } if involvement != :sticky
+        #   break if involvement != :released
+        # end
 
         locs = confluences.group_by{ |l| l.stage_with_candidate(candidate) }
         if locs[:joinable]
@@ -139,10 +137,10 @@ module CEML
         send(*cmd)
       end
 
-      if already_launched_with and involvement == :sticky
-        puts "PUSHING INSTEAD"
-        push already_launched_with, nil, candidate
-      end
+      # if already_launched_with and involvement == :sticky
+      #   puts "PUSHING INSTEAD"
+      #   push already_launched_with, nil, candidate
+      # end
     end
 
     def push incident_id, script, *updated_players

data/lib/ceml/incident.rb

@@ -123,6 +123,7 @@ module CEML
 
     def ask_q q
       text = interpolate(q[:text]) or return false
+      handled!
       say :ask, :q => text
       true
     end

data/lib/ceml/role.rb

@@ -35,29 +35,16 @@ module CEML
     end
 
     def fits?(candidate, star = nil)
-      puts "HERE1"
       return false unless criteria =~ candidate
-      puts "HERE2"
       return false if casted.size >= range.max
-      puts "HERE3"
       return false if casted.any?{ |guy| guy[:id] == candidate[:id] }
-      puts "HERE4"
       return true unless star
       c = criteria
       if c.matching
-        puts "CEML: ATTempting to match: #{c.matching.inspect}"
-        worked = c.matching.all? do |g|
+        return unless c.matching.all? do |g|
           candidate[:matchables][g] && star[:matchables][g] &&
           candidate[:matchables][g].downcase.strip == star[:matchables][g].downcase.strip
         end
-
-        if worked
-          puts "CEML: MATCHED"
-          true
-        else
-          puts "CEML: MATCH FAILED"
-          return false
-        end
       end
       if c.radius
         c_ll = Geokit::LatLng(candidate[:lat], candidate[:lng])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 11
-  version: 0.7.11
+  - 13
+  version: 0.7.13
 platform: ruby
 authors: 
 - Joe Edelman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-12 00:00:00 -08:00
+date: 2011-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency