nanite 0.4.1.15 → 0.4.1.16

data/lib/nanite.rb

@@ -40,7 +40,7 @@ require 'nanite/security/static_certificate_store'
 require 'nanite/serializer'
 
 module Nanite
-  VERSION = '0.4.1.15' unless defined?(Nanite::VERSION)
+  VERSION = '0.4.1.16' unless defined?(Nanite::VERSION)
 
   class MapperNotRunning < StandardError; end
 

data/lib/nanite/state.rb

@@ -48,8 +48,8 @@ module Nanite
       log_redis_error("[]") do
         status = @redis[nanite]
         timestamp = @redis["t-#{nanite}"]
-        services = @redis.set_members("s-#{nanite}")
-        tags = @redis.set_members("tg-#{nanite}")
+        services = @redis.smembers("s-#{nanite}")
+        tags = @redis.smembers("tg-#{nanite}")
         return nil unless status && timestamp && services
         {:services => services, :status => status, :timestamp => timestamp.to_i, :tags => tags}
       end
@@ -63,66 +63,66 @@ module Nanite
     
     def delete(nanite)
       log_redis_error("delete") do
-        (@redis.set_members("s-#{nanite}")||[]).each do |srv|
-          @redis.set_delete(srv, nanite)
-          if @redis.set_count(srv) == 0
-            @redis.delete(srv)
-            @redis.set_delete("naniteservices", srv)
+        (@redis.smembers("s-#{nanite}")||[]).each do |srv|
+          @redis.srem(srv, nanite)
+          if @redis.scard(srv) == 0
+            @redis.del(srv)
+            @redis.srem("naniteservices", srv)
           end
         end
-        (@redis.set_members("tg-#{nanite}")||[]).each do |tag|
-          @redis.set_delete(tag, nanite)
-          if @redis.set_count(tag) == 0
-            @redis.delete(tag)
-            @redis.set_delete("nanitetags", tag)
+        (@redis.smembers("tg-#{nanite}")||[]).each do |tag|
+          @redis.srem(tag, nanite)
+          if @redis.scard(tag) == 0
+            @redis.del(tag)
+            @redis.sdelete("nanitetags", tag)
           end
         end
-        @redis.delete nanite
-        @redis.delete "s-#{nanite}"
-        @redis.delete "t-#{nanite}"
-        @redis.delete "tg-#{nanite}"
+        @redis.del nanite
+        @redis.del "s-#{nanite}"
+        @redis.del "t-#{nanite}"
+        @redis.del "tg-#{nanite}"
       end
     end
     
     def all_services
       log_redis_error("all_services") do
-        @redis.set_members("naniteservices")
+        @redis.smembers("naniteservices")
       end
     end
 
     def all_tags
       log_redis_error("all_tags") do
-        @redis.set_members("nanitetags")
+        @redis.smembers("nanitetags")
       end
     end
     
     def update_state(name, status, services, tags)
-      old_services = @redis.set_members("s-#{name}")
+      old_services = @redis.smembers("s-#{name}")
       if old_services
         (old_services - services).each do |s|
-          @redis.set_delete(s, name)
-          @redis.set_delete("naniteservices", s)
+          @redis.srem(s, name)
+          @redis.srem("naniteservices", s)
         end
       end
-      old_tags = @redis.set_members("tg-#{name}")
+      old_tags = @redis.smembers("tg-#{name}")
       if old_tags
         (old_tags - tags).each do |t|
-          @redis.set_delete(t, name)
-          @redis.set_delete("nanitetags", t)
+          @redis.srem(t, name)
+          @redis.srem("nanitetags", t)
         end
       end
       @redis.delete("s-#{name}")
       services.each do |srv|
-        @redis.set_add(srv, name)
-        @redis.set_add("s-#{name}", srv)
-        @redis.set_add("naniteservices", srv)
+        @redis.sadd(srv, name)
+        @redis.sadd("s-#{name}", srv)
+        @redis.sadd("naniteservices", srv)
       end
       @redis.delete("tg-#{name}")
       tags.each do |tag|
         next if tag.nil?
-        @redis.set_add(tag, name)
-        @redis.set_add("tg-#{name}", tag)
-        @redis.set_add("nanitetags", tag)
+        @redis.sadd(tag, name)
+        @redis.sadd("tg-#{name}", tag)
+        @redis.sadd("nanitetags", tag)
       end
       update_status(name, status)
     end
@@ -158,7 +158,7 @@ module Nanite
       keys = tags.dup << service
       log_redis_error("nanites_for") do
         res = []
-        (@redis.set_intersect(keys)||[]).each do |nan|
+        (@redis.sinter(keys)||[]).each do |nan|
           res << [nan, self[nan]]
         end
         res

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nanite
 version: !ruby/object:Gem::Version 
-  version: 0.4.1.15
+  version: 0.4.1.16
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 +01:00
+date: 2010-04-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency