texzip 0.1.4 → 0.1.5

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.5 / 2011-06-22
+* compatibility with bibtex-parser >= 1.3.6
+* require ffi-libarchive only if necessary
+
 == 0.1.4 / 2011-04-20 
 * Scan all files at once instead of linewise to deal with commands
   over multiple lines

data/Rakefile

@@ -17,7 +17,7 @@ Bones {
     authors   'Frank Fischer'
     email     'frank.fischer@mathematik.tu-chemnitz.de'
     url       'http://darcsden.com/lyro/texzip'
-    depend_on 'bibtex-ruby', ['>= 1.2.1', '< 2.0']
+    depend_on 'bibtex-ruby', ['>= 1.3.6', '< 2.0']
     depend_on 'trollop', '~> 1.16'
     depend_on 'ffi-libarchive', '>= 0.1.3', '< 2.0'
     depend_on 'ffi-inliner', '>= 0.2.4', '< 2.0'

data/lib/texzip/Project.rb

@@ -2,7 +2,6 @@ require 'pathname'
 require 'set'
 require 'fileutils'
 require 'bibtex'
-require 'ffi-libarchive'
 require 'highline'
 
 class TeXzip::Error < Exception; end
@@ -99,7 +98,7 @@ class TeXzip::Project < HighLine
             @bib_files.each do |bib_file|
                 bib = BibTeX.open(bib_file.path)
                 bib.replace_strings
-                @bib.add(bib.to_a)
+                @bib.add(bib.data)
             end
         else
             @bib = nil
@@ -351,27 +350,28 @@ class TeXzip::Project < HighLine
 
     def filter_bibtex
         if @bib
-            cites = @cites.to_a
+            cites = @cites.to_a.map{|c| c.to_s}
             seen_cites = cites.to_set
             until cites.empty?
                 cite = cites.pop
-                entry = @bib[cite]
-                if entry
-                    crossref = entry["crossref"]
-                    if crossref
-                        crossref.split(',').map(&:strip).each do |ref|
-                            if seen_cites.add? ref
-                                cites << ref
-                                seen_cites << ref
+                entries = @bib[cite]
+                if entries.nil?
+                    puts "WARNING: Can't find BibTeX-entry #{cite}"
+                else
+                    entries = [entries] unless entries.kind_of? Array
+                    entries.each do |entry|
+                        crossref = entry["crossref"]
+                        if crossref
+                            crossref.split(',').map(&:strip).each do |ref|
+                                ref = ref.to_s
+                                cites << ref if seen_cites.add? ref
                             end
                         end
                     end
-                else
-                    puts "WARNING: Can't find BibTeX-entry #{cite}"
                 end
             end
 
-            @bib = BibTeX::Bibliography.new( @bib.to_a.select{|entry| seen_cites.include? entry.key} )
+            @bib = BibTeX::Bibliography.new.add(@bib.data.select{|entry| seen_cites.include? entry.key.to_s})
         end
     end
 
@@ -391,6 +391,8 @@ class TeXzip::Project < HighLine
     end
 
     def write_archive( archive_file, force = false )
+        require 'ffi-libarchive'
+
         archive_file = Pathname.new(archive_file).expand_path
         return unless ask_overwrite(archive_file)
 

data/version.txt

@@ -1 +1 @@
-0.1.4
+0.1.5

metadata

@@ -2,7 +2,7 @@
 name: texzip
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Frank Fischer
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 Z
+date: 2011-06-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bibtex-ruby
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.3.6
     - - <
       - !ruby/object:Gem::Version 
         version: "2.0"
@@ -78,7 +78,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.6.5
+        version: 3.7.0
   type: :development
   version_requirements: *id006
 description: |-