yetis_node 0.0.2 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41ed3c76fab85cda7f767da3c395a93cb7ba874f
-  data.tar.gz: b5b20ee35b9aad8fa92bd5966597b45baf63fd2e
+  metadata.gz: 73cc4c5a4c2931c35f55b526115b79619ccc596d
+  data.tar.gz: ba9ebf51cc5f23ad6f632c3339bf6cc83c281377
 SHA512:
-  metadata.gz: c7b95d2ca78890e4011a1c6e9af8ee17734b84c410a6393dcfcc8ea8294c94d69145501a064a22c7c4970dab5ebc6fc91abe95d7de3bbefb7afa9f0b978ededa
-  data.tar.gz: f8169c46cb7f6a0ac827ed27d1422ee0d8a363f4e308a73c2998fc3fdd24aaf1c2841695ec3727b9bdd4fa3a7585184ed2a8bb1cfeed78504450f4c120e17c8f
+  metadata.gz: 1dc1ebfe06f54f42d22eac5379bf2e05bdbc29ac23856658f53d7642f1aa4cdf1aab82fb6998ea87947e33b6b36d4e800588741104647e16382ed878608cc290
+  data.tar.gz: 294dd20cfbebec68d4b28ab19693fb82589ca97104788b5cd6ba881c7626a0c065a5859aa75049d39607b6f43a283ae7e1d61e0a98c39f92f960dc8ae34b6096

data/bin/yetis_cmd_list.rb

@@ -2,23 +2,23 @@
 
 require "xmlrpc/client"
 
-if(ARGV.empty?)
-	puts "usage: #{$0} host:port"
-	exit
+if (ARGV.empty?)
+  puts "usage: #{$0} host:port"
+  exit
 end
 
-(host,port) = ARGV[0].split(':')
+(host, port) = ARGV[0].split(':')
 $s = XMLRPC::Client.new(host, "/", port)
 
 def f(*args)
-	puts args.take(args.size-1).join(' ')
-	r = $s.call("di","yeti", *args)
-	return if !r.kind_of?(Array)
-	r.each do |e|
-		if e.kind_of?(Array)
-			f(*args.first(args.size - 1), e[0],'_list')
-		end
-	end
+  puts args.take(args.size-1).join(' ')
+  r = $s.call("di", "yeti", *args)
+  return if !r.kind_of?(Array)
+  r.each do |e|
+    if e.kind_of?(Array)
+      f(*args.first(args.size - 1), e[0], '_list')
+    end
+  end
 end
 
 begin

data/lib/yetis_node.rb

@@ -1,9 +1,12 @@
-require "yetis_node/version"
+require 'yetis_node/version'
 require 'yetis_node/cmd/base'
 require 'yetis_node/cmd/show'
 require 'yetis_node/cmd/set'
 require 'yetis_node/cmd/request'
 require 'yetis_node/error'
+require 'yetis_node/base_transport'
+require 'yetis_node/xml_rpc_transport'
+require 'yetis_node/json_rpc_transport'
 require 'yetis_node/client'
 
 module YetisNode

data/lib/yetis_node/base_transport.rb

@@ -0,0 +1,12 @@
+module YetisNode
+  class BaseTransport
+    attr_reader :uri, :options
+    DEFAULT_TIMEOUT = 5
+
+    def initialize(uri, options = {})
+      @uri = uri
+      @options = options
+    end
+
+  end
+end

data/lib/yetis_node/client.rb

@@ -1,4 +1,4 @@
-require 'xmlrpc/client'
+require 'forwardable'
 module YetisNode
 
 
@@ -7,13 +7,16 @@ module YetisNode
   # node.calls_count
   # => "10"
   class Client
-    attr_reader :uri
+    extend Forwardable
 
-    DEFAULT_TIMEOUT = 10
+    attr_reader :uri, :options, :transport
+
+    def_delegators :@transport, :rpc_send
 
     def initialize(uri, options = {})
       @uri = uri
       @options = options
+      select_transport!
     end
 
     include Cmd::Base
@@ -21,15 +24,22 @@ module YetisNode
     include Cmd::Request
     include Cmd::Set
 
-
     protected :invoke_show, :invoke_request, :invoke_set
 
-    protected
+    private
 
-    def xml_rpc
-      @xml_rpc ||= XMLRPC::Client.new2(uri, @options.fetch(:proxy, nil), @options.fetch(:timeout, DEFAULT_TIMEOUT))
-    end
+    def select_transport!
+      transport_klass = case @options.fetch(:transport, :xml_rpc)
+                          when :xml_rpc
+                            XmlRpcTransport
+                          when :json_rpc
+                            JsonRpcTransport
+                          else
+                            raise Error.new('invalid transport')
+                        end
 
