sfpagent 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/bin/init_script

@@ -0,0 +1,51 @@
+#! /bin/sh
+
+### BEGIN INIT INFO
+# Provides:		   sfpagent
+# Required-Start:	
+# Required-Stop:	
+# Default-Start:	2 3 4 5
+# Default-Stop:		
+# Short-Description:	SFP Agent Daemon
+### END INIT INFO
+
+set -e
+
+bin="/home/herry/workspace/sfp/sfpagent/bin/sfpagent"
+
+test -x $bin || exit 0
+
+umask 022
+
+. /lib/lsb/init-functions
+
+if [ `/usr/bin/id -u` != "0" ]; then
+  log_daemon_msg "Error: must be run with root"
+  exit 1
+fi
+
+export PATH="${PATH:+$PATH:}/usr/sbin:/sbin:/usr/local/bin"
+
+case "$1" in
+  start)
+	log_daemon_msg "Starting SFP Agent daemon" "sfpagent" || true
+   $bin -s
+	;;
+  stop)
+	log_daemon_msg "Stopping SFP Agent daemon" "sfpagent" || true
+   $bin -t
+	;;
+  restart)
+	log_daemon_msg "Restarting SFP Agent daemon" "sfpagent" || true
+   $bin -r
+	;;
+  status)
+	$bin -a && exit 0 || exit $?
+	;;
+
+  *)
+	log_action_msg "Usage: /etc/init.d/sfpagent {start|stop|restart|status}" || true
+	exit 1
+esac
+
+exit 0

data/lib/sfpagent/agent.rb

@@ -168,8 +168,11 @@ module Sfp
 		end
 
 		def self.get_cache_model(name)
-			model = JSON[File.read(CacheModelFile)]
-			(model.has_key?(name) ? model[name] : nil)
+			if File.exist?(CacheModelFile)
+				model = JSON[File.read(CacheModelFile)]
+				return model[name] if model.has_key?(name)
+			end
+			nil
 		end
 
 		def self.set_cache_model(p={})
@@ -181,7 +184,7 @@ module Sfp
 				if p[:name]
 					if p[:model]
 						model[p[:name]] = p[:model]
-						Sfp::Agent.logger.info "Setting cache model for #{p[:name]}..."
+						Sfp::Agent.logger.info "Saving cache model for #{p[:name]}..."
 					else
 						model.delete(p[:name]) if model.has_key?(p[:name])
 						Sfp::Agent.logger.info "Deleting cache model for #{p[:name]}..."
@@ -312,6 +315,25 @@ module Sfp
 			false
 		end
 
+		def self.resolve_model(path)
+			return Sfp::Undefined.new if !defined?(@@runtime) or @@runtime.nil? or @@runtime.root.nil?
+			begin
+				path = path.simplify
+				value = @@runtime.model.at?(path)
+				if value.is_a?(Sfp::Unknown)
+					_, name, rest = path.split('.', 3)
+					model = get_cache_model(name)
+					if !model.nil? and model.has_key?('model')
+						return (rest.to_s.length <= 0 ? model['model'] : model['model'].at?("$.#{rest}"))
+					end
+				end
+				return value
+			rescue Exception => e
+				Sfp::Agent.logger.error "Resolve model #{path} [Failed] #{e}\n#{e.backtrace.join("\n")}"
+			end
+			Sfp::Undefined.new
+		end
+
 		def self.resolve(path, as_sfp=true)
 			return Sfp::Undefined.new if !defined?(@@runtime) or @@runtime.nil? or @@runtime.root.nil?
 			begin

data/lib/sfpagent/module.rb

@@ -27,10 +27,6 @@ module Sfp::Resource
 		model.each { |k,v| @model[k] = v }
 	end
 
-	def apply(p={})
-		true
-	end
-
 	def to_model
 		@state = {}
 		@model.each { |k,v| @state[k] = v }
@@ -39,7 +35,13 @@ module Sfp::Resource
 	alias_method :reset, :to_model
 
 	def resolve(path)
-		Sfp::Agent.resolve(path.simplify)
+		Sfp::Agent.resolve(path)
+	end
+
+	alias_method :resolve_state, :resolve
+
+	def resolve_model(path)
+		Sfp::Agent.resolve_model(path)
 	end
 
 	protected

data/lib/sfpagent/runtime.rb

@@ -1,7 +1,7 @@
 require 'thread'
 
 class Sfp::Runtime
-	attr_reader :root, :cloudfinder
+	attr_reader :root, :model, :cloudfinder
 
 	def initialize(model)
 		@mutex_procedure = Mutex.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp
-  requirement: &7796160 !ruby/object:Gem::Requirement
+  requirement: &12203820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.3.12
   type: :runtime
   prerelease: false
-  version_requirements: *7796160
+  version_requirements: *12203820
 description: A Ruby implementation of SFP agent.
 email: herry13@gmail.com
 executables:
@@ -34,6 +34,7 @@ files:
 - README.md
 - VERSION
 - bin/cert.rb
+- bin/init_script
 - bin/install_module
 - bin/sfpagent
 - lib/sfpagent.rb