octopress 3.0.0.alpha6 → 3.0.0.alpha7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c62527f5ef1b7b0e75d335abc472f1cf5dbb21d
-  data.tar.gz: 30988331da408ed9f8ae6d39160dcaf9dc5ee01c
+  metadata.gz: 1652fdb31e927325dd2d90571f8dab99be6dfe7d
+  data.tar.gz: a214422e3a4c98cd014c57cc91bc036b93778a23
 SHA512:
-  metadata.gz: 7a046d7353d0acf7f3baf45e4ebe5c29eb546f660a138a0610c81dbc033d6977151f7ab923d83e596db445cd4340ab09a7201ebcdd066c4136597b9a0257121f
-  data.tar.gz: 85237ccbced52a8ae86ad2d1c24df0527f76c90aa5dda09eaafcd11cf40814929e12c4a8ea6d3c062a54d2ed3d240818d8e8bc2e3d5f2bd2f1a3166fe90c4c9f
+  metadata.gz: b699385d7fc6d6473c78ce88e8f0c759994eb32e6f8fe130cdfd25fcaa518b43b3e4543b86e34e4ae6a8522c361a4af89abcd01145b2eceaac2c7ca195af0568
+  data.tar.gz: 35219bf6f8ebbddfeaf2ce04906ed20c1978c698bf979f768959cab9a49a987772a31ee9fb4d3db87d3dafb1deb06a47445bc5eeb32d80ae08a4c1ba115e8cf1

data/lib/octopress.rb

@@ -1,3 +1,5 @@
+require 'mercenary'
+
 module Octopress
   require 'octopress/core_ext'
   require 'octopress/configuration'
@@ -20,7 +22,7 @@ module Octopress
   ]
 
   def self.logger
-    @logger ||= Logger.new(STDOUT)
+    @logger ||= Mercenary::Command.logger
     @logger.level = Logger::DEBUG
     @logger
   end

data/lib/octopress/commands/helpers.rb

@@ -1,7 +1,7 @@
 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 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'
@@ -18,8 +18,8 @@ module Octopress
     end
 
     def self.add_common_options(c)
+      c.option 'template', '--template PATH', "New #{c.name.to_s} from a template. PATH is relative to _templates/"
       c.option 'date', '--date DATE', 'String that is parseable by Time#parse. (default: Time.now.iso8601)'
-      c.option 'template', '--template PATH', 'Path to a post or page template.'
       c.option 'force', '--force', 'Force creation even if PATH already exists'
     end
   end

data/lib/octopress/commands/new.rb

@@ -4,31 +4,33 @@ module Octopress
   class New < Command
     def self.init_with_program(p)
       p.command(:new) do |c|
-        c.syntax 'octopress new PATH'
-        c.description 'Creates a new Jekyll site scaffold in PATH'
-        c.option 'force', '--force', 'Force creation even if PATH already exists'
+        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'
         
         c.action do |args, options|
-          abort "You must specify a path." if args.empty?
-          ::Jekyll::Commands::New.process(args, options.to_symbol_keys)
+          if args.empty?
+            c.logger.error "You must specify a path."
+          else
+            ::Jekyll::Commands::New.process(args, options.to_symbol_keys)
+          end
         end
 
         c.command(:page) do |page_command|
-          page_command.syntax 'octopress new page PATH [options]'
+          page_command.syntax 'page <PATH> [options]'
           page_command.description 'Add a new page to your Jekyll site.'
           page_command.option 'title', '--title TITLE', 'String to be added as the title in the YAML front-matter.'
           CommandHelpers.add_common_options page_command
 
           page_command.action do |args, options|
-            abort "You must specify a path." if args.empty?
             options['path'] = args.first
             Page.new(options).write
           end
         end
 
         c.command(:post) do |post_command|
-          post_command.syntax 'octopress new post TITLE [options]'
+          post_command.syntax 'post <TITLE> [options]'
           post_command.description 'Add a new post to your Jekyll site.'
           CommandHelpers.add_common_options post_command
 
@@ -39,7 +41,7 @@ module Octopress
         end
 
         c.command(:draft) do |draft_command|
-          draft_command.syntax 'octopress new draft TITLE [options]'
+          draft_command.syntax 'draft <TITLE> [options]'
           draft_command.description 'Add a new draft post to your Jekyll site.'
           CommandHelpers.add_common_options draft_command
 

data/lib/octopress/configuration.rb

@@ -17,7 +17,6 @@ module Octopress
       if File.exist? file
         config = YAML.safe_load(File.open(file))
       end
-      #config['jekyll'] = jekyll_config(options)
       @config = DEFAULTS.deep_merge(config)
     end
 

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"
+        raise "File #{relative_path} already exists. Use --force to overwrite."
       end
 
       FileUtils.mkdir_p(File.dirname(path))
@@ -34,6 +34,7 @@ module Octopress
     def path
       return @path if @path
       file = @options['path']
+      raise "You must specify a path." unless file
 
       # If path ends with a slash, make it an index
       file += "index" if file =~ /\/$/

data/lib/octopress/post.rb

@@ -4,10 +4,10 @@ module Octopress
     def set_default_options
       @options['type'] ||= 'post'
       @options['layout'] =  @config['new_post_layout']
-      @options['title'] ||= 'New Post'
       @options['date'] = convert_date @options['date'] || Time.now
       @options['extension'] ||= @config['new_post_extension']
       @options['template'] ||= @config['new_post_template']
+      raise "You must specify a title." if @options['title'].nil?
     end
 
     def path

data/lib/octopress/version.rb

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

data/octopress.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "mercenary", "~> 0.3.0"
+  spec.add_runtime_dependency "mercenary", "~> 0.3.1"
   spec.add_runtime_dependency "jekyll", "~> 1.4.2"
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha6
+  version: 3.0.0.alpha7
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement