cupsffi 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5dc42d5733faba1d922a1bb2049ffb676891d825
-  data.tar.gz: adf32d3a751973533fb46eda8fd9f004d50aba9e
+SHA256:
+  metadata.gz: 47a841acf2892908e3fc82f1c57dbb8ce88de8702eb23c97a008ae16f09cb9d3
+  data.tar.gz: 26ed717b2d62f9691f3e73eed0328536e1f2f51290a88cfc124c7678485527af
 SHA512:
-  metadata.gz: ffced75bf023e694075a312097dba31f28a42078a56c685bcf0d71cbd2dd62d34a6257e6cb42c7b318af3d723bebe286dc39e5de6f68d98ae4d7b35fb1490944
-  data.tar.gz: 3f48bdcdea3b8427b1362cba31932fbc3c60c1e5abc953698d860f5c3b74911bed7d6387b5b3e8c2f112b6b50e51ba035b1292f26fa56ebfdcddd88720141b67
+  metadata.gz: d7be6fae7c463d30bb708f0bf21f23b46b25f628a3318831acb0d7e9c9ee7de956986cb4621a046ae12b102e2130c831fc96d1107eabd6494bbe2174fec0c723
+  data.tar.gz: '0628de98a1925214e6a3519b7af0c807373e9612b21ae6181efe2cfd39adc1769637d77588481b90b68dc5bb1446692493c15bf7cdfb06b36456de3a06ea93ec'

data/lib/cupsffi/lib.rb

@@ -170,18 +170,18 @@ module CupsFFI
 
 
 
-  attach_function 'cupsEncryption', [], :int
-  attach_function 'httpConnectEncrypt', [ :string, :int, :int], :pointer
-  attach_function 'httpClose', [ :pointer ], :void
+  attach_function 'cupsEncryption', [], :int, blocking: true
+  attach_function 'httpConnectEncrypt', [ :string, :int, :int], :pointer, blocking: true
+  attach_function 'httpClose', [ :pointer ], :void, blocking: true
 
 
-  attach_function 'cupsGetDests', [ :pointer ], :int
+  attach_function 'cupsGetDests', [ :pointer ], :int, blocking: true
 
-  attach_function 'cupsGetDests2', [ :pointer, :pointer ], :int
+  attach_function 'cupsGetDests2', [ :pointer, :pointer ], :int, blocking: true
 
   # :int is the number of CupsDestS structs to free
   # :pointer is the first one
-  attach_function 'cupsFreeDests', [ :int, :pointer ], :void
+  attach_function 'cupsFreeDests', [ :int, :pointer ], :void, blocking: true
 
   # Parameters:
   #  - printer name
@@ -191,18 +191,18 @@ module CupsFFI
   #  - a pointer to a CupsOptionS struct
   # Returns
   #  - job number or 0 on error
-  attach_function 'cupsPrintFile', [ :string, :string, :string, :int, :pointer ], :int
+  attach_function 'cupsPrintFile', [ :string, :string, :string, :int, :pointer ], :int, blocking: true
 
-  attach_function 'cupsPrintFile2', [ :pointer, :string, :string, :string, :int, :pointer ], :int
+  attach_function 'cupsPrintFile2', [ :pointer, :string, :string, :string, :int, :pointer ], :int, blocking: true
 
-  attach_function 'cupsLastErrorString', [], :string
+  attach_function 'cupsLastErrorString', [], :string, blocking: true
 
   # Parameters
   #  - printer name
   #  - job id
-  attach_function 'cupsCancelJob', [:string, :int], :void
+  attach_function 'cupsCancelJob', [:string, :int], :void, blocking: true
 
-  attach_function 'cupsCancelJob2', [:pointer, :string, :int], :void
+  attach_function 'cupsCancelJob2', [:pointer, :string, :int], :void, blocking: true
 
   # Parameters
   #  - pointer to struct CupsJobS to populate
