sfpagent 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/sfpagent/bsig.rb

@@ -133,7 +133,7 @@ class Sfp::BSig
 	def achieve_local_goal(id, goal, operators, pi, mode)
 		current = get_current_state
 		flaws = compute_flaws(goal, current)
-		Sfp::Agent.logger.info "[#{mode}] flaws: #{flaws.inspect}"
+		#Sfp::Agent.logger.info "[#{mode}] flaws: #{flaws.inspect}"
 
 		return :no_flaw if flaws.length <= 0
 		

data/lib/sfpagent/helper.rb

@@ -1,4 +1,28 @@
+module Sfp
+	def self.to_ruby(object)
+		object = Sfp::Helper.deep_clone(object)
+		object.accept(Sfp::Helper::Sfp2Ruby)
+		object
+	end
+end
+
 module Sfp::Helper
+	Sfp2Ruby = Object.new
+	def Sfp2Ruby.visit(name, value, parent)
+		if name[0] == '_'
+			parent.delete(name)
+		elsif value.is_a?(Hash)
+			case value['_context']
+			when 'null'
+				parent[name] = nil
+			when 'any_value', 'constraint', 'procedure'
+				parent.delete(name)
+			when 'set'
+				parent[name] = value['_values']
+			end
+		end
+		true
+	end
 end
 
 module Sfp::Helper::Net

data/lib/sfpagent/module.rb

@@ -24,7 +24,7 @@ module Sfp::Resource
 	end
 
 	def update_model(model)
-		model.each { |k,v| @model[k] = v }
+		@model = Sfp.to_ruby(model)
 	end
 
 	def to_model
@@ -47,23 +47,12 @@ module Sfp::Resource
 	protected
 	def exec_seq(*commands)
 		commands = [commands.to_s] if not commands.is_a?(Array)
-		commands.each { |c| raise Exception, "Cannot execute: #{c}" if !system(c) }
+		commands.each { |c| raise Exception, "Error on executing '#{c}'" if !system(c) }
 	end
 
 	def log
 		Sfp::Agent.logger
 	end
-
-	# copy source file to destination
-	# if source is an HTTP/HTTPS/FTP url, then use 'wget' to download the file
-	#
-	def copy(source, destination)
-		if source =~ /^(http|https|ftp):\/\/.+/
-			system "wget -O #{destination} #{source}"
-		else
-			system "cp #{source} #{destination}"
-		end
-	end
 end
 
 module Sfp::Module

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   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: &9972640 !ruby/object:Gem::Requirement
+  requirement: &10379460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.3.16
   type: :runtime
   prerelease: false
-  version_requirements: *9972640
+  version_requirements: *10379460
 description: A Ruby implementation of SFP agent.
 email: herry13@gmail.com
 executables: