distlock 0.0.5 → 0.0.6

data/lib/dist_lock.rb

@@ -0,0 +1 @@
+require 'distlock'

data/lib/distlock.rb

@@ -3,3 +3,8 @@ require 'distlock/zk/zk'
 
 module Distlock
 end
+
+# convenience so we can use either name
+module DistLock
+  include Distlock
+end

data/lib/distlock/version.rb

@@ -1,3 +1,3 @@
 module Distlock
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/distlock/zk/affinity_pool.rb

@@ -1,19 +1,13 @@
 module Distlock
   module ZK
   	class AffinityPool
+      include Distlock::ZK::Common
+
       def initialize(options={})
-        defaults = {:host => "localhost:2181", :timeout => 10, :root_path => "/affinity/global/test"}
+        defaults = {:host => "localhost:2181", :timeout => 10, :root_path => "/affinity/pool/test"}
         @options = defaults.merge(options)
       end
 
-      def zk
-        @zk ||= begin
-          zk = Zookeeper.new(@options[:host], @options[:timeout])
-
-          # todo - initialize the root_path hierarchy here
-          zk.stat(:path => @options[:root_path])
-        end
-      end
     end
   end
 end

data/lib/distlock/zk/common.rb

@@ -0,0 +1,48 @@
+module Distlock
+  module ZK
+    module Common
+      def zk
+        @zk ||= begin
+          zk = Zookeeper.new(@options[:host], @options[:timeout])
+        end
+      end
+
+      # does a node exist for the given path?
+      def exists?(path)
+        puts "checking if #{path} exists"
+        result = zk.stat(:path => path)[:stat].exists
+        puts result
+        result
+      end
+      
+      # create all levels of the hierarchy as necessary
+      # i.e. for "/foo/bar/baz", creates the following nodes - 
+      #
+      # /foo
+      # /foo/bar
+      # /foo/bar/baz
+      #
+      def safe_create(path)
+        path_elements = path.split("/").reject{ |x| x=="" }
+        
+        all = []
+        while(!path_elements.empty?)
+          all << path_elements
+          path_elements = path_elements[0..-2]
+        end
+
+        all.reverse.each do |path_elements|
+          path = "/" + path_elements.join("/")
+          zk.create(:path => path) unless exists?(path)
+        end
+      end
+
+      def create_sequenced_ephemeral(path, prefix="lock")
+        lock_path = [path, "#{prefix}-#{zk.client_id}-"].join("/")
+        puts lock_path
+        result = zk.create(:path => lock_path, :sequence => true, :ephemeral => true)
+        puts result
+      end            
+    end
+  end
+end

data/lib/distlock/zk/zk.rb

@@ -1,4 +1,5 @@
 require 'zookeeper'
+require 'distlock/zk/common'
 require 'distlock/zk/affinity_pool'
 
 module Distlock

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: distlock
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2012-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70178525913240 !ruby/object:Gem::Requirement
+  requirement: &70294611917200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70178525913240
+  version_requirements: *70294611917200
 - !ruby/object:Gem::Dependency
   name: zookeeper
-  requirement: &70178525912080 !ruby/object:Gem::Requirement
+  requirement: &70294611916060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70178525912080
+  version_requirements: *70294611916060
 description: Distributed Locking
 email:
 - simon@soulware.co.uk
@@ -45,9 +45,11 @@ files:
 - README
 - Rakefile
 - distlock.gemspec
+- lib/dist_lock.rb
 - lib/distlock.rb
 - lib/distlock/version.rb
 - lib/distlock/zk/affinity_pool.rb
+- lib/distlock/zk/common.rb
 - lib/distlock/zk/zk.rb
 homepage: http://soulware.github.com/distlock
 licenses: []
@@ -63,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4249032564007254320
+      hash: -2701141366311173259
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -72,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4249032564007254320
+      hash: -2701141366311173259
 requirements: []
 rubyforge_project: distlock
 rubygems_version: 1.8.10