pdfmult 1.2.0 → 1.3.0

data/README.md

@@ -39,6 +39,10 @@ Use the program as shown in the examples below.
 
     processes the first 3 pages of `sample.pdf`
 
+* `pdfmult sample.pdf -o - | lpr`
+
+    sends output via stdout to print command
+
 Installation
 ------------
 

data/lib/pdfmult.rb

@@ -27,15 +27,18 @@
 #
 # -n, --number:: Number of copies to put on one page: 2 (default), 4, 8, 9, 16.
 #
-# -f, --force:: Do not prompt before overwriting.
+# -f, --[no-]force:: Do not prompt before overwriting.
 #
 # -l, --latex:: Create a LaTeX file instead of a PDF file (default: infile_NUMBER.tex).
 #
 # -o, --output:: Output file (default: infile_NUMBER.pdf).
+#                Use - to output to stdout.
 #
 # -p, --pages:: Number of pages to convert.
 #               If given, +pdfmult+ does not try to obtain the page count from the source PDF.
 #
+# -s, --[no-]silent:: Do not output progress information.
+#
 # -h, --help:: Prints a brief help message and exits.
 #
 # -v, --version:: Prints a brief version information and exits.
@@ -46,6 +49,7 @@
 #   pdfmult -n 4 sample.pdf            # =>  sample_4.pdf (4 copies)
 #   pdfmult sample.pdf -o outfile.pdf  # =>  outfile.pdf  (2 copies)
 #   pdfmult sample.pdf -p 3            # =>  processes 3 pages
+#   pdfmult sample.pdf -o - | lpr      # =>  sends output via stdout to print command
 #
 # == Author
 #
@@ -58,17 +62,18 @@
 require 'optparse'
 require 'tempfile'
 require 'fileutils'
+require 'open3'
 
-# This module contains the classes for the +pdfmult+ tool
+# This module contains the classes for the +pdfmult+ tool.
 module Pdfmult
 
   PROGNAME  = 'pdfmult'
-  VERSION   = '1.2.0'
-  DATE      = '2012-04-15'
+  VERSION   = '1.3.0'
+  DATE      = '2012-09-22'
   HOMEPAGE  = 'https://github.com/stomar/pdfmult/'
 
   COPYRIGHT = "Copyright (C) 2011-2012 Marcus Stollsteimer.\n" +
-              "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n" +
+              "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n" +
               "This is free software: you are free to change and redistribute it.\n" +
               "There is NO WARRANTY, to the extent permitted by law."
 
@@ -94,6 +99,7 @@ module Pdfmult
         :latex   => false,
         :number  => 2,
         :outfile => nil,
+        :silent  => false,
         :pages   => nil
       }
 
@@ -138,8 +144,8 @@ module Pdfmult
           options[:number] = n
         end
 
-        opt.on('-f', '--force', 'Do not prompt before overwriting.') do
-          options[:force] = true
+        opt.on('-f', '--[no-]force', 'Do not prompt before overwriting.') do |f|
+          options[:force] = f
         end
 
         opt.on('-l', '--latex', 'Create a LaTeX file instead of a PDF file (default: file_2.tex).') do
@@ -147,7 +153,7 @@ module Pdfmult
         end
 
         opt.on('-o', '--output FILE', String,
-               'Output file (default: file_2.pdf).') do |f|
+               'Output file (default: file_2.pdf). Use - to output to stdout.') do |f|
           options[:outfile] = f
         end
 
@@ -158,6 +164,10 @@ module Pdfmult
           options[:pages] = p
         end
 
+        opt.on('-s', '--[no-]silent', 'Do not output progress information.') do |s|
+          options[:silent] = s
+        end
+
         opt.separator ''
       end
       opt_parser.parse!(argv)
@@ -198,7 +208,7 @@ module Pdfmult
       "\\includepdf[pages={PAGES},nup=GEOMETRY]{FILENAME}%\n"
 
     FOOTER =
-      '\end{document}'
+      "\\end{document}\n"
 
     # Initializes a LaTeXDocument instance.
     #
@@ -230,7 +240,10 @@ module Pdfmult
         geometry = '4x4'
       end
 
-      content_template = CONTENT.gsub(/PAGES/, page_string).gsub(/GEOMETRY/, geometry).gsub(/FILENAME/, @infile)
+      content_template = CONTENT.gsub(/PAGES|GEOMETRY|FILENAME/,
+                                      'PAGES' => page_string,
+                                      'GEOMETRY' => geometry,
+                                      'FILENAME' => @infile)
 
       content = HEADER.gsub(/CLASSOPTIONS/, class_options)
       @page_count.times do |i|