@@ -211,12 +211,12 @@ module CupsFFI
   #  - whichjobs (CUPS_WHICHJOBS_ALL, CUPS_WHICHJOBS_ACTIVE, or CUPS_WHICHJOBS_COMPLETED)
   # Returns:
   #  - number of jobs
-  attach_function 'cupsGetJobs', [:pointer, :string, :int, :int], :int
+  attach_function 'cupsGetJobs', [:pointer, :string, :int, :int], :int, blocking: true
 
   # Parameters
   #  - number of jobs
   #  - pointer to the first CupsJobS to free
-  attach_function 'cupsFreeJobs', [:int, :pointer ], :void
+  attach_function 'cupsFreeJobs', [:int, :pointer ], :void, blocking: true
 
   # Parameters
   #  - pointer to http connection to server or CUPS_HTTP_DEFAULT
@@ -226,7 +226,7 @@ module CupsFFI
   #  - pointer to a CupsOptionS struct
   # Returns
   #  - job number or 0 on error
-  attach_function 'cupsCreateJob', [:pointer, :string, :string, :int, :pointer], :int
+  attach_function 'cupsCreateJob', [:pointer, :string, :string, :int, :pointer], :int, blocking: true
 
   # Parameters
   #  - pointer to http connection to server or CUPS_HTTP_DEFAULT
@@ -237,7 +237,7 @@ module CupsFFI
   #  - last document (1 for last document in job, 0 otherwise)
   # Returns
   #  - HttpStatus
-  attach_function 'cupsStartDocument', [:pointer, :string, :int, :string, :string, :int], HttpStatus
+  attach_function 'cupsStartDocument', [:pointer, :string, :int, :string, :string, :int], HttpStatus, blocking: true
 
   # Parameters
   #  - pointer to http connection to server or CUPS_HTTP_DEFAULT
@@ -245,21 +245,21 @@ module CupsFFI
   #  - length of data
   # Returns
   #  - HttpStatus
-  attach_function 'cupsWriteRequestData', [:pointer, :pointer, :size_t], HttpStatus
+  attach_function 'cupsWriteRequestData', [:pointer, :pointer, :size_t], HttpStatus, blocking: true
 
   # Parameters
   #  - pointer to http connection to server or CUPS_HTTP_DEFAULT
   #  - printer name
   # Returns
   #  - IppStatus
-  attach_function 'cupsFinishDocument', [:pointer, :string], IppStatus
+  attach_function 'cupsFinishDocument', [:pointer, :string], IppStatus, blocking: true
 
   # Parameters
   #  - printer name
   # Returns
   #  - filename for PPD file
-  attach_function 'cupsGetPPD', [:string], :string
-  attach_function 'cupsGetPPD2', [:pointer, :string], :string
+  attach_function 'cupsGetPPD', [:string], :string, blocking: true
+  attach_function 'cupsGetPPD2', [:pointer, :string], :string, blocking: true
 
   # Parameters
   #  - option name
@@ -268,12 +268,12 @@ module CupsFFI
   #  - pointer to options
   # Returns
   #  - number of options
-  attach_function 'cupsAddOption', [:string, :string, :int, :pointer], :int
+  attach_function 'cupsAddOption', [:string, :string, :int, :pointer], :int, blocking: true
 
   # Parameters
   #  - number of options
   #  - pointer to options
-  attach_function 'cupsFreeOptions', [:int, :pointer], :void
+  attach_function 'cupsFreeOptions', [:int, :pointer], :void, blocking: true
 
 
 
@@ -389,23 +389,23 @@ module CupsFFI
   #  - filename for PPD file
   # Returns
   #  - pointer to PPDFileS struct
-  attach_function 'ppdOpenFile', [:string], :pointer
+  attach_function 'ppdOpenFile', [:string], :pointer, blocking: true
 
   # Parameters
   #  - pointer to PPDFileS struct
-  attach_function 'ppdClose', [:pointer], :void
+  attach_function 'ppdClose', [:pointer], :void, blocking: true
 
   # Parameters
   #  - pointer to PPDFileS struct
   # Returns
   #  - pointer to PPDOptionS struct
-  attach_function 'ppdFirstOption', [:pointer], :pointer
+  attach_function 'ppdFirstOption', [:pointer], :pointer, blocking: true
 
   # Parameters
   #  - pointer to PPDFileS struct
   # Returns
   #  - pointer to PPDOptionS struct
-  attach_function 'ppdNextOption', [:pointer], :pointer
+  attach_function 'ppdNextOption', [:pointer], :pointer, blocking: true
 
   # Parameters
   #  - pointer to PPDFileS struct
@@ -413,7 +413,7 @@ module CupsFFI
   #  - spec name
   # Returns
   #  - pointer to PPDAttrS struct
-  attach_function 'ppdFindAttr', [:pointer, :string, :string], :pointer
+  attach_function 'ppdFindAttr', [:pointer, :string, :string], :pointer, blocking: true
 
   # Parameters
   #  - pointer to PPDFileS struct
@@ -421,14 +421,14 @@ module CupsFFI
   #  - spec name
   # Returns
   #  - pointer to PPDAttrS struct
-  attach_function 'ppdFindNextAttr', [:pointer, :string, :string], :pointer
+  attach_function 'ppdFindNextAttr', [:pointer, :string, :string], :pointer, blocking: true
 
   # Parameters
   #  - pointer to PPDFileS struct
   #  - page name
   # Returns
   #  - pointer to PPDSizeS struct
-  attach_function 'ppdPageSize', [:pointer, :string], :pointer
+  attach_function 'ppdPageSize', [:pointer, :string], :pointer, blocking: true
 
 
 
@@ -439,11 +439,11 @@ module CupsFFI
   #  - pointer to _cups_array_s struct
   # Returns
   #  - void pointer to first element
-  attach_function 'cupsArrayFirst', [:pointer], :pointer
+  attach_function 'cupsArrayFirst', [:pointer], :pointer, blocking: true
 
   # Parameters
   #  - pointer to _cups_array_s struct
   # Returns
   #  - void pointer to first element
-  attach_function 'cupsArrayNext', [:pointer], :pointer
+  attach_function 'cupsArrayNext', [:pointer], :pointer, blocking: true
 end

data/lib/cupsffi/printer.rb

@@ -93,6 +93,15 @@ class CupsPrinter
     release_connection(connection)
     hash
   end
+  
+  def self.default_printer
+    connection = get_connection
+    walk_attributes(connection) do |dest|
+      return dest[:name].dup if dest[:is_default] == 1
+    end
+    release_connection(connection)
+    nil
+  end
 
   def attributes
     hash = {}
@@ -235,7 +244,7 @@ class CupsPrinter
     options.each do |key,value|
       key_string = key.to_s
       # Accept common CUPS options
-      next if ['copies', 'landscape'].include?(key_string)
+      next if %w[collate copies landscape].include?(key_string)
 
       raise "Invalid option #{key} for printer #{@name}" if ppd_options[key_string].nil?
       choices = ppd_options[key_string][:choices].map{|c| c[:choice]}

data/lib/cupsffi/version.rb

@@ -1,3 +1,3 @@
 module Cupsffi
-  VERSION = "0.1.6"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,30 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: cupsffi
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.9
 platform: ruby
 authors:
 - Nathan Ehresman
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: ffi
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Simple wrapper around libcups to give CUPS printing capabilities to Ruby apps.
+description: Simple wrapper around libcups to give CUPS printing capabilities to Ruby
+  apps.
 email:
 - nehresma@gmail.com
 executables: []
@@ -46,7 +47,7 @@ files:
 homepage: https://github.com/nehresma/cupsffi
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -61,9 +62,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: cupsffi
-rubygems_version: 2.6.8
-signing_key:
+rubygems_version: 3.0.6
+signing_key: 
 specification_version: 4
 summary: FFI wrapper around libcups
 test_files: []