octopress 3.0.0.rc.15 → 3.0.0.rc.16

data/bin/octopress

@@ -5,8 +5,6 @@ $LOAD_PATH.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
 require 'mercenary'
 require 'octopress'
 
-Octopress.require_blessed_gems
-
 if ENV['BUNDLE_BIN_PATH'] || ENV['BUNDLE_GEMFILE']
   begin
     require 'bundler'

data/lib/octopress.rb

@@ -8,19 +8,18 @@ module Octopress
   require 'octopress/commands/new'
   require 'octopress/commands/init'
   require 'octopress/commands/publish'
-  require 'octopress/commands/build'
-  require 'octopress/commands/serve'
-  require 'octopress/commands/doctor'
+  require 'octopress/commands/isolate'
+  require 'octopress/isolate'
 
   autoload :Page, 'octopress/page'
   autoload :Post, 'octopress/post'
   autoload :Draft, 'octopress/draft'
   autoload :Scaffold, 'octopress/scaffold'
 
+  # Automatically require these gems if installed
   BLESSED_GEMS = %w[
-    octopress-deploy
     octopress-ink
-    octopress-docs
+    octopress-deploy
   ]
 
   def self.logger
@@ -50,6 +49,11 @@ end
 require 'octopress-docs'
 
 Octopress::Docs.add({
-  name:        "Octopress",
+  name:        "Octopress CLI",
+  slug:        "octopress",
+  base_url:    "/octopress",
   dir:         File.expand_path(File.join(File.dirname(__FILE__), "../")),
 })
+
+Octopress.require_blessed_gems
+

data/lib/octopress/commands/isolate.rb

@@ -0,0 +1,31 @@
+module Octopress
+  module Commands
+    class Isolate < Command
+      def self.init_with_program(p)
+        p.command(:isolate) do |c|
+          c.syntax 'isolate [search] [options]'
+          c.description "Move posts to _posts/_exile if they do not match the search text or move the most recent post if search text is omitted."
+          c.option 'path',   '--path [STRING]', 'Isolate a post at the specified path.'
+          c.option 'config', '--config <CONFIG_FILE>[,CONFIG_FILE2,...]', Array, 'Custom Jekyll configuration file'
+
+          c.action do |args, options|
+            if !args.empty?
+              options['search'] = args.first
+            end
+            Octopress::Isolate.new(options).process
+          end
+        end
+
+        p.command(:integrate) do |c|
+          c.syntax 'integrate'
+          c.description "Reintegrate posts from _posts/_exile."
+          c.option 'config', '--config <CONFIG_FILE>[,CONFIG_FILE2,...]', Array, 'Custom Jekyll configuration file'
+
+          c.action do |args, options|
+            Octopress::Isolate.new(options).revert
+          end
+        end
+      end
+    end
+  end
+end

data/lib/octopress/commands/new.rb

@@ -3,7 +3,7 @@ module Octopress
     def self.init_with_program(p)
       p.command(:new) do |c|
         c.syntax 'new <PATH>'
-        c.description 'Creates a new Jekyll site scaffold in path.'
+        c.description 'Creates a new site with Jekyll and Octopress scaffolding at the specified path.'
         c.option 'force', '--force', 'Force creation even if path already exists.'
         c.option 'blank', '--blank', 'Creates scaffolding but with empty files.'
         
@@ -12,6 +12,7 @@ module Octopress
             c.logger.error "You must specify a path."
           else
             Jekyll::Commands::New.process(args, options)
+            Octopress::Scaffold.new(args, options).write
           end
         end
 

data/lib/octopress/isolate.rb

@@ -0,0 +1,108 @@
+require 'find'
+
+module Octopress
+  class Isolate
+    def initialize(options)
+      @options = options
+      Jekyll.logger.log_level = :error
+      @site = Jekyll::Site.new(Jekyll.configuration(@options))
+      Jekyll.logger.log_level = :info      
+    end
+
+    def revert
+      dir = File.join(@site.source, '_posts')
+      exile_dir = File.join(dir, '_exile')
+      if Dir.exist?(exile_dir)
+        posts = find_exiled_posts
+        if posts.size > 0
+          FileUtils.mv(posts, dir)
+          FileUtils.rmdir(File.join(dir, '_exile'))
+
+          puts "Reintegrated #{posts.size} post#{'s' if posts.size != 1} from _posts/_exile"
+        else
+          puts "There aren't any posts in _posts/_exile."
+        end
+      else
+        puts "There aren't any posts in _posts/_exile."
+      end
+    end
+
+    def process
+
+      if @options['path']
+        path = File.join(@site.source, @options['path'])
+        if File.exist? path
+          isolate_except(path)
+        else
+          puts "File not found: #{@options['path']}"
+        end
+      elsif @options['search']
+        isolate_search(@options['search'])
+      else
+        isolate_latest
+      end
+    end
+
+    # remove all posts that do not match string
+    def isolate_search(string)
+      posts = find_posts.select { |p| p =~ /#{string.gsub(/\s/, '-')}/i }
+      isolate_except(posts)
+    end
+
+    # Isolate all but the most recent post
+    def isolate_latest
+      post = @site.read_posts('').sort_by(&:date).last
+      path = File.join(@site.source, post.path)
+      isolate_except(path)
+    end
+
+    def isolate_except(posts)
+      others = find_other_posts(posts)
+      posts = default_array(posts)
+      exile_dir = @site.source, '_posts/_exile'
+
+
+      if posts.size > 0
+        FileUtils.mkdir_p(exile_dir)
+        FileUtils.mv(others, exile_dir)
+
+        puts "Isolated #{posts.size} post#{'s' if posts.size != 1}:"
+        posts.each do |p|
+          puts "  - #{p.sub(@site.source+'/_posts/', '')}" 
+        end
+        puts "Moved #{others.size} post#{'s' if others.size != 1} into _posts/_exile"
+      else
+        puts "No matching posts were found."
+      end
+    end
+
+    def find_other_posts(paths)
+      paths = default_array(paths)
+
+      find_posts.reject do |p| 
+        paths.include?(p)
+      end
+    end
+
+    def find_posts
+      dir = File.join(@site.source, '_posts')
+      Find.find(dir).to_a.reject do |f| 
+        File.directory?(f) || f =~ /_exile\//
+      end
+    end
+
+    def find_exiled_posts
+      dir = File.join(@site.source, '_posts/_exile')
+      Find.find(dir).to_a.reject do |f| 
+        File.directory?(f)
+      end
+    end
+
+    def default_array(input)
+      i = input || []
+      i = [i] unless i.is_a?(Array)
+      i
+    end
+
+  end
+end

data/lib/octopress/scaffold.rb

@@ -5,10 +5,11 @@ module Octopress
     def initialize(args, options)
       @path  = File.expand_path(args.join(" "), Dir.pwd)
       @force = !!options['force']
+      @blank = !!options['blank']
     end
     
     def write
-      if !force && (File.exist?(path + '/_templates') ||
+      if !@force && (File.exist?(path + '/_templates') ||
         File.exist?(path + '/_octopress.yml'))
         abort "Some files already exist.  Use --force to overwrite."
       end

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.0.rc.15"
+  VERSION = "3.0.0.rc.16"
 end

data/octopress.gemspec

@@ -24,9 +24,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "octopress-docs"
   spec.add_runtime_dependency "octopress-deploy"
 
-  spec.add_development_dependency "octopress-ink"
+  spec.add_development_dependency "octopress-ink", "~> 1.0.0.rc"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "clash"
 
   if RUBY_VERSION >= "2"
     spec.add_development_dependency "pry-byebug"

data/test/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'octopress', path: '../'
-gem 'pry-debugger'
+gemspec path: "../"

data/test/_config.yml

@@ -0,0 +1,3 @@
+timezone: GMT
+exclude:
+  - Gemfile*

data/test/_expected/integrate/_posts/2011-11-11-a-random-post.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "A Random Post"
+date: 2011-11-11T11:11:00Z
+---
+

data/test/_expected/integrate/_posts/2012-11-11-another-random-post.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "Another Random Post"
+date: 2012-11-11T11:11:00Z
+---
+

data/test/_expected/integrate/_posts/2013-11-11-this-post-is-happy.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "This Post Is Happy."
+date: 2013-11-11T11:11:00Z
+---
+

data/test/_expected/isolate-path/_posts/2011-11-11-a-random-post.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "A Random Post"
+date: 2011-11-11T11:11:00Z
+---
+

data/test/_expected/isolate-path/_posts/_exile/2012-11-11-another-random-post.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "Another Random Post"
+date: 2012-11-11T11:11:00Z
+---
+

data/test/_expected/isolate-path/_posts/_exile/2013-11-11-this-post-is-happy.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "This Post Is Happy."
+date: 2013-11-11T11:11:00Z
+---
+

data/test/_expected/isolate-search/_posts/2011-11-11-a-random-post.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "A Random Post"
+date: 2011-11-11T11:11:00Z
+---
+

data/test/_expected/isolate-search/_posts/2012-11-11-another-random-post.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "Another Random Post"
+date: 2012-11-11T11:11:00Z
+---
+

data/test/_expected/isolate-search/_posts/_exile/2013-11-11-this-post-is-happy.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "This Post Is Happy."
+date: 2013-11-11T11:11:00Z
+---
+

data/test/_expected/isolate/_posts/2013-11-11-this-post-is-happy.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "This Post Is Happy."
+date: 2013-11-11T11:11:00Z
+---
+

data/test/_expected/isolate/_posts/_exile/2011-11-11-a-random-post.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "A Random Post"
+date: 2011-11-11T11:11:00Z
+---
+

data/test/_expected/isolate/_posts/_exile/2012-11-11-another-random-post.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "Another Random Post"
+date: 2012-11-11T11:11:00Z
+---
+

data/test/{expected/_posts/2014-03-11-idea.markdown → _expected/new-draft-slug/_drafts/idea.markdown}

@@ -1,6 +1,5 @@
 ---
 layout: post
 title: "Some Great Idea for a Post"
-date: 2014-03-11T20:20:00Z
 ---
 

data/test/{expected/_drafts/stupid-idea.markdown → _expected/new-draft/_drafts/some-cool-idea.markdown}

@@ -1,6 +1,6 @@
 ---
 layout: post
-title: "Stupid Idea"
+title: "Some Cool Idea"
 date: 2014-03-10T15:20:00Z
 ---
 

data/test/{expected/date-page.html → _expected/new-page-date/pages/awesome-page.html}

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "Some Date Page"
+title: ""
 date: 2011-11-11T11:11:00Z
 ---
 

data/test/_expected/new-page-index/pages/index.html

@@ -0,0 +1,5 @@
+---
+layout: page
+title: "Awesome Page"
+---
+

data/test/{expected/custom-template-page.html → _expected/new-page-template/pages/awesome-page.html}

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "Some Date Page"
+title: ""
 kittens: true
 ---
 

data/test/_expected/new-page/pages/awesome-page.html

@@ -0,0 +1,5 @@
+---
+layout: page
+title: "Awesome Page"
+---
+

data/test/_expected/publish-draft-date/_posts/2014-03-11-some-cool-idea.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "Some Cool Idea"
+date: 2014-03-11T20:20:00Z
+---
+

data/test/_expected/publish-draft-dir/_posts/ideas/2014-03-10-some-cool-idea.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "Some Cool Idea"
+date: 2014-03-10T15:20:00Z
+---
+

data/test/_expected/publish-draft/_posts/2014-03-10-some-cool-idea.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "Some Cool Idea"
+date: 2014-03-10T15:20:00Z
+---
+