monad 0.0.2 → 0.0.3

data/features/support/env.rb

@@ -1,15 +1,17 @@
+if RUBY_VERSION > '1.9'
+  require 'coveralls'
+  Coveralls.wear_merged!
+end
+
 require 'fileutils'
 require 'rr'
 require 'test/unit'
+require 'time'
 
-World do
-  include Test::Unit::Assertions
-end
-
-TEST_DIR    = File.join('/', 'tmp', 'monad')
+TEST_DIR    = File.join('/', 'tmp', 'jekyll')
 JEKYLL_PATH = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'monad')
 
-def run_monad(opts = {})
+def run_jekyll(opts = {})
   command = JEKYLL_PATH.clone
   command << " build"
   command << " --drafts" if opts[:drafts]
@@ -17,8 +19,25 @@ def run_monad(opts = {})
   system command
 end
 
-def has_time_component?(date_string)
-  date_string.split(" ").size > 1
+def call_jekyll_new(opts = {})
+  command = JEKYLL_PATH.clone
+  command << " new"
+  command << " #{opts[:path]}" if opts[:path]
+  command << " --blank" if opts[:blank]
+  command << " >> /dev/null 2>&1" if opts[:debug].nil?
+  system command
+end
+
+def slug(title)
+  title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
+end
+
+def location(folder, direction)
+  if folder
+    before = folder if direction == "in"
+    after = folder if direction == "under"
+  end
+  [before || '.', after || '.']
 end
 
 # work around "invalid option: --format" cucumber bug (see #296)

data/lib/jekyll.rb

@@ -0,0 +1,99 @@
+$:.unshift File.dirname(__FILE__) # For use/testing when no gem is installed
+
+# Require all of the Ruby files in the given directory.
+#
+# path - The String relative path from here to the directory.
+#
+# Returns nothing.
+def require_all(path)
+  glob = File.join(File.dirname(__FILE__), path, '*.rb')
+  Dir[glob].each do |f|
+    require f
+  end
+end
+
+# rubygems
+require 'rubygems'
+
+# stdlib
+require 'fileutils'
+require 'time'
+require 'safe_yaml'
+require 'English'
+require 'pathname'
+
+# 3rd party
+require 'liquid'
+require 'maruku'
+require 'colorator'
+
+# internal requires
+require 'jekyll/core_ext'
+require 'jekyll/stevenson'
+require 'jekyll/deprecator'
+require 'jekyll/configuration'
+require 'jekyll/site'
+require 'jekyll/convertible'
+require 'jekyll/url'
+require 'jekyll/layout'
+require 'jekyll/page'
+require 'jekyll/post'
+require 'jekyll/excerpt'
+require 'jekyll/draft'
+require 'jekyll/filters'
+require 'jekyll/static_file'
+require 'jekyll/errors'
+require 'jekyll/related_posts'
+require 'jekyll/cleaner'
+
+# extensions
+require 'jekyll/plugin'
+require 'jekyll/converter'
+require 'jekyll/generator'
+require 'jekyll/command'
+
+require_all 'jekyll/commands'
+require_all 'jekyll/converters'
+require_all 'jekyll/converters/markdown'
+require_all 'jekyll/generators'
+require_all 'jekyll/tags'
+require_all 'jekyll/drivers'
+
+SafeYAML::OPTIONS[:suppress_warnings] = true
+
+module Jekyll
+  VERSION = '1.2.1'
+
+  # Public: Generate a Jekyll configuration Hash by merging the default
+  # options with anything in _config.yml, and adding the given options on top.
+  #
+  # override - A Hash of config directives that override any options in both
+  #            the defaults and the config file. See Jekyll::Configuration::DEFAULTS for a
+  #            list of option names and their defaults.
+  #
+  # Returns the final configuration Hash.
+  def self.configuration(override)
+    config = Configuration[Configuration::DEFAULTS]
+    override = Configuration[override].stringify_keys
+    config = config.read_config_files(config.config_files(override))
+
+    # Merge DEFAULTS < _config.yml < override
+    config = config.deep_merge(override).stringify_keys
+    set_timezone(config['timezone']) if config['timezone']
+
+    config
+  end
+
+  # Static: Set the TZ environment variable to use the timezone specified
+  #
+  # timezone - the IANA Time Zone
+  #
+  # Returns nothing
+  def self.set_timezone(timezone)
+    ENV['TZ'] = timezone
+  end
+
+  def self.logger
+    @logger ||= Stevenson.new
+  end
+end

data/lib/jekyll/cleaner.rb

@@ -0,0 +1,73 @@
+require 'set'
+
+module Jekyll
+  class Site
+    # Handles the cleanup of a site's destination before it is built.
+    class Cleaner
+      def initialize(site)
+        @site = site
+      end
+
+      # Cleans up the site's destination directory
+      def cleanup!
+        FileUtils.rm_rf(obsolete_files)
+      end
+
+      private
+
+      # Private: The list of files and directories to be deleted during cleanup process
+      #
+      # Returns an Array of the file and directory paths
+      def obsolete_files
+        (existing_files - new_files - new_dirs + replaced_files).to_a
+      end
+
+      # Private: The list of existing files, apart from those included in keep_files and hidden files.
+      #
+      # Returns a Set with the file paths
+      def existing_files
+        files = Set.new
+        Dir.glob(File.join(@site.dest, "**", "*"), File::FNM_DOTMATCH) do |file|
+          files << file unless file =~ /\/\.{1,2}$/ || file =~ keep_file_regex
+        end
+        files
+      end
+
+      # Private: The list of files to be created when site is built.
+      #
+      # Returns a Set with the file paths
+      def new_files
+        files = Set.new
+        @site.each_site_file { |item| files << item.destination(@site.dest) }
+        files
+      end
+
+      # Private: The list of directories to be created when site is built.
+      # These are the parent directories of the files in #new_files.
+      #
+      # Returns a Set with the directory paths
+      def new_dirs
+        new_files.map { |file| File.dirname(file) }.to_set
+      end
+
+      # Private: The list of existing files that will be replaced by a directory during build
+      #
+      # Returns a Set with the file paths
+      def replaced_files
+        new_dirs.select { |dir| File.file?(dir) }.to_set
+      end
+
+      # Private: Creates a regular expression from the config's keep_files array
+      #
+      # Examples
+      #   ['.git','.svn'] creates the following regex: /\/(\.git|\/.svn)/
+      #
+      # Returns the regular expression
+      def keep_file_regex
+        or_list = @site.keep_files.join("|")
+        pattern = "\/(#{or_list.gsub(".", "\.")})"
+        Regexp.new pattern
+      end
+    end
+  end
+end

data/lib/{monad → jekyll}/command.rb

@@ -1,4 +1,4 @@
-module Monad
+module Jekyll
   class Command
     def self.globs(source, destination)
       Dir.chdir(source) do
@@ -11,16 +11,16 @@ module Monad
 
     # Static: Run Site#process and catch errors
     #
-    # site - the Monad::Site object
+    # site - the Jekyll::Site object
     #
     # Returns nothing
     def self.process_site(site)
       site.process
-    rescue Monad::FatalException => e
+    rescue Jekyll::FatalException => e
       puts
-      Monad::Logger.error "ERROR:", "YOUR SITE COULD NOT BE BUILT:"
-      Monad::Logger.error "", "------------------------------------"
-      Monad::Logger.error "", e.message
+      Jekyll.logger.error "ERROR:", "YOUR SITE COULD NOT BE BUILT:"
+      Jekyll.logger.error "", "------------------------------------"
+      Jekyll.logger.error "", e.message
       exit(1)
     end
   end

data/lib/{monad → jekyll}/commands/build.rb

@@ -1,8 +1,8 @@
-module Monad
+module Jekyll
   module Commands
     class Build < Command
       def self.process(options)
-        site = Monad::Site.new(options)
+        site = Jekyll::Site.new(options)
 
         self.build(site, options)
         self.watch(site, options) if options['watch']
@@ -10,23 +10,23 @@ module Monad
 
       # Private: Build the site from source into destination.
       #
-      # site - A Monad::Site instance
+      # site - A Jekyll::Site instance
       # options - A Hash of options passed to the command
       #
       # Returns nothing.
       def self.build(site, options)
         source = options['source']
         destination = options['destination']
-        Monad::Logger.info "Source:", source
-        Monad::Logger.info "Destination:", destination
-        print Monad::Logger.formatted_topic "Generating..."
+        Jekyll.logger.info "Source:", source
+        Jekyll.logger.info "Destination:", destination
+        print Jekyll.logger.formatted_topic "Generating..."
         self.process_site(site)
         puts "done."
       end
 
       # Private: Watch for file changes and rebuild the site.
       #
-      # site - A Monad::Site instance
+      # site - A Jekyll::Site instance
       # options - A Hash of options passed to the command
       #
       # Returns nothing.
@@ -36,14 +36,14 @@ module Monad
         source = options['source']
         destination = options['destination']
 
-        Monad::Logger.info "Auto-regeneration:", "enabled"
+        Jekyll.logger.info "Auto-regeneration:", "enabled"
 
         dw = DirectoryWatcher.new(source, :glob => self.globs(source, destination), :pre_load => true)
         dw.interval = 1
 
         dw.add_observer do |*args|
           t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-          print Monad::Logger.formatted_topic("Regenerating:") + "#{args.size} files at #{t} "
+          print Jekyll.logger.formatted_topic("Regenerating:") + "#{args.size} files at #{t} "
           self.process_site(site)
           puts  "...done."
         end

data/lib/jekyll/commands/doctor.rb

@@ -0,0 +1,67 @@
+module Jekyll
+  module Commands
+    class Doctor < Command
+      class << self
+        def process(options)
+          site = Jekyll::Site.new(options)
+          site.read
+
+          if healthy?(site)
+            Jekyll.logger.info "Your test results", "are in. Everything looks fine."
+          else
+            abort
+          end
+        end
+
+        def healthy?(site)
+          [
+            !deprecated_relative_permalinks(site),
+            !conflicting_urls(site)
+          ].all?
+        end
+
+        def deprecated_relative_permalinks(site)
+          contains_deprecated_pages = false
+          site.pages.each do |page|
+            if page.uses_relative_permalinks
+              Jekyll.logger.warn "Deprecation:", "'#{page.path}' uses relative" +
+                                  " permalinks which will be deprecated in" +
+                                  " Jekyll v1.2 and beyond."
+              contains_deprecated_pages = true
+            end
+          end
+          contains_deprecated_pages
+        end
+
+        def conflicting_urls(site)
+          conflicting_urls = false
+          urls = {}
+          urls = collect_urls(urls, site.pages, site.dest)
+          urls = collect_urls(urls, site.posts, site.dest)
+          urls.each do |url, paths|
+            if paths.size > 1
+              conflicting_urls = true
+              Jekyll.logger.warn "Conflict:", "The URL '#{url}' is the destination" +
+                " for the following pages: #{paths.join(", ")}"
+            end
+          end
+          conflicting_urls
+        end
+
+        private
+
+        def collect_urls(urls, things, destination)
+          things.each do |thing|
+            dest = thing.destination(destination)
+            if urls[dest]
+              urls[dest] << thing.path
+            else
+              urls[dest] = [thing.path]
+            end
+          end
+          urls
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/commands/new.rb

@@ -0,0 +1,67 @@
+require 'erb'
+
+module Jekyll
+  module Commands
+    class New < Command
+      def self.process(args, options = {})
+        raise ArgumentError.new('You must specify a path.') if args.empty?
+
+        new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
+        FileUtils.mkdir_p new_blog_path
+        if preserve_source_location?(new_blog_path, options)
+          Jekyll.logger.error "Conflict:", "#{new_blog_path} exists and is not empty."
+          exit(1)
+        end
+
+        if options[:blank]
+          create_blank_site new_blog_path
+        else
+          create_sample_files new_blog_path
+
+          File.open(File.expand_path(self.initialized_post_name, new_blog_path), "w") do |f|
+            f.write(self.scaffold_post_content)
+          end
+        end
+
+        puts "New jekyll site installed in #{new_blog_path}."
+      end
+
+      def self.create_blank_site(path)
+        Dir.chdir(path) do
+          FileUtils.mkdir(%w(_layouts _posts _drafts))
+          FileUtils.touch("index.html")
+        end
+      end
+
+      def self.scaffold_post_content
+        ERB.new(File.read(File.expand_path(scaffold_path, site_template))).result
+      end
+
+      # Internal: Gets the filename of the sample post to be created
+      #
+      # Returns the filename of the sample post, as a String
+      def self.initialized_post_name
+        "_posts/#{Time.now.strftime('%Y-%m-%d')}-welcome-to-jekyll.markdown"
+      end
+
+      private
+
+      def self.preserve_source_location?(path, options)
+        !options[:force] && !Dir["#{path}/**/*"].empty?
+      end
+
+      def self.create_sample_files(path)
+        FileUtils.cp_r site_template + '/.', path
+        FileUtils.rm File.expand_path(scaffold_path, path)
+      end
+
+      def self.site_template
+        File.expand_path("../../site_template", File.dirname(__FILE__))
+      end
+
+      def self.scaffold_path
+        "_posts/0000-00-00-welcome-to-jekyll.markdown.erb"
+      end
+    end
+  end
+end

data/lib/jekyll/commands/serve.rb

@@ -0,0 +1,65 @@
+# -*- encoding: utf-8 -*-
+module Jekyll
+  module Commands
+    class Serve < Command
+      def self.process(options)
+        require 'webrick'
+        include WEBrick
+
+        destination = options['destination']
+
+        FileUtils.mkdir_p(destination)
+
+        # recreate NondisclosureName under utf-8 circumstance
+        fh_option = WEBrick::Config::FileHandler
+        fh_option[:NondisclosureName] = ['.ht*','~*']
+
+        s = HTTPServer.new(webrick_options(options))
+
+        s.mount(options['baseurl'], HTTPServlet::FileHandler, destination, fh_option)
+
+        Jekyll.logger.info "Server address:", "http://#{s.config[:BindAddress]}:#{s.config[:Port]}"
+
+        if options['detach'] # detach the server
+          pid = Process.fork { s.start }
+          Process.detach(pid)
+          Jekyll.logger.info "Server detatched with pid '#{pid}'.", "Run `kill -9 #{pid}' to stop the server."
+        else # create a new server thread, then join it with current terminal
+          t = Thread.new { s.start }
+          trap("INT") { s.shutdown }
+          t.join()
+        end
+      end
+
+      def self.webrick_options(config)
+        opts = {
+          :Port => config['port'],
+          :BindAddress => config['host'],
+          :MimeTypes => self.mime_types,
+          :DoNotReverseLookup => true,
+          :StartCallback => start_callback(config['detach'])
+        }
+
+        if !config['verbose']
+          opts.merge!({
+            :AccessLog => [],
+            :Logger => Log::new([], Log::WARN)
+          })
+        end
+
+        opts
+      end
+
+      def self.start_callback(detached)
+        unless detached
+          Proc.new { Jekyll.logger.info "Server running...", "press ctrl-c to stop." }
+        end
+      end
+
+      def self.mime_types
+        mime_types_file = File.expand_path('../mime.types', File.dirname(__FILE__))
+        WEBrick::HTTPUtils::load_mime_types(mime_types_file)
+      end
+    end
+  end
+end