pdfmult 1.1.0 → 1.2.0

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="/stomar/pdfmult/raw/master/example1.png" alt="" width="152" height="59">
+    <img src="https://github.com/stomar/pdfmult/raw/master/example1.png" alt="" width="152" height="59">
 
 * `pdfmult -n 4 sample.pdf`
 
     writes 4 copies of `sample.pdf` to `sample_4.pdf`
 
-    <img src="/stomar/pdfmult/raw/master/example2.png" alt="" width="234" height="59">
+    <img src="https://github.com/stomar/pdfmult/raw/master/example2.png" alt="" width="234" height="59">
 
 * `pdfmult sample.pdf -o outfile.pdf`
 

data/Rakefile

@@ -34,7 +34,7 @@ end
 desc 'Install binary and man page'
 task :install => [BINARY, MANPAGE] do
   mkdir_p BINDIR
-  install(BINARY, BINDIR + '/' + BINARYNAME)
+  install(BINARY, "#{BINDIR}/#{BINARYNAME}")
   mkdir_p MANDIR
   install(MANPAGE, MANDIR, :mode => 0644)
 end

data/lib/pdfmult.rb

@@ -27,13 +27,15 @@
 #
 # -n, --number:: Number of copies to put on one page: 2 (default), 4, 8, 9, 16.
 #
+# -f, --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).
 #
 # -p, --pages:: Number of pages to convert.
 #               If given, +pdfmult+ does not try to obtain the page count from the source PDF.
 #
-# -l, --latex:: Create a LaTeX file instead of a PDF file (default: infile_NUMBER.tex).
-#
 # -h, --help:: Prints a brief help message and exits.
 #
 # -v, --version:: Prints a brief version information and exits.
@@ -61,8 +63,10 @@ require 'fileutils'
 module Pdfmult
 
   PROGNAME  = 'pdfmult'
-  VERSION   = '1.1.0'
-  DATE      = '2012-03-16'
+  VERSION   = '1.2.0'
+  DATE      = '2012-04-15'
+  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" +
               "This is free software: you are free to change and redistribute it.\n" +
@@ -85,9 +89,10 @@ module Pdfmult
     def self.parse!(argv)
 
       options = {
-        :number  => 2,
+        :force   => false,
         :infile  => nil,
         :latex   => false,
+        :number  => 2,
         :outfile => nil,
         :pages   => nil
       }
@@ -117,7 +122,7 @@ module Pdfmult
         # exit successfully (GNU Coding Standards)
         opt.on_tail('-h', '--help', 'Prints a brief help message and exits.') do
           puts opt_parser
-          puts "\nReport bugs on the pdfmult home page: <https://github.com/stomar/pdfmult/>"
+          puts "\nReport bugs on the #{PROGNAME} home page: <#{HOMEPAGE}>"
           exit
         end
 
@@ -133,6 +138,14 @@ module Pdfmult
           options[:number] = n
         end
 
+        opt.on('-f', '--force', 'Do not prompt before overwriting.') do
+          options[:force] = true
+        end
+
+        opt.on('-l', '--latex', 'Create a LaTeX file instead of a PDF file (default: file_2.tex).') do
+          options[:latex] = true
+        end
+
         opt.on('-o', '--output FILE', String,
                'Output file (default: file_2.pdf).') do |f|
           options[:outfile] = f
@@ -145,10 +158,6 @@ module Pdfmult
           options[:pages] = p
         end
 
-        opt.on('-l', '--latex', 'Create a LaTeX file instead of a PDF file (default: file_2.tex).') do
-          options[:latex] = true
-        end
-
         opt.separator ''
       end
       opt_parser.parse!(argv)
@@ -160,7 +169,8 @@ module Pdfmult
 
       # set output file unless set by option
       ext = options[:latex] ? 'tex' : 'pdf'
-      options[:outfile] ||= options[:infile].gsub(/(.pdf)$/, '') + "_#{options[:number].to_s}.#{ext}"
+      infile_without_ext = options[:infile].gsub(/(.pdf)\Z/, '')
+      options[:outfile] ||= "#{infile_without_ext}_#{options[:number].to_s}.#{ext}"
 
       options
     end
@@ -207,12 +217,12 @@ module Pdfmult
 
       case @number
       when 2
-        class_options += ',landscape'
+        class_options << ',landscape'
         geometry = '2x1'
       when 4
         geometry = '2x2'
       when 8
-        class_options += ',landscape'
+        class_options << ',landscape'
         geometry = '4x2'
       when 9
         geometry = '3x3'
@@ -266,7 +276,7 @@ module Pdfmult
 
     # Returns true if default +pdfinfo+ system tool is available (for unit tests).
     def self.infocmd_available? # :nodoc:
-      Application.command_available?(PDFINFOCMD + ' -v')
+      Application.command_available?("#{PDFINFOCMD} -v")
     end
   end
 
@@ -302,7 +312,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)
+      if File.exist?(outfile) and !options[:force]
         overwrite_ok = ask("File `#{outfile}' already exists. Overwrite?")
         exit  unless overwrite_ok
       end
@@ -316,9 +326,7 @@ module Pdfmult
       document = LaTeXDocument.new(infile, options[:number], pages)
 
       if options[:latex]
-        open(outfile, 'w') do |f|
-          f.write(document.to_s)
-        end
+        open(outfile, 'w') {|f| f.write(document.to_s) }
       else
         Dir.mktmpdir('pdfmult') do |dir|
           open("#{dir}/pdfmult.tex", 'w') do |f|
@@ -340,7 +348,7 @@ module Pdfmult
     # Returns +true+ if the answer is yes.
     def self.ask(question) # :nodoc:
       while true
-        print question + ' [y/n] '
+        print "#{question} [y/n] "
         reply = $stdin.gets.chomp.downcase  # $stdin: avoids gets / ARGV problem
         return true   if reply == 'y'
         return false  if reply == 'n'
@@ -365,7 +373,7 @@ module Pdfmult
     #
     # +command+ - command to test
     def self.command_available?(command) # :nodoc:
-      !!system(command + ' >/dev/null 2>&1')
+      !!system("#{command} >/dev/null 2>&1")
     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" "March 2012" "pdfmult 1.1.0" "User Commands"
+.TH PDFMULT "1" "April 2012" "pdfmult 1.2.0" "User Commands"
 .SH NAME
 pdfmult \- puts multiple copies of a PDF page on one page
 .SH SYNOPSIS
@@ -25,6 +25,12 @@ 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
+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).
 .TP
@@ -32,9 +38,6 @@ Output file (default: file_2.pdf).
 Number of pages to convert.
 If given, pdfmult does not try to obtain the page count from the source PDF.
 .TP
-\fB\-l\fR, \fB\-\-latex\fR
-Create a LaTeX file instead of a PDF file (default: file_2.tex).
-.TP
 \fB\-h\fR, \fB\-\-help\fR
 Prints a brief help message and exits.
 .TP

data/pdfmult.gemspec

@@ -1,7 +1,8 @@
 require 'lib/pdfmult'
 
-version = Pdfmult::VERSION
-date    = Pdfmult::DATE
+version  = Pdfmult::VERSION
+date     = Pdfmult::DATE
+homepage = Pdfmult::HOMEPAGE
 
 Gem::Specification.new do |s|
   s.name              = 'pdfmult'
@@ -16,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.authors = ['Marcus Stollsteimer']
   s.email = 'sto.mar@web.de'
-  s.homepage = 'https://github.com/stomar/pdfmult/'
+  s.homepage = homepage
 
   s.license = 'GPL-3'
 
@@ -29,12 +30,12 @@ Gem::Specification.new do |s|
 
   s.rdoc_options = ['--charset=UTF-8']
 
-  s.files = %w[
+  s.files = %w{
       README.md
       Rakefile
       pdfmult.gemspec
       pdfmult.h2m
-    ] +
+    } +
     Dir.glob('example*.*') +
     Dir.glob('{bin,lib,man,test}/**/*')
 

data/test/test_optionparser.rb

@@ -13,11 +13,12 @@ describe Pdfmult::Optionparser do
   it 'should return the correct default values' do
     options = Pdfmult::Optionparser.parse!(['sample.pdf'])
     expected = {
-      :infile => 'sample.pdf',
+      :force   => false,
+      :infile  => 'sample.pdf',
+      :latex   => false,
+      :number  => 2,
       :outfile => 'sample_2.pdf',
-      :number => 2,
-      :pages => nil,
-      :latex => false
+      :pages   => nil
     }
     options.must_equal expected
   end
@@ -42,6 +43,11 @@ describe Pdfmult::Optionparser do
     options[:pages].must_equal 4
   end
 
+  it 'should recognize the -f option' do
+    options = Pdfmult::Optionparser.parse!(['sample.pdf', '-f'])
+    options[:force].must_equal true
+  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'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pdfmult
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Marcus Stollsteimer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-16 00:00:00 Z
+date: 2012-04-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake