gimli 0.1.9 → 0.2.0

data/bin/gimli

@@ -4,5 +4,10 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)) + '/../lib/')
 
 require 'gimli'
 
-Gimli.process!
+if ARGV.flags.version?
+  puts "Version: #{Gimli::Version}"
+  exit
+end
+
+Gimli.process! ARGV.flags.file, ARGV.flags.recursive?, ARGV.flags.merge?, ARGV.flags.outputfilename, ARGV.flags.outputdir, ARGV.flags.stylesheet
 

data/lib/gimli.rb

@@ -10,14 +10,10 @@ require 'gimli/path'
 module Gimli
 
   # Starts the processing of selected files
-  def self.process!
+  def self.process!(file, recursive = false, merge = false, output_filename = nil, output_dir = nil, stylesheet = nil)
 
-    if ARGV.flags.version?
-      puts "Version: #{Gimli::Version}"
-      return
-    end
 
-    @files = Path.list_valid(ARGV.flags.file, ARGV.flags.recursive?).map { |file| MarkupFile.new(file) }
-    Converter.new(@files).convert!(ARGV.flags.merge?)
+    @files = Path.list_valid(file, recursive).map { |file| MarkupFile.new(file) }
+    Converter.new(@files, output_filename, output_dir, stylesheet).convert!(merge)
   end
 end

data/lib/gimli/converter.rb

@@ -13,8 +13,11 @@ module Gimli
 
     # Initialize the converter with a File
     # @param [Array] files The list of Gimli::MarkupFile to convert (passing a single file will still work)
-    def initialize(files)
+    def initialize(files, output_filename = nil, output_dir = nil, stylesheet = nil)
       @files = files
+      @output_filename = output_filename
+      @output_dir = output_dir
+      @stylesheet = stylesheet
     end
 
     # Convert the file and save it as a PDF file
@@ -81,13 +84,13 @@ module Gimli
     # Returns the selected stylesheet. Defaults to ./gimli.css
     # @return [String]
     def stylesheet
-      ARGV.flags.stylesheet? ? ARGV.flags.stylesheet : 'gimli.css'
+      @stylesheet.nil? ? 'gimli.css' : @stylesheet
     end
 
     # Returns the directory where to save the output. Defaults to ./
     # @return [String]
     def output_dir
-      output_dir = ARGV.flags.outputdir? ? ARGV.flags.outputdir : Dir.getwd
+      output_dir = @output_dir.nil? ? Dir.getwd : @output_dir
       FileUtils.mkdir_p(output_dir) unless ::File.directory?(output_dir)
       output_dir
     end
@@ -98,13 +101,13 @@ module Gimli
     def output_file(file = nil)
       if file
         output_filename = file.name
-        if ARGV.flags.outputfilename? && @files.length == 1
-          output_filename = ARGV.flags.outputfilename
+        if !@output_filename.nil? && @files.length == 1
+          output_filename = @output_filename
         end
       else
         output_filename = Time.now.to_s.split(' ').join('_')
         output_filename = @files.last.name if @files.length == 1 || ARGV.flags.merge?
-        output_filename = ARGV.flags.outputfilename if ARGV.flags.outputfilename?
+        output_filename = @output_filename unless @output_filename.nil?
       end
 
       ::File.join(output_dir, "#{output_filename}.pdf")

data/lib/gimli/version.rb

@@ -2,7 +2,7 @@
 
 module Gimli
 
-  Version = "0.1.9"
+  Version = "0.2.0"
 
 end
 

data/spec/gimli/converter_spec.rb

@@ -31,10 +31,8 @@ describe Gimli::Converter do
     file = Gimli::MarkupFile.new 'fake'
     output_filename = 'my_file'
 
-    converter = Gimli::Converter.new [file]
+    converter = Gimli::Converter.new [file], output_filename
     mock(converter).output_dir { Dir.getwd }
-    mock(ARGV).flags.mock!.outputfilename? { true }
-    mock(ARGV).flags.mock!.outputfilename { output_filename }
 
     converter.output_file.should == File.join(Dir.getwd, "#{output_filename}.pdf")
   end
@@ -52,34 +50,27 @@ describe Gimli::Converter do
     dir = '/tmp/out'
 
     file = Gimli::MarkupFile.new 'fake'
-    converter = Gimli::Converter.new file
+    converter = Gimli::Converter.new file, nil, dir
 
-    mock(ARGV).flags.mock!.outputdir? { true }
-    mock(ARGV).flags.mock!.outputdir { dir }
     mock(File).directory?(dir) { true }
 
     converter.output_dir.should == dir
   end
 
-  it 'should use stylesheet if exists in folder' do
+  it 'should use default stylesheet if none given' do
     file = Gimli::MarkupFile.new 'fake'
     converter = Gimli::Converter.new file
 
-    mock(ARGV).flags.mock!.stylesheet? { false }
-
     converter.stylesheet.should == 'gimli.css'
   end
 
   it 'should use stylesheet if given' do
     file = Gimli::MarkupFile.new 'fake'
-    converter = Gimli::Converter.new file
-
-    style = '/home/me/gimli/my-style.css'
+    stylesheet = '/home/me/gimli/my-style.css'
 
-    mock(ARGV).flags.mock!.stylesheet? { true }
-    mock(ARGV).flags.mock!.stylesheet { style }
+    converter = Gimli::Converter.new file, nil, nil, stylesheet
 
-    converter.stylesheet.should == style
+    converter.stylesheet.should == stylesheet
   end
 
   it 'should convert relative image urls to absolute' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gimli
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-11 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-08-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
-  requirement: &10022600 !ruby/object:Gem::Requirement
+  requirement: &22561440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *10022600
+  version_requirements: *22561440
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &10022120 !ruby/object:Gem::Requirement
+  requirement: &22557940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: 1.17.2
   type: :runtime
   prerelease: false
-  version_requirements: *10022120
+  version_requirements: *22557940
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &10021660 !ruby/object:Gem::Requirement
+  requirement: &22556960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 4.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *10021660
+  version_requirements: *22556960
 - !ruby/object:Gem::Dependency
   name: org-ruby
-  requirement: &10021200 !ruby/object:Gem::Requirement
+  requirement: &22555840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +54,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *10021200
+  version_requirements: *22555840
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &10020740 !ruby/object:Gem::Requirement
+  requirement: &22555200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +65,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *10020740
+  version_requirements: *22555200
 - !ruby/object:Gem::Dependency
   name: wikicloth
-  requirement: &10020280 !ruby/object:Gem::Requirement
+  requirement: &22554420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +76,10 @@ dependencies:
         version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *10020280
+  version_requirements: *22554420
 - !ruby/object:Gem::Dependency
   name: albino
-  requirement: &10019820 !ruby/object:Gem::Requirement
+  requirement: &22553060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +87,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *10019820
+  version_requirements: *22553060
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &10019360 !ruby/object:Gem::Requirement
+  requirement: &22551860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +98,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *10019360
+  version_requirements: *22551860
 - !ruby/object:Gem::Dependency
   name: wkhtmltopdf-binary
-  requirement: &10018900 !ruby/object:Gem::Requirement
+  requirement: &22550100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +109,10 @@ dependencies:
         version: 0.9.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *10018900
+  version_requirements: *22550100
 - !ruby/object:Gem::Dependency
   name: pdfkit
-  requirement: &10018440 !ruby/object:Gem::Requirement
+  requirement: &22546560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +120,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *10018440
+  version_requirements: *22546560
 - !ruby/object:Gem::Dependency
   name: optiflag
-  requirement: &10017980 !ruby/object:Gem::Requirement
+  requirement: &22545840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +131,21 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *10017980
+  version_requirements: *22545840
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &22545180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *22545180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10017600 !ruby/object:Gem::Requirement
+  requirement: &22544200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10017600
+  version_requirements: *22544200
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &10017140 !ruby/object:Gem::Requirement
+  requirement: &22543320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10017140
+  version_requirements: *22543320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10016720 !ruby/object:Gem::Requirement
+  requirement: &22542540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +175,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10016720
+  version_requirements: *22542540
 description: Utility for converting markup files to pdf files. Useful for reports
   etc.
 email: fredrik.wallgren@gmail.com
@@ -198,7 +208,6 @@ files:
 - config/style.css
 - LICENSE
 - README.textile
-has_rdoc: true
 homepage: https://github.com/walle/gimli
 licenses: []
 post_install_message: 
@@ -212,15 +221,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1493974172056676610
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1493974172056676610
 requirements: []
 rubyforge_project: gimli
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Utility for converting markup files to pdf files.