sfpagent 0.4.0 → 0.4.1

data/README.md

@@ -15,19 +15,19 @@ Every software component could have a set of methods which could be called throu
 
 Requirements
 ------------
-- Ruby (>= 1.8.7)
+- Ruby (>= 1.9.2)
 - Ruby Gems
 	- sfp
 
 
-To install
-----------
-- Ruby 1.8.7
+Tested On
+---------
+- Ruby: 1.9.2, 1.9.3, 2.0.0, JRuby-19mode
+- OS: Ubuntu, Debian, MacOS X
 
-		$ apt-get install ruby ruby-dev libz-dev libaugeas-ruby
-		$ gem install json
-		$ gem install sfpagent
 
+To install
+----------
 - Ruby 1.9.x
 
 		$ apt-get install ruby1.9.1 ruby1.9.1-dev libz-dev libaugeas-ruby1.9.1
@@ -47,32 +47,47 @@ As daemon
 		$ sfpagent -t
 
 
-Cached Directory
+Home Directory
 ----------------
-Cached directory keeps all agent's local data such as:
+Home directory keeps all agent's local data such as:
 - log file
 - PID file
 - model file
 - installed modules
 
-In default, the agent will use (and created if not exist) the following directory as _cached directory_:
-- **~/.sfpagent**, when the daemon is running with non-root user,
-- **/var/sfpagent**, when the daemon is running with root user.
+In default, the agent will use (and created if not exist) the following directory as _home directory_:
+- **~/.sfpagent**, when the daemon is running with non-root user
+- **/var/sfpagent**, when the daemon is running with root user
 
 
 HTTP RESTful API
 ----------------
 - GET
-	- /state : return the state of the agent
-	- /model : return the model of the agent
-	- /modules : return the list of modules
-	- /log : return the last 100 lines of the log file
+	- /pid      : save daemon's PID to a file (only requested from localhost)
+	- /state    : return the current state
+	- /model    : return the current model
+	- /sfp      : return the SFP description of a module
+	- /modules  : return a list of available modules
+	- /agents   : return a list of agents database
+	- /log      : return last 100 lines of log file
 
-- POST
-	- /execute : execute an action as specified in "action" parameter
+- POST	
+	- /execute : receive an action's schema and execute it
 
 - PUT
-	- /model : set/replace the model with given model as specified in "model" parameter
-	- /module : set/replace the module if "module" parameter is specified, or delete the module if the parameter is not exist
-
-
+	- /model          : receive a new model and then save it
+	- /model/cache    : receive a "cache" model and then save it
+	- /modules        : save the module if parameter "module" is provided
+	- /agents         : save the agents' list if parameter "agents" is provided
+	- /bsig           : receive BSig model and receive it in cached directory
+	- /bsig/satisfier : receive goal request from other agents and then start a satisfier thread in order to achieve it
+
+- DELETE
+	- /model            : delete existing model
+	- /model/cache      : delete all cache models
+	- /model/cache/name : delete cache model of agent "name"
+	- /modules          : delete all modules from module database
+	- /modules/name     : delete module "name" from module database
+	- /agents           : delete all agents from agent database
+	- /agents/name      : delete "name" from agent database
+	- /bsig             : delete existing BSig model

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/sfpagent/module.rb

@@ -132,7 +132,7 @@ module Sfp::Resource
 		def use_http_proxy?(uri)
 			ENV['no_proxy'].to_s.split(',').each { |pattern|
 				pattern.chop! if pattern[-1] == '*'
-				return false if uri.hist[0, pattern.length] == pattern
+				return false if uri.host[0, pattern.length] == pattern
 			}
 			true
 		end
@@ -203,6 +203,7 @@ class Sfp::Module::Shell
 		log.info Shellwords.shellescape(JSON.generate(parameters))
 		begin
 			output = `#{@main} #{Shellwords.shellescape(JSON.generate(parameters))}`
+			log.info output
 			JSON.parse(output)
 		rescue Exception => exp
 			log.info "Invalid module output: #{output}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp
-  requirement: &6198020 !ruby/object:Gem::Requirement
+  requirement: &20865400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.17
   type: :runtime
   prerelease: false
-  version_requirements: *6198020
+  version_requirements: *20865400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &6197580 !ruby/object:Gem::Requirement
+  requirement: &20864580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6197580
+  version_requirements: *20864580
 description: A Ruby implementation of SFP agent.
 email: herry13@gmail.com
 executables: