vagrant-invade 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e06288dca14df145c0464799d0da097feab7916
-  data.tar.gz: 5a151c1e3e863aabfeb0497df3874159dad6a13a
+  metadata.gz: b26a83ceef2c6f5da8509d206bf4abcfab0d7225
+  data.tar.gz: 5a5039deff0e7169bcce99372509c17478076864
 SHA512:
-  metadata.gz: 7b1339ac0eda98c1df71fd55261db75e03deeab302e3afcb7d2dc24e435f8ab62b040e73a8554a329e39ed09970f0056b5763a099d14e71f0a467d4177ad4730
-  data.tar.gz: 5a59b6bf983099845b2c3b5ea8af59d0ac1a56e3beefe1323c06a823504e145637fe5ce8e7aa90e733c7f67f2e53d1cdbd378334660ba44f4a8b92711e35c569
+  metadata.gz: ba8eb47717c0faeba35803cb63be44a4ce28bc916ffa74f7fa7660a534527a9c1547e3176164f1830d0918a2a133a1f1951e07b9396779c8d20243118045dbac
+  data.tar.gz: d5a7832668e5b7888b4aa7e25aa4cc9c8e6ed24b7549167d85ea4454be7ec427b5e204c26a5a2538c02068daa959bfadf68386263855f87f0d522e1e9f743405

data/.gitignore

@@ -1,6 +1,9 @@
 invade.yml
 Vagrantfile
+!Vagrantfile/
+!vagrantfile.rb
 Vagrantfile-*
 Vagrantfile.new
+!vagrantfile.rb
 .vagrant
 .idea

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/devopsgroup-io/vagrant-hostmanager
-  revision: 4ae7655be4ca149482b43592acf0e759463a0bfc
+  revision: e97bc6fd169bed754755d8f3f68786610ef48281
   specs:
     vagrant-hostmanager (1.8.5)
 
@@ -37,7 +37,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-invade (0.5.5)
+    vagrant-invade (0.6.0)
 
 GEM
   remote: https://rubygems.org/
@@ -48,7 +48,7 @@ GEM
     colored (1.2)
     cri (2.6.1)
       colored (~> 1.2)
-    domain_name (0.5.20160615)
+    domain_name (0.5.20161021)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     faraday (0.9.2)
@@ -64,7 +64,7 @@ GEM
     gettext (3.2.2)
       locale (>= 2.0.5)
       text (>= 1.3.0)
-    gettext-setup (0.6)
+    gettext-setup (0.7)
       fast_gettext (~> 1.1.0)
       gettext (>= 3.0.2)
     gssapi (1.2.0)
@@ -72,11 +72,11 @@ GEM
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashicorp-checkpoint (0.1.4)
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httpclient (2.8.2.2)
+    httpclient (2.8.2.4)
     i18n (0.7.0)
-    jruby-jars (1.7.25)
+    jruby-jars (1.7.26)
     jruby-parser (0.5.4)
     json_pure (1.8.3)
     listen (3.1.5)
@@ -114,10 +114,10 @@ GEM
       log4r (= 1.1.10)
       multi_json (~> 1.10)
       semantic_puppet (~> 0.1.0)
-    rack (1.6.4)
+    rack (1.6.5)
     rack-protection (1.5.3)
       rack
-    rb-fsevent (0.9.7)
+    rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.4)
@@ -150,8 +150,8 @@ GEM
       rsense-core (~> 0.6.6)
       sinatra
       spoon (~> 0.0.4)
-    ruby_dep (1.4.0)
-    rubyntlm (0.6.0)
+    ruby_dep (1.5.0)
+    rubyntlm (0.6.1)
     rubyzip (1.2.0)
     semantic_puppet (0.1.4)
       gettext-setup (>= 0.3)
@@ -159,7 +159,7 @@ GEM
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    spoon (0.0.4)
+    spoon (0.0.6)
       ffi
     text (1.3.1)
     thor (0.19.1)

data/lib/vagrant-invade/generator.rb

@@ -22,14 +22,14 @@ module VagrantPlugins
             # Generates the templates with validated data
             case @type
               when Invade::Generator::Type::VAGRANTFILE
-                generated_data = InvadeModule::Invade::Vagrantfile.new(data).build
+                generated_data = InvadeModule::Vagrant::Vagrantfile.new(data).build
 
               when Invade::Generator::Type::VAGRANT_PART
                 generator_class_name = type.split('_').collect(&:capitalize).join
                 generated_data = InvadeModule.const_get(generator_class_name).new(data).build
 
               when Invade::Generator::Type::MACHINE
