sfpagent 0.3.4 → 0.3.5

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/lib/sfpagent/agent.rb

@@ -392,9 +392,10 @@ module Sfp
 		# @param action contains the action's schema.
 		#
 		def self.execute_action(action)
-			logger = (@@config[:daemon] ? Sfp::Agent.logger : Logger.new(STDOUT))
-			action_string = "#{action['name']} #{JSON.generate(action['parameters'])}"
 			begin
+				logger = (@@config[:daemon] ? Sfp::Agent.logger : Logger.new(STDOUT))
+				action_string = "#{action['name']} #{JSON.generate(action['parameters'])}"
+				logger.info "Executing #{action_string} [Wait]"
 				result = @@runtime.execute_action(action)
 				logger.info "Executing #{action_string} " + (result ? "[OK]" : "[Failed]")
 				return result

data/lib/sfpagent/module.rb

@@ -66,8 +66,10 @@ module Sfp::Resource
 		shell "cp -rf #{source} #{destination}"
 	end
 
-	def render(file, map)
-		::Sfp::Template.render_file(file, map)
+	def render(file, map={})
+		model = @model.clone
+		map.each { |k,v| model[k] = v }
+		::Sfp::Template.render_file(file, model)
 	end
 end
 

data/lib/sfpagent/template.rb

@@ -16,8 +16,14 @@ class Sfp::Template < OpenStruct
 	end
 
 	def self.render(template, map)
-		renderer = ::Sfp::Template.new(map)
-		renderer.render(template)
+		if map.is_a?(Hash)
+			renderer = ::Sfp::Template.new(map)
+			renderer.render(template)
+		elsif map.is_a?(OpenStruct)
+			ERB.new(template).result(map.instance_eval { binding })
+		else
+			raise Exception, 'A Hash or OpenStruct is required!'
+		end
 	end
 
 	def self.render_to_file(template, file, map)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.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: &18546300 !ruby/object:Gem::Requirement
+  requirement: &7650780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.16
   type: :runtime
   prerelease: false
-  version_requirements: *18546300
+  version_requirements: *7650780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17727260 !ruby/object:Gem::Requirement
+  requirement: &6831420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17727260
+  version_requirements: *6831420
 description: A Ruby implementation of SFP agent.
 email: herry13@gmail.com
 executables: