jn_services 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eff6fbc1693bbfb1e88fa15649d128c8d28a493
-  data.tar.gz: 19aa9ff94044ade2a6b5bbcb0186a7de1d8f925b
+  metadata.gz: feed0dad1b87bef9a88b9d0a796d8cefadbf9206
+  data.tar.gz: 3043657e5671623245ff93888584c81a86fdb039
 SHA512:
-  metadata.gz: 9c8a7ffb2ecf2292d9572d6c90cee57a12bd5037cc208fbc9ea7bc6ca628d5d5c1b3139d876541f96720d60ac9c22f7024ddcb45879a280663334c87a6361dc2
-  data.tar.gz: d816ec5c038c7396651c55b95fb572f71c7dbfdea72ee70acbcba3739197dca712af9c049124de0ab7056ea0cf2dc250dd67af9f4a00e61484ce4895d4a8e496
+  metadata.gz: 66ef578629746a992b58400c69cf990f510811b262a0020bef7ad72df91712abf04c562e5ca2a1cfbb6e93125d2f3eabe8a6b2df549825381f235bbad4b0b8f5
+  data.tar.gz: 7deb2dc8215e67f1fcd63484a88ce0013886fe74f2bf2d871b383ca65c2111eda2815995dda31786db085f1f75b3b4aa3f3ac30c10b4d9c842eadc0dec801735

data/Guardfile

@@ -0,0 +1,9 @@
+# vim: set ft=ruby:
+require 'guard/guard'
+require 'guard/rake'
+
+guard 'rake', :task => 'test:quick' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/jn_services.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "etcd"
+  spec.add_runtime_dependency "etcd", "~> 0.2.0.alpha"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
@@ -27,5 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "systemu"
   spec.add_development_dependency "uuid"
   spec.add_development_dependency "rubocop"
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rake'
   spec.add_development_dependency 'simplecov'
 end

data/lib/services/entity.rb

@@ -53,19 +53,16 @@ module Services
       return unless valid_path
       to_hash.each do |k, v|
         next if k == 'name'
-        value =  Services.get("#{KEY}/#{path}/#{k}").value
-        instance_variable_set "@#{k}", value
+        if Services.exists? "#{KEY}/#{path}/#{k}"
+          value =  Services.get("#{KEY}/#{path}/#{k}").value
+          instance_variable_set "@#{k}", value
+        end
       end
       self
     end
 
     def valid_path
-      begin
-        Services.get("#{KEY}/#{path}")
-      rescue
-        return false
-      end
-      true
+      Services.exists?("#{KEY}/#{path}")
     end
   end
 end

data/lib/services/member.rb

@@ -18,14 +18,9 @@ module Services
     private
 
     def validate
-      unless @service
-        fail ArgumentError,
-             "#{self.class} requires service: argument"
-      end
-
-      unless name
+      unless name && @service
         fail ARgumentError,
-             "#{self.class} requires name argument"
+             "#{self.class} requires name and service argument"
       end
     end
   end

data/lib/services/service.rb

@@ -28,9 +28,7 @@ module Services
     private
 
     def create_if_missing
-      Services.get "#{KEY}/#{name}"
-    rescue Net::HTTPServerException => e
-      Services.set "#{KEY}/#{name}/_created", Time.now if e.message.match 'Not Found'
+      Services.set "#{KEY}/#{name}/_created", Time.now unless Services.exists? "#{KEY}/#{name}"
     end
 
     def load_endpoint
@@ -38,17 +36,20 @@ module Services
       endpoint
     end
 
-    # rubocop:disable MethodLength
-    def load_members
-      begin
-        etcd_members = Services.get "#{KEY}/#{name}/members"
-      rescue Net::HTTPServerException => e
-        etcd_members = nil if e.message.match 'Not Found'
+    def fetch_members
+      if Services.exists? "#{KEY}/#{name}/members"
+        Services.get("#{KEY}/#{name}/members").children
+      else
+        nil
       end
+    end
 
+    # rubocop:disable MethodLength
+    def load_members
+      etcd_members = fetch_members
       unless etcd_members.nil? || etcd_members.empty?
-        etcd_members.node.nodes.each do |m|
-          m_name = File.basename m['key']
+        etcd_members.each do |m|
+          m_name = File.basename m.key
           m1 = Services::Member.new(m_name, service: name)
           m1.load
           @members.push m1

data/lib/services/version.rb

@@ -1,4 +1,4 @@
 # setup the version here
 module Services
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/services.rb

@@ -20,22 +20,28 @@ module Services
   class << self
     attr_accessor :connection, :run_context
 
+    # proxy method to Etcd::Client.get
     def get(*args)
       Chef::Log.debug "connection.get args #{args}" unless run_context.nil?
-      connection.get(*args)
+      connection.get(*args) if exists?(*args)
     end
 
+    # proxy method to Etcd::Client.set
     def set(*args)
       Chef::Log.debug "connection.set args #{args}" unless run_context.nil?
       connection.set(*args)
     end
 
+    # proxy method to Etcd::Client.exists?
+    def exists?(*args)
+      connection.exists?(*args)
+    end
+
     # return a list of all services
     def all
       services = []
-      get(KEY).each do |s|
+      get(KEY).node.children.each do |s|
         name = File.basename s.key
-        puts "loading #{name}"
         services << Services::Service.new(name)
       end
       services
@@ -44,9 +50,11 @@ module Services
     # return all services a node is subscribed to
     def subscribed(f = nil)
       fail 'param and run_context can not both be nil' if f.nil? && run_context.nil?
-
-      fqdn = f.nil? ? rteraun_context.node.fqdn : f
-      services = all.map { |s| s.members.include?(fqdn) ? s : nil }
+      fqdn = f.nil? ? run_context.node.fqdn : f
+      services = []
+      all.each do |s|
+        services.concat s.members.map { |m| m.name == fqdn ? s.name : nil }
+      end
       services.compact
     end
   end

data/spec/member_spec.rb

@@ -6,8 +6,12 @@ describe 'Services::Member' do
     @m2 = Services::Member.new 'test_member2', service: 'test', ip: '127.0.0.3', port: 80, weight: 20
   end
 
+  it 'should raise without a service' do
+    expect { Services::Member.new }.to raise_error
+  end
+
   it 'should raise without a service name' do
-    expect { Services::Member.new 'foo' }.to raise_error
+    expect { Services::Member.new 'test_member' }.to raise_error
   end
 
   describe '#to_hash' do

data/spec/service_spec.rb

@@ -13,6 +13,7 @@ describe 'Services::Service' do
   end
 
   it 'should handle non-existant services' do
-    expect { Services::Service.new 'should_not_exist' }.to_not raise_error
+    a = Services::Service.new 'should_not_exist'
+    a.name.should eql 'should_not_exist'
   end
 end

data/spec/services_spec.rb

@@ -27,11 +27,28 @@ describe 'Services' do
   end
 
   it 'can set' do
-    Services.set '/test/1', 1
+    s = Services.set('/test/1', 1)
+    s.node.key.should eql '/test/1'
+    s.node.value.should eql '1'
   end
 
   it 'can get' do
-    Services.get '/_etcd/machines'
+    Services.get('/test/1').value.should eql '1'
+  end
+
+  it 'handles unknown keys on get' do
+    Services.get('/BLARGH!@#@!').should eql nil
+  end
+
+  it 'gets all services' do
+    a = Services.all
+    a.count.should eql 2
+    a[0].members.map { |m| m.name }.sort.should eql %w{test_member test_member2}
+  end
+
+  it 'lists subscribed services' do
+    Services.subscribed('test').should eql []
+    Services.subscribed('test_member').should eql ['test']
   end
 
   describe '::Entity' do

data/spec/spec_helper.rb

@@ -90,14 +90,16 @@ end
 
 RSpec.configure do |config|
 
-  config.include Etcd::SpecHelper
+  unless ENV['ETCD_SKIP']
+    config.include Etcd::SpecHelper
 
-  config.before(:suite) do
-    Etcd::SpecHelper.start_etcd_servers
-  end
+    config.before(:suite) do
+      Etcd::SpecHelper.start_etcd_servers
+    end
 
-  config.after(:suite) do
-    Etcd::SpecHelper.stop_etcd_servers
+    config.after(:suite) do
+      Etcd::SpecHelper.stop_etcd_servers
+    end
   end
   # Use color in STDOUT
   config.color_enabled = true

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jn_services
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jesse Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0.alpha
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  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: guard-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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +162,7 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile