octopress 3.0.0.alpha2 → 3.0.0.alpha3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzIyMmUzODkxNzk0ODFlYjlhZmVhYTUzMjE2ZmNlNjVmYTdiMGMwZA==
-  data.tar.gz: !binary |-
-    NTIwYzkxODI5ZTI5Y2M5MTliZTBkNTJlODE1ODI0YWEyOWFjZTdjNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    Nzg4YTgwYWZkMmNlYWZmYTZiN2VhNmJjNzQzZGM2MDFkNWZkN2Q2YjI0ZDFi
-    NjNmZjQ4YzcyZWY3NGNhNWMwMWNmZGE0NThkOTNjYjgxOTg2NmYyZjA5MDM0
-    YWE4MTJkNDc3Y2E0YzI0NjVjMGNjOWVjY2FhNzQ1NDdiY2VjODA=
-  data.tar.gz: !binary |-
-    OTE5YzI3NzYwOTg4YTdlMjczNWRkZGE1NWZhNmY1MjIzODVmZTU0OTQ2ZjAw
-    NDkyMThmOWNhMDEyMmY0MDE2M2E1NDJhY2U2MGY5MDQ3YWMyMWExZGViZTMy
-    MjU5NzU1ZjBiZjllMjE5YTkyOWI0NjA1NWI3YWViMWM0NjJhZWM=
+SHA1:
+  metadata.gz: 43594e6b5026cdfe8c0b63659e8c6d23073153b4
+  data.tar.gz: 13fe34f1bfa868adebaf7fbbe9f875a7ba4cffe3
+SHA512:
+  metadata.gz: bd87b4fee80759d6791deb6bb974a0ae92d538babcc9ee57df1308d0bae65fcd0fb0b14d924fcea6e528748d71071c10737be6b436d59f5949c05245fed6d507
+  data.tar.gz: 622aef0de4f00a34f80a2d8f595ff95f1ba3f8c6ac55d0897f898aa278a0b4ec6636300454873b1d9a1635ece49a8ead7e97bcccfefaea99378898b7285050af

data/.gitignore

@@ -1,20 +1,17 @@
+*.gem
+*.rbc
 .bundle
-.DS_Store
+.config
+.yardoc
 Gemfile.lock
-*.sw[mnop]
-*~
-/.sass-cache
-/.gist-cache
-/.pygments-cache
-/_deploy
-/public
-/source/_stash
-/source/stylesheets/site.css
-/source/javascripts/build
-/source/images/icon-*.png
-/vendor
-/lib/vendor
-node_modules
-/_config.yml
-/config/deploy.yml
-/coverage/
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -1,2 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in octopress.gemspec
 gemspec

data/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 octopress
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,66 @@
+# Octopress
+
+Octopress is an obsessively designed toolkit for writing and deploying Jekyll
+blogs. Pretty sweet, huh?
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'octopress'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install octopress
+
+## Usage
+
+### Generating a new Post
+
+```bash
+$ octopress new post --title "My Title"
+```
+
+"Ok, great? What else can I do?" Great question! Check out these other options:
+
+| Option       | Type     | Description |
+|:-------------|:---------|:------------|
+| `title`      | `String` | The title of the new post |
+| `date`       | `String` | The date for the post. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) (defaults to Time.now) |
+| `slug`       | `String` | The slug for the new post. |
+| `categories` | `Array`  | A comma-separated list of categories to which this post belongs |
+| `tags`       | `Array`  | A comma-separated list of tags for this post |
+
+### Generating a new Page
+
+```bash
+$ octopress new page --path about/index.markdown
+```
+
+| Option       | Type     | Description |
+|:-------------|:---------|:------------|
+| `title`      | `String` | The title of the new page |
+| `date`       | `String` | The date for the page. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) |
+| `path`       | `String` | The path at which the new page should be generated. |
+
+### Other Commands
+
+Octopress also has the following commands, bundled as separate gems:
+
+| Command  | Gem                  | Description |
+|:---------|:---------------------|:------------|
+| `deploy` | [octopress-deploy][] | Deployment for Octopress and Jekyll blogs. |
+
+[octopress-deploy]: https://github.com/octopress/deploy
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1,76 +1 @@
-# encoding: utf-8
-
-$:.unshift File.expand_path("lib", File.dirname(__FILE__)) # For use/testing when no gem is installed
-require 'octopress'
-require 'tzinfo'
-
-### Configuring Octopress:
-###   Under config/ you will find:
-###       site.yml, deploy.yml
-###   Here you can override Octopress's default configurations or add your own.
-###   This Rakefile uses those config settings to do what it does.
-###   Please do not change anything below if you want help --
-###   otherwise, you're on your own ;-)
-
-#
-# Run tests for Octopress module, found in lib/.
-#
-require 'rspec/core/rake_task'
-desc "Run all examples"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = "./lib/spec{,/*/**}/*_spec.rb"
-end
-
-task :test do
-  sh "bundle exec rake spec"
-  #sh "bundle exec rake install['classic-theme']"
-  #sh "bundle exec rake install['video-tag']"
-  #sh "bundle exec rake install['adn-timeline']"
-  #sh "bundle exec rake generate"
-end
-
-def get_stdin(message)
-  print message
-  STDIN.gets.chomp
-end
-
-def now_in_timezone(timezone)
-  time = Time.now
-  unless timezone.nil? || timezone.empty? || timezone == 'local'
-    tz = TZInfo::Timezone.get(timezone) #setup Timezone object
-    adjusted_time = tz.utc_to_local(time.utc) #time object without correct offset
-    #time object with correct offset
-    time = Time.new(
-      adjusted_time.year,
-      adjusted_time.month,
-      adjusted_time.day,
-      adjusted_time.hour,
-      adjusted_time.min,
-      adjusted_time.sec,
-      tz.period_for_utc(time.utc).utc_total_offset())
-    #convert offset to utc instead of just ±0 if that was specified
-    if ['utc','zulu','universal','uct','gmt','gmt0','gmt+0','gmt-0'].include? timezone.downcase
-      time = time.utc
-    end
-  end
-  time
-end
-
-def get_unpublished(posts, options={})
-  result = ""
-  message = options[:message] || "These Posts will not be published:"
-  posts.sort.each do |post|
-    file = File.read(post)
-    data = YAML.load file.match(/(^-{3}\n)(.+?)(\n-{3})/m)[2]
-
-    if options[:env] == 'production'
-      future = Time.now < Time.parse(data['date'].to_s) ? "future date: #{data['date']}" : false
-    end
-    draft = data['published'] == false ? 'published: false' : false
-    result << "- #{data['title']} (#{draft or future})\n" if draft or future
-  end
-  result = "#{message}\n" + result unless result.empty?
-  result
-end
-
-Octopress::Rake.init!(self)
+require "bundler/gem_tasks"

data/bin/octopress

@@ -1,66 +1,22 @@
-#!/usr/bin/env ruby
+#! /usr/bin/env ruby
 
-require 'rubygems'
-require File.expand_path("../lib/octopress", File.dirname(__FILE__))
-require 'commander/import'
+$LOAD_PATH.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
 
-program :version, Octopress::VERSION
-program :description, 'Octopress is an obsessively designed framework for Jekyll blogging.'+
-                      'It\'s easy to configure and easy to deploy. Sweet huh?'
+require 'mercenary'
+require 'octopress'
 
-command :build do |c|
-  c.syntax = 'octopress build [options]'
-  c.summary = 'Build your static site'
+Octopress.require_blessed_gems
 
-  c.option '--env ENV', 'Specify the build environment'
-  c.option '--watch',   'Auto-regenerate with filesystem changes'
-
-  c.action do |args, options|
-    Octopress::Commands::Build.process(args, options.__hash__)
-  end
-end
-
-command :install do |c|
-  c.syntax = 'octopress install NAME'
-  c.summary = 'Install an Octopress plugin'
-
-  c.action do |args, options|
-    Octopress::Commands::Install.process(args, options.__hash__)
-  end
+begin
+  require 'bundler'
+  Bundler.require(:octopress)
+rescue
 end
 
-command :new do |c|
-  c.syntax = 'octopress new PATH'
-  c.summary = 'Create a new octopress site in the specified directory'
-
-  c.example 'Create new site in current directory', 'octopress build .'
-  c.example 'Create new site in subdirectory "./blog"', 'octopress build blog'
-
-  c.action do |args, options|
-    Octopress::Commands::New.process(args, options.__hash__)
-  end
-end
-
-command :scaffold do |c|
-  c.syntax = 'octopress scaffold (plugin|theme) [options]'
-  c.summary = 'Scaffold a new plugin or theme to release'
-
-  c.example 'Create a new plugin called "image_resizer" in "./image_resizer"',
-    'octopress scaffold plugin image_resizer'
-
-  c.action do |args, options|
-    Octopress::Commands::Scaffold.process(args, options.__hash__)
-  end
-end
+Mercenary.program(:octopress) do |p|
+  p.version Octopress::VERSION
+  p.description "Octopress is an obsessively designed toolkit for Jekyll blogging."
+  p.syntax "octopress <subcommand> [options]"
 
-command :serve do |c|
-  c.syntax = 'octopress serve [options]'
-  c.summary = 'Build your site locally and start a server for it'
-  
-  c.option '--env ENV', 'Specify the build environment'
-  c.option '--watch',   'Auto-regenerate with filesystem changes'
-  
-  c.action do |args, options|
-    Octopress::Commands::Serve.process(args, options.__hash__)
-  end
+  Octopress::Command.subclasses.each { |c| c.init_with_program(p) }
 end

data/lib/octopress.rb

@@ -1,90 +1,51 @@
-$:.unshift File.expand_path(File.dirname(__FILE__)) # For use/testing when no gem is installed
-
-# stdlib
-require 'logger'
-
-# gems
-require 'colorator'
-require 'open3'
-require 'stringex'
-require 'time'
-require 'tzinfo'
-require 'safe_yaml'
-
-SafeYAML::OPTIONS[:suppress_warnings] = true
-
-# octopress
-require "octopress/version"
-require "octopress/errors"
-require "octopress/core_ext"
-require "octopress/helpers/titlecase"
-
 module Octopress
-  autoload :Configuration,       'octopress/configuration'
-  autoload :Ink,                 'octopress/ink'
-  autoload :Installer,           'octopress/installer'
-  autoload :Formatters,          'octopress/formatters'
-  autoload :InquirableString,    'octopress/inquirable_string'
-  autoload :DependencyInstaller, 'octopress/dependency_installer'
-  autoload :JSAssetsManager,     'octopress/js_assets_manager'
-  autoload :Command,             'octopress/command'
-  autoload :Commands,            'octopress/commands'
-  autoload :Rake,                'octopress/rake'
-  autoload :Plugin,              'octopress/plugin'
-
-  # Static: Get absolute file path of the octopress lib directory
-  #
-  # Returns the absolute path to the octopress lib directory
-  def self.lib_root
-    File.dirname(__FILE__)
-  end
-
-  # Static: Get absolute file path of the main octopress installation
-  #
-  # Returns the absolute path of the main octopress installation
-  def self.root
-    Dir.pwd
-  end
+  require 'octopress/core_ext'
+  require 'octopress/command'
+  require 'octopress/version'
+  require 'octopress/commands/new'
+  require 'octopress/commands/publish'
+
+  autoload :Page, 'octopress/page'
+  autoload :Post, 'octopress/post'
+  autoload :Draft, 'octopress/draft'
+
+  BLESSED_GEMS = %w[
+    octopress-deploy
+    octopress-ink
+  ]
+
+  DEFAULTS = { 'octopress' => {
+    'new_post_extension' => 'markdown',
+    'new_page_extension' => 'html',
+    'new_post_layout' => 'post',
+    'new_page_layout' => 'page',
+    'titlecase' => true
+  }}
 
-  # Static: Fetches the Octopress environment
-  #
-  # Returns the Octopress environment as an InquirableString
-  def self.env
-    # Not simply memoizing the result in case the configuration changes out
-    # from under us at runtime...  Not sure if that can happen, but just in
-    # case let's be conservative in our behavior here.
-    env_raw_tmp = (ENV["OCTOPRESS_ENV"] || self.configuration[:env]).to_s
-    if(env_raw_tmp != @env_raw)
-      @env = nil
-    end
-    @env_raw = env_raw_tmp
-    @env ||= InquirableString.new(@env_raw)
-  end
-
-  # Static: Fetch the logger for Octopress
-  #
-  # Returns the Logger, based on Ruby's stdlib Logger
   def self.logger
-    @@logger ||= Ink.build
-  end
-
-  def self.configurator(root_dir = Octopress::Configuration::DEFAULT_CONFIG_DIR)
-    @configurator ||= Configuration.new(root_dir)
+    @logger ||= Logger.new(STDOUT)
+    @logger.level = Logger::DEBUG
+    @logger
   end
 
-  def self.configuration
-    @configuration ||= self.configurator.read_configuration
+  def self.site(options={})
+    @site ||= Jekyll::Site.new(config(options))
   end
 
-  def self.clear_config!
-    @configurator = nil
-    @configuration = nil
+  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
   end
-end
 
-def require_all(relative_path)
-  Dir[File.expand_path("../#{relative_path}/**/*", __FILE__)].entries.each do |f|
-    require f
+  def self.require_blessed_gems
+    BLESSED_GEMS.each do |gem|
+      begin
+        require gem
+      rescue LoadError
+      end
+    end
   end
 end
-

data/lib/octopress/command.rb

@@ -1,9 +1,15 @@
 module Octopress
   class Command
-    class << self
-      def process(args = nil, options = nil)
-        raise NotImplementedError
-      end
+    def self.inherited(base)
+      subclasses << base
+    end
+
+    def self.subclasses
+      @subclasses ||= []
+    end
+
+    def init_with_program(p)
+      raise NotImplementedError.new("")
     end
   end
 end