octopress 3.0.0.rc.8 → 3.0.0.rc.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (18) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +4 -0
  3. data/README.md +1 -1
  4. data/assets/docs/changelog.markdown +4 -0
  5. data/assets/docs/index.markdown +1 -1
  6. data/lib/octopress/commands/build.rb +1 -1
  7. data/lib/octopress/commands/doctor.rb +1 -1
  8. data/lib/octopress/commands/new.rb +1 -1
  9. data/lib/octopress/commands/serve.rb +1 -1
  10. data/lib/octopress/version.rb +1 -1
  11. data/octopress.gemspec +2 -2
  12. data/test/expected/_site/2014/02/10/another-idea.html +2 -1
  13. data/test/expected/_site/2014/02/11/some-stuff.html +2 -1
  14. data/test/expected/_site/2014/02/13/yet-another-idea.html +2 -1
  15. data/test/expected/_site/2014/03/11/idea.html +2 -1
  16. data/test/expected/_site/2014/03/12/awesome-stuff.html +2 -1
  17. data/test/expected/_site/2014/03/13/awesome.html +2 -1
  18. metadata +6 -20
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7181311c72df30bf2bd51536204ffb32729cdbbc
4
- data.tar.gz: 870db272c2517159439914f81b78c289b092190f
3
+ metadata.gz: 928d005e00226bf64fe9a765855b056d71456cdd
4
+ data.tar.gz: 0499f3d1ea7a11c5334b28790bb0337139b7993b
5
5
  SHA512:
6
- metadata.gz: 8faa5b4e17b749720394be730ea8880a243b4ae09fba9166f5f75fff4e3212b25fae705d91bf726359aee948054a93c358c389c17c48822f3305902b79dab7f7
7
- data.tar.gz: 84a04d179116e46154689aa89bcd06eb09b108151110c415f55deae5acb682290ade34191859d0aa7ce5448bc539b87499b9969b38fa1bf4c53a0b2e98e21db3
6
+ metadata.gz: 2d0d87b7fe8e0f13f912af8008bfb9bcf10c1851124b232005fcdfed60307743b73e56bea2bcf81211e0ace65239b77b598d4827e2aded3ce5aebf1b13850734
7
+ data.tar.gz: de68579bad1e44529221764ff6721b7d6c87b9c20567ee4a96a427df2c04e36e131ec3495b926457e5fb9d9c2e96aae1b19631b3ac3123368a8b7cd5c9e0c617
data/CHANGELOG.md CHANGED
@@ -2,6 +2,10 @@
2
2
 
3
3
  ## Current released version
4
4
 
5
+ ### 3.0.0 RC9 - 2014-05-07
6
+
7
+ - Support for Jekyll 2.0
8
+
5
9
  ### 3.0.0 RC8 - 2014-05-02
6
10
 
7
11
  - Improved draft date management [#35](https://github.com/octopress/octopress/issues/35)
data/README.md CHANGED
@@ -10,7 +10,7 @@ Octopress is an obsessively designed toolkit for writing and deploying Jekyll bl
10
10
 
11
11
  Add this line to your application's Gemfile:
12
12
 
13
- gem 'octopress', '~> 3.0.0.rc.5'
13
+ gem 'octopress', '~> 3.0.0.rc.9'
14
14
 
15
15
  And then execute:
16
16
 
data/assets/docs/changelog.markdown CHANGED
@@ -5,6 +5,10 @@ permalink: /changelog/
5
5
 
6
6
  ## Current released version
7
7
 
8
+ ### 3.0.0 RC9 - 2014-05-07
9
+
10
+ - Support for Jekyll 2.0
11
+
8
12
  ### 3.0.0 RC8 - 2014-05-02
9
13
 
10
14
  - Improved draft date management [#35](https://github.com/octopress/octopress/issues/35)
data/assets/docs/index.markdown CHANGED
@@ -12,7 +12,7 @@ Octopress is an obsessively designed toolkit for writing and deploying Jekyll bl
12
12
 
13
13
  Add this line to your application's Gemfile:
14
14
 
15
- gem 'octopress', '~> 3.0.0.rc.5'
15
+ gem 'octopress', '~> 3.0.0.rc.9'
16
16
 
17
17
  And then execute:
18
18
 
data/lib/octopress/commands/build.rb CHANGED
@@ -9,7 +9,7 @@ module Octopress
9
9
  c.action do |args, options|
10
10
  Octopress.config(options)
11
11
  options = CommandHelpers.normalize_options(options)
12
- options = ::Jekyll.configuration(options.to_symbol_keys)
12
+ options = ::Jekyll.configuration(options)
13
13
  ::Jekyll::Commands::Build.process(options)
14
14
  end
15
15
  end
data/lib/octopress/commands/doctor.rb CHANGED
@@ -10,7 +10,7 @@ module Octopress
10
10
 
11
11
  c.action do |args, options|
12
12
  options = CommandHelpers.normalize_options(options)
13
- options = Jekyll.configuration(options.to_symbol_keys)
13
+ options = Jekyll.configuration(options)
14
14
  Jekyll::Commands::Doctor.process(options)
15
15
  end
16
16
  end
data/lib/octopress/commands/new.rb CHANGED
@@ -11,7 +11,7 @@ module Octopress
11
11
  if args.empty?
12
12
  c.logger.error "You must specify a path."
13
13
  else
14
- Jekyll::Commands::New.process(args, options.to_symbol_keys)
14
+ Jekyll::Commands::New.process(args, options)
15
15
  end
16
16
  end
17
17
 
data/lib/octopress/commands/serve.rb CHANGED
@@ -19,7 +19,7 @@ module Octopress
19
19
  options["serving"] ||= true
20
20
 
21
21
  options = CommandHelpers.normalize_options(options)
22
- options = Jekyll.configuration(options.to_symbol_keys)
22
+ options = Jekyll.configuration(options)
23
23
  Jekyll::Commands::Build.process(options)
24
24
  Jekyll::Commands::Serve.process(options)
25
25
  end
data/lib/octopress/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Octopress
2
- VERSION = "3.0.0.rc.8"
2
+ VERSION = "3.0.0.rc.9"
3
3
  end
data/octopress.gemspec CHANGED
@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
19
19
  spec.require_paths = ["lib"]
20
20
 
21
21
  spec.add_runtime_dependency "mercenary", "~> 0.3.2"
22
- spec.add_runtime_dependency "jekyll", "~> 1.5", ">= 1.5.0"
22
+ spec.add_runtime_dependency "jekyll", "~> 2.0", ">= 2.0.0"
23
23
 
24
- spec.add_development_dependency "octopress-ink"
24
+ #spec.add_development_dependency "octopress-ink"
25
25
  spec.add_development_dependency "bundler", "~> 1.3"
26
26
  spec.add_development_dependency "pry-debugger"
27
27
  spec.add_development_dependency "rake"
data/test/expected/_site/2014/02/10/another-idea.html CHANGED
@@ -1 +1,2 @@
1
- <div class='post'>Another Idea</div>
1
+ <div class='post'>Another Idea
2
+ </div>
data/test/expected/_site/2014/02/11/some-stuff.html CHANGED
@@ -1 +1,2 @@
1
- <div class='post'>Some Stuff</div>
1
+ <div class='post'>Some Stuff
2
+ </div>
data/test/expected/_site/2014/02/13/yet-another-idea.html CHANGED
@@ -1 +1,2 @@
1
- <div class='post'>Yet Another Idea</div>
1
+ <div class='post'>Yet Another Idea
2
+ </div>
data/test/expected/_site/2014/03/11/idea.html CHANGED
@@ -1 +1,2 @@
1
- <div class='post'>Some Great Idea for a Post</div>
1
+ <div class='post'>Some Great Idea for a Post
2
+ </div>
data/test/expected/_site/2014/03/12/awesome-stuff.html CHANGED
@@ -1 +1,2 @@
1
- <div class='post'>Awesome Stuff</div>
1
+ <div class='post'>Awesome Stuff
2
+ </div>
data/test/expected/_site/2014/03/13/awesome.html CHANGED
@@ -1 +1,2 @@
1
- <div class='post'>Super Awesome Stuff</div>
1
+ <div class='post'>Super Awesome Stuff
2
+ </div>
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.rc.8
4
+ version: 3.0.0.rc.9
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-05-02 00:00:00.000000000 Z
12
+ date: 2014-05-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: mercenary
@@ -31,34 +31,20 @@ dependencies:
31
31
  requirements:
32
32
  - - "~>"
33
33
  - !ruby/object:Gem::Version
34
- version: '1.5'
34
+ version: '2.0'
35
35
  - - ">="
36
36
  - !ruby/object:Gem::Version
37
- version: 1.5.0
37
+ version: 2.0.0
38
38
  type: :runtime
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
41
41
  requirements:
42
42
  - - "~>"
43
43
  - !ruby/object:Gem::Version
44
- version: '1.5'
44
+ version: '2.0'
45
45
  - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: 1.5.0
48
- - !ruby/object:Gem::Dependency
49
- name: octopress-ink
50
- requirement: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - ">="
53
- - !ruby/object:Gem::Version
54
- version: '0'
55
- type: :development
56
- prerelease: false
57
- version_requirements: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - ">="
60
- - !ruby/object:Gem::Version
61
- version: '0'
47
+ version: 2.0.0
62
48
  - !ruby/object:Gem::Dependency
63
49
  name: bundler
64
50
  requirement: !ruby/object:Gem::Requirement