sfpagent 0.3.5 → 0.3.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fe2ede39bf427923db9d74e08feb35a2f73804d2
+  data.tar.gz: 57b4f30d742a9850c04db2b2cde793ce6e8ac744
+SHA512:
+  metadata.gz: a441bf2082df51400315fb8146b6b115c0df4defd57353e7487d5f1131618d4e6f95c00318717a652869d38f7c5291a5e88c0f3c20796ac95c469e8f6f443bc3
+  data.tar.gz: ea2716ccce08b9672b6ab5c5a40f36c6be0a200652304b874d1925840aeee1b186b9a672983695cff590feeb36b2cfb6e5320aca947ec09f4ed970af1bed7fec

data/Rakefile

@@ -1,13 +1,13 @@
 def name
-        @name ||= Dir['*.gemspec'].first.split('.').first
+	@name ||= Dir['*.gemspec'].first.split('.').first
 end
 
 def version
-        File.read('VERSION').strip
+	File.read('VERSION').strip
 end
 
 def date
-        Date.today.to_s
+	Date.today.to_s
 end
 
 def test_script

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/sfpagent/module.rb

@@ -8,11 +8,9 @@ module Sfp::Resource
 	attr_reader :state, :model
 
 	def init(model={})
-		@model = {}
 		@state = {}
+		@model = (model.length <= 0 ? {} : Sfp.to_ruby(model))
 		@synchronized = []
-
-		update_model(model)
 	end
 
 	def update_state
@@ -30,30 +28,21 @@ module Sfp::Resource
 	end
 
 	protected
-	def update_model(model)
-		@model = Sfp.to_ruby(model)
-	end
-
-	def reset
+	def to_model
 		@state = {}
 		@model.each { |k,v| @state[k] = v }
 	end
 
-	def resolve(path)
+	def resolve_state(path)
 		Sfp::Agent.resolve(path)
 	end
 
-	alias_method :resolve_state, :resolve
+	alias_method :resolve, :resolve_state
 
 	def resolve_model(path)
 		Sfp::Agent.resolve_model(path)
 	end
 
-	def exec_seq(*commands)
-		commands = [commands.to_s] if not commands.is_a?(Array)
-		commands.each { |c| raise Exception, "Error on executing '#{c}'" if !shell(c) }
-	end
-
 	def log
 		Sfp::Agent.logger
 	end
@@ -66,7 +55,13 @@ module Sfp::Resource
 		shell "cp -rf #{source} #{destination}"
 	end
 
-	def render(file, map={})
+	def render(string, map={})
+		model = @model.clone
+		map.each { |k,v| model[k] = v }
+		::Sfp::Template.render_file(file, model)
+	end
+
+	def render_file(file, map={})
 		model = @model.clone
 		map.each { |k,v| model[k] = v }
 		::Sfp::Template.render_file(file, model)

data/lib/sfpagent/runtime.rb

@@ -97,12 +97,12 @@ class Sfp::Runtime
 
 	def update_model(model, root, path)
 		object = {}
-		if model['_context'] == 'object' and model['_isa'].to_s.isref and model['_isa'].to_s != '$.Object'
+		if model['_context'] == 'object' and model['_isa'].to_s.isref #and model['_isa'].to_s != '$.Object'
 			object[:_self] = instantiate_sfp_object(model, root)
 		end
 
 		model.each do |key,child|
-			if key[0,1] != '_' and child.is_a?(Hash) and child['_context'] == 'object' and child['_isa'].to_s != '$.Object'
+			if key[0,1] != '_' and child.is_a?(Hash) and child['_context'] == 'object' #and child['_isa'].to_s != '$.Object'
 				object[key] = update_model(child, root, path.push(key))
 			end
 		end

data/lib/sfpagent/template.rb

@@ -2,19 +2,39 @@ require 'erb'
 require 'ostruct'
 
 class Sfp::Template < OpenStruct
-	def render(template)
-		ERB.new(template).result(binding)
+	def initialize(resolver=nil)
+		@resolver = resolver
 	end
 
-	def render_to_file(template, file)
-		result = render(template)
-		File.open(file, 'w+') { |f| f.write(result) }
+	def resolve(path)
+		(@resolver.nil? ? nil : @resolver.resolve(path))
+	end
+
+	# Render given template string, and then return the result
+	# @template   template string to be rendered
+	#
+	def render(template)
+		ERB.new(template).result(binding)
 	end
 
+	# Render given file, and then save the result back to the file
+	# @file   target file that will be rendered
+	#
 	def render_file(file)
-		render_to_file(File.read(file), file)
+		File.open(file, File::RDWR|File::CREAT) do |f|
+			f.flock(File::LOCK_EX)
+			result = render(f.read)
+			f.rewind
+			f.write(result)
+			f.flush
+			f.truncate(f.pos)
+		end
 	end
 
+	# Render given template string, and then return the result
+	# @template   template string to be rendered
+	# @map        a Hash of accessible variables in the template
+	#
 	def self.render(template, map)
 		if map.is_a?(Hash)
 			renderer = ::Sfp::Template.new(map)
@@ -26,11 +46,10 @@ class Sfp::Template < OpenStruct
 		end
 	end
 
-	def self.render_to_file(template, file, map)
-		renderer = ::Sfp::Template.new(map)
-		renderer.render_to_file(template, file)
-	end
-
+	# Render given file, and then save the result back to the file
+	# @file   target file to be rendered
+	# @map    a Hash of accessible variables in the template
+	#
 	def self.render_file(file, map)
 		renderer = ::Sfp::Template.new(map)
 		renderer.render_file(file)

data/sfpagent.gemspec

@@ -1,22 +1,22 @@
 Gem::Specification.new do |s|
 	s.name			= 'sfpagent'
-	s.version		= File.read(File.join(File.dirname(__FILE__), 'VERSION')).sub(/\n/, '')
-	s.date			= '2013-08-13'
+	s.version		= File.read(File.dirname(__FILE__) + '/VERSION').strip
+	s.date			= File.mtime(File.dirname(__FILE__) + '/VERSION').strftime("%Y-%m-%d")
 	s.summary		= 'SFP Agent'
 	s.description	= 'A Ruby implementation of SFP agent.'
 	s.authors		= ['Herry']
 	s.email			= 'herry13@gmail.com'
 
-	s.executables << 'sfpagent'
+	s.executables   << 'sfpagent'
 	s.files			= `git ls-files`.split("\n").select { |n| !(n =~ /^(modules|test)\/.*/) }
 
 	s.require_paths = ['lib']
-	s.license = 'BSD'
+	s.license       = 'BSD'
 
-	s.homepage		= 'https://github.com/herry13/sfpagent'
+	s.homepage		    = 'https://github.com/herry13/sfpagent'
 	s.rubyforge_project = 'sfpagent'
 
-	s.add_dependency 'sfp', '~> 0.3.16'
+	s.add_dependency 'sfp', '~> 0.3.17'
 
 	s.add_development_dependency 'rake'
 end	

metadata

@@ -1,38 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.3.5
-  prerelease: 
+  version: 0.3.6
 platform: ruby
 authors:
 - Herry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp
-  requirement: &7650780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.16
+        version: 0.3.17
   type: :runtime
   prerelease: false
-  version_requirements: *7650780
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.17
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &6831420 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6831420
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby implementation of SFP agent.
 email: herry13@gmail.com
 executables:
@@ -65,26 +70,25 @@ files:
 homepage: https://github.com/herry13/sfpagent
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sfpagent
-rubygems_version: 1.8.11
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: SFP Agent
 test_files: []