sockd 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eac67e5bf5c221e1246054c67fe114d0e1ce125
-  data.tar.gz: cd0fca78d6544e1b4badca98c291313bb2c3955f
+  metadata.gz: 22b8a9ad90fe47dae69da26ef9d88774529e9b9a
+  data.tar.gz: c94d37f82af935bad426c91209b2cb7258cbdeed
 SHA512:
-  metadata.gz: 4dee986312d3761ef7854df1a6f6937ddf3d3a9a086969ea056ec396334d4fb4f4c7e32bcbc3f94c174e019da22d83cc5e32a0232a40dd21797abfeaa9b2652b
-  data.tar.gz: 92af3f8162ba59946f266c01198c3b4fd08814a4fbba27d1b465989a57b3f1d3f80fbfa19ddfe4f4d6ffd15f4734d07e1916b6ab172f21d315b551e2f21a8bf0
+  metadata.gz: 2bd29d45c860985129b625157fc66993f6c88952568d81cfafc1027a08bcaf1b93dc39e8db011a8f516600e737d89f92bc20b77c0e9f660e0792b80f5eb52d4d
+  data.tar.gz: 2170f73f868f664ccb9671cea2ffeabbbacb5532fe49cff3e0495113323374f74fbc70c04653107f996769a79380c4dd60bad848799417266b9884a431d61d53

data/lib/sockd.rb

@@ -31,7 +31,7 @@ module Sockd
         raise ParseError, 'no config file path specified, unable to save' unless save_path
         save_yaml options, save_path
 
-        puts "config saved to: #{path}"
+        puts "config saved to: #{save_path}"
         exit
       end
 
@@ -154,7 +154,7 @@ module Sockd
 
     def read_yaml(options, path)
       config = YAML.load_file(path).merge!(options)
-      options.replace(config)
+      options.replace Hash[config.map{ |k, v| [k.to_sym, v] }]
     rescue Errno::EACCES, Errno::EISDIR => e
       raise ConfigFileError, "unable to read config (#{e.message})"
     end

data/lib/sockd/runner.rb

@@ -134,6 +134,8 @@ module Sockd
         warn "#{name} process not running"
       end
       self
+    rescue Errno::EPERM => e
+      raise ServiceError, "unable to stop #{name} process (#{e.message})"
     end
 
     # restart our service
@@ -195,9 +197,9 @@ module Sockd
       ensure
         server.close
       end
-    rescue Errno::EACCES
+    rescue Errno::EACCES, Errno::EADDRINUSE => e
       sock = options[:socket] || "#{options[:host]}:#{options[:port]}"
-      raise ServiceError, "unable to open socket: #{sock} (check permissions)"
+      raise ServiceError, "unable to open socket: #{sock} (#{e.message})"
     end
 
     # return a UNIXSocket or TCPSocket instance depending on config
@@ -260,6 +262,8 @@ module Sockd
       pid
     rescue Errno::ESRCH
       false
+    rescue Errno::EPERM
+      pid
     end
 
     # reverse of daemon_running?

data/lib/sockd/version.rb

@@ -1,3 +1,3 @@
 module Sockd
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sockd
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Mike Greiling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler