vcloud-core 0.0.13 → 0.1.0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.1.0 (2014-05-02)
+
+Feature:
+
+  - Allow config files to be rendered from [Mustache](http://mustache.github.io/)
+    templates so that common configs can be re-used across environments with
+    differences represented as variables.
+
 ## 0.0.13 (2014-04-30)
 
 Feature:

data/lib/vcloud/core/config_loader.rb

@@ -1,9 +1,19 @@
+require 'mustache'
+
 module Vcloud
   module Core
     class ConfigLoader
 
-      def load_config(config_file, schema = nil)
-        input_config = YAML::load(File.open(config_file))
+      def load_config(config_file, schema = nil, vars_file = nil)
+        if vars_file
+          rendered_config = Mustache.render(
+            File.read(config_file),
+            YAML::load_file(vars_file)
+          )
+          input_config = YAML::load(rendered_config)
+        else
+          input_config = YAML::load_file(config_file)
+        end
 
         # There is no way in YAML or Ruby to symbolize keys in a hash
         json_string = JSON.generate(input_config)
@@ -18,6 +28,7 @@ module Vcloud
             raise("Supplied configuration does not match supplied schema")
           end
         end
+
         config
       end
 

data/lib/vcloud/core/version.rb

@@ -1,5 +1,5 @@
 module Vcloud
   module Core
-    VERSION = '0.0.13'
+    VERSION = '0.1.0'
   end
 end

data/spec/vcloud/core/config_loader_spec.rb

@@ -8,41 +8,55 @@ module Vcloud
         @data_dir = File.join(File.dirname(__FILE__), "/data")
       end
 
-      it "should create a valid hash when input is JSON" do
-        input_file = "#{@data_dir}/working.json"
-        loader = ConfigLoader.new
-        actual_config = loader.load_config(input_file)
-        valid_config.should eq(actual_config)
-      end
+      describe 'basic config loading' do
+        it "should create a valid hash when input is JSON" do
+          input_file = "#{@data_dir}/working.json"
+          loader = ConfigLoader.new
+          actual_config = loader.load_config(input_file)
+          valid_config.should eq(actual_config)
+        end
 
-      it "should create a valid hash when input is YAML" do
-        input_file = "#{@data_dir}/working.yaml"
-        loader = ConfigLoader.new
-        actual_config = loader.load_config(input_file)
-        valid_config.should eq(actual_config)
-      end
+        it "should create a valid hash when input is YAML" do
+          input_file = "#{@data_dir}/working.yaml"
+          loader = ConfigLoader.new
+          actual_config = loader.load_config(input_file)
+          valid_config.should eq(actual_config)
+        end
 
-      it "should create a valid hash when input is YAML with anchor defaults" do
-        input_file = "#{@data_dir}/working_with_defaults.yaml"
-        loader = ConfigLoader.new
-        actual_config = loader.load_config(input_file)
-        valid_config['vapps'].should eq(actual_config['vapps'])
+        it "should create a valid hash when input is YAML with anchor defaults" do
+          input_file = "#{@data_dir}/working_with_defaults.yaml"
+          loader = ConfigLoader.new
+          actual_config = loader.load_config(input_file)
+          valid_config['vapps'].should eq(actual_config['vapps'])
+        end
       end
 
-      it "should validate correctly against a schema" do
-        input_file = "#{@data_dir}/working_with_defaults.yaml"
-        loader = ConfigLoader.new
-        schema = vapp_config_schema
-        actual_config = loader.load_config(input_file, schema)
-        valid_config['vapps'].should eq(actual_config['vapps'])
+      describe 'config loading with variable interpolation' do
+        it "should create a valid hash when input is YAML with variable file" do
+          input_file = "#{@data_dir}/working_template.yaml"
+          vars_file = "#{@data_dir}/working_variables.yaml"
+          loader = ConfigLoader.new
+          actual_config = loader.load_config(input_file, nil, vars_file)
+          valid_config.should eq(actual_config)
+        end
       end
 
-      it "should raise an error if checked against an invalid schema" do
-        input_file = "#{@data_dir}/working_with_defaults.yaml"
-        loader = ConfigLoader.new
-        Vcloud::Core.logger.should_receive(:fatal).with("vapps: is not a hash")
-        expect { loader.load_config(input_file, invalid_schema) }.
-          to raise_error('Supplied configuration does not match supplied schema')
+      describe 'config loading with schema validation' do
+        it "should validate correctly against a schema" do
+          input_file = "#{@data_dir}/working_with_defaults.yaml"
+          loader = ConfigLoader.new
+          schema = vapp_config_schema
+          actual_config = loader.load_config(input_file, schema)
+          valid_config['vapps'].should eq(actual_config['vapps'])
+        end
+
+        it "should raise an error if checked against an invalid schema" do
+          input_file = "#{@data_dir}/working_with_defaults.yaml"
+          loader = ConfigLoader.new
+          Vcloud::Core.logger.should_receive(:fatal).with("vapps: is not a hash")
+          expect { loader.load_config(input_file, invalid_schema) }.
+            to raise_error('Supplied configuration does not match supplied schema')
+        end
       end
 
       def vapp_config_schema

data/spec/vcloud/core/data/working_template.yaml

@@ -0,0 +1,22 @@
+---
+vapps:
+- name: vapp-vcloud-tools-tests
+  vdc_name: VDC_NAME
+  catalog: CATALOG_NAME
+  catalog_item: CATALOG_ITEM
+  vm:
+    hardware_config:
+      memory: '4096'
+      cpu: '2'
+    extra_disks:
+    - size: '8192'
+    network_connections:
+    - name: Default
+      ip_address: {{ ip1 }}
+    - name: NetworkTest2
+      ip_address: {{ ip2 }}
+    bootstrap:
+      script_path: 'spec/data/basic_preamble_test.erb'
+      vars:
+        message: 'hello world'
+    metadata: {}

data/spec/vcloud/core/data/working_variables.yaml

@@ -0,0 +1,3 @@
+---
+ip1: 192.168.2.10
+ip2: 192.168.1.10

data/spec/vcloud/core/query_runner_spec.rb

@@ -15,7 +15,7 @@ describe Vcloud::QueryRunner do
       result.size.should == 0
     end
 
-    it 'should parse the format=records query hrefs into a list of entity types' do
+    it 'returns queriable entity types provided by the API via :href link elements' do
       @mock_fog_interface.stub(:get_execute_query).and_return(
         {:Link => [
           {:rel  => 'down',

data/vcloud-core.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'fog', '>= 1.22.0'
   s.add_runtime_dependency 'methadone'
+  s.add_runtime_dependency 'mustache'
   s.add_development_dependency 'aruba', '~> 0.5.3'
   s.add_development_dependency 'cucumber', '~> 1.3.10'
   s.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-core
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mustache
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +207,8 @@ files:
 - spec/vcloud/core/data/basic_preamble_test.erb.OUT
 - spec/vcloud/core/data/working.json
 - spec/vcloud/core/data/working.yaml
+- spec/vcloud/core/data/working_template.yaml
+- spec/vcloud/core/data/working_variables.yaml
 - spec/vcloud/core/data/working_with_defaults.yaml
 - spec/vcloud/core/edge_gateway_interface_spec.rb
 - spec/vcloud/core/edge_gateway_spec.rb
@@ -227,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4282482764039593007
+      hash: 339249452835220012
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -248,6 +266,8 @@ test_files:
 - spec/vcloud/core/data/basic_preamble_test.erb.OUT
 - spec/vcloud/core/data/working.json
 - spec/vcloud/core/data/working.yaml
+- spec/vcloud/core/data/working_template.yaml
+- spec/vcloud/core/data/working_variables.yaml
 - spec/vcloud/core/data/working_with_defaults.yaml
 - spec/vcloud/core/edge_gateway_interface_spec.rb
 - spec/vcloud/core/edge_gateway_spec.rb