sockd 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f68f3a2116561ffd7fc5101c67fda661e884e78a
-  data.tar.gz: 46ebcbfd7636d55685c63b7de5a3afe983cbd6e1
+  metadata.gz: c93b6cac5618173e86c540e2446d38951fe8d850
+  data.tar.gz: 8fec53e267e784fff36b0590f29d229ab2f5cec1
 SHA512:
-  metadata.gz: 0e6b7cc336524b6b8a0a83598be660fd361d53c704c496cec8637f57526c1b48c5fbebd1a3201722874ed45673bfdcd5ff6a4e662c20df7d860a6080721c6be5
-  data.tar.gz: e04246c93263fd5f5571d33ab9ed87237f50c73c2c18cb2c88fe2bd3576926fa907ba183e34390673e1343a64d7b83286f21c20c28796c0fb942246642217d82
+  metadata.gz: a194fe567ce9591b13df3148a7f4f10b388e13bd3c70a95477db1e0f575113b2e5555d7fe1a326a9d2d0402028e930e20da5ee7cb5a0cca437c0d8faa82136bc
+  data.tar.gz: ea83519987f2cffe4798a6e7622cc93304e2c61abf24b4396f3e47a8965ffec6c2e5222ec0ecc73c19da360a8b7a48ea3674786ffb30aa2a1977eaa62dc0e4cc

data/.gitignore

@@ -1,4 +1,5 @@
 /.bundle/
+/.vagrant/
 /.yardoc
 /Gemfile.lock
 /_yardoc/
@@ -7,8 +8,9 @@
 /pkg/
 /spec/reports/
 /tmp/
+Vagrantfile
 *.bundle
 *.so
 *.o
 *.a
-mkmf.log
+mkmf.log

data/README.md

@@ -24,7 +24,7 @@ TODO: Write usage instructions here
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/sockd/fork )
+1. Fork it ( https://github.com/pixelcog/sockd/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/examples/piglatin.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+require 'sockd'
+
+# run a daemon bound to localhost port 23456
+Sockd.run 'piglatin', pid_path: '/tmp/piglatin.pid', port: 23456 do |sockd|
+
+  sockd.options = {
+    port: 12123
+  }
+
+  sockd.handle do |message, socket|
+
+    # translate a message into pig-latin
+    translated = message.chomp.split(' ').map do |str|
+      alpha = ('a'..'z').to_a
+      vowels = %w[a e i o u]
+      consonants = alpha - vowels
+
+      if vowels.include?(str[0])
+        str + 'ay'
+      elsif consonants.include?(str[0]) && consonants.include?(str[1])
+        str[2..-1] + str[0..1] + 'ay'
+      elsif consonants.include?(str[0])
+        str[1..-1] + str[0] + 'ay'
+      else
+        str # return unchanged
+      end
+    end.join(' ')
+
+    # log and return the translation
+    sockd.log "received message: #{message}"
+    sockd.log "returning pig latin: #{translated}"
+    socket.print translated + "\r\n"
+  end
+end

data/lib/sockd/optparse.rb

@@ -18,9 +18,8 @@ module Sockd
         pid_path:  "/var/run/#{safe_name}.pid",
         log_path:  false,
         force:     false,
-        user:      nil,
-        group:     nil,
-        verbose:   false
+        user:      false,
+        group:     false
       }.merge(defaults))
       @callback = block if block_given?
     end
@@ -41,7 +40,7 @@ module Sockd
             #{name} stop [-f]       stop a running daemon
             #{name} restart         stop, then start the daemon
             #{name} send <message>  send a message to a running daemon
-            #{name} <message>       send a message (command implied)
+            #{name} <message>       send a message (send command implied)
 
         Options:
         EOF
@@ -60,7 +59,7 @@ module Sockd
           options[:socket] = nil
         end
 
-        opts.on("-s", "--socket [SOCKET]", String, "Listen on Unix socket path (disables network support)", "(default: #{options[:socket]})") do |x|
+        opts.on("-s", "--socket SOCKET", String, "Listen on Unix socket path (disables network support)", "(default: #{options[:socket]})") do |x|
           options[:socket] = File.expand_path(x)
         end
 
@@ -72,11 +71,11 @@ module Sockd
           options[:log_path] = File.expand_path(x)
         end
 
-        opts.on("-u", "--user USER", String, "Assume the identity of USER when running as a daemon (default: #{options[:user]})") do |x|
+        opts.on("-u", "--user USER", String, "Assume the identity of USER when running as a daemon", "(default: #{options[:user]})") do |x|
           options[:user] = x
         end
 
-        opts.on("-g", "--group GROUP", String, "Assume group GROUP when running as a daemon (default: #{options[:group]})") do |x|
+        opts.on("-g", "--group GROUP", String, "Assume group GROUP when running as a daemon", "(default: #{options[:group]})") do |x|
           options[:group] = x
         end
 

data/lib/sockd/runner.rb

@@ -25,8 +25,8 @@ module Sockd
         :pid_path  => "/var/run/#{safe_name}.pid",
         :log_path  => false,
         :force     => false,
-        :user      => nil,
-        :group     => nil
+        :user      => false,
+        :group     => false
       }.merge(options)
 
       [:setup, :teardown, :handle].each do |opt|
@@ -88,7 +88,7 @@ module Sockd
       if options[:daemonize]
         pid = daemon_running?
         raise ProcError, "#{name} process already running (#{pid})" if pid
-        log "starting #{name} process..."
+        puts "starting #{name} process..."
         return self unless daemonize
       end
 
@@ -111,14 +111,14 @@ module Sockd
       if daemon_running?
         pid = stored_pid
         Process.kill('TERM', pid)
-        log "SIGTERM sent to #{name} (#{pid})"
+        puts "SIGTERM sent to #{name} (#{pid})"
         if !wait_until(2) { daemon_stopped? pid } && options[:force]
           Process.kill('KILL', pid)
-          log "SIGKILL sent to #{name} (#{pid})"
+          puts "SIGKILL sent to #{name} (#{pid})"
         end
         raise ProcError.new("unable to stop #{name} process") if daemon_running?
       else
-        log "#{name} process not running"
+        warn "#{name} process not running"
       end
       self
     end
@@ -148,6 +148,11 @@ module Sockd
       puts response
     end
 
+    # output a timestamped log message
+    def log(message)
+      puts Time.now.strftime('[%d-%b-%Y %H:%M:%S] ') + message
+    end
+
     protected
 
     # run a server loop, passing data off to our handler
@@ -334,9 +339,5 @@ module Sockd
       end
       timer > 0
     end
-
-    def log(message)
-      puts Time.now.strftime('%Y-%m-%d %H:%M:%S: ') + message
-    end
   end
 end

data/lib/sockd/version.rb

@@ -1,3 +1,3 @@
 module Sockd
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/sockd.rb

@@ -17,9 +17,10 @@ module Sockd
 
   # instantiate and run a sockd service using command line arguments
   def self.run(name, options = {}, &block)
-    parser = optparse(name, options)
+    runner = define(name, options, &block)
+    parser = optparse(runner.name, runner.options)
     argv = parser.parse!
-    define(name, options, &block).run(*argv)
+    runner.run(*argv)
   rescue OptionParserError, BadCommandError => e
     warn "Error: #{e.message}"
     warn "#{parser}\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sockd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mike Greiling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,17 +46,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .vagrant/machines/default/virtualbox/action_provision
-- .vagrant/machines/default/virtualbox/action_set_name
-- .vagrant/machines/default/virtualbox/id
-- .vagrant/machines/default/virtualbox/index_uuid
-- .vagrant/machines/default/virtualbox/private_key
-- .vagrant/machines/default/virtualbox/synced_folders
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- Vagrantfile
+- examples/piglatin.rb
 - lib/sockd.rb
 - lib/sockd/errors.rb
 - lib/sockd/optparse.rb

data/.vagrant/machines/default/virtualbox/action_provision

@@ -1 +0,0 @@
-1.5:5b9af9bc-a6a4-4a38-bcee-3dd882a77565

data/.vagrant/machines/default/virtualbox/action_set_name

@@ -1 +0,0 @@
-1426302069

data/.vagrant/machines/default/virtualbox/id

@@ -1 +0,0 @@
-5b9af9bc-a6a4-4a38-bcee-3dd882a77565

data/.vagrant/machines/default/virtualbox/index_uuid

@@ -1 +0,0 @@
-c2db229506d4472b8fb6d1e0d697d20f

data/.vagrant/machines/default/virtualbox/private_key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA7xjuC39O1pFg27/RWTeSTOwaGWqCYka1WpLBRd1nr/2mZw81
-yjBGmWRwkD686TMZR+id5x+4bDTE9VasiZ3OU9EX6thL+8epVPdkBBRaQqluXHzW
-soLZ1sP8GprJkTMEzUJyBPiVEl/feVW55yzTHWAgDUWWrp4qd7VvRmk4e0W25NRF
-69EMMvHMaFneHYJZ9BiDh2w2OAM1ehdyHU4ruWm8UTjwEzpT98fJSsUhBcColtZT
-J7+cN8ksSiaihUlbJjzSS36CWrX5jBXyE4RYCFSEoHzp3vdO756j9bQqfdqMLfS4
-25C2azX6bQehlR3eSxK5CHixgzcWyyb2ZnT5TQIDAQABAoIBAQDB9BwuMXCXuEi1
-Gi5NzDmesqwdT/xCko9M0N19ujQBXKae1YTR5kVu6z4wlOQT3AK3BWkJ8v5csJXR
-WyUNYXjdHzHirOE+dmHTbfexI31wtBa1agOTvXfOsx8Pyd6XLabIhw0NIUV0KVeU
-CsmKUR9UpgR6H6gzMFTM1N5WZMaPn5VatDCv8/1n3wju+7CHClPuPdYfAoNNTPY0
-uIMkMVwguO9EjgNitbzfickQNT37UNyKXyqccVfdyvR7nnrs8QMIUH6Ny+dHwVei
-+mkeOmEK8+vzCz/6XaRkgZ8lp3tKDRgaoUqIIK2zHGoS3YfugkbMhjI8E8NFpXVi
-plNRzYQVAoGBAPyTEsXD/1qVvIibowPzA/kvb1QAzkdosxY2X5O7eYbGWB7bQSvt
-hdp48/EalWOjp0CsUYCmXZRjU7BfIodbvVn87hAS2cc1BHqAgFmrx31jp/qfc4Zc
-iqjJ/dnUto/yw/9ymg6uAc4dWQkzFsUj/gpEFJYuDsjZxCDFEe4DUUiLAoGBAPJX
-EInRvuq6351Yq5YqHSuKhCxDAsF5Us+9dQqglQ5C7T/XuTb3bbgryvKU05FUVTQ4
-zI6cRbDKkamOMK3wFdSX7It6h7VYqnuyb+BB2kx/GYkguI2Gh2jDvu0GS8RmnVOe
-MzAACZW56jBCH8TIo1WyYbgnFsi5br9W/JrABiiHAoGAaaTKsVWttSH0Xd9bbAd1
-ngCtPCGqJkwwvBW6HHzJ9Al6Sk3DELCk0CDPSAWqfqaxCmgJHxp3Ad4Z3yertZo1
-tTIKEUcRODWAzgx5owgqxNOuKzIOjCChDsCOIVLLmaIdQPeaYJF/x8qWtzZbS9Im
-K/0V70sMfA457sr/GOLiWMkCgYBG4tTBm4q+2n7CZcd7G0KBE/lpgQhzU2u3vHFZ
-9HLlQwpm3FEfFO0RLC4nGwVvwz1REzQymt9/wSEueZsfpdSc5PuaKPM9RnxHxoAX
-Fuwl6B+uDtYs/6boLCnS5z6Oan2mkeXjKn+jPkiUaSMlypKMZKtU1IpDmIoeifFF
-ytmCTQKBgHOzJIaY5b/s0mRbBGKYPT7idRWT0a1XVvAsJOTTuYNsbzGpWGcNPr+n
-YmO2cl10W4YntFG3+U7uZYdEIqNK+mc1hs801dKmGdJqeBGwf0N6memJMLRZG+HX
-FI8PY96eiNVJfIjG/tORr443ziJTlWJJf//pOvHEtQE54erC6ocI
------END RSA PRIVATE KEY-----

data/.vagrant/machines/default/virtualbox/synced_folders

@@ -1 +0,0 @@
-{"virtualbox":{"/tmp/vagrant-opsworks":{"guestpath":"/tmp/vagrant-opsworks","hostpath":"/Users/mike/.vagrant.d/boxes/ubuntu1404-opsworks/0/virtualbox","disabled":false},"/vagrant":{"guestpath":"/vagrant","hostpath":"/Users/mike/Projects/sockd","disabled":false}}}

data/Vagrantfile

@@ -1,4 +0,0 @@
-Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu1404-opsworks"
-  config.vm.network "private_network", ip: "10.10.10.11"
-end