pdfmult 1.3.1 → 1.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c9bf2768201410416ee2153db93969369d244400
+  data.tar.gz: 9d557ec2a86736e344a32f74429444284c669215
+SHA512:
+  metadata.gz: a28230d86378317f8f9a1a4f840337db503a0a8858d76aed997c39d1eebfd0d353118dbd304f6ecde108adb79bb61c50ab093f3b08285376d8fdada93f576fda
+  data.tar.gz: 3144c04883b80892b335add20689d04cc85a5b500a9499989b5db282e6bcb02f3091e4915e5599b71b47ffb8f98c39e82c8747e0739547f6fc56a9d2752c2d69

data/README.md

@@ -23,13 +23,13 @@ Use the program as shown in the examples below.
 
     writes 2 copies of `sample.pdf` to `sample_2.pdf`
 
-    <img src="https://github.com/stomar/pdfmult/raw/master/example1.png" alt="" width="152" height="59">
+    <img src="example1.png" alt="" width="152" height="59">
 
 * `pdfmult -n 4 sample.pdf`
 
     writes 4 copies of `sample.pdf` to `sample_4.pdf`
 
-    <img src="https://github.com/stomar/pdfmult/raw/master/example2.png" alt="" width="234" height="59">
+    <img src="example2.png" alt="" width="234" height="59">
 
 * `pdfmult sample.pdf -o outfile.pdf`
 
@@ -46,7 +46,7 @@ Use the program as shown in the examples below.
 Installation
 ------------
 
-Use `gem install pdfmult`.
+Use `gem install pdfmult` to install from RubyGems.org.
 
 Or copy `lib/pdfmult.rb` under the name `pdfmult` into your search path.
 
@@ -60,7 +60,7 @@ As of now, `pdfmult` has only been tested on a Linux system.
 
 - `pdfmult` is written in [Ruby][Ruby], so Ruby must be installed on your system.
 - `pdfmult` uses `pdflatex` with the `pdfpages` package, so both have to be installed on the system.
