simple_provision 0.99.10 → 0.99.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 579178d76f20065852e9d4249dde9cf2820c8db1
-  data.tar.gz: b3a2ccf6acba6c6d2cf20a211cd9b950703b9b25
+  metadata.gz: a84b27a7d77c4dab349b86d6eefd5284a634c9e6
+  data.tar.gz: 02df93e35588a93b161e85aca17de65e4138c6ad
 SHA512:
-  metadata.gz: f41cdfc9a634d2c2233371a6f786ac9562a8275e8d34f7b28f39c2c0e7b19fac95fc3bcbe13106bb384a27f3081919b8c59e26e81ae78f8776e8cc19fa90d851
-  data.tar.gz: 7afecbcf8f883f435c4c1d1cd9c38a06bed397a0c3ecb57406fb52d66756da5b7af05adc8172c4207242fc581914d2b88cf9c7ce147afa6f6e5bb6ed3f9daaf8
+  metadata.gz: 40fb63e80483f5e12f060f40a332d1a6f0feca8fc4420ab90201f8aa898cd3cb887386306714368908d09a670373b317165ced044ec4cf3e60db5cc19189f11c
+  data.tar.gz: d52379b7f229d185bc0c9e6ce5b1e00370cd317c9336bc1092c75afb21d4e0f8f3b88c8924129424bafffa2f5d69d5494e64a28bfee9f0ed7814d10174427bf5

data/README.md

@@ -87,6 +87,7 @@ scripts:
   - scripts/redis.sh
 env:
   DBNAME: my_db_name
+  REDISNAME: <%= ENV["REDIS_NAME"] %>
   WEBROOT: /var/www/app
 ```
 
@@ -98,6 +99,9 @@ provisioned server at ~/files and ~/scripts
 ### Passing variables to scripts
 Variables defined in `env` will be exposed to scripts during execution.
 That way you can re-use the same scripts for different type of servers.
+You can pass environment variables (available through the use of bash `export ENVNAME=value`
+or passing to `simpro` command such as `ENVNAME=value simpro`) to the
+env section using the ERB syntax (`<%= ENV['ENVNAME'] %>`).
 
 ## Provision your server
 `bundle exec simpro my-awesome-server root@my-host`

data/lib/simple_provision/configuration.rb

@@ -18,7 +18,7 @@ module SimpleProvision
 
     def default_options
       begin
-        YAML.load(File.read(server_file))
+        YAML.load(ERB.new(File.read(default_file)).result)
       rescue Errno::ENOENT
         {}
       end
@@ -26,12 +26,16 @@ module SimpleProvision
 
     def server_options
       begin
-        YAML.load(File.read(server_file))
+        YAML.load(ERB.new(File.read(server_file)).result)
       rescue Errno::ENOENT
-        raise MissingServerConfiguration, "Please create a configuration file './#{server_file}'"
+        raise MissingServerConfiguration, "Please create a configuration file at '#{server_file}'"
       end
     end
 
+    def default_file
+      "provision/servers/default.yml"
+    end
+
     def server_file
       "provision/servers/#{profile}.yml"
     end

data/lib/simple_provision/version.rb

@@ -1,3 +1,3 @@
 module SimpleProvision
-  VERSION = "0.99.10"
+  VERSION = "0.99.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_provision
 version: !ruby/object:Gem::Version
-  version: 0.99.10
+  version: 0.99.11
 platform: ruby
 authors:
 - Phuong Gia Su
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler