vagrantomatic 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec2f618d02c4bedd8f9af8deab061dc8d781d034
-  data.tar.gz: ba2d50da5efe8a1a60913cde81d9120f364397b1
+  metadata.gz: fb2da2108c6e8b03cbc54d79c0f6461c31293d83
+  data.tar.gz: 649cce1ad226a8f2a6b5e0f5337da8c999937aa8
 SHA512:
-  metadata.gz: dbbd77d09576ef3c372b9a1705407fa5fd4e3fdd5dddcbf553f7bc2ae0ede0d62e7837edeef83b097ecff0f94ec376c4b4ff9a9fe3008e5af2a24ce036c66b99
-  data.tar.gz: e4508fee7a02185af499a5ff8bf03d7655c09d192a44458e1f394032e02e1f4b32cfc0f33b197e765fc9cbdce7e8c5e16154f8803f538dc764929be7fdb2d611
+  metadata.gz: bfef357e63871207431c4ba50c35a6b74eb4cf7575271e7320eac0b1371b2affec54df63f002dcac29f8f99bb36e491e0ddfa94e68064e5ff04ac0fcb54ffcdc
+  data.tar.gz: 7c8fc1638323131160fc2cac173276ce652f4861bae7f94c41005b494effd46b39a25da42372efa81db0ef9e036fb3758d2d0124f7981af24498ee88920fa786

data/lib/vagrantomatic/instance.rb

@@ -11,17 +11,71 @@ module Vagrantomatic
 
     attr_accessor :config
 
+    def validate_config(fatal = true)
+      valid = true
+      if ! @config.has_key?("box")
+        valid = false
+        if fatal
+          raise "Node #{@name} must specify box"
+        end
+      end
+
+      valid
+    end
+
+
+    def fix_folders()
+      # can't use dig() might not be ruby 2.3
+      if @config.has_key?("folders")
+        @config["folders"] = Array(@config["folders"])
+
+        # all paths must be fully qualified.  If we were asked to do a relative path, change
+        # it to the current directory since that's probably what the user wanted.  Not right?
+        # user supply correct path!
+        @config["folders"] = @config["folders"].map { |folder|
+          if ! folder.start_with? '/'
+            folder = "#{Dir.pwd}/#{folder}"
+          end
+          folder
+        }
+      else
+        @config["folders"] = []
+      end
+    end
+
     def initialize(vagrant_vm_dir, name, logger: nil, config:nil)
       @name           = name
       @vagrant_vm_dir = vagrant_vm_dir
-      @logger         = ::Vagrantomatic::Logger.new(logger).logger
+      @logger         = Logger.new(logger).logger
+
+      # if we encounter conditions such as missing or damaged files we may need
+      # to force a save that would normally not be detected - eg if we load bad
+      # json it gets fixed up to an empty hash which would them be compared to a
+      # fresh read of the file (also results in empty hash) - so we must supply
+      # another way to force the save here
+      @force_save     = false
 
       # use supplied config if present, otherwise load from file
       if config
         @config = config
+
+        # validate a user-supplied config now, at the point of insertion
+        # by this point we have a config either from file or supplied by user it
+        # must be valid for us to proceed!
+        @logger.debug "validating config for #{name}"
+        validate_config
+
+        # user may have specified relative folders at time of creation - if so
+        # we must now expand all paths in them and write them forever to config
+        # file
+        fix_folders
       else
         @config = configfile_hash
+
+        # this passed-in config could still be bad - we will validate it before
+        # use on either save() or get_vm()
       end
+
       @logger.debug "initialized vagrantomatic instance for #{name}"
     end
 
@@ -45,22 +99,47 @@ module Vagrantomatic
         json    = File.read(configfile)
         config  = JSON.parse(json)
       rescue Errno::ENOENT
-        @logger.debug("#{configfile} does not exist")
+        # depending on whether the instance has been saved or not, we may not
+        # yet have a configfile - allow to proceed
+        @logger.debug "#{configfile} does not exist"
+        @force_save = true
       rescue JSON::ParserError
-        @logger.error("JSON parser error in #{configfile}")
+        # swallow parse errors so that we can destroy and recreate automatically
+        @logger.debug "JSON parse error in #{configfile}"
+        @force_save = true
       end
       config
     end
 
     def configured?
-      configured = false
-      if Dir.exists? (vm_instance_dir) and File.exists?(configfile) and File.exists?(vagrantfile)
-        configured = configfile_hash.has_key?("box")
+      configured = true
+
+      if ! Dir.exists? (vm_instance_dir)
+        @logger.debug "Vagrant instance directory #{vm_instance_dir} does not exist"
+        configured = false
+      end
+
+      if ! File.exists?(vagrantfile)
+        @logger.debug "#{VAGRANTFILE} not found at #{vagrantfile}"
+        configured = false
+      end
+
+      if ! File.exists?(configfile)
+        @logger.debug "#{VAGRANTFILE_JSON} not found at #{configfile}"
+        configured = false
       end
+
+      # check config hash is valid without causing a fatal error if its damaged
+      if ! validate_config(false)
+        configured = false
+      end
+
       configured
     end
 
     def save
+      @logger.debug("validating settings for save...")
+      validate_config
       @logger.debug("saving vm settings...")
       FileUtils.mkdir_p(vm_instance_dir)
       ensure_config
@@ -88,11 +167,17 @@ module Vagrantomatic
 
     def get_vm
       # Create an instance (represents a Vagrant **installation**)
-      instance = Derelict.instance(::Vagrantomatic::Vagrantomatic::DEFAULT_VAGRANT_DIR)
-      result = instance.execute('--version') # Derelict::Executer object (vagrant --version)
+      if ! in_sync?
+        raise "get_vm called for instance but it is not in_sync! (call save() first?)"
+      end
+
+      validate_config
+
+      vagrant_installation = Derelict.instance(Vagrantomatic::DEFAULT_VAGRANT_DIR)
+      result = vagrant_installation.execute('--version') # Derelict::Executer object (vagrant --version)
       if result.success?
         # vagrant present and working, connect to our vm INSTANCE
-        vm = instance.connect(vm_instance_dir)
+        vm = vagrant_installation.connect(vm_instance_dir)
       else
         raise "Error connecting to vagrant! (vagrant --version failed)"
       end
@@ -111,7 +196,7 @@ module Vagrantomatic
       configured  = false
       have_config = configfile_hash
 
-      if have_config == @config
+      if (! @force_save) and (have_config == @config )
         configured = true
       end
 

data/lib/vagrantomatic/vagrantomatic.rb

@@ -10,13 +10,13 @@ module Vagrantomatic
 
     def initialize(vagrant_vm_dir: nil, logger: nil)
       @vagrant_vm_dir = vagrant_vm_dir || DEFAULT_VAGRANT_VM_DIR
-      @logger = ::Vagrantomatic::Logger.new(logger).logger
+      @logger = Logger.new(logger).logger
     end
 
     # Return a has representing the named instance.  This is suitable for Puppet
     # type and provider, or you can use the returned info for whatever you like
     def instance_metadata(name)
-      instance = ::Vagrantomatic::Instance.new(@vagrant_vm_dir, name)
+      instance = instance(name)
       config = {}
       # annotate the raw config hash with data for puppet (and humans...)
       if instance.configured?
@@ -31,7 +31,7 @@ module Vagrantomatic
       config
     end
 
-    # Return a has of instances
+    # Return a hash of all instances
     def instances_metadata()
       instance_wildcard = File.join(@vagrant_vm_dir, "*", ::Vagrantomatic::Instance::VAGRANTFILE)
       instances = {}
@@ -48,7 +48,7 @@ module Vagrantomatic
     end
 
     def instance(name)
-      ::Vagrantomatic::Instance.new(@vagrant_vm_dir, name, logger: @logger)
+      Instance.new(@vagrant_vm_dir, name, logger: @logger)
     end
 
   end

data/lib/vagrantomatic/version.rb

@@ -1,3 +1,3 @@
 module Vagrantomatic
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantomatic
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Geoff Williams