sfpagent 0.3.1 → 0.3.2

data/.travis.yml

@@ -0,0 +1,31 @@
+language: ruby
+
+gemfile:
+  - Gemfile
+  - Gemfile.1.8.7
+
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - jruby-18mode
+  - jruby-19mode
+
+matrix:
+  exclude:
+    - rvm: 1.8.7
+      gemfile: Gemfile
+    - rvm: 1.9.2
+      gemfile: Gemfile.1.8.7
+    - rvm: 1.9.3
+      gemfile: Gemfile.1.8.7
+    - rvm: 2.0.0
+      gemfile: Gemfile.1.8.7
+    - rvm: jruby-18mode
+      gemfile: Gemfile
+    - rvm: jruby-19mode
+      gemfile: Gemfile.1.8.7
+
+notification:
+  - email: false

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/Gemfile.1.8.7

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'json', '~>1.8.1'
+
+gemspec

data/README.md

@@ -1,9 +1,9 @@
 SFP Agent for Ruby
 ==================
 - Author: Herry (herry13@gmail.com)
-- [Version](https://github.com/herry13/sfpagent/blob/master/VERSION)
 - License: [BSD License](https://github.com/herry13/sfpagent/blob/master/LICENSE)
 
+[![Build Status](https://travis-ci.org/herry13/sfpagent.png?branch=master)](https://travis-ci.org/herry13/sfpagent)
 [![Gem Version](https://badge.fury.io/rb/sfpagent.png)](http://badge.fury.io/rb/sfpagent)
 
 A Ruby script and library of SFP agent. The agent could be accessed through HTTP RESTful API.

data/Rakefile

@@ -0,0 +1,21 @@
+def name
+        @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+def version
+        File.read('VERSION').strip
+end
+
+def date
+        Date.today.to_s
+end
+
+def test_script
+	File.dirname(__FILE__) + '/bin/test'
+end
+
+task :default => :test
+
+namespace :test do
+	sh(test_script)
+end

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/bin/sfpagent

@@ -1,10 +1,13 @@
 #!/usr/bin/env ruby
 
-dir = File.expand_path(File.dirname(__FILE__))
-require "#{dir}/../lib/sfpagent"
+require File.dirname(__FILE__) + '/../lib/sfpagent'
+
+def version?
+	File.read(File.dirname(__FILE__) + '/../VERSION').strip
+end
 
 opts = Trollop::options do
-	version "sfpagent " + File.read("#{dir}/../VERSION").sub(/\n/, '') + " (c) 2013 Herry"
+	version "sfpagent #{version?} (c) 2013 Herry"
 	banner <<-EOS
 SFP Agent that provides a Ruby framework for managing system configurations. The configurations are modelled in SFP language.
 
@@ -19,10 +22,6 @@ EOS
 	opt :restart, "Restart the daemon agent.", :short => '-r'
 	opt :status, "Print the status of the daemon agent.", :short => '-a'
 	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.", :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 => ''
@@ -44,7 +43,7 @@ if opts[:start]
 	Sfp::Agent.start(opts)
 
 elsif opts[:stop]
-	Sfp::Agent.stop
+	Sfp::Agent.stop(opts)
 
 elsif opts[:restart]
 	opts[:daemon] = true

data/bin/test

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../lib/sfpagent'
+
+opts = {
+	:daemon => false,
+	:port => Sfp::Agent::DefaultPort,
+	:certfile => '',
+	:keyfile => '',
+	:modules_dir => '',
+	:mock => true
+}
+
+### start agent as non-daemon process
+Sfp::Agent.start(opts)
+
+### get agent's status
+Sfp::Agent.status
+
+### generate agent's current state
+Sfp::Agent.get_state
+
+### stop agent
+Sfp::Agent.stop(opts)

data/lib/sfpagent/agent.rb

@@ -27,7 +27,7 @@ module Sfp
 
 		BSigFile = "#{CacheDir}/bsig.model"
 		BSigPIDFile = "#{CacheDir}/bsig.pid"
-		BSigThreadsLockFile = "#{CacheDir}/bsig.threads.lock.#{Time.now.nsec}"
+		BSigThreadsLockFile = "#{CacheDir}/bsig.threads.lock.#{Time.now.to_i}"
 
 		@@logger = WEBrick::Log.new(LogFile, WEBrick::BasicLog::INFO ||
 		                                     WEBrick::BasicLog::ERROR ||
@@ -68,45 +68,51 @@ module Sfp
 		#	:certfile => certificate file path for HTTPS
 		#	:keyfile  => key file path for HTTPS
 		#
-		def self.start(p={})
+		def self.start(opts={})
 			Sfp::Agent.logger.info "Starting SFP Agent daemons..."
 			puts "Starting SFP Agent daemons..."
 
-			Process.daemon if p[:daemon]
+			@@config = opts
+
+			Process.daemon if opts[:daemon] and not opts[:mock]
 
 			begin
 				# check modules directory, and create it if it's not exist
-				p[:modules_dir] = File.expand_path(p[:modules_dir].to_s.strip != '' ? p[:modules_dir].to_s : "#{CacheDir}/modules")
-				Dir.mkdir(p[:modules_dir], 0700) if not File.exist?(p[:modules_dir])
-				@@config = p
+				opts[:modules_dir] = File.expand_path(opts[:modules_dir].to_s.strip != '' ? opts[:modules_dir].to_s : "#{CacheDir}/modules")
+				Dir.mkdir(opts[:modules_dir], 0700) if not File.exist?(opts[:modules_dir])
 
 				# load modules from cached directory
-				load_modules(p)
+				load_modules(opts)
 
 				# reload model
 				update_model({:rebuild => true})
 
 				# create web server
 				server_type = WEBrick::SimpleServer
-				port = (p[:port] ? p[:port] : DefaultPort)
+				port = (opts[:port] ? opts[:port] : DefaultPort)
 				config = { :Host => '0.0.0.0',
 				           :Port => port,
 				           :ServerType => server_type,
 				           :pid => '/tmp/webrick.pid',
 				           :Logger => Sfp::Agent.logger }
-				if p[:ssl]
+				if opts[:ssl]
 					config[:SSLEnable] = true
 					config[:SSLVerifyClient] = OpenSSL::SSL::VERIFY_NONE
-					config[:SSLCertificate] = OpenSSL::X509::Certificate.new(File.open(p[:certfile]).read)
-					config[:SSLPrivateKey] = OpenSSL::PKey::RSA.new(File.open(p[:keyfile]).read)
+					config[:SSLCertificate] = OpenSSL::X509::Certificate.new(File.open(opts[:certfile]).read)
+					config[:SSLPrivateKey] = OpenSSL::PKey::RSA.new(File.open(opts[:keyfile]).read)
 					config[:SSLCertName] = [["CN", WEBrick::Utils::getservername]]
 				end
 				server = WEBrick::HTTPServer.new(config)
 				server.mount("/", Sfp::Agent::Handler, Sfp::Agent.logger)
 
+				# create maintenance object
+				maintenance = Maintenance.new(opts)
+
 				# trap signal
 				['INT', 'KILL', 'HUP'].each { |signal|
 					trap(signal) {
+						maintenance.stop
+
 						Sfp::Agent.logger.info "Shutting down web server and BSig engine..."
 						bsig_engine.stop
 						loop do
@@ -121,7 +127,9 @@ module Sfp
 
 				bsig_engine.start
 
-				server.start
+				maintenance.start
+
+				server.start if not opts[:mock]
 
 			rescue Exception => e
 				Sfp::Agent.logger.error "Starting the agent [Failed] #{e}\n#{e.backtrace.join("\n")}"
@@ -131,23 +139,26 @@ module Sfp
 
 		# Stop the agent's daemon.
 		#
-		def self.stop
+		def self.stop(opts={})
 			begin
 				pid = File.read(PIDFile).to_i
 				puts "Stopping SFP Agent with PID #{pid}..."
 				Process.kill 'HUP', pid
 
-				begin
-					sleep (Sfp::BSig::SleepTime + 0.25)
-					Process.kill 0, pid
-					Sfp::Agent.logger.info "SFP Agent daemon is still running."
-					puts "SFP Agent daemon is still running."
-					return false
-				rescue
-					Sfp::Agent.logger.info "SFP Agent daemon has stopped."
-					puts "SFP Agent daemon has stopped."
-					File.delete(PIDFile) if File.exist?(PIDFile)
+				if not opts[:mock]
+					begin
+						sleep (Sfp::BSig::SleepTime + 0.25)
+						Process.kill 0, pid
+						Sfp::Agent.logger.info "SFP Agent daemon is still running."
+						puts "SFP Agent daemon is still running."
+						return false
+					rescue
+						Sfp::Agent.logger.info "SFP Agent daemon has stopped."
+						puts "SFP Agent daemon has stopped."
+						File.delete(PIDFile) if File.exist?(PIDFile)
+					end
 				end
+
 			rescue
 				puts "SFP Agent is not running."
 				File.delete(PIDFile) if File.exist?(PIDFile)
@@ -616,6 +627,24 @@ module Sfp
 			@@agents_database = JSON[File.read(AgentsDataFile)]
 		end
 
+		class Maintenance
+			IntervalTime = 600 # 10 minutes
+
+			def initialize(opts={})
+				@opts = opts
+			end
+
+			def start
+				return if not defined?(@@enabled) or @@enabled
+				@@enabled = true
+				# TODO
+			end
+
+			def stop
+				@@enabled = false
+			end
+		end
+
 		# A class that handles HTTP request.
 		#
 		class Handler < WEBrick::HTTPServlet::AbstractServlet

data/lib/sfpagent/bsig.rb

@@ -8,7 +8,7 @@ class Sfp::BSig
 
 	SatisfierPath = '/bsig/satisfier'
 	CacheDir = (Process.euid == 0 ? '/var/sfpagent' : File.expand_path('~/.sfpagent'))
-	SatisfierLockFile = "#{CacheDir}/bsig.satisfier.lock.#{Time.now.nsec}"
+	SatisfierLockFile = "#{CacheDir}/bsig.satisfier.lock.#{Time.now.to_i}"
 
 	attr_reader :enabled, :status, :mode
 
@@ -331,7 +331,7 @@ class Sfp::BSig
 		agent_goal
 	end
 
-	def send_goal_to_agent(agent, id, goal, pi, agent_name='', mode)
+	def send_goal_to_agent(agent, id, goal, pi, agent_name, mode)
 		begin
 			data = {
 				'id' => id,

data/lib/sfpagent/sfplanner.rb

@@ -58,7 +58,7 @@ class Planner
 
 	def to_image(p={})
 		def self.dot2image(dot, image_file)
-			dot_file = "/tmp/#{Time.now.getutc.to_i}.dot"
+			dot_file = "/tmp/#{Time.now.to_i}.dot"
 			File.open(dot_file, 'w') { |f|
 				f.write(dot)
 				f.flush

data/sfpagent.gemspec

@@ -17,4 +17,6 @@ Gem::Specification.new do |s|
 	s.rubyforge_project = 'sfpagent'
 
 	s.add_dependency 'sfp', '~> 0.3.16'
+
+	s.add_development_dependency 'rake'
 end	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   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: &10379460 !ruby/object:Gem::Requirement
+  requirement: &6888980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,18 @@ dependencies:
         version: 0.3.16
   type: :runtime
   prerelease: false
-  version_requirements: *10379460
+  version_requirements: *6888980
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &6069840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *6069840
 description: A Ruby implementation of SFP agent.
 email: herry13@gmail.com
 executables:
@@ -30,13 +41,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- Gemfile
+- Gemfile.1.8.7
 - LICENSE
 - README.md
+- Rakefile
 - VERSION
 - bin/cert.rb
 - bin/init_script
 - bin/install_module
 - bin/sfpagent
+- bin/test
 - lib/sfpagent.rb
 - lib/sfpagent/agent.rb
 - lib/sfpagent/bsig.rb