pdfs2pdf 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83ae1e3e9fca1d4df07df80d14b3922da5b49696
-  data.tar.gz: fcae014da249a1a8b3743c3739a50613d4343b3e
+  metadata.gz: 1ceb2f9f7a6a8fc41d1d6f3b246adf6764506e74
+  data.tar.gz: 28a4f610e387bc2b698a002d45742635b1d7a751
 SHA512:
-  metadata.gz: f21dcaa0b180e265f60a51facf62bb5df68c9d44f16f6a701770096d8fbc6899ad3ccd9ac102a9b72992df2ce8d5b5e3be78002021b265e993d7df358ddd6a11
-  data.tar.gz: ace3b8d0838f2fb957afc602d29f9bbab518bba0083b692a9b0c6033e37435698892945e08e8a648207534c559584dd3a273460c7e752d9111199134126fda5c
+  metadata.gz: ab425500b6d2f1f2310b790a659ff39eb21e20ef8f5c4fce6629dac16d35c428a343e72d076de612f717e04071ea2345e13f887d8ef4d9092fa81e640ded0259
+  data.tar.gz: 2111ce959961cf4e0f947171bef478bdebac15432c40c0e0644503c093acdf5fcf967aea898f6e5e4b4964d70c84fb3c831667f00a88dae415502d07fd3bfde5

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ### Changelogs
 
+#### 0.1.2
+
+- Re-instate the `--base-dir` option and make relative path work correctly
+- Respect the `--recursive` option
+- Minor code cleanup
+
 #### 0.1.1
 
 - Simplify the CLI interface

data/README.md

