octopress 3.0.0.alpha4 → 3.0.0.alpha5

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: 143b9c71ad561fd9a939fea1b64efee7c076d453
4
- data.tar.gz: 958d911bbe77152603ff177fec4a2c9f46de50cd
3
+ metadata.gz: e88ffd8d12a4e66e4727e6f29c8db96106b0bd4d
4
+ data.tar.gz: f3ad99f3d9d4022da49bb1ea815fe22d2068f1da
5
5
  SHA512:
6
- metadata.gz: 102c7015e4688e0f0dcce8457bcb4ebb5a9aa98092036123591d1da348bff257220a31fb55c533e229fd6ad6708b51b28ec581a9a6e1d8cd96b9f9d22718cdae
7
- data.tar.gz: 9600f8aea81d1a57efccbefdd5402162e32faed45ec96518e981ce4cc7cac2fa91d14fb719b5cdaa3ac97f671493a27bab8a7f57bf781d71fa8c10690a3e24f5
6
+ metadata.gz: 943d23e0f3842d057131dfa717a1201f837e591f89a2e9cbdeff21793ca4e5dcbb3a5641ed366e0a4140932d365ae45f89f08e5b8b4f88945a96901ef0a144e1
7
+ data.tar.gz: 3f0ae5fdb60088ddf300ecc841e988c51fe574bc9a2e4e195c4064df0aa7ff8c7666725be5390af3bb9679eb3827161392cc30516668c8f3a0d3ad6bc03d6a76
@@ -7,10 +7,12 @@ require 'octopress'
7
7
 
8
8
  Octopress.require_blessed_gems
9
9
 
10
- begin
11
- require 'bundler'
12
- Bundler.require(:octopress)
13
- rescue
10
+ if ENV['BUNDLE_BIN_PATH'] || ENV['BUNDLE_GEMFILE']
11
+ begin
12
+ require 'bundler'
13
+ Bundler.require(:octopress)
14
+ rescue
15
+ end
14
16
  end
15
17
 
16
18
  Mercenary.program(:octopress) do |p|
@@ -1,3 +1,3 @@
1
1
  module Octopress
2
- VERSION = "3.0.0.alpha4"
2
+ VERSION = "3.0.0.alpha5"
3
3
  end
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
18
18
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19
19
  spec.require_paths = ["lib"]
20
20
 
21
- spec.add_runtime_dependency "mercenary", "~> 0.1.0"
21
+ spec.add_runtime_dependency "mercenary", "~> 0.2.1"
22
22
  spec.add_runtime_dependency "jekyll", "~> 1.4.2"
23
23
 
24
24
  spec.add_development_dependency "bundler", "~> 1.3"
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.0.alpha4
4
+ version: 3.0.0.alpha5
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: 2014-02-19 00:00:00.000000000 Z
12
+ date: 2014-02-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: mercenary
@@ -17,14 +17,14 @@ dependencies:
17
17
  requirements:
18
18
  - - ~>
19
19
  - !ruby/object:Gem::Version
20
- version: 0.1.0
20
+ version: 0.2.1
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - ~>
26
26
  - !ruby/object:Gem::Version
27
- version: 0.1.0
27
+ version: 0.2.1
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: jekyll
30
30
  requirement: !ruby/object:Gem::Requirement