-  (If `pdfmult` can not find the `pdflatex` command on your system
+  (If `pdfmult` cannot find the `pdflatex` command on your system
   you might want to use the `--latex` option.)
 - `pdfmult` tries to obtain the page count of PDF files with `pdfinfo`.
   If it fails, by default only the first page of a PDF file will be processed.
@@ -81,7 +81,7 @@ Report bugs on the `pdfmult` home page: <https://github.com/stomar/pdfmult/>
 License
 -------
 
-Copyright &copy; 2011-2012, Marcus Stollsteimer
+Copyright &copy; 2011-2013 Marcus Stollsteimer
 
 `pdfmult` is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 3 or later (GPLv3+),

data/bin/pdfmult

@@ -2,4 +2,4 @@
 
 require 'pdfmult'
 
-Pdfmult::Application.run!
+Pdfmult::Application.new.run!

data/lib/pdfmult.rb

@@ -29,15 +29,17 @@ require 'erb'
 module Pdfmult
 
   PROGNAME  = 'pdfmult'
-  VERSION   = '1.3.1'
-  DATE      = '2013-01-04'
+  VERSION   = '1.3.2'
+  DATE      = '2013-10-27'
   HOMEPAGE  = 'https://github.com/stomar/pdfmult/'
   TAGLINE   = 'puts multiple copies of a PDF page on one page'
 
-  COPYRIGHT = "Copyright (C) 2011-2013 Marcus Stollsteimer.\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."
+  COPYRIGHT = <<-copyright.gsub(/^ +/, '')
+    Copyright (C) 2011-2013 Marcus Stollsteimer.
+    License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
+    This is free software: you are free to change and redistribute it.
+    There is NO WARRANTY, to the extent permitted by law.
+  copyright
 
   PDFLATEX  = '/usr/bin/pdflatex'
   KPSEWHICH = '/usr/bin/kpsewhich'
@@ -67,24 +69,24 @@ module Pdfmult
 
       opt_parser = OptionParser.new do |opt|
         opt.banner = "Usage: #{PROGNAME} [options] file"
-        opt.separator ''
-        opt.separator 'pdfmult is a command line tool that'
-        opt.separator 'rearranges multiple copies of a PDF page (shrunken) on one page.'
-        opt.separator ''
-        opt.separator 'The paper size of the produced PDF file is A4,'
-        opt.separator 'the input file is also assumed to be in A4 format.'
-        opt.separator 'The input PDF file may consist of several pages.'
-        opt.separator 'If pdfmult succeeds in obtaining the page count it will rearrange all pages,'
-        opt.separator 'if not, only the first page is processed'
-        opt.separator '(unless the page count was specified via command line option).'
-        opt.separator ''
-        opt.separator 'pdfmult uses pdflatex with the pdfpages package,'
-        opt.separator 'so both have to be installed on the system.'
-        opt.separator 'If the --latex option is used, though, pdflatex is not run'
-        opt.separator 'and a LaTeX file is created instead of a PDF.'
-        opt.separator ''
-        opt.separator 'Options'
-        opt.separator ''
+        opt.separator %q{
+          pdfmult is a command line tool that
+          rearranges multiple copies of a PDF page (shrunken) on one page.
+
+          The paper size of the produced PDF file is A4,
+          the input file is also assumed to be in A4 format.
+          The input PDF file may consist of several pages.
+          If pdfmult succeeds in obtaining the page count it will rearrange all pages,
+          if not, only the first page is processed
+          (unless the page count was specified via command line option).
+
+          pdfmult uses pdflatex with the pdfpages package,
+          so both have to be installed on the system.
+          If the --latex option is used, though, pdflatex is not run
+          and a LaTeX file is created instead of a PDF.
+
+          Options
+        }.gsub(/^ +/, '')
 
         # process --version and --help first,
         # exit successfully (GNU Coding Standards)
@@ -177,13 +179,14 @@ module Pdfmult
 
   # Class for the LaTeX document.
   #
-  # Create an instance with LaTeXDocument.new, specifying
-  # the input file, the number of pages to put on one page,
-  # and the page count of the input file.
+  # Create an instance with LaTeXDocument.new, specifying the
+  # input file, the layout, and the page count of the input file.
   #
   # The method +to_s+ returns the document as multiline string.
   class LaTeXDocument
 
+    attr_reader :pdffile, :layout, :page_count
+
     TEMPLATE = %q(
       \documentclass[<%= class_options %>]{article}
       \usepackage{pdfpages}
@@ -191,7 +194,7 @@ module Pdfmult
       \setlength{\parindent}{0pt}
       \begin{document}
       % pages_strings.each do |pages|
-        \includepdf[pages={<%= pages %>},nup=<%= geometry %>]{<%= @pdffile %>}%
+        \includepdf[pages={<%= pages %>},nup=<%= geometry %>]{<%= pdffile %>}%
       % end
       \end{document}
     ).gsub(/\A\n/,'').gsub(/^ +/, '')
@@ -209,8 +212,8 @@ module Pdfmult
     end
 
     def to_s
-      class_options = "a4paper"
-      class_options << ',landscape'  if @layout.landscape?
+      class_options = 'a4paper'
+      class_options << ',landscape'  if layout.landscape?
       latex = ERB.new(TEMPLATE, 0, '%<>')
 
       latex.result(binding)
@@ -219,15 +222,19 @@ module Pdfmult
     private
 
     def geometry
-      @layout.geometry
+      layout.geometry
+    end
+
+    def pages_per_sheet
+      layout.pages
     end
 
     # Returns an array of pages strings.
     # For 4 copies and 2 pages: ["1,1,1,1", "2,2,2,2"].
     def pages_strings
-      template = 'PAGE,' * (@layout.pages - 1) + 'PAGE'
+      pages = (1..page_count).to_a
 
-      Array.new(@page_count) {|i| template.gsub(/PAGE/, "#{i+1}") }
+      pages.map {|page| ([page] * pages_per_sheet).join(',') }
     end
   end
 
@@ -250,8 +257,8 @@ module Pdfmult
     def initialize(file, options={})
       @file = file
       @binary = options[:pdfinfocmd] || PDFINFOCMD  # for unit tests
-      @infos = retrieve_infos
-      @page_count = @infos['Pages'] && @infos['Pages'].to_i
+      infos = retrieve_infos
+      @page_count = infos['Pages'] && infos['Pages'].to_i
     end
 
     private
@@ -279,51 +286,52 @@ module Pdfmult
 
     ERRORCODE = {:general => 1, :usage => 2}
 
-    # The main program.
-    def self.run!
-
-      # parse options
+    def initialize
       begin
         options = Optionparser.parse!(ARGV)
       rescue => e
         usage_fail(e.message)
       end
+      @infile = options[:infile]
+      @outfile = options[:outfile]
+      @use_stdout = (@outfile == '-')
+      @silent = options[:silent]
+      @force = options[:force]
+      @latex = options[:latex]
+      @number = options[:number]
+      @pages = options[:pages] || PDFInfo.new(@infile).page_count || 1
+    end
 
-      infile = options[:infile]
-      outfile = options[:outfile]
-      use_stdout = (outfile == '-')
-      silent = options[:silent]
+    # The main program.
+    def run!
 
       # test for pdflatex installation
-      unless options[:latex]
+      unless @latex
         message = 'seems not to be installed (you might try using the -l option)'
-        general_fail("`#{PDFLATEX}' #{message}")  unless command_available?("#{PDFLATEX} --version")
-        general_fail("`pdfpages.sty' #{message}")  unless command_available?("#{KPSEWHICH} pdfpages.sty")
+        general_fail("`#{PDFLATEX}' #{message}")  unless self.class.command_available?("#{PDFLATEX} --version")
+        general_fail("`pdfpages.sty' #{message}")  unless self.class.command_available?("#{KPSEWHICH} pdfpages.sty")
       end
 
       # test input file
-      usage_fail("no such file: `#{infile}'")  unless File.exist?(infile)
-      usage_fail("specified input not of the type `file'")  unless File.ftype(infile) == 'file'
+      usage_fail("no such file: `#{@infile}'")  unless File.exist?(@infile)
+      usage_fail("specified input not of the type `file'")  unless File.ftype(@infile) == 'file'
 
       # test for existing output file
-      if !use_stdout and !options[:force] and File.exist?(outfile)
-        overwrite_ok = ask("File `#{outfile}' already exists. Overwrite?")
+      if !@use_stdout && !@force && File.exist?(@outfile)
+        overwrite_ok = confirm("File `#{@outfile}' already exists. Overwrite?")
         exit  unless overwrite_ok
       end
 
-      # set page number (get PDF info if necessary)
-      pages = options[:pages] || PDFInfo.new(infile).page_count || 1
-
       # create LaTeX document
       args = {
-        :pdffile    => infile,
-        :layout     => Layout.new(options[:number]),
-        :page_count => pages
+        :pdffile    => @infile,
+        :layout     => Layout.new(@number),
+        :page_count => @pages
       }
       document = LaTeXDocument.new(args)
 
       output = nil
-      if options[:latex]
+      if @latex
         output = document.to_s
       else
         Dir.mktmpdir('pdfmult') do |dir|
@@ -332,7 +340,7 @@ module Pdfmult
           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
+            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
           output = File.read("#{dir}/#{pdffile}")
@@ -340,35 +348,36 @@ module Pdfmult
       end
 
       # redirect stdout to output file
-      $stdout.reopen(outfile, 'w')  unless use_stdout
+      $stdout.reopen(@outfile, 'w')  unless @use_stdout
 
-      warn "Writing on #{outfile}."  unless (use_stdout || silent)
+      warn "Writing on #{@outfile}."  unless (@use_stdout || @silent)
       puts output
     end
 
+    private
+
     # Asks for yes or no (y/n).
     #
     # +question+ - string to be printed
     #
     # Returns +true+ if the answer is yes.
-    def self.ask(question) # :nodoc:
+    def confirm(question)
       loop do
         $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'
+        reply = $stdin.gets.chomp.downcase  # $stdin avoids gets/ARGV problem
+        return reply == 'y'  if /\A[yn]\Z/ =~ reply
         warn "Please answer `y' or `n'."
       end
     end
 
     # Prints an error message and exits.
-    def self.general_fail(message) # :nodoc:
+    def general_fail(message)
       warn "#{PROGNAME}: #{message}"
       exit ERRORCODE[:general]
     end
 
     # Prints an error message and a short help information, then exits.
-    def self.usage_fail(message) # :nodoc:
+    def usage_fail(message)
       warn "#{PROGNAME}: #{message}"
       warn "Use `#{PROGNAME} --help' for valid options."
       exit ERRORCODE[:usage]
@@ -381,11 +390,10 @@ module Pdfmult
       !!system("#{command} >/dev/null 2>&1")
     end
   end
+end  # module
 
 ### call main method only if called on command line
 
 if __FILE__ == $0
-  Application.run!
+  Pdfmult::Application.new.run!
 end
-
-end  # module

data/man/pdfmult.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
-.TH PDFMULT "1" "January 2013" "pdfmult 1.3.1" "User Commands"
+.TH PDFMULT "1" "October 2013" "pdfmult 1.3.2" "User Commands"
 .SH NAME
 pdfmult \- puts multiple copies of a PDF page on one page
 .SH SYNOPSIS

data/pdfmult.gemspec

@@ -9,7 +9,6 @@ Gem::Specification.new do |s|
   s.name              = 'pdfmult'
   s.version           = version
   s.date              = date
-  s.rubyforge_project = 'pdfmult'
 
   s.description = 'pdfmult is a command line tool that rearranges ' +
                   'multiple copies of a PDF page (shrunken) on one page. ' +
@@ -24,12 +23,15 @@ Gem::Specification.new do |s|
 
   s.requirements << 'pdflatex and the pdfpages package'
 
+  s.add_development_dependency('rake')
+  s.add_development_dependency('minitest')
+
   s.executables = ['pdfmult']
   s.bindir = 'bin'
+
   s.require_path = 'lib'
-  s.test_files = Dir.glob('test/**/test_*.rb')
 
-  s.rdoc_options = ['--charset=UTF-8']
+  s.test_files = Dir.glob('test/**/test_*.rb')
 
   s.files = %w{
       README.md
@@ -40,6 +42,5 @@ Gem::Specification.new do |s|
     Dir.glob('example*.*') +
     Dir.glob('{bin,lib,man,test}/**/*')
 
-  s.add_development_dependency('rake')
-  s.add_development_dependency('minitest')
+  s.rdoc_options = ['--charset=UTF-8']
 end

metadata

@@ -1,59 +1,51 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pdfmult
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 1
-  version: 1.3.1
+version: !ruby/object:Gem::Version
+  version: 1.3.2
 platform: ruby
-authors: 
+authors:
 - Marcus Stollsteimer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-10-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    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 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    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
+    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
@@ -72,39 +64,32 @@ files:
 - test/test_optionparser.rb
 - test/sample.pdf
 homepage: https://github.com/stomar/pdfmult/
-licenses: 
+licenses:
 - GPL-3
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-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 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - pdflatex and the pdfpages package
-rubyforge_project: pdfmult
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 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_layout.rb