notorious 0.1.3 → 0.1.4

data/README.md

@@ -62,6 +62,13 @@ Or install it yourself as:
 
 ![Example Output](https://raw.github.com/zackrw/notorious/v1/spec/examples/example.png)
 
+###Opening Multiple Files
+*If you specify multiple files to `build`, notorious will concatenate them and
+make an output file called "multiple_files.html" in your current working
+directory (unless you specify a -o)*
+
+    $ notorious build notes.md other_notes.md
+
 ###To run this example
 
     $ notorious example

data/bin/notorious

@@ -36,6 +36,10 @@ def parse
       options[:verbose] = v
     end
 
+    opts.on("--version", "Print Version") do |v|
+      options[:version] = v
+    end
+
   end
   opts.parse!
   options
@@ -44,6 +48,11 @@ end
 # Parse options
 options = parse
 
+if options[:version]
+  puts "Notorious: version #{Notorious::VERSION}"
+  exit
+end
+
 # assign arguments
 unless ARGV[0]
   puts "Notorious. Run `notorious --help` for details"
@@ -55,22 +64,30 @@ end
 
 case ARGV[0]
 when 'build'
-  options[:file_name] = ARGV[1] || raise(ArgumentError, "you must specify a file to build")
+  options[:file_names] = ARGV[1..-1]
+  raise(ArgumentError, "you must specify a file to build") if options[:file_names].length == 0
 when 'example'
-  options[:file_name] = File.expand_path("../../spec/examples/example_notes.md", __FILE__)
+  options[:file_names] = [File.expand_path("../../spec/examples/example_notes.md", __FILE__)]
 else
   raise ArgumentError, "you have specified an invalid command"
 end
 
-# must be a markdown file
-Notorious.validate_extension(options[:file_name], ["md", "mdown", "markdown", "Markdown"])
+# must be a markdown files
+options[:file_names].each do |f|
+  Notorious.validate_extension(f, ["md", "mdown", "markdown", "Markdown"])
+end
 
 options[:stylesheet] ||= File.expand_path("../../stylesheets/default.css", __FILE__)
 
 unless options[:output]
-  split = options[:file_name].split('.')
-  split.pop if split.length > 1
-  options[:output] = split.push('html').join('.')
+  if options[:file_names].length == 1
+    file_name = options[:file_names][0]
+    split = file_name.split('.')
+    split.pop if split.length > 1
+    options[:output] = split.push('html').join('.')
+  else
+    options[:output] = 'multiple_files.html'
+  end
 end
 
 

data/lib/notorious.rb

@@ -6,7 +6,7 @@ require "redcarpet"
 module Notorious
 
   def self.build(opts)
-    file_name = opts[:file_name]
+    file_names = opts[:file_names]
     stylesheet = opts[:stylesheet]
     title = opts[:title]
     output = opts[:output]
@@ -14,7 +14,7 @@ module Notorious
 
 
     # make the html
-    html = self.render(file_name, title, stylesheet)
+    html = self.render(file_names, title, stylesheet)
 
     # write to the output file
     outfile = File.new(File.expand_path(output), 'w')
@@ -33,26 +33,30 @@ module Notorious
     end
   end
 
-  def self.render(file_name, title, stylesheet)
+  def self.render(file_names, title, stylesheet)
     begin
       styles = File.new(stylesheet, 'r').read
     rescue
       raise RuntimeError, "Could not load the stylesheet. Make sure there is a file at #{stylesheet}"
     end
 
-    # read in and convert the markdown file
-    begin
-      md_file = File.new(file_name, 'r')
-    rescue
-      raise ArgumentError, "Could not find the file you specified: #{file_name}"
+    body = ""
+
+    file_names.each do |f|
+      # read in and convert the markdown file
+      begin
+        md_file = File.new(f, 'r')
+      rescue
+        raise ArgumentError, "Could not find the file you specified: #{f}"
+      end
+
+      # convert markdown to HTML
+      md_contents = md_file.read
+      md = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
+      body += md.render(md_contents)
+      md_file.close
     end
 
-    # convert markdown to HTML
-    md_contents = md_file.read
-    md = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
-    body = md.render(md_contents)
-    md_file.close
-
     self.html(styles, title, body)
   end
 

data/lib/notorious/version.rb

@@ -1,3 +1,3 @@
 module Notorious
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/examples/example_notes.html

@@ -111,7 +111,7 @@ body{font-size:16px;}
 }
 
   </style>
-  <title>Tech Notes</title>
+  <title></title>
 </head>
 <body>
   <!-- notes.md -->

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notorious
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet