vagrant-invade 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b26a83ceef2c6f5da8509d206bf4abcfab0d7225
-  data.tar.gz: 5a5039deff0e7169bcce99372509c17478076864
+  metadata.gz: dbd3d96412ec32d5a5b356a5aafba507ea052ad3
+  data.tar.gz: 14445f3fd7ed2148da40e6ab91c477a2ae35d49f
 SHA512:
-  metadata.gz: ba8eb47717c0faeba35803cb63be44a4ce28bc916ffa74f7fa7660a534527a9c1547e3176164f1830d0918a2a133a1f1951e07b9396779c8d20243118045dbac
-  data.tar.gz: d5a7832668e5b7888b4aa7e25aa4cc9c8e6ed24b7549167d85ea4454be7ec427b5e204c26a5a2538c02068daa959bfadf68386263855f87f0d522e1e9f743405
+  metadata.gz: dd3ec435c6b5c1a3dc9328ad6165f808c9e2b2ea0b2596b9be1f31f1f5b83a047e565626c567a571357d1db7124459dfd46387815d196800a583f1c5c068c8fe
+  data.tar.gz: 356f5e4443d13e1e8033cee651cf208c9e74c3a252d4b3d3d7ce060c468463b4995632230db76f7f613b35e94db7486ae34f2d493744ea62d117946d193673b4

data/Gemfile.lock

@@ -37,7 +37,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-invade (0.6.0)
+    vagrant-invade (0.6.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/vagrant-invade/action/process.rb

@@ -13,109 +13,122 @@ module VagrantPlugins
           @validator = VagrantPlugins::Invade::Validator::Validator.new(env)
           @generator = VagrantPlugins::Invade::Generator::Generator.new(env)
 
+          @invade_machine = Hash.new
+          @invade_machine_part = Hash.new
+          @invade_vagrantfile = Hash.new
+
+          @generate = @env[:invade_generate]
+          @quiet = @env[:invade_validate_quiet]
+
           @logger = Log4r::Logger.new('vagrant::invade::action::validate')
         end
 
         def call(env)
-          config  = env[:invade]
-          quiet   = @env[:invade_validate_quiet]
-          generate = @env[:invade_generate]
-
-          invade_machine = Hash.new
-          invade_machine_part = Hash.new
-          invade_vagrantfile = Hash.new
 
-          ###############################################################
-          # Validate the settings and set default variables if needed
-          ###############################################################
+          config = env[:invade]
 
           # Remove empty Hashes
           config.delete_blank
 
           config.each do |config_key, config_data|
-
             if config_key == 'machines'
+              process_machines(config_data)
+            else
+              process_vagrant_part(config_key, config_data)
+            end
+          end
 
-              # Iterate over machine configurations
-              config_data.each_with_index do |(machine, machine_part), _|
-
-                # Iterate over each machine part configuration
-                machine_part.each do |machine_part_name, machine_part_data|
-                  @env[:ui].info("\n[Invade][Machine: #{machine.upcase}]: Validating #{machine_part_name.upcase} part...") unless quiet
-
-                  # Is nested synced_folder, network, provision, or plugin part hash
-                  if machine_part_data.depth > 1
-
-                    invade_machine_part[machine_part_name] = ''
-                    machine_part_data.each do |value_name, value_data|
-
-                      # Output info message
-                      info_message = "\t#{machine_part_name.split('_').collect(&:capitalize).join}: #{value_name}"
-                      @env[:ui].info(info_message) unless @env[:invade_validate_quiet]
-
-                      # Exception handling for synced_folder and provision types
-                      if machine_part_name == 'synced_folder' or machine_part_name == 'provision'
-                        value_name = value_data['type']
-                        value_data.delete('type')
-                      end
-
-                      validated_data = validate(machine_part_name, value_name, value_data, machine_part_data.depth)
-                      invade_machine_part[machine_part_name].concat(
-                          generate(
-                              machine_name: machine,
-                              part: machine_part_name,
-                              part_type: value_name,
-                              data: validated_data,
-                              generator_type: Invade::Generator::Type::MACHINE_NESTED_PART
-                        )
-                      ) if generate
-                    end
-                  else # Is VM, or SSH part
-                    validated_data = validate('Machine', machine_part_name, machine_part_data, machine_part_data.depth)
-                    invade_machine_part[machine_part_name] = generate(
-                        machine_name: machine,
-                        part_type: machine_part_name,
-                        data: validated_data,
-                        generator_type: Invade::Generator::Type::MACHINE_PART
-                    ) if generate
-                  end
-                end
-
-                invade_machine[machine] = generate(
-                    machine_name: machine,
-                    data: invade_machine_part,
-                    generator_type: Invade::Generator::Type::MACHINE
-                )
+          @env[:invade]['vagrantfile'] = generate(
+              data: @invade_vagrantfile,
+              generator_type: Invade::Generator::Type::VAGRANTFILE
+          ) if @generate
+
+          @env[:invade].delete('machines')
+
+          @app.call(env)
+        end
 
-              end
+        private
 
-              invade_vagrantfile['machines'] = invade_machine
-              @env[:ui].success "\n[Invade]: Processed #{config_data.count} machine(s)."
+        def process_machines(machines)
+        
+          # Iterate over machine configurations
+          machines.each_with_index do |(machine, machine_data), _|
+            process_machine(machine, machine_data)
+          end
 
-            else
+          @invade_vagrantfile['machines'] = @invade_machine
+          @env[:ui].success "\n[Invade]: Processed #{machines.count} machine(s)."
 
-              # Info message
-              @env[:ui].info("\n[Invade]: Validating #{config_key.upcase} part...") unless quiet
+        end
 
-              validated_data = validate(config_key, config_key, config_data, config_data.depth)
-              invade_vagrantfile[config_key] = generate(
-                  part_type: config_key,
-                  data: validated_data,
-                  generator_type: Invade::Generator::Type::VAGRANT_PART
-              ) if generate
+        def process_machine(machine_name, machine_data)
+          # Iterate over each machine part configuration
+          machine_data.each do |machine_part_name, machine_part_data|
+            @env[:ui].info("\n[Invade][Machine: #{machine_name.upcase}]: Validating #{machine_part_name.upcase} part...") unless @quiet
 
+            if machine_part_data.depth > 1
+              process_machine_nested_part(machine_name, machine_part_name, machine_part_data)
+            else
+              process_machine_part(machine_name, machine_part_name, machine_part_data)
             end
 
+            @invade_machine[machine_name] = generate(
+                machine_name: machine_name,
+                data: @invade_machine_part,
+                generator_type: Invade::Generator::Type::MACHINE
+            )
           end
+        end
 
-          @env[:invade]['vagrantfile'] = generate(
-              data: invade_vagrantfile,
-              generator_type: Invade::Generator::Type::VAGRANTFILE
-          ) if generate
+        def process_machine_part(machine, machine_part_name, machine_part_data)
+          validated_data = validate('Machine', machine_part_name, machine_part_data, machine_part_data.depth)
+          @invade_machine_part[machine_part_name] = generate(
+              machine_name: machine,
+              part_type: machine_part_name,
+              data: validated_data,
+              generator_type: Invade::Generator::Type::MACHINE_PART
+          ) if @generate
+        end
 
-          @env[:invade].delete('machines')
+        def process_machine_nested_part(machine, machine_part_name, machine_part_data)
 
-          @app.call(env)
+          @invade_machine_part[machine_part_name] = ''
+          machine_part_data.each do |value_name, value_data|
+
+            # Output info message
+            info_message = "\t#{machine_part_name.split('_').collect(&:capitalize).join}: #{value_name}"
+            @env[:ui].info(info_message) unless @env[:invade_validate_quiet]
+
+            # Exception handling for synced_folder and provision types
+            if machine_part_name == 'synced_folder' or machine_part_name == 'provision'
+              value_name = value_data['type']
+              value_data.delete('type')
+            end
+
+            validated_data = validate(machine_part_name, value_name, value_data, machine_part_data.depth)
+            @invade_machine_part[machine_part_name].concat(
+                generate(
+                    machine_name: machine,
+                    part: machine_part_name,
+                    part_type: value_name,
+                    data: validated_data,
+                    generator_type: Invade::Generator::Type::MACHINE_NESTED_PART
+              )
+            ) if @generate
+          end
+          
+        end
+
+        def process_vagrant_part(config_key, config_data)
+          @env[:ui].info("\n[Invade]: Validating #{config_key.upcase} part...") unless @quiet
+
+          validated_data = validate(config_key, config_key, config_data, config_data.depth)
+          @invade_vagrantfile[config_key] = generate(
+            part_type: config_key,
+            data: validated_data,
+            generator_type: Invade::Generator::Type::VAGRANT_PART
+          ) if @generate
         end
 
         def validate(part_name, value_name, value_data, depth)

data/lib/vagrant-invade/action.rb

@@ -28,21 +28,12 @@ module VagrantPlugins
         end
       end
 
-      def self.check
-        Vagrant::Action::Builder.new.tap do |builder|
-          builder.use Config
-          builder.use Process
-          builder.use Check
-        end
-      end
-
       # The autoload farm
       action_root = Pathname.new(File.expand_path('../action', __FILE__))
       autoload :Init, action_root.join('init')
       autoload :Config, action_root.join('config')
       autoload :Process, action_root.join('process')
       autoload :Create, action_root.join('create')
-      autoload :Check, action_root.join('check')
 
     end
   end

data/lib/vagrant-invade/command/root.rb

@@ -20,12 +20,6 @@ module VagrantPlugins
             Init
           end
 
-          # CHECK COMMAND ("vagrant invade check")
-            @subcommands.register(:check) do
-            require_relative 'check'
-            Check
-          end
-
           # VALIDATE COMMAND ("vagrant invade validate")
           @subcommands.register(:validate) do
             require_relative 'validate'

data/lib/vagrant-invade/validator/type/type_string_array.rb

@@ -16,20 +16,19 @@ module VagrantPlugins
 
           def validate
 
-            if @value.is_a?(String) || @value.is_a?(Array)
-              @env[:ui].success("\t#{name} => '#{@value}'") unless @env[:invade_validate_quiet]
-            elsif @value === nil
-              @env[:ui].warn("\t#{name} not set. Use Vagrant default.") unless @env[:invade_validate_quiet]
-
-              return default
-            elsif @value === ''
-              @env[:ui].warn("\tError: Empty string is not valid. Set '#{name}' => '#{default}'.") unless @env[:invade_validate_quiet]
-
-              return default
-            else
-              @env[:ui].error("\tError: '#{@value}' is not a string or array. Set to '#{name}' to default value '#{default}'.") unless @env[:invade_validate_quiet]
-
-              return default
+            case @value
+              when String, Array
+                @env[:ui].success("\t#{name} => '#{@value}'") unless @env[:invade_validate_quiet]
+
+              when nil?
+                @env[:ui].warn("\t#{name} not set. Use Vagrant default.") unless @env[:invade_validate_quiet]
+                return default
+              when ''
+                @env[:ui].warn("\tError: Empty string is not valid. Set '#{name}' => '#{default}'.") unless @env[:invade_validate_quiet]
+                return default
+              else
+                @env[:ui].error("\tError: '#{@value}' is not a string or array. Set to '#{name}' to default value '#{default}'.") unless @env[:invade_validate_quiet]
+                return default
             end
 
             @value

data/lib/vagrant-invade/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Invade
-    VERSION = '0.6.1'
+    VERSION = '0.6.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-invade
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Lennart Stein
@@ -65,14 +65,12 @@ files:
 - invade.yml.dist
 - lib/vagrant-invade.rb
 - lib/vagrant-invade/action.rb
-- lib/vagrant-invade/action/check.rb
 - lib/vagrant-invade/action/config.rb
 - lib/vagrant-invade/action/create.rb
 - lib/vagrant-invade/action/init.rb
 - lib/vagrant-invade/action/process.rb
 - lib/vagrant-invade/command/base.rb
 - lib/vagrant-invade/command/build.rb
-- lib/vagrant-invade/command/check.rb
 - lib/vagrant-invade/command/init.rb
 - lib/vagrant-invade/command/root.rb
 - lib/vagrant-invade/command/validate.rb

data/lib/vagrant-invade/action/check.rb

@@ -1,44 +0,0 @@
-module VagrantPlugins
-  module Invade
-    module Action
-
-      include Vagrant::Action::Builtin
-
-      class Check
-
-        def initialize(app, env)
-          @app = app
-          @env = env
-          @logger = Log4r::Logger.new('vagrant::invade::action::init')
-          @dir = Dir.pwd
-
-          ENV['VAGRANT_VAGRANTFILE'] ? @vagrantfile_name = ENV['VAGRANT_VAGRANTFILE'] : @vagrantfile_name = "Vagrantfile"
-          @root_path = Dir.pwd
-        end
-
-        def call(env)
-
-          data = @env[:invade]['vagrantfile']
-
-          checksum_helper = Helper::Checksum.new @env
-          vagrantfile_path = "#{@root_path}/#{@vagrantfile_name}"
-          md5_current = checksum_helper.get_checksum_of_file(vagrantfile_path)
-          md5_generated = checksum_helper.get_checksum_of_data(data)
-
-          if checksum_helper.check
-            @env[:ui].success "[Invade][CHECK] #{md5_current}"
-            @env[:ui].success "[Invade][CHECK] Checksum is valid!"
-          else
-            @env[:ui].warn "[Invade][CHECK] Changes found. Checksum is not equal!"
-            @env[:ui].warn "[Invade][CHECK] #{@vagrantfile_name} \tMD5:#{md5_current}"
-            @env[:ui].warn "[Invade][CHECK] invade.yml\tMD5:#{md5_generated}"
-          end
-
-          @app.call(env)
-        end
-
-      end
-
-    end
-  end
-end

data/lib/vagrant-invade/command/check.rb

@@ -1,33 +0,0 @@
-require 'optparse'
-require_relative 'base'
-
-module VagrantPlugins
-  module Invade
-    module Command
-      class Check < Base
-        def execute
-          options = {}
-          opts = OptionParser.new do |o|
-            o.banner = 'Usage: vagrant invade check [-f|--force] [-q|--quiet] [-h|--help]'
-            o.separator ''
-            o.on('-q', '--quiet', 'No verbose output.') do |q|
-              options[:quiet] = q
-            end
-          end
-
-          # Parse the options
-          argv = parse_options(opts)
-          return unless argv
-
-          # Validates InVaDE configuration
-          action(Action.check, {
-            :invade_validate_quiet => true # set this to true. Just build without validate output
-          })
-
-          # Success, exit status 0
-          0
-        end
-      end
-    end
-  end
-end