cupsffi 0.0.9 → 0.1.0

data/README.rdoc

@@ -59,3 +59,12 @@ Nothing required.  libcups is used to find and read all configuration.
 
     # Cancel all outstanding jobs on the printer
     printer.cancel_all_jobs
+
+== Remote CUPS Server
+
+You may pass in :hostname and :port arguments when creating a CupsPrinter instance or querying
+for available printers.
+
+    remote_printers = CupsPrinter.get_all_printer_names(:hostname => 'print.example.com')
+    print = CupsPrinter.new(remote_printers.first, :hostname => 'print.example.com')
+

data/lib/cupsffi/lib.rb

@@ -25,14 +25,12 @@ require 'ffi'
 module CupsFFI
   extend FFI::Library
 
-  paths =
-    Array(
-      ENV['CUPS_LIB'] ||
-      Dir['/{opt,usr}/{,local/}lib{,64}/{,x86_64-linux-gnu/,i386-linux-gnu/}libcups.{dylib,so*}']
-      )
-  raise LoadError, "Didn't find libcups on your system." if paths.empty?
   begin
-    ffi_lib(*paths)
+    if ENV['CUPS_LIB']
+      ffi_lib(ENV['CUPS_LIB'])
+    else
+      ffi_lib('cups')
+    end
   rescue LoadError => le
     raise LoadError, "Didn't find libcups on your system."
   end
@@ -172,10 +170,14 @@ module CupsFFI
 
 
 
+  attach_function 'cupsEncryption', [], :int
+  attach_function 'httpConnectEncrypt', [ :string, :int, :int], :pointer
 
 
   attach_function 'cupsGetDests', [ :pointer ], :int
 
+  attach_function 'cupsGetDests2', [ :pointer, :pointer ], :int
+
   # :int is the number of CupsDestS structs to free
   # :pointer is the first one
   attach_function 'cupsFreeDests', [ :int, :pointer ], :void
@@ -190,6 +192,8 @@ module CupsFFI
   #  - job number or 0 on error
   attach_function 'cupsPrintFile', [ :string, :string, :string, :int, :pointer ], :int
 
+  attach_function 'cupsPrintFile2', [ :pointer, :string, :string, :string, :int, :pointer ], :int
+
   attach_function 'cupsLastErrorString', [], :string
 
   # Parameters
@@ -197,6 +201,8 @@ module CupsFFI
   #  - job id
   attach_function 'cupsCancelJob', [:string, :int], :void
 
+  attach_function 'cupsCancelJob2', [:pointer, :string, :int], :void
+
   # Parameters
   #  - pointer to struct CupsJobS to populate
   #  - printer name
@@ -252,6 +258,7 @@ module CupsFFI
   # Returns
   #  - filename for PPD file
   attach_function 'cupsGetPPD', [:string], :string
+  attach_function 'cupsGetPPD2', [:pointer, :string], :string
 
   # Parameters
   #  - option name

data/lib/cupsffi/ppd.rb

@@ -21,8 +21,8 @@
 # THE SOFTWARE.
 
 class CupsPPD
-  def initialize(printer_name)
-    @file = CupsFFI::cupsGetPPD(printer_name)
+  def initialize(printer_name, connection)
+    @file = CupsFFI::cupsGetPPD2(connection, printer_name)
     raise "No PPD found for #{printer_name}" if @file.nil?
 
     @pointer = CupsFFI::ppdOpenFile(@file)

data/lib/cupsffi/printer.rb

@@ -21,16 +21,33 @@
 # THE SOFTWARE.
 
 class CupsPrinter
-  attr_reader :name
+  attr_reader :name, :connection
 
-  def initialize(name)
-    raise "Printer not found" unless CupsPrinter.get_all_printer_names.include? name
+  def self.get_connection(args = {})
+    hostname = args[:hostname]
+    port     = args[:port] || 631
+
+    if hostname.nil?
+      return CupsFFI::CUPS_HTTP_DEFAULT
+    else
+      connection = CupsFFI::httpConnectEncrypt(hostname, port.to_i, CupsFFI::cupsEncryption())
+      raise "Printserver at #{hostname}:#{port} not available" if connection.null?
+
+      return connection
+    end
+  end
+
+  def initialize(name, args = {})
+    raise "Printer not found" unless CupsPrinter.get_all_printer_names(args).include? name
     @name = name
+    @connection = CupsPrinter.get_connection(args)
   end
 
-  def self.get_all_printer_names
+  def self.get_all_printer_names(args = {})
+    connection = get_connection(args)
+
     p = FFI::MemoryPointer.new :pointer
-    dest_count = CupsFFI::cupsGetDests(p)
+    dest_count = CupsFFI::cupsGetDests2(connection, p)
     ary = []
     dest_count.times do |i|
       d = CupsFFI::CupsDestS.new(p.get_pointer(0) + (CupsFFI::CupsDestS.size * i))
@@ -42,7 +59,7 @@ class CupsPrinter
 
   def attributes
     p = FFI::MemoryPointer.new :pointer
-    dest_count = CupsFFI::cupsGetDests(p)
+    dest_count = CupsFFI::cupsGetDests2(@connection, p)
     hash = {}
     dest_count.times do |i|
       dest = CupsFFI::CupsDestS.new(p.get_pointer(0) + (CupsFFI::CupsDestS.size * i))
@@ -85,7 +102,7 @@ class CupsPrinter
       options_pointer = options_pointer.get_pointer(0)
     end
 
-    job_id = CupsFFI::cupsPrintFile(@name, file_name, file_name, num_options, options_pointer)
+    job_id = CupsFFI::cupsPrintFile2(@connection, @name, file_name, file_name, num_options, options_pointer)
 
     if job_id == 0
       last_error = CupsFFI::cupsLastErrorString()
@@ -109,19 +126,19 @@ class CupsPrinter
       options_pointer = options_pointer.get_pointer(0)
     end
 
-    job_id = CupsFFI::cupsCreateJob(CupsFFI::CUPS_HTTP_DEFAULT, @name, 'data job', num_options, options_pointer)
+    job_id = CupsFFI::cupsCreateJob(@connection, @name, 'data job', num_options, options_pointer)
     if job_id == 0
       last_error = CupsFFI::cupsLastErrorString()
       CupsFFI::cupsFreeOptions(num_options, options_pointer) unless options_pointer.nil?
       raise last_error
     end
 
-    http_status = CupsFFI::cupsStartDocument(CupsFFI::CUPS_HTTP_DEFAULT, @name,
+    http_status = CupsFFI::cupsStartDocument(@connection, @name,
                                              job_id, 'my doc', mime_type, 1)
 
-    http_status = CupsFFI::cupsWriteRequestData(CupsFFI::CUPS_HTTP_DEFAULT, data, data.length)
+    http_status = CupsFFI::cupsWriteRequestData(@connection, data, data.length)
 
-    ipp_status = CupsFFI::cupsFinishDocument(CupsFFI::CUPS_HTTP_DEFAULT, @name)
+    ipp_status = CupsFFI::cupsFinishDocument(@connection, @name)
 
     unless ipp_status == :ipp_ok
       CupsFFI::cupsFreeOptions(num_options, options_pointer) unless options_pointer.nil?
@@ -133,14 +150,14 @@ class CupsPrinter
   end
 
   def cancel_all_jobs
-    r = CupsFFI::cupsCancelJob(@name, CupsFFI::CUPS_JOBID_ALL)
+    r = CupsFFI::cupsCancelJob2(@connection, @name, CupsFFI::CUPS_JOBID_ALL)
     raise CupsFFI::cupsLastErrorString() if r == 0
   end
 
 
   private
   def validate_options(options)
-    ppd = CupsPPD.new(@name)
+    ppd = CupsPPD.new(@name, @connection)
 
     # Build a hash of the ppd options for quick lookup
     ppd_options = {}

data/lib/cupsffi/version.rb

@@ -1,3 +1,3 @@
 module Cupsffi
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,49 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cupsffi
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  version: 0.0.9
 platform: ruby
-authors: 
+authors:
 - Nathan Ehresman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ffi
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: Simple wrapper around libcups to give CUPS printing capabilities to Ruby apps.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Simple wrapper around libcups to give CUPS printing capabilities to Ruby
+  apps.
+email:
 - nehresma@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - COPYING
 - Gemfile
@@ -58,30 +65,26 @@ files:
 - lib/cupsffi/version.rb
 homepage: http://www.tebros.com/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: cupsffi
-rubygems_version: 1.8.13
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: FFI wrapper around libcups
 test_files: []
-