sfpagent 0.3.6 → 0.3.7

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/bin/sfpagent

@@ -39,8 +39,12 @@ model_file = ARGV[0].to_s
 plan_file = ARGV[1].to_s
 
 if opts[:start]
-	opts[:daemon] = true
-	Sfp::Agent.start(opts)
+	if not Sfp::Agent.pid.nil?
+		puts "Agent is already running with PID #{Sfp::Agent.pid}"
+	else
+		opts[:daemon] = true
+		Sfp::Agent.start(opts)
+	end
 
 elsif opts[:stop]
 	Sfp::Agent.stop(opts)

data/lib/sfpagent/agent.rb

@@ -13,7 +13,7 @@ module Sfp
 	module Agent
 		NetHelper = Object.new.extend(Sfp::Helper::Net)
 
-		CacheDir = (Process.euid == 0 ? '/var/sfpagent' : File.expand_path('~/.sfpagent'))
+		CacheDir = (Process.euid == 0 ? '/var/sfpagent' : File.expand_path(Dir.home + '/.sfpagent'))
 		Dir.mkdir(CacheDir, 0700) if not File.exist?(CacheDir)
 
 		DefaultPort = 1314
@@ -69,8 +69,8 @@ module Sfp
 		#	:keyfile  => key file path for HTTPS
 		#
 		def self.start(opts={})
-			Sfp::Agent.logger.info "Starting SFP Agent daemons..."
-			puts "Starting SFP Agent daemons..."
+			Sfp::Agent.logger.info "Starting agent..."
+			puts "Starting agent..."
 
 			@@config = opts
 
@@ -133,6 +133,7 @@ module Sfp
 
 			rescue Exception => e
 				Sfp::Agent.logger.error "Starting the agent [Failed] #{e}\n#{e.backtrace.join("\n")}"
+
 				raise e
 			end
 		end
@@ -142,41 +143,49 @@ module Sfp
 		def self.stop(opts={})
 			begin
 				pid = File.read(PIDFile).to_i
-				puts "Stopping SFP Agent with PID #{pid}..."
+				puts "Stopping agent with PID #{pid}..."
 				Process.kill 'HUP', pid
 
 				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
+						Sfp::Agent.logger.info "Agent is still running."
+						puts "Agent is still running."
+
+						Sfp::Agent.logger.info "Killing agent."
+						puts "Killing agent."
+						Process.kill 9, pid
 					rescue
-						Sfp::Agent.logger.info "SFP Agent daemon has stopped."
-						puts "SFP Agent daemon has stopped."
+						Sfp::Agent.logger.info "Agent has stopped."
+						puts "Agent has stopped."
 						File.delete(PIDFile) if File.exist?(PIDFile)
 					end
 				end
 
 			rescue
-				puts "SFP Agent is not running."
+				puts "Agent is not running."
 				File.delete(PIDFile) if File.exist?(PIDFile)
 			end
-
-			true
 		end
 
-		# Print the status of the agent.
-		#
-		def self.status
+		def self.pid
 			begin
 				pid = File.read(PIDFile).to_i
-				Process.kill 0, pid
-				puts "SFP Agent is running with PID #{pid}"
+				return pid if Process.kill 0, pid
 			rescue
-				puts "SFP Agent is not running."
-				File.delete(PIDFile) if File.exist?(PIDFile)
+			end
+			nil
+		end
+
+		# Return agent's PID if it is running, otherwise nil.
+		#
+		def self.status
+			if pid.nil?
+				puts "Agent is not running."
+			else
+				puts "Agent is running with PID #{pid}"
 			end
 		end
 

data/lib/sfpagent/bsig.rb

@@ -7,7 +7,7 @@ class Sfp::BSig
 	MaxTries = 5
 
 	SatisfierPath = '/bsig/satisfier'
-	CacheDir = (Process.euid == 0 ? '/var/sfpagent' : File.expand_path('~/.sfpagent'))
+	CacheDir = (Process.euid == 0 ? '/var/sfpagent' : File.expand_path(Dir.home + '/.sfpagent'))
 	SatisfierLockFile = "#{CacheDir}/bsig.satisfier.lock.#{Time.now.to_i}"
 
 	attr_reader :enabled, :status, :mode

data/lib/sfpagent/module.rb

@@ -58,7 +58,7 @@ module Sfp::Resource
 	def render(string, map={})
 		model = @model.clone
 		map.each { |k,v| model[k] = v }
-		::Sfp::Template.render_file(file, model)
+		::Sfp::Template.render(file, model)
 	end
 
 	def render_file(file, map={})

data/lib/sfpagent/template.rb

@@ -2,14 +2,6 @@ require 'erb'
 require 'ostruct'
 
 class Sfp::Template < OpenStruct
-	def initialize(resolver=nil)
-		@resolver = resolver
-	end
-
-	def resolve(path)
-		(@resolver.nil? ? nil : @resolver.resolve(path))
-	end
-
 	# Render given template string, and then return the result
 	# @template   template string to be rendered
 	#

metadata

@@ -1,43 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
+  prerelease: 
 platform: ruby
 authors:
 - Herry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &12384860 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.17
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.17
+  version_requirements: *12384860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &12384420 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *12384420
 description: A Ruby implementation of SFP agent.
 email: herry13@gmail.com
 executables:
@@ -70,25 +65,26 @@ files:
 homepage: https://github.com/herry13/sfpagent
 licenses:
 - BSD
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sfpagent
-rubygems_version: 2.1.10
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: SFP Agent
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: fe2ede39bf427923db9d74e08feb35a2f73804d2
-  data.tar.gz: 57b4f30d742a9850c04db2b2cde793ce6e8ac744
-SHA512:
-  metadata.gz: a441bf2082df51400315fb8146b6b115c0df4defd57353e7487d5f1131618d4e6f95c00318717a652869d38f7c5291a5e88c0f3c20796ac95c469e8f6f443bc3
-  data.tar.gz: ea2716ccce08b9672b6ab5c5a40f36c6be0a200652304b874d1925840aeee1b186b9a672983695cff590feeb36b2cfb6e5320aca947ec09f4ed970af1bed7fec