syncrony 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: dffadb4614ad54b53c65613f08a76d12614ab5a1
-  data.tar.gz: 5c9202982c7068d1c321e438026bd67c0b2eab5e
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MWUyYzkxMjg1Y2Q0ODNmZGQ2ZGUxYTY0ZWI5NTA5NGUwYmVhZTIwMQ==
+  data.tar.gz: !binary |-
+    Yzk4NTBhZWU3NjgzOWNjMWRhMTIzYzc4MDZmNjU3YTMyNGJkOTlmMg==
 SHA512:
-  metadata.gz: b01a40144dec8e02860303c7002a84beb3dfc096db36d1106c702d930d1280ddb72862d927b819f17aaf7d65d6e2924d3b5237dd2ee8c733230d8cacf08a14f3
-  data.tar.gz: c49c62a2a6c8d28ba9d43cf3b9ac908d678282324a71f2db0312c41b6b8b7c17158bd37d0e756ea48181883f680df1bba13adbc986943b5f092d75a41c9ab397
+  metadata.gz: !binary |-
+    Mzg2MmI0ZWJmODhiYWY5NDA0Yzk5YWE4N2U5ZTZjMDkzOGE4YWZiNmNlYTA1
+    ZDU5MTA2YzIzYTNiMzQ4NTIyNzU1M2ZmNzQ0YzZjOTQ0MDgyMjYyMDU2OTk0
+    NjlkMWE5YjVlMDIyZTA2NzE3YjAwNzk5N2FmMjRiMTVmMDM3NjM=
+  data.tar.gz: !binary |-
+    OTFkMjM5ZjA2M2Y1MDZjOWNmNjFhZjAxMjE1NzlkYjY4MzI1MGEyNTBhODk0
+    MGE1YWFkZjE5OTJlZDhkMmM5ZTI4OWYzMTA2ZmE4YjI3OTE5ZmE2ZDYzOWFm
+    ZTI0MjJjMmM2MThjYzQ3ZDhlMmM2ZDJiZGFlYmQ3ZGExZjNlMTQ=

data/Gemfile

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'etcd-rb', :git => "git@github.com:josephglanville/etcd-rb.git"
-
 # Specify your gem's dependencies in syncrony.gemspec
 gemspec

data/lib/syncrony/election.rb

@@ -10,23 +10,23 @@ module Syncrony
     attr_accessor :is_leader
 
     DEFAULT_OPTS = {
-      :servers => ["127.0.0.1:4001"],
-      :ttl => 15,
-      :interval => 5,
+      server: { host: '127.0.0.1', port: 4001 },
+      ttl: 15,
+      interval: 5
     }
 
     def initialize(options={})
       options = DEFAULT_OPTS.merge(options)
       raise if not options[:path]
       @path = options[:path]
+      @server = options[:server]
       @ttl = options[:ttl]
       @interval = options[:interval]
       @identifier = options[:identifier] || SecureRandom.uuid
     end
 
     def run
-      @client = Etcd::Client.new(:uris => @servers)
-      @client.connect
+      @client = Etcd.client(@server)
       @is_leader = false
       request_election
       return
@@ -42,7 +42,6 @@ module Syncrony
     # Stop being leader, or stop trying to become leader.
     def cancel
       @observer.cancel if @observer
-      # TODO race cdn here? Depends how Celluloid works. What if we're in the moddible of becoming leader?
       if @is_leader
         @timer.cancel
         @is_leader = false
@@ -55,16 +54,23 @@ module Syncrony
       @observer = Syncrony::Observer.new(@client, @path)
       @observer.run do |value, path, info|
         if value.nil?
-          if @client.set(@path, @identifier, :prevValue => nil, :ttl => @ttl)
+          begin
+            @client.set(@path, value: @identifier,
+                               prevExist: false,
+                               ttl: @ttl)
             @observer.cancel
             become_leader
+          rescue Etcd::TestFailed
+            # We lost the election race.
           end
         end
       end
     end
 
     def update
-      @client.set(@path, @identifier, :prevValue => @identifier, :ttl => @ttl)
+      @client.set(@path, value: @identifier,
+                         prevValue: @identifier,
+                         ttl: @ttl)
     end
 
   end

data/lib/syncrony/observer.rb

@@ -13,18 +13,23 @@ module Syncrony
     end
 
     def run(&handler)
-      info = @client.info(@path)
-      value = info ? info[:value] : nil
-      index = info ? info[:index] : nil
+      begin
+        info = @client.get(@path)
+        value = info.value
+        index = info.etcd_index
+      rescue Etcd::KeyNotFound
+        info = nil
+        value = nil
+        index = nil
+      end
 
       yield value, @path, info
       
       while @running
-        @client.watch(@path, :index => index ? index + 1 : nil) do |w_value, w_key, w_info|
-          if @running
-            index = w_info[:index]
-            yield w_value, w_key, w_info
-          end
+        watch = @client.watch(@path, :index => index ? index + 1 : nil)
+        if @running
+          index = watch.etcd_index
+          yield watch.value, @path, watch
         end
       end
     end

data/lib/syncrony/version.rb

@@ -1,3 +1,3 @@
 module Syncrony
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

data/syncrony.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
 
   # Runtime dependencies
   spec.add_runtime_dependency "celluloid"
-#  spec.add_runtime_dependency "etcd-rb", "~> 1.0.0.pre1"
+  spec.add_runtime_dependency "etcd"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syncrony
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Joseph Glanville
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,42 +28,56 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: etcd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Syncrony is a set of distributed systems primitives built with Celluloid
@@ -94,18 +108,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Syncrony distributed systems toolkit
 test_files: []
+has_rdoc: