sfpagent 0.1.6 → 0.1.9

data/README.md

@@ -4,20 +4,20 @@ SFP Agent for Ruby
 - [Version](https://github.com/herry13/sfpagent/blob/master/VERSION)
 - License: [BSD License](https://github.com/herry13/sfpagent/blob/master/LICENSE)
 
-A Ruby script and API of an SFP agent. The agent could be accessed through HTTP RESTful API.
+[![Gem Version](https://badge.fury.io/rb/sfpagent.png)](http://badge.fury.io/rb/sfpagent)
 
-With this agent, you could manage a software component such as get the state, install, uninstall, update
-its configuration, etc. Each configuration should be specified in [SFP language](https://github.com/herry13/sfp).
+A Ruby script and library of SFP agent. The agent could be accessed through HTTP RESTful API.
+
+With this agent, you could get the state and deploy configuration of particular software components.
+Each configuration should be specified in [SFP language](https://github.com/herry13/sfp).
 Every software component could have a set of methods which could be called through HTTP request.
 
 
 Requirements
 ------------
 - Ruby (>= 1.8.7)
-- Rubygems
+- Ruby Gems
 	- sfp (>= 0.3.0)
-	- antlr3
-	- json
 
 
 To install
@@ -48,9 +48,9 @@ Cached directory keeps all agent's local data such as:
 - model file
 - installed modules
 
-In default, the agent will use (and created if not exist):
-- directory **~/.sfpagent**, when the daemon is running with non-root user,
-- directory **/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 _cached directory_:
+- **~/.sfpagent**, when the daemon is running with non-root user,
+- **/var/sfpagent**, when the daemon is running with root user.
 
 
 HTTP RESTful API

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.9

data/bin/sfpagent

@@ -18,11 +18,11 @@ EOS
 	opt :stop, "Stop the daemon agent."
 	opt :restart, "Restart the daemon agent."
 	opt :status, "Print the status of the daemon agent."
+	opt :port, "Port number of the daemon agent should listen to.", :short => '-p', :default => Sfp::Agent::DefaultPort
 	opt :state, "Given a model, print the state of all modules. (Note: [model-file] should be specified.)"
 	opt :execute, "Given a model, execute a plan in given file. (Note: [model-file] should be specified.)"
-	opt :pretty, "Print the result in a pretty JSON format."
-	opt :port, "Port number of the daemon agent should listen to.", :default => Sfp::Agent::DefaultPort
-	opt :daemon, "Start the agent as a daemon.", :default => true
+	opt :pretty, "Print the result in a pretty JSON format.", :short => '-r'
+	#opt :daemon, "Start the agent as a daemon.", :default => true
 	opt :ssl, "Set the agent to use HTTPS instead of HTTP.", :default => false
 	opt :certfile, "Certificate file for HTTPS.", :default => ''
 	opt :keyfile, "Private key file for HTTPS.", :default => ''
@@ -40,12 +40,14 @@ model_file = ARGV[0].to_s
 plan_file = ARGV[1].to_s
 
 if opts[:start]
+	opts[:daemon] = true
 	Sfp::Agent.start(opts)
 
 elsif opts[:stop]
 	Sfp::Agent.stop
 
 elsif opts[:restart]
+	opts[:daemon] = true
 	Sfp::Agent.stop
 	Sfp::Agent.start(opts)