dyn-ruby-launchctl 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7bf1cc2e0dc0245cbdf517893520740041b776c
-  data.tar.gz: b9bcc0fa115cf31ce9718889e61baaa02519f6ac
+  metadata.gz: 6d9b002966c0493456e50e09bab77861905543f5
+  data.tar.gz: 75f2ac70f5bde2226d9830bc0fde4929d487fa4f
 SHA512:
-  metadata.gz: 66b6433dbc685c0d572459e1f407b56178259350e56007f512e1f020b354ffbb32608491f0da836690af468a5d7a189e616c5ab17c86500be7fe56677fb59a23
-  data.tar.gz: 573e6854a43716ee48a2fee670d6747828e2dc7a429006066d9475ed7397c014992687aba2009127a191f7caa68eaab689fe805d146cfd6c333bdd04200f5adf
+  metadata.gz: 84959ec417c27e22d5ecd412ef6e96b7de6ec7bc31f566d34aee2ad2094175d5a816aa44386c88be47434aa1911a2ee8a0ab3336c015788701bd83c81f0aa7e0
+  data.tar.gz: b95b09679e7a2474db6cf45df752463172f6efd6f1ddf50890220c33b95c26b5f8f146278a1a67056296849f97f46b2402773b5361682ad1497a345a63536756

data/bin/dyn-daemon

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 require "fileutils"
-SRV=ARGV[0].strip
-exit! unless ["srv","dyntask","help","path","status"].include? SRV
+SRV=(ARGV[0] || "help").strip
+exit! unless ["srv","dyntask","help","path","status","list"].include? SRV
 CMD={ "srv" => "dyn-srv", "dyntask" => "dyntask-server"}[SRV]
 if CMD
   FileUtils.mkdir_p File.join(ENV["HOME"],"dyndoc","log")
-  DYN_DAEMON_ERR_FILE = File.join(ENV["HOME"],"dyndoc","log","launchctl_")+CMD+".err"
-  DYN_DAEMON_OUT_FILE = File.join(ENV["HOME"],"dyndoc","log","launchctl_")+CMD+".out"
+  DYN_DAEMON_ERR_FILE = File.join(ENV["HOME"],"dyndoc","log","")+CMD+".log"
+  DYN_DAEMON_OUT_FILE = File.join(ENV["HOME"],"dyndoc","log","")+CMD+".out"
 end
 
 unless RUBY_PLATFORM =~ /darwin/
@@ -21,10 +21,11 @@ Service helpers to launch dyn-srv or dyntask service.
 Usage:
 dyn-daemon srv|dyntask new|load       => create when not existing the dyntask service
 dyn-daemon srv|dyntask delete|unload  => unload existing service
-dyn-daemon srv|dyntask start/stop     => start/stop the dyntask service
+dyn-daemon srv|dyntask start/stop     => start/stop the service
 dyn-daemon srv|dyntask log            => to watch log files
 
-dyn-daemon status|list                => status of dyntask service
+dyn-daemon status                     => status of dyntask service
+dyn-daemon list                       => wrapper of 'launchctl list'
 dyn-daemon path get|set               => set PATH env to $PATH
 DOC
 when "path"
@@ -35,8 +36,25 @@ when "path"
   elsif mode=="set"
     `launchctl setenv PATH $PATH`
   end
-when "status", "list"
+when "list"
 	puts `launchctl list | grep dyn`
+when "status"
+  res=["dyn-srv","dyntask-server"].map do |cmd|
+    tmp=`launchctl list | grep #{cmd}`.strip
+    if tmp.empty?
+      "Not loaded"
+    else
+      tmp=tmp.split(" ")
+      if tmp[0]=="-"
+        "Stopped"
+      elsif tmp[1]=="-"
+        "Running"
+      else
+        "Unknown"
+      end
+    end
+  end.join("|")
+  puts res
 else
   dyn_plist=File.expand_path("~/Library/LaunchAgents/#{CMD}.plist")
   mode=ARGV[1]
@@ -75,7 +93,7 @@ else
   	end
   	`launchctl load #{dyn_plist}`
   when "unload","delete"
-  	if File.exists? dyn_srv_plist
+  	if File.exists? dyn_plist
   		`launchctl unload #{dyn_plist}`
   	else
   		puts "Service #{CMD} not available. Create it first: dyn-daemon #{SRV} new"
@@ -87,5 +105,17 @@ else
   	puts File.read(DYN_DAEMON_ERR_FILE)
   	puts "Out:"
   	puts File.read(DYN_DAEMON_OUT_FILE)
+  when "status"
+  	tmp=`launchctl list | grep #{CMD}`.strip
+    if tmp.empty?
+      puts "Not loaded"
+    else
+      tmp=tmp.split(" ")
+      if tmp[0]=="-"
+        puts "Stopped"
+      elsif tmp[1]=="-"
+        puts "Running"
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyn-ruby-launchctl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies: []
 description: |2
     Managing dyn daemon.