octopress-deploy 1.2.8 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ce4d859030b32ba4d7c3e3942c494eaa909e0b3
-  data.tar.gz: 2497a1355b26cadb4330ba785acc5d2dd2321f4e
+  metadata.gz: cb1708ce95bc906465623ace6490388d0b83dab3
+  data.tar.gz: ca26c228f9d5fbdbe61ddf3950105338a281af58
 SHA512:
-  metadata.gz: 4050bd2c5bc4187d39fdf82007f29a8fa636e7c39370b1f70c681ee4cf671f0bca36948c842c8f503413270ba6bde6d0fcbe5f9d50559ea7ace81534de18dbdb
-  data.tar.gz: 4e2c3264bcede17fcabf5eabbf843662cbfc93a11c302efa0b3eabb440681fb78c74267bc356fdfbb432ea3d9ad5ca16320a0c6d74563176192a211184b3aa49
+  metadata.gz: c135e234c3447ce4f4a49004e4a8c0fe3f98df7c605c70b05bb82b6f5eb166b2ef634ff673597ed74639a782f4d33bab777ee4dc039055c171a6da285c8ce332
+  data.tar.gz: 93863c8a068ba4d87e6c689edffe962ac95ef3a97a72fe5fb5c31b28c1220600d50e3821affddbf4b327ec46a53ce09533aa34f30e7444ee116c52de8cd6ed1a

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 1.3.0 - 2015-07-05
+- New: Now `_deploy.yml` is processed through ERB, this means you can load configurations for ENV vars pretty easily. [#62](https://github.com/octopress/deploy/pull/62)
+
 ### 1.2.8 - 2015-06-29
 - Fix: Using Regex quote to escape special characters in repo urls. [#61](https://github.com/octopress/deploy/pull/61)
 

data/README.md

@@ -15,7 +15,7 @@ $ gem install octopress
 
 ## Usage
 
-For usage instructions, please refer to [octopress](https://github.com/octopress/octopress#deploy).
+For usage instructions, please refer to the [Octopress CLI documentation](https://github.com/octopress/octopress#deploy).
 
 ## Contributing
 

data/lib/octopress-deploy.rb

@@ -26,12 +26,14 @@ module Octopress
       :site_dir => '_site',
     }
 
-    def self.push(options={})
+    extend self
+
+    def push(options={})
       options = merge_configs(options)
       deployer(options).push
     end
 
-    def self.pull(options={})
+    def pull(options={})
       options = merge_configs(options)
 
       if Dir.exist?(options[:dir]) &&
@@ -45,38 +47,37 @@ module Octopress
       end
     end
 
-    def self.add_bucket(options={})
+    def add_bucket(options={})
       options = merge_configs(options)
       get_deployment_method(options).new(options).add_bucket()
     end
 
-    def self.merge_configs(options={})
-      options = check_config(options)
-      config  = SafeYAML.load(File.open(options[:config_file])).to_symbol_keys
-      options = config.deep_merge(options)
-    end
-
-    def self.check_config(options={})
+    def merge_configs(options={})
       options = options.to_symbol_keys
       options[:config_file] ||= DEFAULT_OPTIONS[:config_file]
 
-      if !File.exists? options[:config_file]
+      load_config(options[:config_file]).deep_merge(options)
+    end
+
+    def load_config(path)
+      if File.exist?(path)
+        YAML.load(ERB.new(File.read(path)).result || {}).to_symbol_keys
+      else
         abort "File not found: #{options[:config_file]}. Create a deployment config file with `octopress deploy init <METHOD>`."
       end
-
-      options
     end
 
-    def self.deployer(options)
+
+    def deployer(options)
       get_deployment_method(options).new(options)
     end
 
-    def self.get_deployment_method(options)
+    def get_deployment_method(options)
       METHODS[options[:method].downcase]
     end
 
 
-    def self.site_dir
+    def site_dir
       if options[:site_dir]
         options[:site_dir]
       elsif File.exist? '_config.yml'
@@ -88,7 +89,7 @@ module Octopress
 
     # Create a config file
     #
-    def self.init_config(options={})
+    def init_config(options={})
       options = options.to_symbol_keys
 
       if !options[:method]
@@ -100,7 +101,7 @@ module Octopress
       check_gitignore
     end
 
-    def self.write_config
+    def write_config
       if File.exist?(@options[:config_file]) && !@options[:force]
         abort "A config file already exists at #{@options[:config_file]}. Use --force to overwrite."
       end
@@ -114,7 +115,7 @@ module Octopress
       puts "Modify these configurations as necessary."
     end
 
-    def self.get_config
+    def get_config
       <<-FILE
 #{"method: #{@options[:method]}".ljust(40)}  # How do you want to deploy? git, rsync or s3.
 #{"site_dir: #{@options[:site_dir]}".ljust(40)}  # Location of your static site files.
@@ -127,7 +128,7 @@ FILE
     #
     # returns: Boolean - whether it is present or not.
     #
-    def self.check_gitignore
+    def check_gitignore
       gitignore = File.join(`git rev-parse --show-toplevel`.strip, ".gitignore")
 
       if !File.exist?(gitignore) ||
@@ -139,7 +140,7 @@ FILE
       end
     end
 
-    def self.gem_dir(*subdirs)
+    def gem_dir(*subdirs)
       File.expand_path(File.join(File.dirname(__FILE__), '../', *subdirs))
     end
 

data/lib/octopress-deploy/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Deploy
-    VERSION = "1.2.8"
+    VERSION = "1.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-deploy
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.3.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorator