sfpagent 0.3.2 → 0.3.3

data/README.md

@@ -17,14 +17,21 @@ Requirements
 ------------
 - Ruby (>= 1.8.7)
 - Ruby Gems
-	- sfp (>= 0.3.0)
+	- sfp
 
 
 To install
 ----------
+- Ruby 1.8.7
 
-	$ apt-get install ruby1.9.1 ruby1.9.1-dev libz-dev libaugeas-ruby1.9.1
-	$ gem install sfpagent
+		$ apt-get install ruby ruby-dev libz-dev libaugeas-ruby
+		$ gem install json
+		$ gem install sfpagent
+
+- Ruby 1.9.x
+
+		$ apt-get install ruby1.9.1 ruby1.9.1-dev libz-dev libaugeas-ruby1.9.1
+		$ gem install sfpagent
 
 
 As daemon

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/sfpagent/module.rb

@@ -4,10 +4,6 @@
 module Sfp::Resource
 	@@resource = Object.new.extend(Sfp::Resource)
 
-	def self.resolve(path)
-		@@resource.resolve(path)
-	end
-
 	attr_accessor :parent, :synchronized
 	attr_reader :state, :model
 
@@ -23,17 +19,26 @@ module Sfp::Resource
 		@state = {}
 	end
 
+	##############################
+	#
+	# Helper methods for resource module
+	#
+	##############################
+
+	def self.resolve(path)
+		@@resource.resolve(path)
+	end
+
+	protected
 	def update_model(model)
 		@model = Sfp.to_ruby(model)
 	end
 
-	def to_model
+	def reset
 		@state = {}
 		@model.each { |k,v| @state[k] = v }
 	end
 
-	alias_method :reset, :to_model
-
 	def resolve(path)
 		Sfp::Agent.resolve(path)
 	end
@@ -44,15 +49,26 @@ module Sfp::Resource
 		Sfp::Agent.resolve_model(path)
 	end
 
-	protected
 	def exec_seq(*commands)
 		commands = [commands.to_s] if not commands.is_a?(Array)
-		commands.each { |c| raise Exception, "Error on executing '#{c}'" if !system(c) }
+		commands.each { |c| raise Exception, "Error on executing '#{c}'" if !shell(c) }
 	end
 
 	def log
 		Sfp::Agent.logger
 	end
+
+	def shell(cmd)
+		!!system(cmd)
+	end
+
+	def copy(source, destination)
+		shell "cp -rf #{source} #{destination}"
+	end
+
+	def render(file, map)
+		::Sfp::Template.render_file(map, file)
+	end
 end
 
 module Sfp::Module

data/lib/sfpagent/templateEngine.rb

@@ -1,7 +1,7 @@
 require 'erb'
 require 'ostruct'
 
-class Sfp::TemplateEngine < OpenStruct
+class Sfp::Template < OpenStruct
 	def render(template)
 		ERB.new(template).result(binding)
 	end
@@ -15,18 +15,18 @@ class Sfp::TemplateEngine < OpenStruct
 		render_to_file(File.read(file), file)
 	end
 
-	def self.render(map, template)
-		renderer = TemplateEngine.new(map)
+	def self.render(template, map)
+		renderer = ::Sfp::Template.new(map)
 		renderer.render(template)
 	end
 
-	def self.render_to_file(map, template, file)
-		renderer = TemplateEngine.new(map)
+	def self.render_to_file(template, file, map)
+		renderer = ::Sfp::Template.new(map)
 		renderer.render_to_file(template, file)
 	end
 
-	def self.render_file(map, file)
-		renderer = TemplateEngine.new(map)
+	def self.render_file(file, map)
+		renderer = ::Sfp::Template.new(map)
 		renderer.render_file(file)
 	end
 end

metadata

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