markdown 0.1.0.beta1 → 0.1.0

data/lib/markdown.rb

@@ -28,7 +28,7 @@ require 'markdown/gen'
 
 module Markdown
 
-  VERSION = '0.1.0.beta1'
+  VERSION = '0.1.0'
 
   # version string for generator meta tag (includes ruby version)
   def self.banner

data/lib/markdown/gen.rb

@@ -18,7 +18,6 @@ module Markdown
   end # class Opts
 
 
-
   class Gen
 
     attr_reader :logger
@@ -30,6 +29,19 @@ module Markdown
       @opts         = Opts.new
     end
 
+
+### fix/todo:
+#    make configureable
+    DEFAULT_MARKDOWN_EXTENSIONS = [
+      '.markdown',
+      '.m',
+      '.mark',
+      '.mkdn',
+      '.md',
+      '.txt',
+      '.text' ]
+
+
     def with_output_path( dest, output_path )
       dest_full = File.expand_path( dest, output_path )
       logger.debug "dest_full=#{dest_full}"
@@ -64,23 +76,10 @@ module Markdown
         logger.debug "newcwd=#{newcwd}"
         Dir.chdir newcwd
       end  
-                
-      if extname.empty? then
-        extname  = ".markdown"   # default to .markdown 
-    
-        [ '.markdown', '.m', '.mark', '.mkdn', '.md', '.txt', '.text' ].each do |e|
-          logger.debug "File.exists? #{dirname}/#{basename}#{e}"
-          if File.exists?( "#{dirname}/#{basename}#{e}" ) then         
-            extname = e
-            logger.debug "extname=#{extname}"
-            break
-          end
-        end  # each extension (e)
-      end
 
       inname  =  "#{dirname}/#{basename}#{extname}"
 
-      puts "Reading document '#{basename}#{extname}'..."
+      puts "Reading document '#{basename}#{extname} (in folder #{dirname})'..."
       
       
       logger.debug "inname=#{inname}"
@@ -92,7 +91,7 @@ module Markdown
       content = Markdown.new( content ).to_html
 
       outname = "#{basename}.html"
-      puts "Preparing #{outname}..."      
+      puts "Preparing #{outname} (in folder #{outpath})..."
 
       out = File.new( with_output_path( outname, outpath ), "w+" )
       out << "<!-- ======================================================================\n"
@@ -104,7 +103,99 @@ module Markdown
       out.close
 
     end # method create_doc
+
+
+    def has_markdown_extension?( fn )
+      dirname  = File.dirname( fn )
+      basename = File.basename( fn, '.*' )
+      extname  = File.extname( fn )
+      logger.debug "dirname=#{dirname}, basename=#{basename}, extname=#{extname}"
+
+      return false if extname.empty?   # no extension
+      
+      DEFAULT_MARKDOWN_EXTENSIONS.include?( extname.downcase )
+    end
     
+    def find_file_with_markdown_extension( fn )
+      dirname  = File.dirname( fn )
+      basename = File.basename( fn, '.*' )
+      extname  = File.extname( fn )
+      logger.debug "dirname=#{dirname}, basename=#{basename}, extname=#{extname}"
+
+      DEFAULT_MARKDOWN_EXTENSIONS.each do |e|
+        logger.debug "File.exists? #{dirname}/#{basename}#{e}"
+        return "#{dirname}/#{basename}#{e}" if File.exists?( "#{dirname}/#{basename}#{e}" )
+      end  # each extension (e)
+      
+      nil   # not found; return nil
+    end
+
+    
+    def find_files( file_or_dir_or_pattern )
+
+      filtered_files = []
+      
+      # assume pattern if includes * or ? or {} or []
+      if file_or_dir_or_pattern =~ /[*?{}\[\]]/
+        puts "searching glob pattern '#{file_or_dir_or_pattern}'..."
+        Dir.glob( file_or_dir_or_pattern ).each do |file|
+          if File.directory?( file )  # skip (sub)directories
+            puts "  skipping folder '#{file}'..."
+            next
+          else
+            if has_markdown_extension?( file )
+              logger.debug "  adding file '#{file}'..."
+              filtered_files << file
+            else
+              puts "  skipping file   '#{file}'..."
+            end
+          end
+        end
+      elsif File.directory?(file_or_dir_or_pattern)
+        puts "searching folder '#{file_or_dir_or_pattern}'..."
+        Dir.entries( file_or_dir_or_pattern ).each do |entry|
+          next if entry == '.' || entry == '..' # silently skip current and up dirs
+          
+          if file_or_dir_or_pattern == '.'
+            file = entry
+          else  # add dir (if not working dir)
+            file = File.join( file_or_dir_or_pattern, entry )  
+          end
+           
+          if File.directory?( file )  # skip (sub)directories
+            puts "  skipping folder '#{file}'..."
+            next
+          else
+            if has_markdown_extension?( file )
+              logger.debug "  adding file '#{file}'..."
+              filtered_files << file
+            else
+              puts "  skipping file   '#{file}'..."
+            end
+          end
+        end
+      else  # assume it's a single file (check for missing extension)
+        if File.exists?( file_or_dir_or_pattern )
+          file = file_or_dir_or_pattern
+          if has_markdown_extension?( file )
+            logger.debug "  adding file '#{file}'..."
+            filtered_files << file
+          else
+            puts "  skipping file   '#{file}'..."
+          end
+        else  # check for existing file w/ missing extension
+          file = find_file_with_markdown_extension( file_or_dir_or_pattern )
+          if file.nil?
+            puts "  skipping missing file '#{file_or_dir_or_pattern}{#{DEFAULT_MARKDOWN_EXTENSIONS.join(',')}}'..."
+          else
+            logger.debug "  adding file '#{file}'..."
+            filtered_files << file
+          end
+        end
+      end
+
+      filtered_files
+    end  # find_files
     
     def run( args )
       opt=OptionParser.new do |cmd|
@@ -116,19 +207,22 @@ module Markdown
         # todo: find different letter for debug trace switch (use v for version?)
         cmd.on( "-v", "--verbose", "Show debug trace" )  do
            logger.datetime_format = "%H:%H:%S"
-           logger.level = Logger::DEBUG      
+           logger.level = Logger::DEBUG
         end
  
+   ## todo: add #{Markdown.lib} to help message?? yes/no
+ 
         cmd.on_tail( "-h", "--help", "Show this message" ) do
            puts 
-           puts "Markdown is ..."
+           puts "markdown - Lets you convert plain text documents (#{DEFAULT_MARKDOWN_EXTENSIONS.join(', ')}) to hypertext (.html) with your Markdown engine of choice."
            puts
            puts cmd.help
            puts
            puts "Examples:"
-           puts "  markdown microformats"
-           puts "  markdown microformats.text            # Process slides using Markdown"
-           puts "  markdown -o site microformats       # Output slideshow to slides folder"
+           puts "  markdown                   # Process all documents in working folder (that is, .)"
+           puts "  markdown ruby_tut          # Process document or folder using Markdown"
+           puts "  markdown ruby_tut.text     # Process document using Markdown"
+           puts "  markdown -o site ruby_tut  # Output documents to site folder"
            puts
            puts "Further information:"
            puts "  http://geraldb.github.com/markdown" 
@@ -139,8 +233,22 @@ module Markdown
       opt.parse!( args )
   
       puts Markdown.banner
+      
+      # force loading of config
+      Markdown.lib
+      
+      logger.debug "args.length: #{args.length}"
+      logger.debug "args: >#{args.join(',')}<"
+      
+      # if no file args given; default to working folder (that is, .)
+      args = ['.'] if args.length == 0
 
-      args.each { |fn| create_doc( fn ) }
+      args.each do |arg|
+        files = find_files( arg )
+        files.each do |file|
+          create_doc( file )
+        end
+      end
       
       puts "Done."
       

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: markdown
 version: !ruby/object:Gem::Version 
-  hash: 321068176
-  prerelease: 6
+  hash: 27
+  prerelease: 
   segments: 
   - 0
   - 1
   - 0
-  - beta
-  - 1
-  version: 0.1.0.beta1
+  version: 0.1.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -112,18 +110,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: markdown
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Markdown Engine Wrapper - Use Your Markdown Library of Choice