-                generated_data = InvadeModule::Invade::Machine.new(machine, data).build
+                generated_data = InvadeModule::Vagrant::Machine.new(machine, data).build
 
               when Invade::Generator::Type::MACHINE_NESTED_PART
                 type_formatted = type.split('_').collect(&:capitalize).join

data/lib/vagrant-invade/module.rb

@@ -3,15 +3,15 @@ module VagrantPlugins
     module InvadeModule
 
       autoload :Hostmanager, 'vagrant-invade/module/hostmanager/hostmanager'
-      autoload :Invade, 'vagrant-invade/module/invade/invade'
       autoload :Network, 'vagrant-invade/module/network/network'
+      autoload :Nfs, 'vagrant-invade/module/nfs/nfs'
       autoload :Plugin, 'vagrant-invade/module/plugin/plugin'
       autoload :Provider, 'vagrant-invade/module/provider/provider'
       autoload :Provision, 'vagrant-invade/module/provision/provision'
       autoload :Ssh, 'vagrant-invade/module/ssh/ssh'
       autoload :SyncedFolder, 'vagrant-invade/module/synced_folder/synced_folder'
+      autoload :Vagrant, 'vagrant-invade/module/vagrant/vagrant'
       autoload :Vm, 'vagrant-invade/module/vm/vm'
-      autoload :Nfs, 'vagrant-invade/module/nfs/nfs'
 
       class InvadeModule
         require 'erubis'

data/lib/vagrant-invade/module/plugin/hostmanager/hostmanager.rb

@@ -5,42 +5,37 @@ module VagrantPlugins
 
         class Hostmanager < InvadeModule
 
+          require 'vagrant'
+
           attr_reader :result
           attr_accessor :machine_name, :ui, :hostmanager_data
 
-          def initialize(machine_name, ui, hostmanager_data, result: nil)
+          def initialize(machine_name, hostmanager_data, result: nil)
             @machine_name = machine_name
             @hostmanager_data = hostmanager_data
-            @ui = ui
             @result = result
           end
 
           def build
 
-            if Vagrant.has_plugin?('vagrant-hostmanager')
-
-              b = binding
+            b = binding
 
-              begin
+            begin
 
-                # Get machine name
-                machine_name = @machine_name
+              # Get machine name
+              machine_name = @machine_name
 
-                # Values for hostmanager section
-                enabled = @hostmanager_data['enabled']
-                manage_host = @hostmanager_data['manage_host']
-                ignore_private_ip = @hostmanager_data['ignore_private_ip']
-                include_offline =@hostmanager_data['include_offline']
-                aliases = @hostmanager_data['aliases']
+              # Values for hostmanager section
+              enabled = @hostmanager_data['enabled']
+              manage_host = @hostmanager_data['manage_host']
+              ignore_private_ip = @hostmanager_data['ignore_private_ip']
+              include_offline =@hostmanager_data['include_offline']
+              aliases = @hostmanager_data['aliases']
 
-                eruby = Erubis::Eruby.new(File.read(self.get_template_path(__FILE__)))
-                @result = eruby.result b
-              rescue TypeError, SyntaxError, SystemCallError => e
-                raise(e)
-              end
-            else
-              @ui.error("[Invade] Plugin 'vagrant-hostmanager' not installed but defined. Use 'vagrant plugin install vagrant-hostmanager' to install it.")
-              @result = ''
+              eruby = Erubis::Eruby.new(File.read(self.get_template_path(__FILE__)))
+              @result = eruby.result b
+            rescue TypeError, SyntaxError, SystemCallError => e
+              raise(e)
             end
           end
         end

data/lib/vagrant-invade/module/plugin/plugin.rb

@@ -3,7 +3,7 @@ module VagrantPlugins
     module InvadeModule
       module Plugin
 
-        autoload :HostManager, 'vagrant-invade/module/plugin/hostmanager/hostmanager'
+        autoload :Hostmanager, 'vagrant-invade/module/plugin/hostmanager/hostmanager'
         autoload :WinNFSd, 'vagrant-invade/module/plugin/winnfsd/winnfsd'
         autoload :R10k, 'vagrant-invade/module/plugin/r10k/r10k'
 

data/lib/vagrant-invade/module/{invade → vagrant}/machine/machine.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Invade
     module InvadeModule
-      module Invade
+      module Vagrant
 
         class Machine < InvadeModule
 

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

@@ -0,0 +1,12 @@
+module VagrantPlugins
+  module Invade
+    module InvadeModule
+      module Vagrant
+
+        autoload :Machine, 'vagrant-invade/module/vagrant/machine/machine'
+        autoload :Vagrantfile, 'vagrant-invade/module/vagrant/vagrantfile/vagrantfile'
+
+      end
+    end
+  end
+end

