spiffy 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 828c78dc74429cf3dd14590c089e3be7a2c4e352
-  data.tar.gz: efdc6ef08397c4b148390b7e01fb02c88e0223ad
+  metadata.gz: e7ff4044805e8ed537f5035d99bcafb96c7a46d3
+  data.tar.gz: e9959f330337f9fc6a5b033b340f80ef52650b3d
 SHA512:
-  metadata.gz: 8ebcdd6da57896fc3890da00c359a40a8c819b79b1dd07beea76fea2488ca6fb1aef928a43d6681aff6e901e967c82f74611921209b512bf0cd8bc1cb27660d0
-  data.tar.gz: 9ac2f6de8bc2ef02dcb3e30cd01e5cedb47621db59576cafa6e8ad88e671e7c0595c988a42caee0810f73dbdbb51645b922c553b8c12db07ab8c34b04a0696d5
+  metadata.gz: d1001a81ae55f69bce7d938fa3f7b25835a8e6535afb111d899e5c09d59eed307ce2186631be8959be031919f9d25487cdafab0c78f5cf19ea9b617b8f7f9b58
+  data.tar.gz: 77cf5774bfc7327733d3515374179067fa68a446d1112060fb1e0f4ff611aeafa80f1d64eff26640247fafdefc3753f42b49d104cfc0d2e6daf514a5445b1e55

data/bin/spiffy

@@ -8,13 +8,16 @@ require_relative "../lib/spiffy"
 DEFAULT_DIR = File.join(File.dirname(__FILE__), "../templates")
 DEFAULT_TEMPLATE_FILE = File.join(DEFAULT_DIR, "default.haml")
 DEFAULT_CSS_FILE = File.join(DEFAULT_DIR, "default.css")
+DEFAULT_HTML = true
+DEFAULT_PDF = false
 
 DOT_FILE = ".spiffy.yml"
 
 options = {
-  :template_file => DEFAULT_TEMPLATE_FILE,
-  :css_file => DEFAULT_CSS_FILE,
-  :pdf => false
+  :template_file => nil,
+  :css_file => nil,
+  :html => nil,
+  :pdf => nil
 }
 
 opt_parser = OptionParser.new do |opt|
@@ -31,8 +34,12 @@ opt_parser = OptionParser.new do |opt|
     options[:template_file] = template
   end
 
-  opt.on("-p", "--pdf", "Output PDF files (default: off)") do
-    options[:pdf] = true
+  opt.on("-p", "--pdf [on|off]", "Output PDF files (default: off)") do |on_or_off|
+    options[:pdf] = on_or_off != "off"
+  end
+
+  opt.on("-h", "--html [on|off]", "Output HTML files (default: on)") do |on_or_off|
+    options[:html] = on_or_off != "off"
   end
 
   opt.on("-h", "--help", "This usage outline.") do
@@ -52,14 +59,19 @@ opt_parser.parse!
 
 has_dot_file = File.exists?(DOT_FILE)
 
-case
-when ARGV.any?
-  warn "Ignoring .spiffy.yml as arguments provided." if has_dot_file
+if File.exists?(DOT_FILE)
+  sets = YAML.load_file(DOT_FILE)
+end
+
+if ARGV.any?
   sets = ARGV.map do |arg|
-    { "markdown_files" => [arg] }
+    set = sets.find({}) do |set|
+      set["markdown_files"].any? do |markdown_file|
+        File.fnmatch(markdown_file, arg)
+      end
+    end
+    set.merge({ "markdown_files" => [arg] })
   end
-when has_dot_file
-  sets = YAML.load_file(DOT_FILE)
 end
 
 if !sets
@@ -67,15 +79,20 @@ if !sets
   abort
 end
 
-sets.each do |set|
-  set["markdown_files"].each do |input|
-    Dir[input].each do |file|
-      print "Converting #{file}..."
-      Spiffy.markup_to_html(file,
-                            css_file: set["css_file"] || options[:css_file],
-                            template_file: set["template_file"] || options[:template_file],
-                            pdf: set["pdf"] || options[:pdf])
-      puts "done"
+begin
+  sets.each do |set|
+    set["markdown_files"].each do |input|
+      Dir[input].each do |file|
+        print "Converting #{file}..."
+        Spiffy.markup_to_html(file,
+                              css_file: options[:css_file] || set["css_file"] || DEFAULT_CSS_FILE,
+                              template_file: options[:template_file] || set["template_file"] || DEFAULT_TEMPLATE_FILE,
+                              output_html: options[:html].nil? ? set["html"] || DEFAULT_HTML : options[:html],
+                              output_pdf: options[:pdf].nil? ? set["pdf"] || DEFAULT_PDF : options[:pdf])
+        puts "done"
+      end
     end
   end
+rescue RuntimeError => e
+  warn e.message
 end

data/lib/spiffy.rb

@@ -3,9 +3,9 @@ require "haml"
 require "pdfkit"
 
 module Spiffy
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 
-  def self.markup_to_html(markup_file, css_file: nil, template_file: nil, pdf: false)
+  def self.markup_to_html(markup_file, css_file: nil, template_file: nil, output_html: true, output_pdf: false)
     markup_file_ext = File.extname(markup_file)
     markup_file_name = markup_file[0...-markup_file_ext.length]
     markup_file_directory = File.dirname(markup_file)
@@ -39,13 +39,16 @@ module Spiffy
              end
     end
 
-    html_file = "#{markup_file_name}.html"
-    File.open(html_file, "w:UTF-8") { |f| f.write(html) }
+    if output_html
+      html_file = "#{markup_file_name}.html"
+      File.open(html_file, "w:UTF-8") { |f| f.write(html) }
+    end
 
-    return unless pdf
-    pdf_file = "#{markup_file_name}.pdf"
-    pdf = PDFKit.new(html)
-    pdf.stylesheets << css_file if css_file
-    pdf.to_file(pdf_file)
+    if output_pdf
+      pdf_file = "#{markup_file_name}.pdf"
+      pdf = PDFKit.new(html)
+      pdf.stylesheets << css_file if css_file
+      pdf.to_file(pdf_file)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spiffy
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Leigh McCulloch