gimli 0.1.5 → 0.1.6

data/lib/gimli.rb

@@ -2,9 +2,10 @@
 
 require 'gimli/version'
 require 'gimli/setup'
-require 'gimli/file'
+require 'gimli/markupfile'
 require 'gimli/converter'
 require 'gimli/albino'
+require 'gimli/path'
 
 module Gimli
 
@@ -15,27 +16,10 @@ module Gimli
       puts "Version: #{Gimli::Version}"
       return
     end
-
-    @files = []
-    if ARGV.flags.file?
-      Gimli.load_file(ARGV.flags.file)
-    else
-      Dir.glob("*").each do |file|
-        Gimli.load_file(file)
-      end
-    end
-
-    @files.each do |file|
-      converter = Converter.new file
+    
+    Path.list_valid(ARGV.flags.file, ARGV.flags.recursive?).each do |file|
+      converter = Converter.new(MarkupFile.new(file))
       converter.convert!
     end
   end
-
-  # Add file to the files to be converted if it's valid
-  # @param [String] file
-  def self.load_file(file)
-    file = File.new file
-    @files << file if file.valid?
-  end
-end
-
+end

data/lib/gimli/{file.rb → markupfile.rb}

@@ -3,7 +3,7 @@
 module Gimli
 
   # Class used to load files and determine if they are valid
-  class File
+  class MarkupFile
     attr_reader :filename, :name, :data, :format
 
     # Accepted formats

data/lib/gimli/path.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+module Gimli
+
+  # Class used to interact with directory structure
+  class Path
+
+    # Return an array of paths to valid markup file matching the passed pattern
+    # @param [String] target
+    # @param [Bool] recursive
+    def self.list_valid(target, recursive = false)
+      if recursive
+        target ||= Dir.pwd
+        if File.directory?(target)
+          target = File.join(target, '**', '*')
+        end
+      else
+        target ||= Dir.pwd
+        if File.directory?(target)
+          target = File.join(target, '*')
+        end
+      end
+      Dir.glob(target).keep_if { |file| MarkupFile.new(file).valid? }
+    end
+  end
+end

data/lib/gimli/setup.rb

@@ -5,7 +5,7 @@ require 'optiflag'
 # Set up the flags available
 module Gimli extend OptiFlagSet
   optional_flag 'file' do
-    description 'The file to convert if you do not want to convert all in the current folder'
+    description 'The file or folder to convert if you do not want to convert all in the current folder'
     alternate_forms 'f'
   end
   optional_flag 'outputdir' do
@@ -16,6 +16,10 @@ module Gimli extend OptiFlagSet
     description 'The stylesheet to use to override the standard'
     alternate_forms 's'
   end
+  optional_switch_flag 'recursive' do
+    description 'Recurse current or target directory and convert all valid markup files'
+    alternate_forms 'r'
+  end
   optional_switch_flag 'version' do
     description 'Show version information and quit'
     alternate_forms 'v'

data/lib/gimli/version.rb

@@ -2,7 +2,7 @@
 
 module Gimli
 
-  Version = "0.1.5"
+  Version = "0.1.6"
 
 end
 

data/spec/fixtures/recursion/level1.textile

@@ -0,0 +1 @@
+h1. Level 1

data/spec/fixtures/recursion/level2/level2.markdown

@@ -0,0 +1 @@
+= Level 2 =

data/spec/gimli/converter_spec.rb

@@ -6,7 +6,7 @@ require './lib/gimli'
 
 describe Gimli::Converter do
   it 'should give the correct output_file with none given' do
-    file = Gimli::File.new 'fake'
+    file = Gimli::MarkupFile.new 'fake'
     name = 'my_file'
     mock(file).name { name }
 
@@ -17,7 +17,7 @@ describe Gimli::Converter do
   end
 
   it 'should give the correct output_file with one given' do
-    file = Gimli::File.new 'fake'
+    file = Gimli::MarkupFile.new 'fake'
     name = 'my_file'
     mock(file).name { name }
 
@@ -30,7 +30,7 @@ describe Gimli::Converter do
   it 'should give the correct output_dir when none given' do
     dir = Dir.getwd
 
-    file = Gimli::File.new 'fake'
+    file = Gimli::MarkupFile.new 'fake'
     converter = Gimli::Converter.new file
 
     converter.output_dir.should == dir
@@ -39,7 +39,7 @@ describe Gimli::Converter do
   it 'should give the correct output_dir when given' do
     dir = '/tmp/out'
 
-    file = Gimli::File.new 'fake'
+    file = Gimli::MarkupFile.new 'fake'
     converter = Gimli::Converter.new file
 
     mock(ARGV).flags.mock!.outputdir? { true }
@@ -50,7 +50,7 @@ describe Gimli::Converter do
   end
 
   it 'should use stylesheet if exists in folder' do
-    file = Gimli::File.new 'fake'
+    file = Gimli::MarkupFile.new 'fake'
     converter = Gimli::Converter.new file
 
     mock(ARGV).flags.mock!.stylesheet? { false }
@@ -59,7 +59,7 @@ describe Gimli::Converter do
   end
 
   it 'should use stylesheet if given' do
-    file = Gimli::File.new 'fake'
+    file = Gimli::MarkupFile.new 'fake'
     converter = Gimli::Converter.new file
 
     style = '/home/me/gimli/my-style.css'
@@ -71,7 +71,7 @@ describe Gimli::Converter do
   end
 
   it 'should convert relative image urls to absolute' do
-    file = Gimli::File.new 'fake'
+    file = Gimli::MarkupFile.new 'fake'
     converter = Gimli::Converter.new file
 
     html = '<p>foo</p><img src="test.jpg" alt="" /><p>bar</p><img src="test2.jpg" alt="" />'
@@ -81,7 +81,7 @@ describe Gimli::Converter do
   end
 
   it 'should not rewrite non relative urls' do
-    file = Gimli::File.new 'fake'
+    file = Gimli::MarkupFile.new 'fake'
     converter = Gimli::Converter.new file
 
     html = '<p>foo</p><img src="https://d3nwyuy0nl342s.cloudfront.net/images/modules/header/logov3-hover.png" alt="" /><p>bar</p>'
@@ -90,7 +90,7 @@ describe Gimli::Converter do
   end
 
   it 'should work on both absolute and relative images' do
-    file = Gimli::File.new 'fake'
+    file = Gimli::MarkupFile.new 'fake'
     converter = Gimli::Converter.new file
 
     html = '<p>foo</p><img src="test.jpg" alt="" /><p>bar</p><img src="/tmp/test2.jpg" alt="" /> <img src="https://d3nwyuy0nl342s.cloudfront.net/images/modules/header/logov3-hover.png" alt="" />'

data/spec/gimli/file_spec.rb

@@ -4,24 +4,24 @@ require './spec/spec_helper'
 
 require './lib/gimli'
 
-describe Gimli::File do
+describe Gimli::MarkupFile do
   it 'should recognize valid format' do
-    file = Gimli::File.new 'fake'
+    file = Gimli::MarkupFile.new 'fake'
     file.valid_format?('textile').should be_true
   end
 
   it 'should recognize invalid format' do
-    file = Gimli::File.new 'fake'
+    file = Gimli::MarkupFile.new 'fake'
     file.valid_format?('abc123').should be_false
   end
 
   it 'should recognize nil as invalid format' do
-    file = Gimli::File.new 'fake'
+    file = Gimli::MarkupFile.new 'fake'
     file.valid_format?(nil).should be_false
   end
 
   it 'should give the name as the filename without the extension' do
-    file = Gimli::File.new 'test.txt'
+    file = Gimli::MarkupFile.new 'test.txt'
     file.name.should == File.basename(file.filename, File.extname(file.filename))
   end
 end

data/spec/gimli/markup_spec.rb

@@ -14,7 +14,7 @@ describe Gimli::Markup do
 
     output_without_pygments = "<p>a</p>\n<pre><code>x = 1</code></pre>\n<p>b</p>"
 
-    file = Gimli::File.new File.expand_path('../../fixtures/code_block.textile', __FILE__)
+    file = Gimli::MarkupFile.new File.expand_path('../../fixtures/code_block.textile', __FILE__)
     markup = Gimli::Markup.new file
 
     # Check if the html seems to be highlighted
@@ -36,7 +36,7 @@ describe Gimli::Markup do
     output_without_pygments = "<p>a</p>\n<pre><code>&lt;h1&gt;Abcåäö&lt;/h1&gt;\n&lt;img " +
                               "src=\"åäö.png\" alt=\"ÅÄÖ\" /&gt;</code></pre>"
 
-    file = Gimli::File.new File.expand_path('../../fixtures/code_block_with_utf8.textile', __FILE__)
+    file = Gimli::MarkupFile.new File.expand_path('../../fixtures/code_block_with_utf8.textile', __FILE__)
     markup = Gimli::Markup.new file
 
     # Check if the html seems to be highlighted
@@ -52,7 +52,7 @@ describe Gimli::Markup do
     output = "<p>a</p>\n<code>&lt;img src=\"åäö.png\" " +
              "alt=\"Abcåäö\" /&gt;</code>\n<p>b</p>"
 
-    file = Gimli::File.new File.expand_path('../../fixtures/code_with_utf8.textile', __FILE__)
+    file = Gimli::MarkupFile.new File.expand_path('../../fixtures/code_with_utf8.textile', __FILE__)
     markup = Gimli::Markup.new file
 
     markup.render.should == output

