Dir option shortcode changed to -D. Fixes #106

octopress · May 10, 2015 · 73bbb02 · 73bbb02
1 parent 82bef28
commit 73bbb02
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### 3.0.4 (2015-05-10)
+- Fix: Changed shortcode for `--dir` to `-D` so it doesn't interfere with `-d` for `--date`.
+
 ### 3.0.3 (2015-05-09)
 - Fix: Require gems from Gemfile if possible to reduce need to prefix with bundle exec.
 

diff --git a/lib/octopress/commands/new.rb b/lib/octopress/commands/new.rb
@@ -40,7 +40,7 @@ def self.init_with_program(p)
           c.description 'Add a new post to your Jekyll site.'
           CommandHelpers.add_page_options c
           c.option 'slug', '-s', '--slug SLUG', 'Use this slug in filename instead of sluggified post title.'
-          c.option 'dir', '-d', '--dir DIR', 'Create post at _posts/DIR/.'
+          c.option 'dir', '-D', '--dir DIR', 'Create post at _posts/DIR/.'
           CommandHelpers.add_common_options c
 
           c.action do |args, options|

diff --git a/lib/octopress/version.rb b/lib/octopress/version.rb
@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end
diff --git a/octopress.gemspec b/octopress.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "mercenary", "~> 0.3.2"
-  spec.add_runtime_dependency "jekyll", "~> 2.5"
+  spec.add_runtime_dependency "jekyll", ">= 2.5"
   spec.add_runtime_dependency "titlecase"
   spec.add_runtime_dependency "octopress-deploy"
   spec.add_runtime_dependency "octopress-hooks", "~> 2.0"
@@ -34,4 +34,4 @@ Gem::Specification.new do |spec|
   if RUBY_VERSION >= "2"
     spec.add_development_dependency "pry-byebug"
   end
-end
+end