ruby_skynet 1.3.0.alpha3 → 2.0.0.rc1

data/lib/ruby_skynet/service.rb

@@ -11,13 +11,10 @@ module RubySkynet
   module Service
 
     def self.included(base)
-      base.extend ::RubySkynet::Base::ClassMethods
+      base.extend ::RubySkynet::Common::ClassMethods
       base.class_eval do
         include SemanticLogger::Loggable
       end
-      # Register the service with the Server
-      # The server will publish the server to services registry when the server is running
-      Server.register_service(base)
     end
 
   end

data/lib/ruby_skynet/version.rb

@@ -1,3 +1,3 @@
 module RubySkynet #:nodoc
-  VERSION = "1.3.0.alpha3"
+  VERSION = "2.0.0.rc1"
 end

data/lib/ruby_skynet/zookeeper/service_registry.rb

@@ -1,5 +1,6 @@
 require 'semantic_logger'
 require 'thread_safe'
+require 'gene_pool'
 require 'resolv'
 
 #
@@ -75,6 +76,18 @@ module RubySkynet
 	      uuid
       end
 
+      # Return a server that implements the specified service
+      def server_for(name, version='*', region=RubySkynet.region)
+        if servers = servers_for(name, version, region)
+          # Randomly select one of the servers offering the service
+          servers[rand(servers.size)]
+        else
+          msg = "No servers available for service: #{name} with version: #{version} in region: #{region}"
+          logger.warn msg
+          raise ServiceUnavailable.new(msg)
+        end
+      end
+
       # Returns [Array<String>] a list of servers implementing the requested service
       def servers_for(name, version='*', region=RubySkynet.region)
         if version == '*'
@@ -87,11 +100,9 @@ module RubySkynet
             end
           end
         end
-        servers = if server_infos = @cache["#{name}/#{version}/#{region}"]
+        if server_infos = @cache["#{name}/#{version}/#{region}"]
           server_infos.first.servers
         end
-        raise ServiceUnavailable.new("No servers available for service: #{name} with version: #{version} in region: #{region}") unless servers
-        servers
       end
 
       # Invokes registered callbacks when a specific server is shutdown or terminates

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_skynet
 version: !ruby/object:Gem::Version
-  version: 1.3.0.alpha3
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic_logger
@@ -39,47 +39,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: bson
+  name: gene_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: gene_pool
+  name: sync_attr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: sync_attr
+  name: bson
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc3
+- !ruby/object:Gem::Dependency
+  name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 description: Ruby Client for invoking Skynet services
 email:
 - reidmo@gmail.com
@@ -87,17 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
-- LICENSE.txt
-- README.md
-- Rakefile
-- examples/echo_client.rb
-- examples/echo_server.rb
 - lib/rails/generators/ruby_skynet/config/config_generator.rb
 - lib/rails/generators/ruby_skynet/config/templates/ruby_skynet.yml
-- lib/ruby_skynet.rb
-- lib/ruby_skynet/base.rb
 - lib/ruby_skynet/client.rb
 - lib/ruby_skynet/common.rb
 - lib/ruby_skynet/connection.rb
@@ -108,20 +113,19 @@ files:
 - lib/ruby_skynet/ruby_skynet.rb
 - lib/ruby_skynet/server.rb
 - lib/ruby_skynet/service.rb
-- lib/ruby_skynet/static_service_registry.rb
 - lib/ruby_skynet/version.rb
-- lib/ruby_skynet/zookeeper.rb
 - lib/ruby_skynet/zookeeper/cached_registry.rb
 - lib/ruby_skynet/zookeeper/extensions/java_base.rb
 - lib/ruby_skynet/zookeeper/json/deserializer.rb
 - lib/ruby_skynet/zookeeper/json/serializer.rb
 - lib/ruby_skynet/zookeeper/registry.rb
 - lib/ruby_skynet/zookeeper/service_registry.rb
-- ruby_skynet.gemspec
-- test/client_test.rb
-- test/service_registry_test.rb
-- test/service_test.rb
-- test/zookeeper_registry_test.rb
+- lib/ruby_skynet/zookeeper.rb
+- lib/ruby_skynet.rb
+- examples/echo_client.rb
+- examples/echo_server.rb
+- LICENSE.txt
+- README.md
 homepage: https://github.com/ClarityServices/ruby_skynet
 licenses:
 - Apache License V2.0
