spiffy 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7ff4044805e8ed537f5035d99bcafb96c7a46d3
-  data.tar.gz: e9959f330337f9fc6a5b033b340f80ef52650b3d
+  metadata.gz: 949d4e18b7e4b71182e90482f7638e965aed7e63
+  data.tar.gz: 0424f08b70eaa537dc306f4b8ab697be3f91dc08
 SHA512:
-  metadata.gz: d1001a81ae55f69bce7d938fa3f7b25835a8e6535afb111d899e5c09d59eed307ce2186631be8959be031919f9d25487cdafab0c78f5cf19ea9b617b8f7f9b58
-  data.tar.gz: 77cf5774bfc7327733d3515374179067fa68a446d1112060fb1e0f4ff611aeafa80f1d64eff26640247fafdefc3753f42b49d104cfc0d2e6daf514a5445b1e55
+  metadata.gz: 8adcff89802c8c90e9fe6fdac2d94b5b80f3e00a51bb47aeb4f1acf78d9faffb4872c3a75f5626b7fd3ad47e96b3731dbdc595b5cad68dbd1d1be0b9c2c8d23e
+  data.tar.gz: 5aaf9f715aa7f3427d0e7d22575d88faaff12054baab6af5e6a5ae7734b2d5e2d5757d84cdad002d74220b161b8cb9abb85dd88a077d4c94089cf695c9162be7

data/bin/spiffy

@@ -1,98 +1,11 @@
 #!/usr/bin/env ruby
 
-require "optparse"
-require "rubygems"
-require "yaml"
-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 => nil,
-  :css_file => nil,
-  :html => nil,
-  :pdf => nil
-}
-
-opt_parser = OptionParser.new do |opt|
-  opt.banner = "Usage: spiffy [options] [file] [file] ..."
-  opt.separator("Version: #{Spiffy::VERSION}")
-  opt.separator("")
-  opt.separator("Options")
-
-  opt.on("-c", "--css [css]", "CSS to include inline in the HTML file output") do |css|
-    options[:css_file] = css
-  end
-
-  opt.on("-t", "--template [template]", "Template to wrap the resulting HTML") do |template|
-    options[:template_file] = template
-  end
-
-  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
-    puts opt_parser
-  end
-
-  opt.separator("")
-  
-  opt.separator("Alternatively:")
-  opt.separator("Create a .spiffy.yml in this directory with options within.")
-  opt.separator("See https://github.com/leighmcculloch/spiffy.")
-  
-  opt.separator("")
-end
-
-opt_parser.parse!
-
-has_dot_file = File.exists?(DOT_FILE)
-
-if File.exists?(DOT_FILE)
-  sets = YAML.load_file(DOT_FILE)
-end
-
-if ARGV.any?
-  sets = ARGV.map do |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
-end
-
-if !sets
-  puts opt_parser
-  abort
-end
+require_relative "../lib/spiffy_cli"
 
 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
+  SpiffyCli.main
+rescue SystemExit, Interrupt
+  warn "\nExiting.."
 rescue RuntimeError => e
   warn e.message
 end

data/lib/spiffy.rb

@@ -3,8 +3,6 @@ require "haml"
 require "pdfkit"
 
 module Spiffy
-  VERSION = "0.0.16"
-
   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]

data/lib/spiffy_cli.rb

@@ -0,0 +1,104 @@
+require "optparse"
+require "rubygems"
+require "yaml"
+require_relative "spiffy"
+require_relative "spiffy_version"
+
+module SpiffyCli
+  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"
+
+  def self.main
+    options = {}
+
+    opt_parser = OptionParser.new do |opt|
+      opt.banner = "Usage: spiffy [options] [file] [file] ..."
+      opt.separator("Version: #{SpiffyVersion::VERSION}")
+      opt.separator("")
+      opt.separator("Options")
+
+      opt.on("-c", "--css [css]", "CSS to include inline in the HTML file output") do |css|
+        options[:css_file] = css
+      end
+
+      opt.on("-t", "--template [template]", "Template to wrap the resulting HTML") do |template|
+        options[:template_file] = template
+      end
+
+      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
+        puts opt_parser
+      end
+
+      opt.separator("")
+      
+      opt.separator("Alternatively:")
+      opt.separator("Create a .spiffy.yml in this directory with options within.")
+      opt.separator("See https://github.com/leighmcculloch/spiffy.")
+      
+      opt.separator("")
+    end
+
+    opt_parser.parse!
+
+    self.handle(options)
+  end
+
+  def self.handle(options)
+    has_dot_file = File.exists?(DOT_FILE)
+
+    if File.exists?(DOT_FILE)
+      sets = YAML.load_file(DOT_FILE)
+    end
+
+    if ARGV.any?
+      sets = ARGV.map do |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
+    end
+
+    if !sets
+      puts opt_parser
+      abort
+    end
+
+    sets.each do |set|
+      set["markdown_files"].each do |input|
+        Dir[input].each do |file|
+          print "Converting #{file}..."
+
+          output_html = options[:html]
+          output_html = set["html"] if output_html.nil?
+          output_html = DEFAULT_HTML if output_html.nil?
+
+          output_pdf = options[:pdf]
+          output_pdf = set["pdf"] if output_pdf.nil?
+          output_pdf = DEFAULT_PDF if output_pdf.nil?
+
+          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: output_html,
+                                output_pdf: output_pdf)
+          puts "done"
+        end
+      end
+    end
+  end
+end

data/lib/spiffy_version.rb

@@ -0,0 +1,3 @@
+module SpiffyVersion
+  VERSION = "0.0.17"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spiffy
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Leigh McCulloch
@@ -120,6 +120,8 @@ extra_rdoc_files: []
 files:
 - bin/spiffy
 - lib/spiffy.rb
+- lib/spiffy_cli.rb
+- lib/spiffy_version.rb
 - templates/default.css
 - templates/default.haml
 homepage: http://rubygems.org/gems/hola