sistero 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99a4ca2119b2a5feddeae0414d9f597c76241349
-  data.tar.gz: 611dddb5acb699692bfa0580c5ae89daa852903a
+  metadata.gz: 96adaad8acc04fa6b38ed622150d5a993fb9279d
+  data.tar.gz: 49a8eefc611b198779728ad4ade3fa91fa82ec81
 SHA512:
-  metadata.gz: 76743177831eb1dd930c410fb8d50d7f7c4baa924226e1fe4d6d8d7c7051bfacadff2e886b000680ad232c440e32cd022251333a511501fcfdca6890e72e1544
-  data.tar.gz: a1921ab8216c5216cf5371aada189d4f21721aed1be6aee23e871194b83e9525acf33d510ea8e0e07405174cf6a33108951a7b87ab5d50a8d8bb2af7c0e36615
+  metadata.gz: c64efc4ecbfd6b30302a19805331b876facb979c5b3e50d2e18aff4c20e7c4d3c62f5e619458b2934a7cc8212c9ff3ab3769f8cae50976dad12437a2cad5968f
+  data.tar.gz: d7fd78c6b1605887013c5032e6c2bf0e10ac773019c70b3824ab551fdbb9572d52730e00d11617033ac377caeaeecee9fdcfe86f5af6fe37a47016b2ba9b3581

data/lib/sistero/config.rb

@@ -22,15 +22,13 @@ module Sistero
     attr_accessor :defaults, :profiles
 
     def profile vm_name
-      if @defaults['vm_name'] and vm_name.nil?
-        profile = @defaults
-      else
-        # TODO: also handle wildcards
-        profile = @profiles.find do |profile|
-          profile.vm_name == vm_name
-        end
-        raise "could not find profile for #{vm_name}" unless profile
+      vm_name ||= @defaults['vm_name']
+      raise "must set a default vm_name or specify one" unless vm_name
+      # TODO: also handle wildcards
+      profile = @profiles.find do |profile|
+        profile.vm_name == vm_name
       end
+      raise "could not find profile for #{vm_name}" unless profile
       profile
     end
 
@@ -54,6 +52,8 @@ module Sistero
 
       @profiles = cfg['profiles'].map do |profile_cfg|
         profile = Profile.new *@defaults
+        profile.vm_name = nil
+
         profile_cfg.each do |key, value|
           profile[key] = value
         end
@@ -67,10 +67,9 @@ module Sistero
           end
           profile.user_data = user_data
         end
+        raise "every profile must have a vm_name field" unless profile.vm_name
         profile
       end
-
-      @profiles.push(@defaults) if @defaults.vm_name
     end
 
     def to_s

data/lib/sistero/version.rb

@@ -1,3 +1,3 @@
 module Sistero
-  VERSION = '0.5.4'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sistero
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - James Pike