data/lib/vagrant-invade/module/vagrant/vagrantfile/template.erb

@@ -0,0 +1,10 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure(2) do |config|
+
+  <% machines.each do |_, data| %>
+  <%= data %>
+  <% end %>
+  <%= hostmanager %>
+end

data/lib/vagrant-invade/module/vagrant/vagrantfile/vagrantfile.rb

@@ -0,0 +1,36 @@
+module VagrantPlugins
+  module Invade
+    module InvadeModule
+      module Vagrant
+
+        class Vagrantfile < InvadeModule
+
+          attr_reader :result
+          attr_accessor :vagrantfile_data
+
+          def initialize(vagrantfile_data, result: nil)
+            @vagrantfile_data  = vagrantfile_data
+            @result   = result
+          end
+
+          def build
+            b = binding
+
+            begin
+
+              # Set variables for template files
+              hostmanager = @vagrantfile_data['hostmanager']
+              machines = @vagrantfile_data['machines']
+
+              eruby = Erubis::Eruby.new(File.read(self.get_template_path(__FILE__)))
+              @result = eruby.result b
+            rescue TypeError, SyntaxError, SystemCallError => e
+              raise(e)
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-invade/version.rb

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

data/vagrant-invade.gemspec

@@ -14,10 +14,10 @@ Gem::Specification.new do |s|
   s.executables     = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   s.require_paths   = ['lib']
   s.homepage        = 'https://github.com/frgmt/vagrant-invade'
-  s.license         = 'GNUv3'
+  s.license         = 'CC-BY-NC-SA-4.0'
 
   s.required_ruby_version = '>= 2.0.0'
 
-  s.add_development_dependency 'bundler', '~> 1.10', '>= 1.10.5'
-  s.add_development_dependency 'rake', '~> 0'
+  s.add_development_dependency 'bundler', '~> 1.12', '>= 1.12.5'
+  s.add_development_dependency 'rake', '~> 10.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-invade
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Lennart Stein
@@ -16,34 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.5
+        version: 1.12.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.5
+        version: 1.12.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 description: InVaDE is a plugin that uses a YAML configuration file to build a Vagrantfile
   from it.
 email: frgmt@posteo.de
@@ -85,9 +85,6 @@ files:
 - lib/vagrant-invade/module/hostmanager/hostmanager.rb
 - lib/vagrant-invade/module/hostmanager/rules.yml
 - lib/vagrant-invade/module/hostmanager/template.erb
-- lib/vagrant-invade/module/invade/invade.rb
-- lib/vagrant-invade/module/invade/machine/machine.rb
-- lib/vagrant-invade/module/invade/machine/template.erb
 - lib/vagrant-invade/module/network/forwarded_port/forwarded_port.rb
 - lib/vagrant-invade/module/network/forwarded_port/rules.yml
 - lib/vagrant-invade/module/network/forwarded_port/template.erb
@@ -144,6 +141,11 @@ files:
 - lib/vagrant-invade/module/synced_folder/virtualbox/rules.yml
 - lib/vagrant-invade/module/synced_folder/virtualbox/template.erb
 - lib/vagrant-invade/module/synced_folder/virtualbox/virtualbox.rb
+- lib/vagrant-invade/module/vagrant/machine/machine.rb
+- lib/vagrant-invade/module/vagrant/machine/template.erb
+- lib/vagrant-invade/module/vagrant/vagrant.rb
+- lib/vagrant-invade/module/vagrant/vagrantfile/template.erb
+- lib/vagrant-invade/module/vagrant/vagrantfile/vagrantfile.rb
 - lib/vagrant-invade/module/vm/rules.yml
 - lib/vagrant-invade/module/vm/template.erb
 - lib/vagrant-invade/module/vm/vm.rb
@@ -162,7 +164,7 @@ files:
 - vagrant-invade.gemspec
 homepage: https://github.com/frgmt/vagrant-invade
 licenses:
-- GNUv3
+- CC-BY-NC-SA-4.0
 metadata: {}
 post_install_message: 
 rdoc_options: []

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

@@ -1,12 +0,0 @@
-module VagrantPlugins
-  module Invade
-    module InvadeModule
-      module Invade
-
-        autoload :Machine, 'vagrant-invade/module/invade/machine/machine'
-        autoload :Vagrantfile, 'vagrant-invade/module/invade/vagrantfile/vagrantfile'
-
-      end
-    end
-  end
-end