rork 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7eacb09d72f31f9327a6e786cdb651cf3ab99c8
-  data.tar.gz: c142b8c488861893a3219e377e56e244bedf80c3
+  metadata.gz: cdad2aad4fc9aca53fbc6619b7c5c3a3e914981a
+  data.tar.gz: 40b76f3d98f26464851765723a727b4f5998ce94
 SHA512:
-  metadata.gz: 478bf81286d188da8902f5237602a103a0127b785464760bcc8e2185aa8f183d0e9b89479b41e964157ca103319f8fd220f4794f555b64e6140a7157db42b482
-  data.tar.gz: add361aa7fa173370eab77826a81aa36eb6f066761352104866b1074e7fa8082cc38fd3f6af83de438f00f79fbfe405c182d51d963e1cd33d24a64ef90d81441
+  metadata.gz: 455e44f3b6cc920626391e9de2e0a25cc1d84afb749a73f4d21bd3123bc1a70efa2c2ce0b067d852b923e66378233c6360818851291d3263f965a5475b7db793
+  data.tar.gz: fde646b547ed0df780c6f8b072c238c65c7af0675af9b009cac21f42fa89a634bc1125d99d5c8a07751c2847c0a5453a05f9d3cd24b4a483d73f146adc52fa14

data/bin/rork

@@ -4,7 +4,7 @@ require 'rork'
 
 begin
 	Parser.parse
-	Controller.run ARGV[0]
+	Controller.run ARGV[0], ARGV[1..-1]
 rescue Exception => e
 	puts e.to_s
 end

data/lib/rork/controller.rb

@@ -1,47 +1,44 @@
 module Controller
-	private
-
-	def self.module_attr *names
-		names.each do |name|
-			instance_eval %{
-				def #{name}
-					@#{name}
-				end
-
-				def #{name}= arg
-					@#{name} = arg
-				end
-			}
+	class Application
+		attr_accessor :pid, :log, :err, :cmd
+
+		def initialize
+			@err = @log = '/dev/null'
 		end
 	end
 
-	public
-
 	module_function
 
-	@err = @log = '/dev/null'
-
-	module_attr :pid, :log, :err, :cmd
+	@apps = Hash.new
+	def [] key
+		@apps[key] = Application.new unless @apps.key? key
+		@apps[key]
+	end
 
-	def start
+	def start args = []
 		begin
-			puts 'Starting daemon'
+			args[0] = 'default' if args[0].nil?
+			@app = @apps[args[0]]
+			raise "Daemon #{args[0]} not found!" if @app.nil?
 
-			raise 'Daemon already running!' if File.exist? @pid
+			puts "Starting daemon #{args[0]}..."
+			raise "Pid file must be given for #{args[0]}!" if @app.pid.nil?
+			raise "Command must be given for #{args[0]}!" if @app.cmd.nil?
+			raise "Daemon #{args[0]} already running!" if File.exist? @app.pid
 
 			id = Process.fork do
 				Process.setsid
 				STDIN.reopen '/dev/null', 'r'
-				STDOUT.reopen @log, 'a'
-				STDERR.reopen @err, 'a'
+				STDOUT.reopen @app.log, 'a'
+				STDERR.reopen @app.err, 'a'
 				STDOUT.sync = true
 				STDERR.sync = true
-				exec @cmd
+				exec @app.cmd
 			end
 
 			raise 'Fork failed!' if id.nil?
 
-			File.open @pid, 'w' do |file|
+			File.open @app.pid, 'w' do |file|
 				file << id
 			end
 		rescue Exception => e
@@ -53,17 +50,22 @@ module Controller
 		puts '[Success]'
 	end
 
-	def stop
+	def stop args = []
 		begin
-			puts 'Stopping daemon'
+			args[0] = 'default' if args[0].nil?
+			@app = @apps[args[0]]
+			raise "Daemon #{args[0]} not found!" if @app.nil?
 
-			raise 'Daemon not running!' unless File.exist? @pid
+			puts "Stopping daemon #{args[0]}..."
+			raise "Pid file must be given for #{args[0]}!" if @app.pid.nil?
+			raise "Daemon #{args[0]}not running!" unless File.exist? @app.pid
 
-			id = File.read @pid
+			id = File.read @app.pid
+			id = id.to_i
 
-			Process.kill 'TERM', id.to_i
+			Process.kill 'TERM', id
 
-			File.delete @pid
+			File.delete @app.pid
 		rescue Exception => e
 			puts '[Failed]'
 			puts e.to_s
@@ -73,7 +75,7 @@ module Controller
 		puts '[Success]'
 	end
 
-	def run cmd
+	def run cmd, args = []
 		cmds = {
 			'start' => :start,
 			'stop' => :stop
@@ -81,6 +83,6 @@ module Controller
 
 		raise "Unknown command #{cmd}" if cmds[cmd].nil?
 
-		send cmds[cmd]
+		send cmds[cmd], args
 	end
 end

data/lib/rork/parser.rb

@@ -3,19 +3,25 @@ module Parser
 		module_function
 		
 		def pid path
-			Controller.pid = path
+			@app.pid = path
 		end
 
 		def log path
-			Controller.log = path
+			@app.log = path
 		end
 
 		def err path
-			Controller.err = path
+			@app.err = path
 		end
 
 		def run cmd
-			Controller.cmd = cmd
+			@app.cmd = cmd
+		end
+
+		def app name = 'default'
+			@app = Controller[name.to_s]
+			yield
+			@app = Controller['default']
 		end
 	end
 
@@ -24,6 +30,8 @@ module Parser
 	def parse
 		raise 'Forkfile not found' unless File.exist? 'Forkfile'
 		forkfile = File.read 'Forkfile'
-		Inside.instance_eval forkfile
+		Inside.app do
+			Inside.instance_eval forkfile
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rork
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - gyf1214
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies: []
 description: Run applications as daemon with ruby.
 email: gyf1214@gmail.com