sfpagent 0.1.1 → 0.1.2

data/README.md

@@ -1,7 +1,7 @@
 SFP Agent for Ruby
 ==================
 - Author: Herry (herry13@gmail.com)
-- Version: 0.1.1
+- Version: 0.1.2
 - License: [BSD License](https://github.com/herry13/sfpagent/blob/master/LICENSE)
 
 A Ruby script and API of an SFP agent. The agent could be accessed through HTTP RESTful API.

data/lib/sfpagent.rb

@@ -1,14 +1,14 @@
 # external dependencies
 require 'rubygems'
 require 'json'
-require 'sfp'
+#require 'sfp'
 
 module Nuri
 end
 
 # internal dependencies
 libdir = File.expand_path(File.dirname(__FILE__))
-
+require libdir + '/../../sfp-ruby/lib/sfp.rb'
 require libdir + '/sfpagent/net_helper.rb'
 require libdir + '/sfpagent/executor.rb'
 require libdir + '/sfpagent/runtime.rb'

data/lib/sfpagent/agent.rb

@@ -30,6 +30,7 @@ module Sfp
 		                                     WEBrick::BasicLog::WARN)
 
 		@@model_lock = Mutex.new
+		@@runtime_lock = Mutex.new
 
 		def self.logger
 			@@logger
@@ -176,7 +177,7 @@ module Sfp
 				@@logger.info "There is no model in cache."
 			else
 				begin
-					@@runtime = Sfp::Runtime.new(model)
+					@@runtime_lock.synchronize { @@runtime = Sfp::Runtime.new(model) }
 					@@logger.info "Reloading the model in cache [OK]"
 				rescue Exception => e
 					@@logger.error "Reloading the model in cache [Failed] #{e}"
@@ -187,41 +188,46 @@ module Sfp
 		# Return the current state of the model.
 		#
 		def self.get_state(as_sfp=true)
-			return nil if !defined?(@@runtime) or @@runtime.nil?
-			begin
-				@@runtime.get_state if @@runtime.modules.nil?
-				return @@runtime.get_state(as_sfp)
-			rescue Exception => e
-				@@logger.error "Get state [Failed] #{e}\n#{e.backtrace.join("\n")}"
-			end
+			@@runtime_lock.synchronize {
+				return nil if !defined?(@@runtime) or @@runtime.nil?
+				begin
+					@@runtime.get_state if @@runtime.modules.nil?
+					return @@runtime.get_state(as_sfp)
+				rescue Exception => e
+					@@logger.error "Get state [Failed] #{e}\n#{e.backtrace.join("\n")}"
+				end
+			}
 			false
 		end
 
 		def self.resolve(path, as_sfp=true)
-			return Sfp::Undefined.new if !defined?(@@runtime) or @@runtime.nil? or @@runtime.modules.nil?
 			begin
-				path = path.simplify
-				_, node, _ = path.split('.', 3)
-				if @@runtime.modules.has_key?(node)
-					# local resolve
-					parent, attribute = path.pop_ref
-					mod = @@runtime.modules.at?(parent)
-					if mod.is_a?(Hash)
-						mod[:_self].update_state
-						state = mod[:_self].state
-						return state[attribute] if state.has_key?(attribute)
-					end
-				else
-					agents = get_agents
-					if agents[node].is_a?(Hash)
-						agent = agents[node]
-						path = path[1, path.length-1].gsub /\./, '/'
-						code, data = NetHelper.get_data(agent['sfpAddress'], agent['sfpPort'], "/state#{path}")
-						if code.to_i == 200
-							state = JSON[data]['state']
-							return Sfp::Unknown.new if state == '<sfp::unknown>'
-							return state if !state.is_a?(String) or state[0,15] != '<sfp::undefined'
+				@@runtime_lock.synchronize {
+					return Sfp::Undefined.new if !defined?(@@runtime) or @@runtime.nil? or @@runtime.modules.nil?
+					path = path.simplify
+					_, node, _ = path.split('.', 3)
+					if @@runtime.modules.has_key?(node)
+						# local resolve
+						parent, attribute = path.pop_ref
+						mod = @@runtime.modules.at?(parent)
+						if mod.is_a?(Hash)
+							mod[:_self].update_state
+							state = mod[:_self].state
+							return state[attribute] if state.has_key?(attribute)
 						end
+						return Sfp::Undefined.new
+					end
+				}
+				agents = get_agents
+				if agents[node].is_a?(Hash)
+					# remote resolve
+					agent = agents[node]
+					path = path[1, path.length-1].gsub /\./, '/'
+					code, data = NetHelper.get_data(agent['sfpAddress'], agent['sfpPort'], "/state#{path}")
+					if code.to_i == 200
+						state = JSON[data]['state']
+						return Sfp::Unknown.new if state == '<sfp::unknown>'
+						return state if !state.is_a?(String) or state[0,15] != '<sfp::undefined'
 					end
 				end
 			rescue Exception => e

data/lib/sfpagent/module.rb

@@ -1,6 +1,6 @@
-require 'etc'
-require 'fileutils'
-
+#
+# predefined methods: update_state, apply, reset, resolve
+#
 module Sfp::Resource
 	attr_accessor :parent
 	attr_reader :state, :model
@@ -17,6 +17,10 @@ module Sfp::Resource
 		@state = {}
 	end
 
+	def apply(p={})
+		true
+	end
+
 	def to_model
 		@state = {}
 		@model.each { |k,v| @state[k] = v }

data/sfpagent.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 	s.name			= 'sfpagent'
-	s.version		= '0.1.1'
-	s.date			= '2013-07-03'
+	s.version		= '0.1.2'
+	s.date			= '2013-08-05'
 	s.summary		= 'SFP Agent'
 	s.description	= 'A Ruby implementation of SFP agent.'
 	s.authors		= ['Herry']
@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
 	s.homepage		= 'https://github.com/herry13/sfpagent'
 	s.rubyforge_project = 'sfpagent'
 
-	s.add_dependency 'sfp', '~> 0.3.0'
+	s.add_dependency 'sfp', '~> 0.3.6'
 end	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp
-  requirement: &17002580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *17002580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.6
 description: A Ruby implementation of SFP agent.
 email: herry13@gmail.com
 executables:
@@ -62,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sfpagent
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: SFP Agent