octopress 3.0.3.alpha.2 → 3.0.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ec17b2ca99d375e538088d074a24006d0c18ddef
4
- data.tar.gz: 26e3f70faeae730afb371dafe592576e25979753
3
+ metadata.gz: ca55c9c24a5374ec8cf04cce863a3c38272ad8a6
4
+ data.tar.gz: 1eb7d555f92b3a4fda4296f293f016ed6459ba78
5
5
  SHA512:
6
- metadata.gz: 61f5ac2fede84e79fb4e6aec2eec79b78825938853e43d6bf32975747b465880521a5cd6d2666c2fc1efcdef9f1a1f84176332b6c2d26ae7827761c0a5b9f964
7
- data.tar.gz: ab8ddac0b4392e76c7c1c04ab7d22cf09110b6d471f50a7370f4b6d3689617d414a11bfa6009551b0f4d60584f43c31eeba8aac358b4c8b9b0cd25286317be58
6
+ metadata.gz: 663ca23814e4e44203e24142189343de2f047fd323db0066701144e95bbf3b09b759e6155d325aee82ffd89a690ace1edcbb2bda7f7a4241dd128fd71b8f857d
7
+ data.tar.gz: 34e10d98e9a607c81dec18c562362e443445d5d36970383e8a10ddb89fa34ec48d57afd75bc1d4ec6296ec95fb424c41a103c502c4d9e259f80ea2712abd6576
data/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # Changelog
2
2
 
3
+ ### 3.0.4 (2015-05-10)
4
+ - Fix: Changed shortcode for `--dir` to `-D` so it doesn't interfere with `-d` for `--date`.
5
+
6
+ ### 3.0.3 (2015-05-09)
7
+ - Fix: Require gems from Gemfile if possible to reduce need to prefix with bundle exec.
8
+
3
9
  ### 3.0.2 (2015-05-06)
4
10
  - Fix: Scaffolding path was broken when a configuration didn't have a source setting.
5
11
 
data/lib/octopress.rb CHANGED
@@ -106,7 +106,7 @@ module Octopress
106
106
  if !ENV["OCTOPRESS_NO_BUNDLER_REQUIRE"] && File.file?("Gemfile")
107
107
  begin
108
108
  require "bundler"
109
- Bundler.setup # puts all groups on the load path
109
+ Bundler.require(:default)
110
110
  Bundler.require(:octopress)
111
111
  true
112
112
  rescue LoadError, Bundler::GemfileNotFound
@@ -40,7 +40,7 @@ module Octopress
40
40
  c.description 'Add a new post to your Jekyll site.'
41
41
  CommandHelpers.add_page_options c
42
42
  c.option 'slug', '-s', '--slug SLUG', 'Use this slug in filename instead of sluggified post title.'
43
- c.option 'dir', '-d', '--dir DIR', 'Create post at _posts/DIR/.'
43
+ c.option 'dir', '-D', '--dir DIR', 'Create post at _posts/DIR/.'
44
44
  CommandHelpers.add_common_options c
45
45
 
46
46
  c.action do |args, options|
@@ -1,3 +1,3 @@
1
1
  module Octopress
2
- VERSION = "3.0.3.alpha.2"
2
+ VERSION = "3.0.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: octopress
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.3.alpha.2
4
+ version: 3.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-05-08 00:00:00.000000000 Z
12
+ date: 2015-05-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: mercenary
@@ -29,14 +29,14 @@ dependencies:
29
29
  name: jekyll
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - "~>"
32
+ - - ">="
33
33
  - !ruby/object:Gem::Version
34
34
  version: '2.5'
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - "~>"
39
+ - - ">="
40
40
  - !ruby/object:Gem::Version
41
41
  version: '2.5'
42
42
  - !ruby/object:Gem::Dependency
@@ -245,9 +245,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
245
245
  version: '0'
246
246
  required_rubygems_version: !ruby/object:Gem::Requirement
247
247
  requirements:
248
- - - ">"
248
+ - - ">="
249
249
  - !ruby/object:Gem::Version
250
- version: 1.3.1
250
+ version: '0'
251
251
  requirements: []
252
252
  rubyforge_project:
253
253
  rubygems_version: 2.4.6