pdfunite 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 29e5d158cd6b9da9c8492fffbd17a1ed0bd2045f
-  data.tar.gz: e0089aa79fea511177dcce053b6f866cff2f801d
+SHA256:
+  metadata.gz: 5cd07900239253b89f736e0bc2afaa4dfddf82b295c40727cc6db334af7b7422
+  data.tar.gz: 4a11eb86bdf95d083a835a42639bb840a7fe372e3e9377dde1e0fb6e37f440c0
 SHA512:
-  metadata.gz: 469e1202c596ba22cd4a238f4070395dfc200582c05363bb8fe6355526d087f2056f0bf794af63745d0ed9e9754324afbb429a8b9916978b3abaf4a4ee0ba77c
-  data.tar.gz: a6c5dc3dff1d243d3ed43e377ff2304a756b0f0079ddb5021416ee488a028c959385b1b16dd55450c04f883d17b1971319309cd8198f18e797223df3d566393a
+  metadata.gz: 42098f2bd77ce44e2ad7cc9a1446e9d31e2f506beaa0b0604613d9eb3cde43912118b79890ea431b901c3d63e95b4e1a14f5478115ec2c9059d7eb69c0f7f8e7
+  data.tar.gz: 72ef4ee8e99caad4de5ef4fb4c62ba406c04565c4241d2067006bf935cf9589146d587405b80a25d91dfdd1dbfa799281805041b6c9dc7eb68a0e943bdd909a4

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.5.0 - Jul 4, 2019
+
+* Drop cocaine dependency
+
 0.3.0 - Dec 6, 2014
 
 * Do not read existing files, use paths instead
@@ -5,5 +9,3 @@
 0.2.0 - Nov 27, 2014
 
 * added Pdfunite.binary configuration option
-
-

data/README.md

@@ -1,3 +1,4 @@
+[![Gem Version](https://badge.fury.io/rb/pdfunite.svg)](http://badge.fury.io/rb/pdfunite) [![Build Status](https://travis-ci.org/mtgrosser/pdfunite.svg)](https://travis-ci.org/mtgrosser/pdfunite)
 # Pdfunite
 
 Merge PDF files with Ruby.
@@ -30,7 +31,7 @@ gem 'pdfunite'
 ```ruby
 # Join existing PDF files
 pdf_data = Pdfunite.join('file1.pdf', 'file2.pdf', 'file3.pdf')
-File.open('joined.pdf', 'wb') { f << pdf_data }
+File.open('joined.pdf', 'wb') { |f| f << pdf_data }
 
 # Join PDF binary data provided by a collection of objects
 pdf_data = Pdfunite.join(objects) { |obj| obj.to_pdf }

data/lib/pdfunite.rb

@@ -1,7 +1,8 @@
 require 'pdfunite/version'
 require 'tmpdir'
 require 'pathname'
-require 'cocaine'
+require 'open3'
+require 'shellwords'
 require 'logger'
 
 module Pdfunite
@@ -42,8 +43,7 @@ module Pdfunite
       output = nil
       Dir.mktmpdir do |dir|
         tmpdir = Pathname.new(dir).realpath
-        files = args.flatten(1).inject({}) do |hsh, arg|
-          idx = hsh.size
+        files = args.flatten(1).collect.with_index do |arg, idx|
           realpath = if block_given?
             data = yield(arg)
             file = tmpdir.join("#{idx}.pdf")
@@ -52,19 +52,29 @@ module Pdfunite
           else
             Pathname.new(arg).realpath
           end
-          hsh.update(:"f_#{idx}" => realpath.to_s)
+          realpath.to_s
         end
-        cmdline = Cocaine::CommandLine.new(binary, "#{files.keys.map(&:inspect).join(' ')} :outfile", logger: Pdfunite.logger || Logger.new(STDOUT))
         outfile = tmpdir.join('output.pdf')
-        begin
-          cmdline.run(files.merge(outfile: outfile.to_s))
-        rescue Cocaine::CommandNotFoundError
-          raise BinaryNotFound, "The pdfunite executable could not be found at #{binary.inspect}. Check the pdfunite README for more info."
-        end
-        output = outfile.binread
+        cmdline = [binary.to_s, *files, outfile.to_s]
+        output = outfile.binread if run_command(cmdline.shelljoin)
       end
       output
     end
-  end
   
+    private
+  
+    def run_command(cmdline)
+      logger = Pdfunite.logger || Logger.new(STDOUT)
+      stdout, stderr, status = Open3.capture3(cmdline)
+      logger.info "Pdfunite: #{cmdline}"
+      raise unless status.success?
+      true
+    rescue Errno::ENOENT
+      raise BinaryNotFound, "The pdfunite executable could not be found at #{binary.inspect}. Check the pdfunite README for more info."
+    rescue => e
+      logger.error "Pdfunite error: #{e}\ncommand: #{cmdline}\nerror: #{stderr}"
+      false
+    end
+
+  end
 end

data/lib/pdfunite/version.rb

@@ -1,3 +1,3 @@
 module Pdfunite
-  VERSION = '0.3.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pdfunite
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Matthias Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2019-07-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: cocaine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Merge PDF files with Ruby - no Java required