octopress-deploy 1.0.0.rc.7 → 1.0.0.rc.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) 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-deploy.rb +3 -2
  7. data/lib/octopress-deploy/version.rb +1 -1
  8. data/octopress-deploy.gemspec +1 -1
  9. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7c5c40fa03da556e7001d3927f2bdcf7d03e2513
4
- data.tar.gz: a049b96f9d396cc4d77bc5fe09ebbaff61c5773c
3
+ metadata.gz: a3c93a257c3f64bcde00586e19181c10ab9ab2d9
4
+ data.tar.gz: 00eee66f5704f5be8315653acfaa8551d15c6ee6
5
5
  SHA512:
6
- metadata.gz: bbb6faa73d8c27c83e174954458f28a2878f699af4744495032192dc2b730849ed3bf9a24f719e970b1650cd47edf92761c6e402b06d4fd639a2299823403c55
7
- data.tar.gz: 905263c2650b45c5612916983af759729edc72215a58a0b276449589780bee2e88463659b914e984bdd0b16caa0528f43df230a1e8e3a0e0481fa70b39eda799
6
+ metadata.gz: e69984f331b0ed90ffd675d73bb866f90d160a79bc174b8c3aa2990e54f0202d4e1faafb26eee05e40b014f13a890748db999e8e3e57c8123e2c5c9bcdc4cf33
7
+ data.tar.gz: f9ba5ecfe4ba887c63bc9c48830856f63611ffb5d61209b641e562044b218057b529275b55151e7ec6251306a75472cb0c7b829be04f68f55fa49c746b598763
data/CHANGELOG.md CHANGED
@@ -3,6 +3,10 @@
3
3
 
4
4
  ## Current version
5
5
 
6
+ ### 1.0.0 RC8 - 2014-05-08
7
+
8
+ - Now using SafeYAML for loading configurations.
9
+
6
10
  ### 1.0.0 RC7 - 2014-05-02
7
11
 
8
12
  - Fixed: `--version` flag.
data/README.md CHANGED
@@ -8,7 +8,7 @@ Currently this gem supports deploying static sites using S3, Git and Rsync. Pull
8
8
 
9
9
  Add this line to your application's Gemfile:
10
10
 
11
- gem 'octopress-deploy', '~> 1.0.0.rc.2'
11
+ gem 'octopress-deploy', '~> 1.0.0.rc.8'
12
12
 
13
13
  And then execute:
14
14
 
data/assets/docs/changelog.markdown CHANGED
@@ -6,6 +6,10 @@ permalink: /changelog/
6
6
 
7
7
  ## Current version
8
8
 
9
+ ### 1.0.0 RC8 - 2014-05-08
10
+
11
+ - Now using SafeYAML for loading configurations.
12
+
9
13
  ### 1.0.0 RC7 - 2014-05-02
10
14
 
11
15
  - Fixed: `--version` flag.
data/assets/docs/index.markdown CHANGED
@@ -10,7 +10,7 @@ Currently this gem supports deploying static sites using S3, Git and Rsync. Pull
10
10
 
11
11
  Add this line to your application's Gemfile:
12
12
 
13
- gem 'octopress-deploy', '~> 1.0.0.rc.2'
13
+ gem 'octopress-deploy', '~> 1.0.0.rc.8'
14
14
 
15
15
  And then execute:
16
16
 
data/lib/octopress-deploy.rb CHANGED
@@ -4,6 +4,7 @@ $LOAD_PATH.unshift File.expand_path("../", __FILE__)
4
4
  require 'colorator'
5
5
  require 'yaml'
6
6
  require 'octopress'
7
+ require 'safe_yaml/load'
7
8
 
8
9
  require 'octopress-deploy/version'
9
10
  require 'octopress-deploy/core_ext'
@@ -48,7 +49,7 @@ module Octopress
48
49
 
49
50
  def self.merge_configs(options={})
50
51
  options = check_config(options)
51
- config = YAML.load(File.open(options[:config_file])).to_symbol_keys
52
+ config = SafeYAML.load(File.open(options[:config_file])).to_symbol_keys
52
53
  options = config.deep_merge(options)
53
54
  end
54
55
 
@@ -76,7 +77,7 @@ module Octopress
76
77
  if options[:site_dir]
77
78
  options[:site_dir]
78
79
  elsif File.exist? '_config.yml'
79
- YAML.load(File.open('_config.yml'))['site_dir'] || '_site'
80
+ SafeYAML.load(File.open('_config.yml'))['site_dir'] || '_site'
80
81
  else
81
82
  '_site'
82
83
  end
data/lib/octopress-deploy/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Octopress
2
2
  module Deploy
3
- VERSION = "1.0.0.rc.7"
3
+ VERSION = "1.0.0.rc.8"
4
4
  end
5
5
  end
data/octopress-deploy.gemspec CHANGED
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
17
17
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
18
18
  spec.require_paths = ["lib"]
19
19
 
20
- spec.add_runtime_dependency "octopress", "~> 3.0.0.rc.1"
20
+ spec.add_runtime_dependency "octopress", "~> 3.0.0.rc.10"
21
21
  spec.add_runtime_dependency "colorator"
22
22
 
23
23
  spec.add_development_dependency "octopress-ink"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: octopress-deploy
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.rc.7
4
+ version: 1.0.0.rc.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brandon Mathis
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-05-03 00:00:00.000000000 Z
11
+ date: 2014-05-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: octopress
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 3.0.0.rc.1
19
+ version: 3.0.0.rc.10
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 3.0.0.rc.1
26
+ version: 3.0.0.rc.10
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: colorator
29
29
  requirement: !ruby/object:Gem::Requirement