@@ -4,7 +4,7 @@
 [![Dependency Status](https://gemnasium.com/agilecreativity/pdfs2pdf.png)](https://gemnasium.com/agilecreativity/pdfs2pdf)
 [![Code Climate](https://codeclimate.com/github/agilecreativity/pdfs2pdf.png)](https://codeclimate.com/github/agilecreativity/pdfs2pdf)
 
-Combine multiple PDF files into a single pdf file with simple bookmarks support using [Ghostscript][].
+Combine multiple PDF files into a single pdf file with combine table of centent using [Ghostscript][].
 
 ### What it does?
 
@@ -39,7 +39,6 @@ When you run the following command:
 
 ```
 gem install pdfs2pdf
-# Note: must change to the root of the directory that we want to start from
 cd ./test/fixtures/samples
 pdfs2pdf --recursive
 ```
@@ -75,8 +74,11 @@ Usage:
   pdfs2pdf
 
 Options:
-  -r, [--recursive], [--no-recursive]      # Search for files recursively
-  -v, [--version], [--no-version]          # Display version information
+  -b, [--base-dir=BASE_DIR]            # Base directory
+                                       # Default: . (current directory)
+  -r, [--recursive], [--no-recursive]  # Search for files recursively
+                                       # Default: true
+  -v, [--version], [--no-version]      # Display version information
 
 Combine multiple pdfs into one file with bookmarks
 ```

data/lib/pdfs2pdf/cli.rb

@@ -8,21 +8,20 @@ module Pdfs2Pdf
   include AgileUtils::Options
   include CodeLister
   class CLI < Thor
-    desc "merge", "Combine multiple pdfs into one file with bookmarks"
-    # method_option *AgileUtils::Options::BASE_DIR
+    desc "merge", "Combine multiple pdfs into one file with combined table of content"
+    method_option *AgileUtils::Options::BASE_DIR
     method_option *AgileUtils::Options::RECURSIVE
     method_option *AgileUtils::Options::VERSION
-
     def merge
       opts = options.symbolize_keys
       if opts[:version]
         puts "You are using Pdfs2Pdf version #{Pdfs2Pdf::VERSION}"
         exit
       end
-      base_dir = File.expand_path(Dir.pwd)
+      base_dir  = File.expand_path(opts[:base_dir])
       pdf_files = CodeLister.files base_dir:  base_dir,
                                    exts:      %w[pdf],
-                                   recursive: true
+                                   recursive: opts[:recursive]
       create_pdfmarks(pdf_files, base_dir)
       merge_pdfs(pdf_files)
     end
@@ -31,11 +30,18 @@ module Pdfs2Pdf
     def usage
       puts <<-EOT
 Usage:
+
   pdfs2pdf
+
 Options:
-  -r, [--recursive], [--no-recursive]      # Search for files recursively
-  -v, [--version], [--no-version]          # Display version information
-Combine multiple pdfs into one file with bookmarks
+  -b, [--base-dir=BASE_DIR]            # Base directory
+                                       # Default: . (current directory)
+  -r, [--recursive], [--no-recursive]  # Search for files recursively
+                                       # Default: --recursive
+  -v, [--version], [--no-version]      # Display version information
+
+Combine multiple pdfs into one file with combined table of content
+
       EOT
     end
 
@@ -51,11 +57,12 @@ Combine multiple pdfs into one file with bookmarks
     end
 
     def merge_pdfs(pdf_files)
+      output_filename = "pdfs2pdf_output.pdf"
       elapsed = AgileUtils::FileUtil.time do
-        Pdfs2Pdf.merge_pdfs(pdf_files, "pdfmarks", "pdfs2pdf_output.pdf")
+        Pdfs2Pdf.merge_pdfs(pdf_files, "pdfmarks", output_filename)
       end
       puts "Combine pdf files took #{elapsed} ms"
-      puts "Your combined pdf is available at #{File.absolute_path("pdfs2pdf_output.pdf")}"
+      puts "Your combined pdf is available at #{File.absolute_path(output_filename)}"
     end
   end
 end

data/lib/pdfs2pdf/pdfs2pdf.rb

@@ -12,12 +12,13 @@ module Pdfs2Pdf
     # @param [String] base_dir the base directory
     # def create_pdfmarks(pdf_files, pdfmarks_file = "pdfmarks", base_dir = Dir.pwd)
     def create_pdfmarks(pdf_files, pdfmarks_file = "pdfmarks", base_dir)
+      FileUtils.chdir(base_dir)
       File.open(pdfmarks_file, "w") do |out_file|
         out_file.write(Pdfs2Pdf.configuration.pdfmarks_meta)
         current_page = 1
         pdf_files.each do |pdf_file|
           out_file.write "[ /Page #{current_page} /Title (#{pdf_file}) /OUT pdfmark\n"
-          current_page += page_count(base_dir, pdf_file)
+          current_page += page_count(pdf_file)
         end
       end
     end
@@ -46,8 +47,8 @@ module Pdfs2Pdf
     # Extract pdf page count using pdf-reader
     #
     # @return [Fixnum] the page count of the given pdf file
-    def page_count(base_dir, pdf_file)
-      pdf_file = File.expand_path([base_dir, pdf_file].join("/"))
+    def page_count(pdf_file)
+      pdf_file = File.expand_path(pdf_file)
       File.open(pdf_file, "rb") do |io|
         reader = PDF::Reader.new(io)
         return reader.page_count

data/lib/pdfs2pdf/version.rb

@@ -1,3 +1,3 @@
 module Pdfs2Pdf
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/pdfs2pdf.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Pdfs2Pdf::VERSION
   spec.authors       = ["Burin Choomnuan"]
   spec.email         = ["agilecreativity@gmail.com"]
-  spec.summary       = %q(Combine multiple pdfs into one pdf with proper bookmarks for easy navigation)
-  spec.description   = %q(Combine multiple pdfs into a single file with bookmarks for easy navigation)
+  spec.summary       = %q(Combine multiple pdf files into a single pdf with combined table of content for quick navigation)
+  spec.description   = %q(Combine multiple pdf files into a single file with combined table of content for quick navigation)
   spec.homepage      = "https://github.com/agilecreativity/pdfs2pdf"
   spec.license       = "MIT"
   spec.files         = Dir.glob("{bin,lib,config}/**/*") + %w[Gemfile

data/test/lib/pdfs2pdf/test_pdfs2pdf.rb

@@ -3,7 +3,7 @@ describe Pdfs2Pdf do
   context "#page_count" do
     it "returns result for valid command" do
       input_file = "demo1_xxx.rb.xhtml.pdf"
-      result = Pdfs2Pdf.page_count("./test/fixtures/samples", input_file)
+      result = Pdfs2Pdf.page_count("./test/fixtures/samples/#{input_file}")
       result.must_equal 1
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdfs2pdf
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Burin Choomnuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -206,7 +206,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: Combine multiple pdfs into a single file with bookmarks for easy navigation
+description: Combine multiple pdf files into a single file with combined table of
+  content for quick navigation
 email:
 - agilecreativity@gmail.com
 executables:
@@ -258,12 +259,13 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Combine multiple pdfs into one pdf with proper bookmarks for easy navigation
+summary: Combine multiple pdf files into a single pdf with combined table of content
+  for quick navigation
 test_files:
-- test/fixtures/samples/demo1_xxx.rb.xhtml.pdf
-- test/fixtures/samples/demo2_xxx.rb.xhtml.pdf
-- test/fixtures/samples/sub_dir/demo3_xxx.rb.xhtml.pdf
-- test/fixtures/samples/sub_dir/demo4_xxx.rb.xhtml.pdf
 - test/lib/pdfs2pdf/test_pdfs2pdf.rb
 - test/test_helper.rb
+- test/fixtures/samples/demo2_xxx.rb.xhtml.pdf
+- test/fixtures/samples/sub_dir/demo4_xxx.rb.xhtml.pdf
+- test/fixtures/samples/sub_dir/demo3_xxx.rb.xhtml.pdf
+- test/fixtures/samples/demo1_xxx.rb.xhtml.pdf
 has_rdoc: