constable 0.0.1 → 0.1.0

data/README.md

@@ -13,7 +13,7 @@ Installing
 
 The server needs ImageMagick installed. Mostly I do this using `apt-get`:
 
-    apt-get isntall imagemagick
+    apt-get install imagemagick
 
 You'll need a broker that talks Stomp somewhere on your network. I use Apache
 Apollo, and I'm not totally sure if the code uses anything that's specific to
@@ -24,14 +24,14 @@ bring this closer to reality please send them to me!
 Usage
 -----
 
-ImageMagick provides a huge nubmer of commands and options. Supporting them
+ImageMagick provides a huge number of commands and options. Supporting them
 all is a big task, so I'm implementing just the few that I use. If you need
 something else supported, please do fork and patch the project. Let me know
 and I'll pull your changes.
 
 Run the server, somewhere that has ImageMagick installed:
 
-    constabled --broker stomp://mq.yourdomain.com:61613
+    constabled --broker=stomp://mq.yourdomain.com:61613
 
 Use the services on the command line. You don't need ot have ImageMagick
 installed on your client machines, just constable.
@@ -49,7 +49,7 @@ Constable (and I have no plans to handle it).
 A brief example of what interacting with Constable looks like, here
 identifying some image file I had lying around on disk:
 
-    $ cat input_file | constable-identify --broker stomp://mq.yourdomain.com:61613
+    $ cat input_file | constable-identify --broker=stomp://mq.yourdomain.com:61613
     constabled-164829495-102948483-1939485.jpg JPEG 640x480 DirectClass 87kb 0.050u 0:01
 
 I explicitly state the broker in the above commands but if you leave out that

data/bin/constable-identify

@@ -11,9 +11,19 @@ encoded_input = Base64.encode64 image
 
 require 'stomp'
 require 'json'
+require "getoptlong"
+
+options = {}
+argv = GetoptLong.new(
+  [ "--broker", "-b", GetoptLong::OPTIONAL_ARGUMENT ]
+)
+argv.each do |option, value|
+  options['broker'] = value if option == '--broker'
+end
+options['broker'] ||= 'stomp://127.0.0.1:61613'
 
 results = '/queue/constable.results-' + Process.pid.to_s + '-' + Time.now.to_i.to_s
-client = Stomp::Client.new ARGV[0]
+client = Stomp::Client.new options['broker']
 client.subscribe results, 'auto-delete' => true do |message|
   results = JSON.parse message.body
   if results['exit_code'] == 0
@@ -24,9 +34,11 @@ client.subscribe results, 'auto-delete' => true do |message|
   client.close
 end
 
+parameters = ARGV.join ' '
 command = {
   command: 'identify',
-  input: encoded_input
+  input: encoded_input,
+  parameters: parameters
 }
 command_json = JSON.generate command
 

data/bin/constabled

@@ -6,6 +6,7 @@ require 'json'
 require 'tempfile'
 require 'open3'
 require 'base64'
+require 'getoptlong'
 
 class Job
   module WorkingEnvironment
@@ -31,14 +32,15 @@ class Job
       end
     end
 
-    def run_command command
-      puts "Running #{command}"
-      stdin, stdout, stderr, command = Open3.popen3 command
+    def run_command command_line
+      puts "Running #{command_line}"
+      stdin, stdout, stderr, command = Open3.popen3 command_line
       {
         stdout: stdout.readlines.join,
         stderr: stderr.readlines.join,
         exit_code: command.value.exitstatus,
-        pid: command.value.pid
+        pid: command.value.pid,
+        command_line: command_line
       }
     end
   end
@@ -55,9 +57,13 @@ class Job
 
     def execute
       using_file_with_content options['input'] do |file|
-        run_command "identify #{file.path}"
+        run_command "identify #{parameters} #{file.path}"
       end
     end
+
+    def parameters
+      '-verbose' if options['parameters'] == '-verbose'
+    end
   end
 
   attr_accessor :options
@@ -91,7 +97,16 @@ class Job
   end
 end
 
-client = Stomp::Client.new ARGV[0]
+options = {}
+argv = GetoptLong.new(
+  [ "--broker", "-b", GetoptLong::OPTIONAL_ARGUMENT ]
+)
+argv.each do |option, value|
+  options['broker'] = value if option == '--broker'
+end
+options['broker'] ||= 'stomp://127.0.0.1:61613'
+
+client = Stomp::Client.new options['broker']
 client.subscribe '/queue/constable' do |message|
   puts "Received #{message.headers['message-id']}"
 

data/lib/constable/version.rb

@@ -1,3 +1,3 @@
 module Constable
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constable
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stomp
-  requirement: &70138922339840 !ruby/object:Gem::Requirement
+  requirement: &70227556077520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138922339840
+  version_requirements: *70227556077520
 description: Installing ImageMagick and RMagick everywhere sucks, right? So install
   it in one place and have everything else use that one install.
 email: