vagrant-invade 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4c1bea715489a8245c212a230950d76a5edf15b
-  data.tar.gz: fe03ae6e9a1f448de2aa9f8d5c64161914f00151
+  metadata.gz: dd40809f47915424d22391ac52ef13899ce46285
+  data.tar.gz: ccdaa0b5ef73e7b5b374fd319b60fc9fe1a9abb8
 SHA512:
-  metadata.gz: abd4f07f368386344eebb666843bab9cdb7cf109782bb5496d13c545f0ea40fd21a08a4adf36c83e7f0f9b2c5265b0fd3a2b70fb0b8b32026ce362c7a6b555ed
-  data.tar.gz: 6a91d43bbc87cf42e56b3ecef57cba45baaedadab1103f64e429c36a8354eddc3f962fae9912a01839b501fb1df0b98d02282195cd74cb61ca5aa86088196f0d
+  metadata.gz: a6c1373e32591bdd714b8a96ac78c59c06049e93ac5294b21adb593d41f051edd8b21372b3d6601fe83ddf8988bbce1758ba62f6036007e40e80c87c66ebdd90
+  data.tar.gz: 21e75da17edaace7d6ac27377a40a21dd7c189ec3dfb6e62ec9b6e96373c8e0acac0d0cc9667ab6da4907b8b09f183c445bf27cb9b68430a75ac059ce7943623

data/.gitignore

@@ -6,4 +6,4 @@ Vagrantfile-*
 Vagrantfile.new
 !vagrantfile.rb
 .vagrant
-.idea
+.idea/

data/Gemfile

@@ -1,14 +1,9 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 group :development do
-  gem "rsense"
-  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", :ref => 'v1.8.5'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', :ref => 'v1.8.5'
 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
+  gemspec
+end

data/Gemfile.lock

@@ -1,16 +1,3 @@
-GIT
-  remote: https://github.com/devopsgroup-io/vagrant-hostmanager
-  revision: e97bc6fd169bed754755d8f3f68786610ef48281
-  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
@@ -37,7 +24,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-invade (0.6.2)
+    vagrant-invade (0.6.3)
 
 GEM
   remote: https://rubygems.org/
@@ -45,28 +32,10 @@ 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.20161021)
       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.7)
-      fast_gettext (~> 1.1.0)
-      gettext (>= 3.0.2)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
@@ -76,15 +45,11 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.2.4)
     i18n (0.7.0)
-    jruby-jars (1.7.26)
-    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)
@@ -94,7 +59,6 @@ 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)
@@ -104,19 +68,7 @@ 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.5)
-    rack-protection (1.5.3)
-      rack
+    rake (10.4.2)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
@@ -126,44 +78,9 @@ 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.5.0)
     rubyntlm (0.6.1)
     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.6)
-      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)
@@ -186,11 +103,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rsense
+  bundler (~> 1.12, >= 1.12.5)
+  rake (~> 10.0)
   vagrant!
-  vagrant-hostmanager!
   vagrant-invade!
-  vagrant-r10k!
 
 BUNDLED WITH
    1.12.5

data/lib/vagrant-invade/module/provision/salt/rules.yml

@@ -12,10 +12,10 @@ install_syncdir:
   default: false
 install_type:
   type: String
-  default: 'stable'
+  default: :stable
 install_args:
   type: String
-  default: 'develop'
+  default: nil
 always_install:
   type: Boolean
   default: false
@@ -87,4 +87,9 @@ log_level:
 # PILLAR DATA
 pillar:
   type: Hash
-  default: nil
+  default: nil
+
+# MISC
+verbose:
+  type: Boolean
+  default: true

data/lib/vagrant-invade/module/provision/salt/salt.rb

@@ -25,7 +25,7 @@ module VagrantPlugins
               # salt install options
               install_master = @salt_data['install_master']
               no_minion = @salt_data['no_minion']
-              install_syncdir = @salt_data['install_syncdir']
+              install_syndic = @salt_data['install_syndic']
               install_type = @salt_data['install_type']
               install_args = @salt_data['install_args']
               always_install = @salt_data['always_install']
@@ -61,6 +61,9 @@ module VagrantPlugins
               # PILLAR DATA
               pillar = @salt_data['pillar']
 
+              # MISC
+              verbose = @salt_data['verbose']
+
               eruby = Erubis::Eruby.new(File.read(self.get_template_path(__FILE__)))
               @result = eruby.result b
             rescue TypeError, SyntaxError, SystemCallError => e

data/lib/vagrant-invade/module/provision/salt/template.erb

@@ -5,11 +5,11 @@
       <% if no_minion %>
       salt.no_minion = <%= no_minion %>
       <% end %>
-      <% if install_syncdir %>
-      salt.install_syncdir = <%= install_syncdir %>
+      <% if install_syndic %>
+      salt.install_syndic = <%= install_syndic %>
       <% end %>
       <% if install_type %>
-      salt.install_type = '<%= install_type %>'
+      salt.install_type = :<%= install_type %>
       <% end %>
       <% if install_args %>
       salt.install_args = '<%= install_args %>'
@@ -74,7 +74,10 @@
       <% if log_level %>
       salt.log_level = '<%= log_level %>'
       <% end %>
+      <% if verbose %>
+      salt.verbose = <%= verbose %>
+      <% end %>
       <% if pillar %>
-      salt.pillar = <%= pillar %>
+      salt.pillar(<%= pillar %>)
       <% end %>
     end

data/lib/vagrant-invade/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Invade
-    VERSION = '0.6.3'
+    VERSION = '0.6.4'
   end
 end

data/lib/vagrant-invade.rb

@@ -1,20 +1,11 @@
-require 'bundler'
-
-begin
-  require 'vagrant'
-rescue LoadError
-  Bundler.require(:default, :development)
-end
-
 require 'vagrant-invade/plugin'
+require 'vagrant-invade/version'
+require 'vagrant-invade/extend'
+require 'yaml'
 
 module VagrantPlugins
   module Invade
 
-    require 'vagrant-invade/version'
-    require 'vagrant-invade/extend'
-    require 'yaml'
-
     autoload :Validator, 'vagrant-invade/validator'
     autoload :InvadeModule, 'vagrant-invade/module'
     autoload :Generator, 'vagrant-invade/generator'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-invade
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Lennart Stein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,6 @@ extra_rdoc_files: []
 files:
 - ".gitattributes"
 - ".gitignore"
-- ".idea/dictionaries/lenste.xml"
 - Gemfile
 - Gemfile.lock
 - LICENSE

data/.idea/dictionaries/lenste.xml

@@ -1,14 +0,0 @@
-<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>