data/spec/gimli/path_spec.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+
+require './spec/spec_helper'
+
+require './lib/gimli'
+
+describe Gimli::Path do
+
+  it 'should find all files in the current directory, with no specified target, without recursion' do
+    mock(Dir).pwd { './spec/fixtures/recursion/' }
+    Gimli::Path.list_valid(nil, false).length.should == 1
+  end
+
+  it 'should find all files in all subdirectories, with no specified target, with recursion ' do
+    mock(Dir).pwd { './spec/fixtures/recursion/' }
+    Gimli::Path.list_valid(nil, true).length.should == 2
+  end
+
+  it 'should find all files in all subdirectories, with a specified directory, with recursion' do
+    Gimli::Path.list_valid('./spec/fixtures/recursion/', true).length.should == 2
+  end
+
+  it 'should find one file, with a specified file, without recursion' do
+    Gimli::Path.list_valid('./spec/fixtures/recursion/level1.textile', false).length.should == 1
+  end
+
+  # What is the sound of one file recursing?
+  it 'should find one file, with a specified file, with recursion' do
+    Gimli::Path.list_valid('README.textile', true).length.should == 1
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gimli
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-27 00:00:00.000000000 +02:00
+date: 2011-05-28 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20582820 !ruby/object:Gem::Requirement
+  requirement: &8153660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20582820
+  version_requirements: *8153660
 - !ruby/object:Gem::Dependency
   name: github-markup
-  requirement: &20582380 !ruby/object:Gem::Requirement
+  requirement: &8153220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20582380
+  version_requirements: *8153220
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &20581960 !ruby/object:Gem::Requirement
+  requirement: &8152800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20581960
+  version_requirements: *8152800
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &20581540 !ruby/object:Gem::Requirement
+  requirement: &8152380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20581540
+  version_requirements: *8152380
 - !ruby/object:Gem::Dependency
   name: org-ruby
-  requirement: &20581120 !ruby/object:Gem::Requirement
+  requirement: &8151960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20581120
+  version_requirements: *8151960
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &20580700 !ruby/object:Gem::Requirement
+  requirement: &8151540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20580700
+  version_requirements: *8151540
 - !ruby/object:Gem::Dependency
   name: wikicloth
-  requirement: &20580280 !ruby/object:Gem::Requirement
+  requirement: &8151120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20580280
+  version_requirements: *8151120
 - !ruby/object:Gem::Dependency
   name: albino
-  requirement: &20579860 !ruby/object:Gem::Requirement
+  requirement: &8150700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20579860
+  version_requirements: *8150700
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &20579440 !ruby/object:Gem::Requirement
+  requirement: &8150280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20579440
+  version_requirements: *8150280
 - !ruby/object:Gem::Dependency
   name: wkhtmltopdf-binary
-  requirement: &20579020 !ruby/object:Gem::Requirement
+  requirement: &8149860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20579020
+  version_requirements: *8149860
 - !ruby/object:Gem::Dependency
   name: pdfkit
-  requirement: &20578600 !ruby/object:Gem::Requirement
+  requirement: &8144320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20578600
+  version_requirements: *8144320
 - !ruby/object:Gem::Dependency
   name: optiflag
-  requirement: &20573260 !ruby/object:Gem::Requirement
+  requirement: &8143860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20573260
+  version_requirements: *8143860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20572820 !ruby/object:Gem::Requirement
+  requirement: &8143440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20572820
+  version_requirements: *8143440
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &20572320 !ruby/object:Gem::Requirement
+  requirement: &8142980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20572320
+  version_requirements: *8142980
 description: Utility for converting markup files to pdf files. Useful for reports
   etc.
 email: fredrik.wallgren@gmail.com
@@ -178,8 +178,9 @@ extra_rdoc_files:
 files:
 - bin/gimli
 - lib/gimli/version.rb
+- lib/gimli/path.rb
 - lib/gimli/albino.rb
-- lib/gimli/file.rb
+- lib/gimli/markupfile.rb
 - lib/gimli/markup.rb
 - lib/gimli/setup.rb
 - lib/gimli/converter.rb
@@ -187,7 +188,10 @@ files:
 - spec/spec_helper.rb
 - spec/fixtures/code_with_utf8.textile
 - spec/fixtures/code_block_with_utf8.textile
+- spec/fixtures/recursion/level2/level2.markdown
+- spec/fixtures/recursion/level1.textile
 - spec/fixtures/code_block.textile
+- spec/gimli/path_spec.rb
 - spec/gimli/converter_spec.rb
 - spec/gimli/markup_spec.rb
 - spec/gimli/file_spec.rb