vagrant-invade 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eb14c72832a49787843fbcb61f2ceeddaa1f1b1
-  data.tar.gz: 6de14569a13b41479d284f197f10e1df5810b4d4
+  metadata.gz: 6e06288dca14df145c0464799d0da097feab7916
+  data.tar.gz: 5a151c1e3e863aabfeb0497df3874159dad6a13a
 SHA512:
-  metadata.gz: 2f41c0f60be3cb2f0384dc38f373804110bc8da0915f0b318bdcc24901cb1a7527e9f359ab735ce8bafc7bb4f66f7a69631eee090839b5612ac38f7add2b31e1
-  data.tar.gz: 13688fb8d5c068d48bdd3d919bbbaeda47ccc6125adca21622e52d9ab2631282762e72907916bb9fbf8bbc12f2a1e88eee624b967cc1c840af5be5c7abab4192
+  metadata.gz: 7b1339ac0eda98c1df71fd55261db75e03deeab302e3afcb7d2dc24e435f8ab62b040e73a8554a329e39ed09970f0056b5763a099d14e71f0a467d4177ad4730
+  data.tar.gz: 5a59b6bf983099845b2c3b5ea8af59d0ac1a56e3beefe1323c06a823504e145637fe5ce8e7aa90e733c7f67f2e53d1cdbd378334660ba44f4a8b92711e35c569

data/.gitignore

@@ -1,4 +1,6 @@
 invade.yml
 Vagrantfile
+Vagrantfile-*
 Vagrantfile.new
 .vagrant
+.idea

data/.idea/dictionaries/lenste.xml

@@ -0,0 +1,14 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="lenste">
+    <words>
+      <w>eruby</w>
+      <w>facter</w>
+      <w>masterless</w>
+      <w>puppetfile</w>
+      <w>syncdir</w>
+      <w>virtualbox</w>
+      <w>vmware</w>
+      <w>winnfsd</w>
+    </words>
+  </dictionary>
+</component>

data/Gemfile

@@ -1,10 +1,14 @@
 source "https://rubygems.org"
 
 group :development do
+  gem "rsense"
   gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", :ref => 'v1.8.5'
-  gem "vagrant-hostmanager", git: "https://github.com/devopsgroup-io/vagrant-hostmanager"
 end
 
 group :plugins do
   gem "vagrant-invade", path: "."
+  gem "vagrant-hostmanager", git: "https://github.com/devopsgroup-io/vagrant-hostmanager"
+  gem "vagrant-r10k", git: "https://github.com/jantman/vagrant-r10k"
+  # Windows only
+  # gem "vagrant-winnfsd", git: "https://github.com/winnfsd/vagrant-winnfsd"
 end

data/Gemfile.lock

@@ -4,6 +4,13 @@ GIT
   specs:
     vagrant-hostmanager (1.8.5)
 
+GIT
+  remote: https://github.com/jantman/vagrant-r10k
+  revision: aa33372532fc031d26da6b059bea3ff113a88947
+  specs:
+    vagrant-r10k (0.4.1)
+      r10k (~> 1.5.0)
+
 GIT
   remote: https://github.com/mitchellh/vagrant.git
   revision: 93f9528687b9a737585d22bc4db5d2ab5d9852d3
@@ -38,10 +45,28 @@ GEM
     builder (3.2.2)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
+    colored (1.2)
+    cri (2.6.1)
+      colored (~> 1.2)
     domain_name (0.5.20160615)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.9.2)
+      faraday (>= 0.7.4, < 0.10)
+    faraday_middleware-multi_json (0.0.6)
+      faraday_middleware
+      multi_json
+    fast_gettext (1.1.0)
     ffi (1.9.14)
+    filetree (1.0.0)
+    gettext (3.2.2)
+      locale (>= 2.0.5)
+      text (>= 1.3.0)
+    gettext-setup (0.6)
+      fast_gettext (~> 1.1.0)
+      gettext (>= 3.0.2)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
@@ -49,13 +74,17 @@ GEM
     hashicorp-checkpoint (0.1.4)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    httpclient (2.8.1)
+    httpclient (2.8.2.2)
     i18n (0.7.0)
+    jruby-jars (1.7.25)
+    jruby-parser (0.5.4)
+    json_pure (1.8.3)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     little-plugger (1.1.4)
+    locale (2.1.2)
     log4r (1.1.10)
     logging (2.1.0)
       little-plugger (~> 1.1)
@@ -65,6 +94,7 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.0.0)
     multi_json (1.12.1)
+    multipart-post (2.0.0)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -74,6 +104,19 @@ GEM
     nokogiri (1.6.7.1)
       mini_portile2 (~> 2.0.0.rc2)
     nori (2.6.0)
+    r10k (1.5.1)
+      colored (= 1.2)
+      cri (~> 2.6.1)
+      faraday (~> 0.9.0)
+      faraday_middleware (~> 0.9.0)
+      faraday_middleware-multi_json (~> 0.0.6)
+      json_pure (~> 1.8)
+      log4r (= 1.1.10)
+      multi_json (~> 1.10)
+      semantic_puppet (~> 0.1.0)
+    rack (1.6.4)
+    rack-protection (1.5.3)
+      rack
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
@@ -83,9 +126,44 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rsense (0.5.18)
+      bundler (~> 1.6)
+      filetree (~> 1.0.0)
+      jruby-jars (~> 1.7.4)
+      jruby-parser (~> 0.5.4)
+      rsense-core (~> 0.6.6)
+      rsense-server (~> 0.5.18)
+      spoon (~> 0.0.4)
+      thor (>= 0.18.1, < 0.20)
+    rsense-core (0.6.6)
+      filetree (~> 1.0.0)
+      jruby-jars (~> 1.7.4)
+      jruby-parser (~> 0.5.4)
+      spoon (~> 0.0.4)
+      thor (>= 0.18.1, < 0.20)
+    rsense-server (0.5.18)
+      bundler (~> 1.6)
+      faraday
+      filetree (~> 1.0.0)
+      jruby-jars (~> 1.7.4)
+      jruby-parser (~> 0.5.4)
+      rsense-core (~> 0.6.6)
+      sinatra
+      spoon (~> 0.0.4)
     ruby_dep (1.4.0)
     rubyntlm (0.6.0)
     rubyzip (1.2.0)
+    semantic_puppet (0.1.4)
+      gettext-setup (>= 0.3)
+    sinatra (1.4.7)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    spoon (0.0.4)
+      ffi
+    text (1.3.1)
+    thor (0.19.1)
+    tilt (2.0.5)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
@@ -108,9 +186,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  rsense
   vagrant!
   vagrant-hostmanager!
   vagrant-invade!
+  vagrant-r10k!
 
 BUNDLED WITH
    1.12.5

data/README.md

@@ -17,11 +17,39 @@ There are new commands you can use to init, validate and build your Vagrantfile.
 ### Init
 `vagrant invade init` creates the default **invade.yml** configuration file for you.
 
+### Check
+`vagrant invade check` will check the checksum of Vagrantfile and invade.yml data. Helpful to check the files without using the build command.
+
 ### Validate
 `vagrant invade validate` will validate the **invade.yml** file and gives you a **detailed output of missing values, wrong parameters and defaults** for each option.
 
 ### Build
