zack 0.2.0 → 0.3.0

data/History.txt

@@ -1,8 +1,12 @@
-= 0.2.0 / ???
+= 0.3.0 / 20Jul2011
+
+  + Channel names are generated using UUIDs. No duplicate detection yet. 
+
+= 0.2.0 / 26Apr2011
 
   + Starting with this version, zack depends on Cod for all its inner workings
     and just adds RPC. This makes it lean to the point of nonexistence. 
-
+    
 = 0.1.3 / not released
 
   + All calls now have a default timeout of 10 seconds. Timeouts reset the

data/README

@@ -48,6 +48,6 @@ Should run with most rubies of the 1.8 and 1.9 generations.
 
 STATUS
 
-Useful and useable. First release. 
+Useful for production use. Not yet tested in high-volume situations. 
 
 (c) Kaspar Schiess, Patrick Marchi

data/Rakefile

@@ -1,66 +1,17 @@
+require 'rake/clean'
 require "rubygems"
-require "rake/gempackagetask"
-require "rake/rdoctask"
+require 'rubygems/package_task'
 
 require 'rspec'
 require 'rspec/core/rake_task'
 Rspec::Core::RakeTask.new
 task :default => :spec
 
-# This builds the actual gem. For details of what all these options
-# mean, and other ones you can add, check the documentation here:
-#
-#   http://rubygems.org/read/chapter/20
-#
-spec = Gem::Specification.new do |s|
+# This task actually builds the gem. 
+task :gem => :spec
+spec = eval(File.read('zack.gemspec'))
 
-  # Change these as appropriate
-  s.name              = "zack"
-  s.version           = "0.2.0"
-  s.summary           = "Ruby RPC calls via Cod"
-  s.authors           = ['Kaspar Schiess', 'Patrick Marchi']
-  s.email             = ["kaspar.schiess@absurd.li", 'mail@patrickmarchi.ch']
-  s.homepage          = "http://github.com/kschiess/zack"
-
-  s.has_rdoc          = true
-  s.extra_rdoc_files  = %w(README)
-  s.rdoc_options      = %w(--main README)
-
-  # Add any extra files to include in the gem
-  s.files             = %w(History.txt LICENSE Rakefile README) + Dir.glob("{spec,lib/**/*}")
-  s.require_paths     = ["lib"]
-
-  s.add_dependency("cod", "~> 0.2")
-  s.add_dependency("beanstalk-client", "~> 1.0")
-
-  # If your tests use any gems, include them here
-  s.add_development_dependency("rspec")
-  s.add_development_dependency("flexmock")
-end
-
-# This task actually builds the gem. We also regenerate a static
-# .gemspec file, which is useful if something (i.e. GitHub) will
-# be automatically building a gem for this project. If you're not
-# using GitHub, edit as appropriate.
-#
-# To publish your gem online, install the 'gemcutter' gem; Read more 
-# about that here: http://gemcutter.org/pages/gem_docs
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-
-  # Generate the gemspec file for github.
-  file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
-  File.open(file, "w") {|f| f << spec.to_ruby }
-end
-
-# Generate documentation
-Rake::RDocTask.new do |rd|
-  rd.main = "README"
-  rd.rdoc_files.include("README", "lib/**/*.rb")
-  rd.rdoc_dir = "rdoc"
-end
-
-desc 'Clear out RDoc and generated packages'
-task :clean => [:clobber_rdoc, :clobber_package] do
-  rm "#{spec.name}.gemspec"
-end
+desc "Generate the gem package."
+Gem::PackageTask.new(spec) do |pkg|
+  # pkg.need_tar = true
+end

data/lib/zack/client.rb

@@ -1,4 +1,5 @@
 
+require 'uuid'
 
 # Client part of Zack RPC
 #
@@ -14,7 +15,8 @@ class Zack::Client
 
     @outgoing = Cod.beanstalk(server, tube_name)
     unless @with_answer.empty?
-      @incoming = Cod.beanstalk(server)
+      @incoming = Cod.beanstalk(server, 
+        unique_tube_name(tube_name))
     end
     
     @service = Cod::Client.new(@outgoing, @incoming, 1)
@@ -41,4 +43,25 @@ class Zack::Client
   def has_answer?(sym)
     @with_answer.include?(sym.to_sym)
   end
+
+private 
+  # Pretend that UUIDs don't collide for now.
+  #
+  def unique_tube_name(name)
+    "name.#{uuid}"
+  end
+  def uuid
+    uuid_generator.generate
+  end
+  def uuid_generator
+    generator=Thread.current[:zack_uuid_generator]
+    return generator if generator
+    
+    # assert: generator is nil
+    
+    # Pretend we've just forked, because that might be the case. 
+    UUID.generator.next_sequence
+    
+    Thread.current[:zack_uuid_generator]=generator=UUID.new
+  end
 end

metadata

@@ -1,74 +1,49 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: zack
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Kaspar Schiess
 - Patrick Marchi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-27 00:00:00 +02:00
+date: 2011-07-20 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cod
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157732620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.2"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: beanstalk-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2157732620
+- !ruby/object:Gem::Dependency
+  name: beanstalk-client
+  requirement: &2157731840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: flexmock
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id004
+  version_requirements: *2157731840
 description: 
-email: 
+email:
 - kaspar.schiess@absurd.li
 - mail@patrickmarchi.ch
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - History.txt
 - LICENSE
 - Rakefile
@@ -79,31 +54,28 @@ files:
 has_rdoc: true
 homepage: http://github.com/kschiess/zack
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby RPC calls via Cod
 test_files: []
-