@@ -142,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Skynet Ruby Client

data/Gemfile

@@ -1,20 +0,0 @@
-source 'https://rubygems.org'
-
-group :test do
-  gem "shoulda"
-end
-
-gem "rake"
-gem "semantic_logger", ">= 2.1"
-gem "resilient_socket"
-# Doozer Client
-#gem "ruby_doozer"
-# Zookeeper Client
-#gem "zookeeper"
-# Thread Safe Hash and Array
-gem "thread_safe"
-# For looking up Service entries in Service Registry
-gem "multi_json"
-# Wire format when communicating with services
-gem "bson", '1.5.2'
-gem "bson_ext", :platform => :ruby

data/Gemfile.lock

@@ -1,45 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.14)
-    bson (1.5.2)
-    bson_ext (1.5.2)
-      bson (= 1.5.2)
-    i18n (0.6.9)
-    minitest (4.7.5)
-    multi_json (1.8.2)
-    rake (10.1.0)
-    resilient_socket (0.5.0)
-      semantic_logger (>= 2.1)
-    semantic_logger (2.6.1)
-      sync_attr (>= 1.0)
-      thread_safe (>= 0.1.0)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.6)
-    shoulda-matchers (2.4.0)
-      activesupport (>= 3.0.0)
-    sync_attr (1.0.0)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bson (= 1.5.2)
-  bson_ext
-  multi_json
-  rake
-  resilient_socket
-  semantic_logger (>= 2.1)
-  shoulda
-  thread_safe

data/Rakefile

@@ -1,44 +0,0 @@
-lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
-
-require 'rubygems'
-require 'rubygems/package'
-require 'rake/clean'
-require 'rake/testtask'
-require 'date'
-require 'semantic_logger'
-require 'ruby_skynet/version'
-
-desc "Build gem"
-task :gem  do |t|
-  gemspec = Gem::Specification.new do |spec|
-    spec.name        = 'ruby_skynet'
-    spec.version     = RubySkynet::VERSION
-    spec.platform    = Gem::Platform::RUBY
-    spec.authors     = ['Reid Morrison']
-    spec.email       = ['reidmo@gmail.com']
-    spec.homepage    = 'https://github.com/ClarityServices/ruby_skynet'
-    spec.date        = Date.today.to_s
-    spec.summary     = "Skynet Ruby Client"
-    spec.description = "Ruby Client for invoking Skynet services"
-    spec.files       = FileList["./**/*"].exclude(/\.gem$/, /\.log$/,/nbproject/).map{|f| f.sub(/^\.\//, '')}
-    spec.license     = "Apache License V2.0"
-    spec.has_rdoc    = true
-    spec.add_dependency 'semantic_logger', '>= 2.1.0'
-    spec.add_dependency 'resilient_socket', '>= 0.5.0'
-    spec.add_dependency 'bson', '>= 1.5.2'
-    spec.add_dependency 'gene_pool', '>= 1.3.0'
-    spec.add_dependency 'sync_attr', '>= 1.0.0'
-  end
-  Gem::Package.build gemspec
-end
-
-desc "Run Test Suite"
-task :test do
-  Rake::TestTask.new(:functional) do |t|
-    t.test_files = FileList['test/*_test.rb']
-    t.verbose    = true
-  end
-
-  Rake::Task['functional'].invoke
-end

data/lib/ruby_skynet/base.rb

@@ -1,47 +0,0 @@
-require 'semantic_logger'
-
-# Base class for RubySkynet Clients and Services
-module RubySkynet
-  module Base
-    def self.included(base)
-      base.extend ClassMethods
-      base.class_eval do
-        include SemanticLogger::Loggable
-      end
-    end
-
-    module ClassMethods
-      # Name of this service to Register with Skynet
-      # Default: class name
-      def skynet_name
-        @skynet_name ||= name.gsub('::', '.')
-      end
-
-      def skynet_name=(skynet_name)
-        @skynet_name = skynet_name
-      end
-
-      # Version of this service to register with Skynet
-      # Default: nil
-      def skynet_version
-        @skynet_version ||= nil
-      end
-
-      def skynet_version=(skynet_version)
-        @skynet_version = skynet_version
-      end
-
-      # Region within which this service is defined
-      # Default: RubySkynet.region
-      def skynet_region
-        @skynet_region || ::RubySkynet.region
-      end
-
-      def skynet_region=(skynet_region)
-        @skynet_region = skynet_region
-      end
-
-    end
-
-  end
-end

data/lib/ruby_skynet/static_service_registry.rb

@@ -1,75 +0,0 @@
-require 'semantic_logger'
-require 'thread_safe'
-
-#
-# RubySkynet Sevices Registry
-#
-# Loads a list of all services and which servers they are available on from a
-# static YAML file
-#
-# Format of the YAML file
-#   key: [String] "<name>/<version>/<region>"
-#   value: [Array<String>] 'host:port', 'host:port'
-#
-module RubySkynet
-  class StaticServiceRegistry
-    include SemanticLogger::Loggable
-
-    # Create a service registry
-    def initialize(params = {})
-      @services = params[:registry]
-      raise "Missing :registry in config that must list the availables services" unless @services
-    end
-
-    # Returns the Service Registry as a Hash
-    def to_h
-      @services.dup
-    end
-
-    # Register the supplied service at this Skynet Server host and Port
-    # Returns the UUID for the service that was created
-    def register_service(name, version, region, hostname, port)
-      server = "#{hostname}:#{port}"
-      key = "#{name}/#{version}/#{region}"
-      (@services[key] ||= []) << server
-      key
-    end
-
-    # Deregister the supplied service from the Registry
-    def deregister_service(name, version, region, hostname, port)
-      server = "#{hostname}:#{port}"
-      key = "#{name}/#{version}/#{region}"
-      if servers = @services[key]
-        servers.delete_if {|s| s == server}
-        @services.delete(key) if servers.count == 0
-      end
-      key
-    end
-
-    # Returns [Array<String>] a list of servers implementing the requested service
-    def servers_for(name, version='*', region=RubySkynet.region)
-      if version == '*'
-        # Find the highest version for the named service in this region
-        version = -1
-        @services.keys.each do |key|
-          if match = key.match(/#{name}\/(\d+)\/#{region}/)
-            ver = match[1].to_i
-            version = ver if ver > version
-          end
-        end
-      end
-      servers = @services["#{name}/#{version}/#{region}"]
-      raise ServiceUnavailable.new("No servers available for service: #{name} with version: #{version} in region: #{region}") unless servers
-      servers
-    end
-
-    # Invokes registered callbacks when a specific server is shutdown or terminates
-    # Not when a server de-registers itself
-    # The callback will only be called once and will need to be re-registered
-    # after being called if future callbacks are required for that server
-    def on_server_removed(server, &block)
-      #nop
-    end
-
-  end
-end

data/ruby_skynet.gemspec

@@ -1,25 +0,0 @@
-lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
-
-require 'date'
-require 'ruby_skynet/version'
-
-Gem::Specification.new do |spec|
-  spec.name        = 'ruby_skynet'
-  spec.version     = RubySkynet::VERSION
-  spec.platform    = Gem::Platform::RUBY
-  spec.authors     = ['Reid Morrison']
-  spec.email       = ['reidmo@gmail.com']
-  spec.homepage    = 'https://github.com/ClarityServices/ruby_skynet'
-  spec.date        = Date.today.to_s
-  spec.summary     = "Skynet Ruby Client"
-  spec.description = "Ruby Client for invoking Skynet services"
-  spec.files       = Dir.glob("lib/**/*") + Dir.glob("examples/**/*.rb") +  %w(LICENSE.txt README.md)
-  spec.license     = "Apache License V2.0"
-  spec.has_rdoc    = true
-  spec.add_dependency 'semantic_logger', '>= 2.6.1'
-  spec.add_dependency 'resilient_socket', '>= 0.5.0'
-  spec.add_dependency 'sync_attr', '>= 1.0.0'
-  spec.add_dependency 'bson', '>= 1.5.2'
-  spec.add_dependency 'thread_safe'
-end