@@ -299,6 +312,8 @@ module Pdfmult
 
       infile = options[:infile]
       outfile = options[:outfile]
+      use_stdout = (outfile == '-')
+      silent = options[:silent]
 
       # test for pdflatex installation
       unless options[:latex]
@@ -312,7 +327,7 @@ module Pdfmult
       usage_fail("specified input not of the type `file'")  unless File.ftype(infile) == 'file'
 
       # test for existing output file
-      if File.exist?(outfile) and !options[:force]
+      if !use_stdout and !options[:force] and File.exist?(outfile)
         overwrite_ok = ask("File `#{outfile}' already exists. Overwrite?")
         exit  unless overwrite_ok
       end
@@ -326,16 +341,29 @@ module Pdfmult
       document = LaTeXDocument.new(infile, options[:number], pages)
 
       if options[:latex]
-        open(outfile, 'w') {|f| f.write(document.to_s) }
+        if use_stdout
+          puts document.to_s
+        else
+          warn "Writing on #{outfile}."  unless silent
+          open(outfile, 'w') {|f| f.write(document.to_s) }
+        end
       else
         Dir.mktmpdir('pdfmult') do |dir|
-          open("#{dir}/pdfmult.tex", 'w') do |f|
-            pdfpath = "#{dir}/pdfmult.pdf"
-            f.write(document.to_s)
-            f.flush
-            system("#{PDFLATEX} -output-directory #{dir} pdfmult.tex")
-            puts "Writing on #{outfile}."
-            FileUtils::mv(pdfpath, outfile)
+          texfile = 'pdfmult.tex'
+          pdffile = 'pdfmult.pdf'
+          open("#{dir}/#{texfile}", 'w') {|f| f.write(document.to_s) }
+          command = "#{PDFLATEX} -output-directory #{dir} #{texfile}"
+          Open3.popen3(command) do |stdin, stdout, stderr|
+            stdout.each_line {|line| warn line.chomp }  unless silent # redirect progress messages to stderr
+            stderr.read  # make sure all streams are read (and command has finished)
+          end
+          if use_stdout
+            File.open("#{dir}/#{pdffile}") do |f|
+              f.each_line {|line| puts line }
+            end
+          else
+            warn "Writing on #{outfile}."  unless silent
+            FileUtils::mv("#{dir}/#{pdffile}", outfile)
           end
         end
       end
@@ -348,11 +376,11 @@ module Pdfmult
     # Returns +true+ if the answer is yes.
     def self.ask(question) # :nodoc:
       while true
-        print "#{question} [y/n] "
+        $stderr.print "#{question} [y/n] "
         reply = $stdin.gets.chomp.downcase  # $stdin: avoids gets / ARGV problem
         return true   if reply == 'y'
         return false  if reply == 'n'
-        puts "Please answer `y' or `n'."
+        warn "Please answer `y' or `n'."
       end
     end
 

data/man/pdfmult.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
-.TH PDFMULT "1" "April 2012" "pdfmult 1.2.0" "User Commands"
+.TH PDFMULT "1" "September 2012" "pdfmult 1.3.0" "User Commands"
 .SH NAME
 pdfmult \- puts multiple copies of a PDF page on one page
 .SH SYNOPSIS
@@ -25,19 +25,22 @@ and a LaTeX file is created instead of a PDF.
 \fB\-n\fR, \fB\-\-number\fR NUMBER
 Number of copies to put on one page: 2 (default), 4, 8, 9, 16.
 .TP
-\fB\-f\fR, \fB\-\-force\fR
+\fB\-f\fR, \fB\-\-[no\-]force\fR
 Do not prompt before overwriting.
 .TP
 \fB\-l\fR, \fB\-\-latex\fR
 Create a LaTeX file instead of a PDF file (default: file_2.tex).
 .TP
 \fB\-o\fR, \fB\-\-output\fR FILE
-Output file (default: file_2.pdf).
+Output file (default: file_2.pdf). Use \- to output to stdout.
 .TP
 \fB\-p\fR, \fB\-\-pages\fR NUMBER
 Number of pages to convert.
 If given, pdfmult does not try to obtain the page count from the source PDF.
 .TP