+      @transport = transport_klass.new(@uri, @options)
+    end
 
   end
 end

data/lib/yetis_node/cmd/base.rb

@@ -2,19 +2,10 @@ module YetisNode
   module Cmd
     module Base
 
-
       def invoke(method, prefix, args = [])
-        rpc_send(*([prefix] + method.to_s.split("_") + args.compact))
-      end
-
-      def rpc_send(*args)
-        begin
-          xml_rpc.call_async('di', 'yeti', *args)
-        rescue XMLRPC::FaultException => e
-           raise Error.new(e.message)
-        end    
+        rpc_send(*([prefix] + method.to_s.split('_') + args.compact))
       end
 
     end
   end
-end
+end

data/lib/yetis_node/cmd/show.rb

@@ -76,7 +76,7 @@ module YetisNode
 
       def resource_state(type_id, id = nil)
         invoke_show([type_id, id || :all])
-      end 
+      end
 
       def invoke_show(args = [])
         invoke(caller_locations(1, 1)[0].label, 'show', args)

data/lib/yetis_node/error.rb

@@ -1,4 +1,11 @@
 module YetisNode
   class Error < RuntimeError
-  end 
+    attr_reader :original
+
+    def initialize(msg, original=$!)
+      super(msg)
+      @original = original
+    end
+
+  end
 end

data/lib/yetis_node/json_rpc_transport.rb

@@ -0,0 +1,23 @@
+require 'jrpc'
+module YetisNode
+  class JsonRpcTransport < BaseTransport
+
+    def rpc_send(*args)
+      begin
+        json_rpc.connect if json_rpc.closed?
+        result = json_rpc.invoke_request(*args)
+        json_rpc.close
+        result
+      rescue ::JRPC::Error => e
+        raise Error.new("JSON RPC Error: #{"(#{e.code}) " if e.respond_to?(:code)}#{e.message}")
+      end
+    end
+
+    def json_rpc
+      @json_rpc ||= ::JRPC::TcpClient.new uri,
+                            namespace: 'yeti.',
+                            timeout: options.fetch(:timeout, BaseTransport::DEFAULT_TIMEOUT)
+    end
+
+  end
+end

data/lib/yetis_node/version.rb

@@ -1,3 +1,3 @@
 module YetisNode
-  VERSION = "0.0.2"
+  VERSION = "0.1.1"
 end

data/lib/yetis_node/xml_rpc_transport.rb

@@ -0,0 +1,17 @@
+require 'xmlrpc/client'
+module YetisNode
+  class XmlRpcTransport < BaseTransport
+
+
+    def rpc_send(*args)
+      xml_rpc.call_async('di', 'yeti', *args)
+    rescue XMLRPC::FaultException => e
+      raise Error.new(e.message)
+    end
+
+    def xml_rpc
+      @xml_rpc ||= XMLRPC::Client.new2 uri, options.fetch(:timeout, BaseTransport::DEFAULT_TIMEOUT)
+    end
+
+  end
+end

data/yetis_node.gemspec

@@ -4,20 +4,21 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'yetis_node/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "yetis_node"
+  spec.name          = 'yetis_node'
   spec.version       = YetisNode::VERSION
-  spec.authors       = ["Igor Fedoronchuk"]
-  spec.email         = ["igor.f@didww.com"]
+  spec.authors       = ['Igor Fedoronchuk']
+  spec.email         = ['igor.f@didww.com']
   spec.summary       = %q{XMLRPC client for YETI switch.}
   spec.description   = %q{XMLRPC client for YETI switch. http://yeti-switch.org  }
-  spec.homepage      = "http://yeti-switch.org"
-  spec.license       = "MIT"
+  spec.homepage      = 'http://yeti-switch.org'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_runtime_dependency 'jrpc', '~> 0.4', '>= 0.4.6'
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 10.0'
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: yetis_node
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - Igor Fedoronchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: jrpc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,13 +73,16 @@ files:
 - Rakefile
 - bin/yetis_cmd_list.rb
 - lib/yetis_node.rb
+- lib/yetis_node/base_transport.rb
 - lib/yetis_node/client.rb
 - lib/yetis_node/cmd/base.rb
 - lib/yetis_node/cmd/request.rb
 - lib/yetis_node/cmd/set.rb
 - lib/yetis_node/cmd/show.rb
 - lib/yetis_node/error.rb
+- lib/yetis_node/json_rpc_transport.rb
 - lib/yetis_node/version.rb
+- lib/yetis_node/xml_rpc_transport.rb
 - yetis_node.gemspec
 homepage: http://yeti-switch.org
 licenses:
@@ -81,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: XMLRPC client for YETI switch.