octopress 3.0.0.alpha3 → 3.0.0.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43594e6b5026cdfe8c0b63659e8c6d23073153b4
-  data.tar.gz: 13fe34f1bfa868adebaf7fbbe9f875a7ba4cffe3
+  metadata.gz: 143b9c71ad561fd9a939fea1b64efee7c076d453
+  data.tar.gz: 958d911bbe77152603ff177fec4a2c9f46de50cd
 SHA512:
-  metadata.gz: bd87b4fee80759d6791deb6bb974a0ae92d538babcc9ee57df1308d0bae65fcd0fb0b14d924fcea6e528748d71071c10737be6b436d59f5949c05245fed6d507
-  data.tar.gz: 622aef0de4f00a34f80a2d8f595ff95f1ba3f8c6ac55d0897f898aa278a0b4ec6636300454873b1d9a1635ece49a8ead7e97bcccfefaea99378898b7285050af
+  metadata.gz: 102c7015e4688e0f0dcce8457bcb4ebb5a9aa98092036123591d1da348bff257220a31fb55c533e229fd6ad6708b51b28ec581a9a6e1d8cd96b9f9d22718cdae
+  data.tar.gz: 9600f8aea81d1a57efccbefdd5402162e32faed45ec96518e981ce4cc7cac2fa91d14fb719b5cdaa3ac97f671493a27bab8a7f57bf781d71fa8c10690a3e24f5

data/lib/octopress.rb

@@ -1,9 +1,14 @@
 module Octopress
   require 'octopress/core_ext'
+  require 'octopress/configuration'
   require 'octopress/command'
   require 'octopress/version'
   require 'octopress/commands/new'
   require 'octopress/commands/publish'
+  require 'octopress/commands/build'
+  require 'octopress/commands/serve'
+  require 'octopress/commands/doctor'
+  require 'octopress/commands/docs'
 
   autoload :Page, 'octopress/page'
   autoload :Post, 'octopress/post'
@@ -14,30 +19,14 @@ module Octopress
     octopress-ink
   ]
 
-  DEFAULTS = { 'octopress' => {
-    'new_post_extension' => 'markdown',
-    'new_page_extension' => 'html',
-    'new_post_layout' => 'post',
-    'new_page_layout' => 'page',
-    'titlecase' => true
-  }}
-
   def self.logger
     @logger ||= Logger.new(STDOUT)
     @logger.level = Logger::DEBUG
     @logger
   end
 
-  def self.site(options={})
-    @site ||= Jekyll::Site.new(config(options))
-  end
-
   def self.config(options={})
-    log_level = Jekyll.logger.log_level
-    Jekyll.logger.log_level = Jekyll::Stevenson::WARN
-    @config ||= DEFAULTS.deep_merge Jekyll.configuration(options)
-    Jekyll.logger.log_level = log_level
-    @config
+    Configuration.config(options)
   end
 
   def self.require_blessed_gems

data/lib/octopress/commands/build.rb

@@ -0,0 +1,21 @@
+require 'jekyll'
+require File.expand_path('helpers', File.dirname(__FILE__))
+
+module Octopress
+  class Build < Command
+    def self.init_with_program(p)
+      p.command(:build) do |c|
+        c.syntax 'octopress build [options]'
+        c.description 'Build your site'
+        CommandHelpers.add_build_options(c)
+        
+        c.action do |args, options|
+          options = CommandHelpers.normalize_options(options)
+          options = ::Jekyll.configuration(options.to_symbol_keys)
+          ::Jekyll::Commands::Build.process(options)
+        end
+      end
+    end
+  end
+end
+

data/lib/octopress/commands/docs.rb

@@ -0,0 +1,42 @@
+require 'jekyll'
+require File.expand_path('helpers', File.dirname(__FILE__))
+
+module Octopress
+  class Docs < Command
+    def self.init_with_program(p)
+      p.command(:docs) do |c|
+        c.syntax 'octopress docs'
+        c.description "Soon: Launch local server with docs for Octopress v#{Octopress::VERSION}"
+
+        c.option 'port', '-P', '--port [PORT]', 'Port to listen on'
+        c.option 'host', '-H', '--host [HOST]', 'Host to bind to'
+        c.option 'jekyll', '--jekyll', "Launch local server with docs for Jekyll v#{Jekyll::VERSION}"
+
+        c.action do |args, options|
+          
+          # Only show jekyll docs if the jekyll flag was used
+          #
+          if options['jekyll']
+            options.delete('jekyll')
+
+            # Find local Jekyll gem path
+            #
+            spec = Gem::Specification.find_by_name("jekyll")
+            gem_path = spec.gem_dir
+
+            options = CommandHelpers.normalize_options(options)
+            options = ::Jekyll.configuration(options.to_symbol_keys.merge!({
+              'source' => "#{gem_path}/site",
+              'destination' => "#{gem_path}/site/_site"
+            }))
+            
+            ::Jekyll::Commands::Build.process(options)
+            ::Jekyll::Commands::Serve.process(options)
+          else
+            puts "Sorry, not yet. View Octopress docs on http://octopress.org or view Jekyll docs locally by running `octopress docs --jekyll`"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/octopress/commands/doctor.rb

@@ -0,0 +1,24 @@
+require 'jekyll'
+require File.expand_path('helpers', File.dirname(__FILE__))
+
+module Octopress
+  class Doctor < Command
+    def self.init_with_program(p)
+      p.command(:doctor) do |c|
+        c.alias(:hyde)
+
+        c.syntax 'octopress doctor'
+        c.description 'Search site and print specific deprecation warnings'
+
+        c.option 'config', '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+
+        c.action do |args, options|
+          options = CommandHelpers.normalize_options(options)
+          options = Jekyll.configuration(options.to_symbol_keys)
+          ::Jekyll::Commands::Doctor.process(options)
+        end
+      end
+    end
+  end
+end
+

data/lib/octopress/commands/helpers.rb

@@ -0,0 +1,20 @@
+module Octopress
+  module CommandHelpers
+    def self.add_build_options(c)
+      c.option 'config',      '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+      c.option 'future',      '--future',    'Publishes posts with a future date'
+      c.option 'limit_posts', '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
+      c.option 'watch',       '--watch',     'Watch for changes and rebuild'
+      c.option 'list',        '--lsi',       'Use LSI for improved related posts'
+      c.option 'drafts','-D', '--drafts',    'Render posts in the _drafts folder'
+      c.option 'verbose',     '--verbose',   'Print verbose output.'
+    end
+
+    def self.normalize_options(options)
+      if drafts_state = options.delete('drafts')
+        options['show_drafts'] = drafts_state
+      end
+      options
+    end
+  end
+end

data/lib/octopress/commands/serve.rb

@@ -0,0 +1,31 @@
+require 'jekyll'
+require File.expand_path('helpers', File.dirname(__FILE__))
+
+module Octopress
+  class Serve < Command
+    def self.init_with_program(p)
+      p.command(:serve) do |c|
+        c.alias(:server)
+
+        c.syntax 'jekyll serve [options]'
+        c.description 'Serve your site locally'
+
+        CommandHelpers.add_build_options(c)
+
+        c.option 'detach', '-B', '--detach',      'Run the server in the background (detach)'
+        c.option 'port',   '-P', '--port PORT',   'Port to listen on'
+        c.option 'host',   '-H', '--host HOST',   'Host to bind to'
+        c.option 'baseurl',      '--baseurl URL', 'Base URL'
+
+        c.action do |args, options|
+          options.default :serving => true
+          options = CommandHelpers.normalize_options(options)
+          options = ::Jekyll.configuration(options.to_symbol_keys)
+          ::Jekyll::Commands::Build.process(options)
+          ::Jekyll::Commands::Serve.process(options)
+        end
+      end
+    end
+  end
+end
+

data/lib/octopress/configuration.rb

@@ -0,0 +1,35 @@
+module Octopress
+  module Configuration
+
+    DEFAULTS = {
+      'new_post_extension' => 'markdown',
+      'new_page_extension' => 'html',
+      'new_post_layout' => 'post',
+      'new_page_layout' => 'page',
+      'titlecase' => true
+    }
+
+    def self.config(options={})
+      return @config if @config
+
+      file = '_octopress.yml'
+      config = {}
+      if File.exist? file
+        config = YAML.safe_load(File.open(file))
+      end
+      #config['jekyll'] = jekyll_config(options)
+      @config = DEFAULTS.deep_merge(config)
+    end
+
+    def self.jekyll_config(options={})
+      return @jekyll_config if @jekyll_config
+
+      log_level = Jekyll.logger.log_level
+      Jekyll.logger.log_level = Jekyll::Stevenson::WARN
+      jekyll_config = Jekyll.configuration(options)
+      Jekyll.logger.log_level = log_level
+
+      @jekyll_config = jekyll_config
+    end
+  end
+end

data/lib/octopress/draft.rb

@@ -18,7 +18,7 @@ module Octopress
 
     def path
       name = "#{title_slug}.#{extension}"
-      File.join(@config['source'], '_drafts', name)
+      File.join(source, '_drafts', name)
     end
 
     def read

data/lib/octopress/page.rb

@@ -10,7 +10,7 @@ module Octopress
 
     def write
       if File.exist?(path) && !@options['force']
-        abort "File #{relative_path} already exists" if File.exist?(path)
+        abort "File #{relative_path} already exists"
       end
 
       FileUtils.mkdir_p(File.dirname(path))
@@ -27,16 +27,21 @@ module Octopress
       path.sub(local, '')
     end
 
+    def source
+      Configuration.jekyll_config(@options)['source']
+    end
+
     def path
+      return @path if @path
       file = @options['path']
 
       # If path ends with a slash, make it an index
-      file << "index" if file =~ /\/$/
+      file += "index" if file =~ /\/$/
 
       # if path has no extension, add the default extension
-      file << ".#{extension}" unless file =~ /\.\w+$/
+      file += ".#{extension}" unless file =~ /\.\w+$/
 
-      File.join(@config['source'], file)
+      @path = File.join(source, file)
     end
 
     def extension
@@ -45,9 +50,10 @@ module Octopress
 
     def set_default_options
       @options['type'] ||= 'page'
-      @options['layout']      =  @config['octopress']['new_page_layout']
+      @options['layout']      =  @config['new_page_layout']
       @options['date']        = convert_date @options['date']
-      @options['extension'] ||= @config['octopress']['new_page_extension']
+      @options['extension'] ||= @config['new_page_extension']
+      @options['template'] ||= @config['new_page_template']
     end
 
     def convert_date(date)
@@ -64,18 +70,29 @@ module Octopress
     #
     def content
       file = @options['template']
-      file = File.join(Octopress.site.source, file) if file
+      file = File.join(source, '_templates', file) if file
       if file 
-        raise "No template found at #{file}" unless File.exist? file
+        abort "No template found at #{file}" unless File.exist? file
         parse_template Pathname.new(file).read
       else
         parse_template default_content
       end
     end
 
+    # Render Liquid vars in YAML front-matter.
     def parse_template(input)
-      template = Liquid::Template.parse(input)
-      template.render(@options)
+
+      # If possible only parse the YAML front matter.
+      # If YAML front-matter dashes aren't present parse the whole 
+      # template and add dashes.
+      #
+      parsed = if input =~ /\A-{3}\s+(.+?)\s+-{3}\s+(.+)/m
+        template = Liquid::Template.parse($1)
+        "---\n#{template.render(@options)}\n---\n\n#{$2}"
+      else
+        template = Liquid::Template.parse(input)
+        "---\n#{template.render(@options)}\n---\n\n"
+      end
     end
 
     def date_slug

data/lib/octopress/post.rb

@@ -3,15 +3,16 @@ module Octopress
 
     def set_default_options
       @options['type'] ||= 'post'
-      @options['layout'] =  @config['octopress']['new_post_layout']
+      @options['layout'] =  @config['new_post_layout']
       @options['title'] ||= 'New Post'
       @options['date'] = convert_date @options['date'] || Time.now
-      @options['extension'] ||= @config['octopress']['new_post_extension']
+      @options['extension'] ||= @config['new_post_extension']
+      @options['template'] ||= @config['new_post_template']
     end
 
     def path
       name = "#{date_slug}-#{title_slug}.#{extension}"
-      File.join(@config['source'], '_posts', name)
+      File.join(source, '_posts', name)
     end
 
     # Post template defaults

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.0.alpha3"
+  VERSION = "3.0.0.alpha4"
 end

data/octopress.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "mercenary", "~> 0.1.0"
-  spec.add_runtime_dependency "jekyll", "~> 1.0.0"
+  spec.add_runtime_dependency "jekyll", "~> 1.4.2"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "pry-debugger"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha3
+  version: 3.0.0.alpha4
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -99,8 +99,14 @@ files:
 - bin/octopress
 - lib/octopress.rb
 - lib/octopress/command.rb
+- lib/octopress/commands/build.rb
+- lib/octopress/commands/docs.rb
+- lib/octopress/commands/doctor.rb
+- lib/octopress/commands/helpers.rb
 - lib/octopress/commands/new.rb
 - lib/octopress/commands/publish.rb
+- lib/octopress/commands/serve.rb
+- lib/octopress/configuration.rb
 - lib/octopress/core_ext.rb
 - lib/octopress/draft.rb
 - lib/octopress/page.rb