-`vagrant invade build` will **build a Vagrantfile** based on what you set in the 'invade.yml' configuration file and place it to the directory you did run the command.
+`vagrant invade build` will **build a Vagrantfile** based on what you configured in the 'invade.yml' file and place it to the directory you did run the command. The old Vagrantfile will be saved as backup. 
+
+## Feature Support
+* Box
+* Network
+* Provider
+	* VirtualBox
+	* VMWare
+* Provision
+	* shell
+	* inline
+	* puppet-agent
+	* puppet-apply
+* Synced Folder
+	* VB
+	* NFS (use *vagrant-winnfsd* plugin to support Windows)
+
+**Not all features are supported yet. See source code for available options.**
+
+With command `vagrant invade init` you can create an example invade.yml with all available options you can pick from.
+
+### 3rd party plugins
+* [vagrant-hostmanager](https://github.com/devopsgroup-io/vagrant-hostmanager)
+* [vagrant-r10k](https://github.com/jantman/vagrant-r10k)
+* [vagrant-winnfsd](https://github.com/winnfsd/vagrant-winnfsd)
+
 
 ## Development
 You are able to collaborate to make this plugin even better. You just need a simple setup of ruby software to make it work. You could also use RVM to keep your ruby environment clean.
@@ -32,6 +60,11 @@ You are able to collaborate to make this plugin even better. You just need a sim
 3. RubyGems
 4. Bundler
 
-### Setup
-1. ``gem install bundler``
-2. ``bundle install``
+### Setup with RVM
+1. `rvm gemset create vagrant-invade`
+2. `rvm gemset use vagrant-invade`
+1. `gem install bundler`
+2. `bundle install`
+
+### Execute vagrant while developing a plugin
+1. `bundle exec vagrant [command]`

data/invade.yml.dist

@@ -74,6 +74,12 @@ machines:
     #       package_state: 'present'
     #       apt_update: true
 
+    nfs:
+      map_uid: Process.uid
+      map_gid: Process.gid
+      #functional: true
+      #verify_installed: false
+
     plugin:
       #hostmanager:
       #  aliases:

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

@@ -0,0 +1,44 @@
+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/action/config.rb

@@ -11,6 +11,7 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @env = env
+
           @logger = Log4r::Logger.new('vagrant::invade::action::config')
           @dir = Dir.pwd
         end
@@ -18,8 +19,8 @@ module VagrantPlugins
         def call(env)
 
           config_file_path = "#{@dir}/invade.yml"
-          template_file_path = "#{config_file_path}.dist"
-          default_config_file_path = "#{File.expand_path('../../../../', __FILE__)}/invade.yml.dist"
+          # template_file_path = "#{config_file_path}.dist"
+          # default_config_file_path = "#{File.expand_path('../../../../', __FILE__)}/invade.yml.dist"
 
           # Returns with invade in environment if Invade Configuration file already exists
           if File.exist?(config_file_path)
@@ -29,7 +30,7 @@ module VagrantPlugins
             # Add invade configuration as global environment variable since we know configuration file exists
             env[:invade] = Invade.get_invade_config
             unless env[:invade]
-              raise "Something went wront. Configuration file could not be loaded."
+              raise 'Something went wrong. Configuration file could not be loaded.'
             end
           else
             @env[:ui].info "[Invade] 'invade.yml' not exists. You forgot a 'vagrant invade init'?"

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

@@ -9,28 +9,33 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @env = env
+          @ui = env[:ui]
           @logger = Log4r::Logger.new('vagrant::invade::action::create')
+
+          ENV['VAGRANT_VAGRANTFILE'] ? @vagrantfile_name = ENV['VAGRANT_VAGRANTFILE'] : @vagrantfile_name = 'Vagrantfile'
+          @root_path = Dir.pwd
         end
 
         def call(env)
 
-          # Get project root where vagrant is running from
-          # Since it is possible to set it through the environment we need to validate it
-          root_path = Dir.pwd
-          ENV['VAGRANT_VAGRANTFILE'] ? vagrantfile_name = ENV['VAGRANT_VAGRANTFILE'] : vagrantfile_name = "Vagrantfile"
+          data = @env[:invade]['vagrantfile']
 
-          # Get generated Vagrantfile from environment
-          if @env[:invade]['vagrantfile']
-            generated_vagrantfile_data = @env[:invade]['vagrantfile']
-          else
-            raise "[Invade]: No generated data found. Can't build Vagrantfile."
-          end
+          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)
 
           # Write new Vagrantfile if checksum is not equal
-          if !check_md5_checksum(@env[:ui], root_path, vagrantfile_name, generated_vagrantfile_data) || @env[:invade_build_force]
-              @env[:invade_build_force] ?
-              write_vagrantfile(@env[:ui], root_path, generated_vagrantfile_data, vagrantfile_name, true) :
-              write_vagrantfile(@env[:ui], root_path, generated_vagrantfile_data, vagrantfile_name, false)
+          if !checksum_helper.check
+            write_vagrantfile(data, md5_current)
+
+            @env[:ui].success "[Invade][BUILD] Current    : '#{md5_current}'"
+            @env[:ui].success "[Invade][BUILD] Generated  : '#{md5_generated}'"
+            @env[:ui].success '[Invade][BUILD] Saved new Vagrantfile to:'
+            @env[:ui].success "[Invade][BUILD] #{vagrantfile_path}"
+          else
+            @ui.warn("[Invade][BUILD] Checksum: #{md5_current}")
+            @ui.warn('[Invade][BUILD] No changes found in invade.yml - Vagrantfile will remain untouched.')
           end
 
           @app.call(env)
@@ -38,63 +43,25 @@ module VagrantPlugins
 
         private
 
-        # Compare md5 strings to replace Vagrantfile
-        def check_md5_checksum(ui, root_path, vagrantfile_name, generated_vagrantfile_data)
-
-          require 'digest'
-
-          md5_new = Digest::MD5.hexdigest(generated_vagrantfile_data)
-
-          if File.exists?("#{root_path}/#{vagrantfile_name}")
-            md5_current = Digest::MD5.file("#{root_path}/#{vagrantfile_name}").hexdigest
-          else
-            md5_current = 0
-          end
-
-          (md5_new.eql? md5_current) ? md5_check = true : md5_check = false
+        def write_vagrantfile(data, checksum)
 
-          unless md5_check
-            ui.warn "[Invade] Checksum not equal!"
-            ui.warn "[Invade] Current    : '#{md5_current}'"
-            ui.warn "[Invade] Generated  : '#{md5_new}'"
+          vagrantfile = "#{@root_path}/#{@vagrantfile_name}"
 
-            return false
-          end
-
-          ui.success "[Invade] Vagrantfile is still valid. Use '-f|--force' to force replacing it." unless @env[:invade_build_force]
-
-          true
-        end
-
-        def reload(ui)
+          # Backup old Vagrantfile and safe it with checksum
+          backup_file = vagrantfile + '-' + "#{checksum}"
 
-          # Get corrent command whether in development mode or using Vagrant for real
-          unless Vagrant.in_installer? && Vagrant.very_quiet?
-            command = 'bundle exec vagrant reload'
-          else
-            command = 'vagrant reload'
+          unless File.exist?(backup_file) || !File.exist?(vagrantfile)
+            File.rename(
+              vagrantfile,
+              backup_file
+            )
           end
 
-          ui.warn '[Invade] Auto reload Vagrant with new Vagrantfile...'
-          sleep 2
-
-          Kernel.exec(command)
-        end
-
-        def write_vagrantfile(ui, root_path, vagrantfile, vagrantfile_name, overwrite)
-
-          overwrite ?
-          vagrantfile_path = "#{root_path}/#{vagrantfile_name}" :
-          vagrantfile_path = "#{root_path}/#{vagrantfile_name}.new"
-
           # Write new Vagrantfile
-          open(vagrantfile_path, "w+") do |f|
-            f.puts vagrantfile
+          open(vagrantfile, 'w+') do |f|
+            f.puts data
           end
 
-          overwrite ?
-          ui.warn("[Invade] Replaced Vagrantfile at '#{root_path}/#{vagrantfile_name}'.") :
-          ui.warn("[Invade] Saved new Vagrantfile at '#{root_path}/#{vagrantfile_name}.new'.")
         end
       end