vagrant-invade 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8dc480d74b95f717060f3fc518a654eaa525097
-  data.tar.gz: 8b379149b20e1cf8385efa5391803253c175251f
+  metadata.gz: 8aa063a5bb88cb75629fc5e12cd9f97fa4094a90
+  data.tar.gz: e80c31179ae0efac9aecc2f971651a22edd7f321
 SHA512:
-  metadata.gz: 5e32a52662ffcbed939a5d226b5b24cfbc45c18bf58b0d21afc0de7a4b156c3e8f144d667e8a99184eff558c1720ef756e76293ba4120ecbee40c2d01b3be020
-  data.tar.gz: a7616beb2ff4285fe4e65185a8d595457409143379ab901f216abd82698b69c5ba935ffe7907c87588b18ddd8071f21e62e02aa660db19d0a25c60e4b0af3486
+  metadata.gz: 87f1af65c50937a5d6be87c20197e75c6276d68e7b71f878c42ea197c39002636b501ef7ae66cd0bc57d72c7d826aa85d504f3295986328cd35d49edb812449a
+  data.tar.gz: 769fb0830b2a1a6575501692d3b109fcca5f8b787d6a9ef395459d6023efc15bca0a8851571107a2b85feb62066f54a62542bcb4517ba86bdb9059f0cfc65f0c

data/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 group :development do
-  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"
+  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", :ref => 'v1.7.4'
 end
 
 group :plugins do

data/Gemfile.lock

@@ -1,9 +1,10 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: e6bb09831bb47803c8b8e0ca50d0218717b4cd2d
+  revision: 78ea5e4a78ce644717ab16d8001ab77430168f0f
+  ref: v1.7.4
   specs:
-    vagrant (1.8.0.dev)
-      bundler (>= 1.5.2, <= 1.10.6)
+    vagrant (1.7.4)
+      bundler (>= 1.5.2, <= 1.10.5)
       childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.1)
@@ -18,18 +19,18 @@ GIT
       rest-client (>= 1.6.0, < 2.0)
       wdm (~> 0.1.0)
       winrm (~> 1.3)
-      winrm-fs (~> 0.2.2)
+      winrm-fs (~> 0.2.0)
 
 PATH
   remote: .
   specs:
-    vagrant-invade (0.4.6)
+    vagrant-invade (0.4.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
     builder (3.2.2)
-    childprocess (0.5.6)
+    childprocess (0.5.8)
       ffi (~> 1.0, >= 1.0.11)
     domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
@@ -42,9 +43,9 @@ GEM
     hashicorp-checkpoint (0.1.4)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    httpclient (2.6.0.1)
+    httpclient (2.7.0.1)
     i18n (0.7.0)
-    listen (3.0.3)
+    listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     little-plugger (1.1.4)
@@ -52,7 +53,7 @@ GEM
     logging (1.8.2)
       little-plugger (>= 1.1.3)
       multi_json (>= 1.8.4)
-    mime-types (2.6.2)
+    mime-types (2.99)
     mini_portile (0.6.0)
     multi_json (1.11.2)
     net-scp (1.1.2)
@@ -60,7 +61,7 @@ GEM
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
-    netrc (0.10.3)
+    netrc (0.11.0)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     nori (2.6.0)
@@ -80,16 +81,16 @@ GEM
     unf_ext (0.0.7.1)
     uuidtools (2.1.5)
     wdm (0.1.1)
-    winrm (1.3.4)
+    winrm (1.3.5)
       builder (>= 2.1.2)
       gssapi (~> 1.2)
       gyoku (~> 1.0)
       httpclient (~> 2.2, >= 2.2.0.2)
-      logging (~> 1.6, >= 1.6.1)
+      logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.4.0)
       uuidtools (~> 2.1.2)
-    winrm-fs (0.2.2)
+    winrm-fs (0.2.3)
       erubis (~> 2.7)
       logging (~> 1.6, >= 1.6.1)
       rubyzip (~> 1.1)
@@ -103,4 +104,4 @@ DEPENDENCIES
   vagrant-invade!
 
 BUNDLED WITH
-   1.10.6
+   1.10.5

data/invade.yml.dist

@@ -17,6 +17,10 @@ machines:
       private:
         ip: '10.42.133.7'
 
+    # SSH settings
+    ssh:
+      forward_agent: true
+
     # Provider related settings. Performance, naming
     provider:
 

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

@@ -41,6 +41,11 @@ module VagrantPlugins
                 end
               end
 
+              # SSH
+              unless section['ssh'] == nil
+                part['ssh'] = (Generator::Section::SSH.new(machine, section['ssh']).generate)
+              end
+
               # PROVIDER
               unless section['provider'] == nil
                 part['provider'] = ''
@@ -81,11 +86,6 @@ module VagrantPlugins
                 end
               end
 
-              # # SSH
-              # unless section['ssh'] == nil
-              #   part['ssh'] = Generator::Section::SSH.new(machine, section['ssh']).generate
-              # end
-
               # Add as definition
               definition[machine] = Generator::Definition.new(machine, part).generate
             end

data/lib/vagrant-invade/builder/definition.rb

@@ -27,6 +27,7 @@ module VagrantPlugins
             # Data to build definition entry
             vm = @definition_data['vm']
             network = @definition_data['network']
+            ssh = @definition_data['ssh']
             provider = @definition_data['provider']
             synced_folder = @definition_data['synced_folder']
             plugin = @definition_data['plugin']

data/lib/vagrant-invade/builder/ssh.rb

@@ -0,0 +1,41 @@
+module VagrantPlugins
+  module Invade
+    module Builder
+
+      require 'erubis'
+
+      class SSH
+
+        attr_reader :result
+        attr_accessor :machine_name, :ssh_data
+
+        def initialize(machine_name, ssh_data, result: nil)
+          @machine_name = machine_name
+          @ssh_data  = ssh_data
+          @result   = result
+        end
+
+        def build
+          b = binding
+          template_file = "#{TEMPLATE_PATH}/ssh/ssh.erb"
+
+          begin
+
+            # Get machine name
+            machine_name = @machine_name
+
+            # Values for vm section
+            forward_agent = @ssh_data['forward_agent']
+            enabled = @ssh_data['enabled']
+            path = @ssh_data['path']
+
+            eruby = Erubis::Eruby.new(File.read(template_file))
+            @result = eruby.result b
+          rescue TypeError, SyntaxError, SystemCallError => e
+            raise(e)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-invade/builder.rb

@@ -4,6 +4,7 @@ module VagrantPlugins
 
       autoload :VM, 'vagrant-invade/builder/vm'
       autoload :Network, 'vagrant-invade/builder/network'
+      autoload :SSH, 'vagrant-invade/builder/ssh'
       autoload :Provider, 'vagrant-invade/builder/provider'
       autoload :Provision, 'vagrant-invade/builder/provision'
       autoload :SyncedFolder, 'vagrant-invade/builder/synced_folder'

data/lib/vagrant-invade/generator/section/ssh.rb

@@ -0,0 +1,27 @@
+module VagrantPlugins
+  module Invade
+    module Generator
+      module Section
+
+        class SSH
+
+          attr_accessor :machine_name, :ssh_data
+
+          def initialize(machine_name, ssh_data)
+            @machine_name = machine_name
+            @ssh_data = ssh_data
+          end
+
+          def generate
+            vm = Builder::SSH.new(@machine_name, @ssh_data)
+            vm.build
+
+            vm.result
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-invade/generator/section.rb

@@ -5,6 +5,7 @@ module VagrantPlugins
 
         autoload :VM, 'vagrant-invade/generator/section/vm'
         autoload :Network, 'vagrant-invade/generator/section/network'
+        autoload :SSH, 'vagrant-invade/generator/section/ssh'
         autoload :Provider, 'vagrant-invade/generator/section/provider'
         autoload :SyncedFolder, 'vagrant-invade/generator/section/synced_folder'
         autoload :Provision, 'vagrant-invade/generator/section/provision'

data/lib/vagrant-invade/template/definition.erb

@@ -8,6 +8,10 @@ config.vm.define "<%= machine_name %>" do |<%= machine_name %>|
     # --- Network Section ---
   <%= network %>
   <% end %>
+  <% if ssh %>
+    # --- SSH Section ---
+    <%= ssh %>
+  <% end %>
   <% if provider %>
     # --- Provider Section ---
   <%= provider %>

data/lib/vagrant-invade/template/ssh/ssh.erb

@@ -0,0 +1,2 @@
+
+    <%= machine_name %>.ssh.forward_agent = <% if forward_agent %>true<% else %>false<% end %>

data/lib/vagrant-invade/validator/ssh.rb

@@ -7,8 +7,7 @@ module VagrantPlugins
         attr_accessor :env, :ssh
 
         DEFAULT = {
-          'enabled' => nil,
-          'path' => '~/.ssh/'
+          'forward_agent' => true
         }
 
         def initialize(env, ssh)
@@ -19,14 +18,8 @@ module VagrantPlugins
         def validate
           return DEFAULT unless @ssh
 
-          # ENABLED
-          @ssh['enabled'] = Validator.validate_boolean(
-            @ssh['enabled'], 'enabled', DEFAULT['enabled']
-          )
-
-          # PATH TO HOST SSH FOLDER
-          @ssh['path'] = Validator.validate_string(
-            @ssh['path'], 'path', DEFAULT['path']
+          @ssh['forward_agent'] = Validator.validate_boolean(
+            @ssh['forward_agent'], 'forward_agent', DEFAULT['forward_agent']
           )
 
           @ssh

data/lib/vagrant-invade/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Invade
-    VERSION = '0.4.7'
+    VERSION = '0.4.8'
   end
 end

data/vagrant-invade.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.0.0'
 
-  s.add_development_dependency 'bundler', '~> 1.10', '>= 1.10.6'
+  s.add_development_dependency 'bundler', '~> 1.10', '>= 1.10.5'
   s.add_development_dependency 'rake', '~> 0'
 end

metadata

@@ -1,47 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-invade
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Lennart Stein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.6
+        version: 1.10.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.6
+        version: 1.10.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: InVaDE is a plugin that uses a YAML configuration file to build a Vagrantfile
@@ -51,8 +51,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitattributes
-- .gitignore
+- ".gitattributes"
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -87,6 +87,7 @@ files:
 - lib/vagrant-invade/builder/provision/puppet_apply.rb
 - lib/vagrant-invade/builder/provision/shell.rb
 - lib/vagrant-invade/builder/provision/shell_inline.rb
+- lib/vagrant-invade/builder/ssh.rb
 - lib/vagrant-invade/builder/synced_folder.rb
 - lib/vagrant-invade/builder/synced_folder/nfs.rb
 - lib/vagrant-invade/builder/synced_folder/virtualbox.rb
@@ -104,6 +105,7 @@ files:
 - lib/vagrant-invade/generator/section/plugin.rb
 - lib/vagrant-invade/generator/section/provider.rb
 - lib/vagrant-invade/generator/section/provision.rb
+- lib/vagrant-invade/generator/section/ssh.rb
 - lib/vagrant-invade/generator/section/synced_folder.rb
 - lib/vagrant-invade/generator/section/vm.rb
 - lib/vagrant-invade/generator/vagrantfile.rb
@@ -121,6 +123,7 @@ files:
 - lib/vagrant-invade/template/provision/puppet_apply.erb
 - lib/vagrant-invade/template/provision/shell.erb
 - lib/vagrant-invade/template/provision/shell_inline.erb
+- lib/vagrant-invade/template/ssh/ssh.erb
 - lib/vagrant-invade/template/synced_folder/nfs.erb
 - lib/vagrant-invade/template/synced_folder/virtualbox.erb
 - lib/vagrant-invade/template/v2.erb
@@ -160,17 +163,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Create a Vagrantfile with a single YAML configuration file