+\fB\-s\fR, \fB\-\-[no\-]silent\fR
+Do not output progress information.
+.TP
 \fB\-h\fR, \fB\-\-help\fR
 Prints a brief help message and exits.
 .TP
@@ -48,12 +51,13 @@ Prints a brief version information and exits.
  pdfmult -n 4 sample.pdf            # =>  sample_4.pdf (4 copies)
  pdfmult sample.pdf -o outfile.pdf  # =>  outfile.pdf  (2 copies)
  pdfmult sample.pdf -p 3            # =>  processes 3 pages
+ pdfmult sample.pdf -o - | lpr      # =>  sends output via stdout to print command
 .SH "REPORTING BUGS"
 Report bugs on the pdfmult home page: <https://github.com/stomar/pdfmult/>
 .SH COPYRIGHT
 Copyright \(co 2011\-2012 Marcus Stollsteimer.
 .br
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
 .br
 This is free software: you are free to change and redistribute it.
 .br

data/pdfmult.gemspec

@@ -1,4 +1,4 @@
-require 'lib/pdfmult'
+require './lib/pdfmult'
 
 version  = Pdfmult::VERSION
 date     = Pdfmult::DATE

data/pdfmult.h2m

@@ -6,3 +6,4 @@ pdfmult \- puts multiple copies of a PDF page on one page
  pdfmult -n 4 sample.pdf            # =>  sample_4.pdf (4 copies)
  pdfmult sample.pdf -o outfile.pdf  # =>  outfile.pdf  (2 copies)
  pdfmult sample.pdf -p 3            # =>  processes 3 pages
+ pdfmult sample.pdf -o - | lpr      # =>  sends output via stdout to print command

data/test/test_optionparser.rb

@@ -18,7 +18,8 @@ describe Pdfmult::Optionparser do
       :latex   => false,
       :number  => 2,
       :outfile => 'sample_2.pdf',
-      :pages   => nil
+      :pages   => nil,
+      :silent  => false
     }
     options.must_equal expected
   end
@@ -48,6 +49,11 @@ describe Pdfmult::Optionparser do
     options[:force].must_equal true
   end
 
+  it 'should recognize the --no-force option' do
+    options = Pdfmult::Optionparser.parse!(['sample.pdf', '--no-force'])
+    options[:force].must_equal false
+  end
+
   it 'should recognize the -l option and set the corresponding output filename' do
     options = Pdfmult::Optionparser.parse!(['sample.pdf', '-l'])
     options[:outfile].must_equal 'sample_2.tex'
@@ -60,6 +66,16 @@ describe Pdfmult::Optionparser do
     lambda { Pdfmult::Optionparser.parse!(['sample.pdf', '-p', '-1']) }.must_raise OptionParser::InvalidArgument
   end
 
+  it 'should recognize the -s option' do
+    options = Pdfmult::Optionparser.parse!(['sample.pdf', '-s'])
+    options[:silent].must_equal true
+  end
+
+  it 'should recognize the --no-silent option' do
+    options = Pdfmult::Optionparser.parse!(['sample.pdf', '--no-silent'])
+    options[:silent].must_equal false
+  end
+
   it 'should not accept wrong number of arguments' do
     lambda { Pdfmult::Optionparser.parse!(['sample.pdf', 'sample2.pdf']) }.must_raise ArgumentError
     lambda { Pdfmult::Optionparser.parse!(['']) }.must_raise ArgumentError

metadata

@@ -1,59 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pdfmult
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Marcus Stollsteimer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   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: minitest
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: pdfmult is a command line tool that rearranges multiple copies of a PDF page (shrunken) on one page. It is a wrapper for pdflatex with the pdfpages package.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: pdfmult is a command line tool that rearranges multiple copies of a PDF
+  page (shrunken) on one page. It is a wrapper for pdflatex with the pdfpages package.
 email: sto.mar@web.de
-executables: 
+executables:
 - pdfmult
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - Rakefile
 - pdfmult.gemspec
@@ -71,39 +68,34 @@ files:
 - test/test_optionparser.rb
 - test/sample.pdf
 homepage: https://github.com/stomar/pdfmult/
-licenses: 
+licenses:
 - GPL-3
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-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 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - pdflatex and the pdfpages package
 rubyforge_project: pdfmult
-rubygems_version: 1.7.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: pdfmult - puts multiple copies of a PDF page on one page
-test_files: 
+test_files:
 - test/test_pdfinfo.rb
 - test/test_latex_document.rb
 - test/test_optionparser.rb
+has_rdoc: