octopress 3.0.0.alpha7 → 3.0.0.alpha8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1652fdb31e927325dd2d90571f8dab99be6dfe7d
-  data.tar.gz: a214422e3a4c98cd014c57cc91bc036b93778a23
+  metadata.gz: 4f9b1847085d24d5bdfcfc8c587c68d416bd9d95
+  data.tar.gz: f4dde30b1c537623df72a4d3bca0f99f308292e0
 SHA512:
-  metadata.gz: b699385d7fc6d6473c78ce88e8f0c759994eb32e6f8fe130cdfd25fcaa518b43b3e4543b86e34e4ae6a8522c361a4af89abcd01145b2eceaac2c7ca195af0568
-  data.tar.gz: 35219bf6f8ebbddfeaf2ce04906ed20c1978c698bf979f768959cab9a49a987772a31ee9fb4d3db87d3dafb1deb06a47445bc5eeb32d80ae08a4c1ba115e8cf1
+  metadata.gz: 439892300f2b23d9c19547ab05dbd409388db470f78069d2ae53339fea3079f1b0db1f3086a66adc304e4ed86dc45554d6f74b5987c58d5ac4966ec6c07a78e3
+  data.tar.gz: 67f5ca769098c7f138dc24791a8b36c50dc837591095e772bb9fb4570997c03a797649b2f119be9a384b83eb599ba33bcb324b2d7f3ad7600058af418d53e49c

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+_site

data/docs/_octopress.yml

@@ -0,0 +1 @@
+docs_mode: true

data/docs/index.html

@@ -0,0 +1 @@
+OMG DOCS

data/lib/octopress.rb

@@ -28,7 +28,7 @@ module Octopress
   end
 
   def self.config(options={})
-    Configuration.config(options)
+    @config ||= Configuration.config(options)
   end
 
   def self.require_blessed_gems
@@ -40,3 +40,4 @@ module Octopress
     end
   end
 end
+

data/lib/octopress/commands/build.rb

@@ -10,6 +10,7 @@ module Octopress
         CommandHelpers.add_build_options(c)
         
         c.action do |args, options|
+          Octopress.config(options)
           options = CommandHelpers.normalize_options(options)
           options = ::Jekyll.configuration(options.to_symbol_keys)
           ::Jekyll::Commands::Build.process(options)

data/lib/octopress/commands/docs.rb

@@ -1,4 +1,5 @@
 require 'jekyll'
+require 'yaml'
 require File.expand_path('helpers', File.dirname(__FILE__))
 
 module Octopress
@@ -6,35 +7,66 @@ module Octopress
     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.description "Launch local server with docs for Octopress v#{Octopress::VERSION} and Octopress Ink plugins."
 
         c.option 'port', '-P', '--port [PORT]', 'Port to listen on'
         c.option 'host', '-H', '--host [HOST]', 'Host to bind to'
+        if ENV['OCTODEV']
+          c.option 'watch', '--watch', 'Watch docs site for changes and rebuild. (For docs development)'
+        end
         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
+          serve_docs(options)
+        end
+      end
+    end
+
+    def self.serve_docs(options)
+      if options['jekyll']
+        options = init_jekyll_docs(options)
+      else
+        options = init_octopress_docs(options)
+      end
+      options["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
+
+    def self.init_octopress_docs(options)
+      Octopress.config({'octopress-config'=>File.join(site_dir, '_octopress.yml')})
+      require_gems
+      options['source'] = site_dir
+      options['destination'] = File.join(site_dir, '_site')
+      options
+    end
+
+    def self.init_jekyll_docs(options)
+      options.delete('jekyll')
+
+      # Find local Jekyll gem path
+      #
+      spec = Gem::Specification.find_by_name("jekyll")
+      gem_path = spec.gem_dir
+
+      options['source'] = "#{gem_path}/site",
+      options['destination'] = "#{gem_path}/site/_site"
+      options
+    end
+
+    def self.site_dir
+      File.expand_path('docs', File.join(File.dirname(__FILE__), '../../../', ))
+    end
+
+    def self.require_gems
+      file = File.join(Dir.pwd, '_config.yml')
+      if File.exist? file
+        config = YAML.safe_load(File.open(file))
+        gems = config['gems']
+        if gems && gems.is_a?(Array)
+          gems.each {|g| require g }
         end
       end
     end

data/lib/octopress/commands/helpers.rb

@@ -1,7 +1,8 @@
 module Octopress
   module CommandHelpers
     def self.add_build_options(c)
-      c.option 'config',      '--config <CONFIG_FILE>[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+      c.option 'config',      '--config <CONFIG_FILE>[,CONFIG_FILE2,...]', Array, 'Custom Jekyll configuration file'
+      c.option 'octopress-config', '--octopress-config <CONFIG_FILE>', 'Custom Octopress 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'

data/lib/octopress/commands/new.rb

@@ -4,7 +4,7 @@ module Octopress
   class New < Command
     def self.init_with_program(p)
       p.command(:new) do |c|
-        c.syntax 'new <path>'
+        c.syntax 'new <PATH>'
         c.description 'Creates a new Jekyll site scaffold in path'
         c.option 'force', '--force', 'Force creation even if path already exists'
         c.option 'blank', '--blank', 'Creates scaffolding but with empty files'

data/lib/octopress/commands/serve.rb

@@ -18,6 +18,8 @@ module Octopress
         c.option 'baseurl',      '--baseurl URL', 'Base URL'
 
         c.action do |args, options|
+          Octopress.config(options)
+
           options.default :serving => true
           options = CommandHelpers.normalize_options(options)
           options = ::Jekyll.configuration(options.to_symbol_keys)

data/lib/octopress/configuration.rb

@@ -12,7 +12,7 @@ module Octopress
     def self.config(options={})
       return @config if @config
 
-      file = '_octopress.yml'
+      file = options['octopress-config'] || '_octopress.yml'
       config = {}
       if File.exist? file
         config = YAML.safe_load(File.open(file))

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.0.alpha7"
+  VERSION = "3.0.0.alpha8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha7
+  version: 3.0.0.alpha8
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -97,6 +97,9 @@ files:
 - README.md
 - Rakefile
 - bin/octopress
+- docs/_octopress.yml
+- docs/_site/index.html
+- docs/index.html
 - lib/octopress.rb
 - lib/octopress/command.rb
 - lib/octopress/commands/build.rb