texzip 0.1.5 → 0.1.6

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.6 / 2012-10-25
+* add .png extension for images
+* add -p parameter for storing images without nested subdirectories
+
 == 0.1.5 / 2011-06-22
 * compatibility with bibtex-parser >= 1.3.6
 * require ffi-libarchive only if necessary

data/Rakefile

@@ -8,15 +8,14 @@ end
 #task :default => 'test:run'
 #task 'gem:release' => 'test:run'
 
-files = `darcs show files`.split("\n").
-    select{|f| File.file?(f)}.
-    map{|f| f.gsub(/^\.\//, '')} - %w(.boring .bnsignore)
+files = `hg locate`.split("\n") - %w(.hgignore .hgtags)
 
 Bones {
     name      'texzip'
     authors   'Frank Fischer'
     email     'frank.fischer@mathematik.tu-chemnitz.de'
-    url       'http://darcsden.com/lyro/texzip'
+    url       'http://bitbucket.org/lyro/texzip'
+    ignore_file '.hgignore'
     depend_on 'bibtex-ruby', ['>= 1.3.6', '< 2.0']
     depend_on 'trollop', '~> 1.16'
     depend_on 'ffi-libarchive', '>= 0.1.3', '< 2.0'

data/bin/texzip

@@ -21,9 +21,10 @@ EOS
     opt :bib, "Output BibTeX file", :default => "bibliography.bib"
     opt :output, "Output directory where the modified files should saved", :type => String
     opt :images, "Subdirectory where the images should be stored", :default => "img"
+    opt "plain-images", "Images should be stored without further subdirectories"
     opt :archive, "Archive to be created", :type => String
     opt :force, "Force overwriting of files", :default => false
-    version "#{File.basename(__FILE__)} #{TeXzip::VERSION} (c) 2011 Frank Fischer"
+    version "#{File.basename(__FILE__)} #{TeXzip::VERSION} (c) 2011,2012 Frank Fischer"
 end
 
 if ARGV.empty?
@@ -40,7 +41,9 @@ end
 
 begin
     texproject = TeXzip::Project.new ARGV.shift
-    texproject.modify_files(opts[:output] || Dir.getwd, opts[:images], opts[:bib])
+    texproject.modify_files(opts[:output] || Dir.getwd,
+                      opts[:images], opts["plain-images"],
+                      opts[:bib])
 
     texproject.overwrite_all = opts[:force]
 

data/lib/texzip/Project.rb

@@ -9,7 +9,7 @@ class TeXzip::Error < Exception; end
 class TeXzip::Project < HighLine
 
     PACKAGE_EXTENSIONS = %w(.sty .cls)
-    IMAGE_EXTENSIONS = %w(.jpg .pdf .eps .pstex)
+    IMAGE_EXTENSIONS = %w(.png .jpg .pdf .eps .pstex)
     TEXIMAGE_EXTENSIONS = %w(.pspdftex .pdf_t .pstex_t)
 
     class Quit < Exception; end
@@ -21,18 +21,28 @@ class TeXzip::Project < HighLine
             @root_dir = Pathname.new(root_dir).expand_path
             @file = Pathname.new(file)
             @file = @root_dir.join(file).expand_path.relative_path_from(@root_dir)
+	        @out_file = @file
         end
 
         def set_output_directory dir
             @out_dir = Pathname.new(dir).expand_path
         end
 
+        def set_plain_output_directory dir
+	        set_output_directory dir
+	        @out_file = @file.basename
+        end
+
         def file
             @file
         end
 
+        def out_file= file
+	        @out_file = Pathname.new(file)
+        end
+
         def output_path
-            @out_dir.join(@file).expand_path
+            @out_dir.join(@out_file).expand_path
         end
 
         def path
@@ -285,15 +295,22 @@ class TeXzip::Project < HighLine
         end
     end
 
-    def modify_files outdir, image_dir, bibtex_file
+    def modify_files outdir, image_dir, plain_img, bibtex_file
         @output_directory = Pathname.new(outdir).expand_path
         @output_image_directory = @output_directory.join(Pathname.new(image_dir)).expand_path
         @output_bibtex = @output_directory.join(Pathname.new(bibtex_file)).expand_path
         @modified_files = {}
 
+	    plain_img_files = Hash.new{|h,k| h[k] = []}
+
         @tex_files.each_key do |file|
             if TEXIMAGE_EXTENSIONS.include? file.extname
-                file.set_output_directory @output_image_directory
+	            if plain_img
+		            file.set_plain_output_directory @output_image_directory
+		            plain_img_files[file.file.to_s] << file
+	            else
+		            file.set_output_directory @output_image_directory
+	            end
             else
                 file.set_output_directory @output_directory
             end
@@ -303,9 +320,32 @@ class TeXzip::Project < HighLine
         end
 
         @image_files.each do |file|
-            file.set_output_directory @output_image_directory
+		    if plain_img
+			    file.set_plain_output_directory @output_image_directory
+			    plain_img_files[file.file.to_s] << file
+		    else
+			    file.set_output_directory @output_image_directory
+		    end
         end
 
+	    # maybe rename some files
+	    plain_img_files.each_pair do |fname, files|
+		    ext = File.extname(fname)
+		    next if files.size <= 1
+		    cnt = 2
+		    files.each do |file|
+			    loop do
+				    new_fname = fname.basename.sub_ext("#{cnt}#{ext}")
+				    if plain_img_files.include?(new_fname.to_s)
+					    cnt += 1
+				    else
+					    file.out_file = new_fname
+					    break
+				    end
+			    end
+		    end
+	    end
+
         filter_bibtex
     end
 

data/version.txt

@@ -1 +1 @@
-0.1.5
+0.1.6

metadata

@@ -2,7 +2,7 @@
 name: texzip
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Frank Fischer
@@ -10,11 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-22 00:00:00 Z
+date: 2012-10-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bibtex-ruby
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -25,10 +24,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "2.0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: trollop
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -36,10 +35,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.16"
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: ffi-libarchive
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,10 +46,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.1.3
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: ffi-inliner
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,10 +57,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.2.4
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: highline
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -69,17 +68,18 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.0"
   type: :runtime
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: bones
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.7.0
+        version: 3.8.0
   type: :development
+  prerelease: false
   version_requirements: *id006
 description: |-
   A small tool to collect images and BibTeX references from tex-files
@@ -96,25 +96,25 @@ files:
 - History.txt
 - README.md
 - Rakefile
-- version.txt
 - bin/texzip
 - lib/texzip.rb
 - lib/texzip/Project.rb
-- spec/spec_helper.rb
-- spec/texzip_spec.rb
 - spec/dummy/bib1.bib
 - spec/dummy/bib2.bib
 - spec/dummy/chapter1.tex
 - spec/dummy/chapter2.tex
-- spec/dummy/chapter4.tex
-- spec/dummy/root-file.tex
-- spec/dummy/root-file2.tex
-- spec/dummy/root-file3.tex
 - spec/dummy/chapter3/chapter3-bad.tex
 - spec/dummy/chapter3/chapter3.1.tex
 - spec/dummy/chapter3/chapter3.2.tex
 - spec/dummy/chapter3/chapter3.tex
-homepage: http://darcsden.com/lyro/texzip
+- spec/dummy/chapter4.tex
+- spec/dummy/root-file.tex
+- spec/dummy/root-file2.tex
+- spec/dummy/root-file3.tex
+- spec/spec_helper.rb
+- spec/texzip_spec.rb
+- version.txt
+homepage: http://bitbucket.org/lyro/texzip
 licenses: []
 
 post_install_message: 
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: texzip
-rubygems_version: 1.7.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A small tool to collect images and BibTeX references from tex-files and repack them in a new directory with a new clean BibTeX file.