hardcode 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94027c695f92dd23d663d2bfc3e682dfb6d96991
-  data.tar.gz: eb31e5343afde8c220ea011744b6ce648779a26c
+  metadata.gz: 91f7b01d422c471ab88fc6c5bf4d576d047082b5
+  data.tar.gz: bc459b0a0b1cc140ad2cdac39ca8f02d5a647713
 SHA512:
-  metadata.gz: acc739903dcf3e44236252fc8472f2ddfa9f7abb35a9f3af0b35b5e98056a17edfacb0c2b8c5176ca624cabd0bb70acfac01e9beb4f70101adbfce5226cac6ef
-  data.tar.gz: dfbc501bfe9717017daf4e386d9eb33bfae9a867d9437feb9a22de7ef8b51291643fcfeafb846e2b0b042e251c582cb70a237936a7972c62a294ec7dc828a6ea
+  metadata.gz: a4cb4f4065e4c06b81e623f9926bd4fe12ea7327d754606e7c5cf2e9091357d01ef2ea4e3c4ff1a14de68c57488ff39eaa5a0d5262b7eeb178abba6813fc03cb
+  data.tar.gz: b6ddc03f544dcbee2968298f0a587dbec37ed0e74a0ed2d42c45feeb397acd59f014a225fc25f430dffc5915b6d97534c6e63eb3c5f84b6a44d8df98ae9fc195

data/README.md

@@ -46,7 +46,8 @@ After=network.target
 After=rabbitmq-server.target
 
 [Service]
-Type=simple
+EnvironmentFile=-/etc/sysconfig/hardcode
+Type=forking
 User=root
 Group=root
 ExecStart=/usr/local/bin/hardcode work

data/lib/hardcode/cli.rb

@@ -83,20 +83,17 @@ module Hardcode
     method_option :debug,
       desc: "Enable debug output",
       type: :boolean
-    method_option :amqp_vhost,
-      desc: "AMQP VHOST",
-      default: ENV['AMQP_VHOST'] ||'/'
     def work
+      vhost = vhost_from_amqp_url(options[:amqp_url])
       Sneakers.configure(
         amqp: options[:amqp_url],
-        vhost: options[:amqp_vhost],
+        vhost: vhost,
         daemonize: false,
         log: STDOUT,
         metrics: Sneakers::Metrics::LoggingMetrics.new
       )
       Sneakers.logger.level = options[:debug] ? Logger::DEBUG : Logger::INFO
-      r = Sneakers::Runner.new([ Hardcode::Worker ])
-      r.run
+      Sneakers::Runner.new([ Hardcode::Worker ]).run
     end
 
     desc "watch DIR", "Watch a source directory for new files, moves the files to tmp and enqueues transcoding jobs to rabbitmq"
@@ -135,5 +132,13 @@ module Hardcode
       sleep
     end
 
+    no_commands do
+      def vhost_from_amqp_url(url)
+        match = url.match(/^amqp:\/\/.+\/(\/|%2f)(.+)$/) rescue []
+        vhost = match && match.size >= 3 ? match[2] : ''
+        vhost = "/#{vhost}"
+      end
+    end
+
   end # class
 end # module

data/lib/hardcode/version.rb

@@ -1,3 +1,3 @@
 module Hardcode
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hardcode
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - niwo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor