vagrant-invade 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04c5c592924d5515441098a652688e9862488366
-  data.tar.gz: 810b25f2f392be9da05eebf87222040add64ea7e
+  metadata.gz: 3f8250dda79bfa6bd1ea542d2c6c305147e0e398
+  data.tar.gz: c411d68908ce389a033b3cc8e1ce73ac48729616
 SHA512:
-  metadata.gz: 9c715e0a601e99eb77154e34121d31c1b32e7f0c029fa372bfb7fee249c64815adc2634de1cdff6d8ffc24171ab153d3eabafd9a8ad9ac787c398804dd267c4f
-  data.tar.gz: 6712c01ae032aba2286ae3f9fd4b58c8b618fe70c3da7d63bb0017254b0c893add664fcc55ebbbcd80607dee67702e51392551fd4a73d2c583247e596c909041
+  metadata.gz: deca05716d35430d20ea7b919ab39aa2411a8ae768d06187770b92acc709b41cba464a513ae4f433254f1446b6b984d16b5715d05655ae252f1e6a183a92ff68
+  data.tar.gz: 3c1898be7bb613f0be500b2edbf6b1ff8484f3b3a1a25a9fa1e213e6c1a9b0777b834d7af3ee9b5ffe0783a85e99f408aed8bbccb45a7df20bb1f13bb52ebc3b

data/Gemfile

@@ -1,5 +1,4 @@
 source "https://rubygems.org"
-ruby "2.2.0"
 
 group :development do
   gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"

data/Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: b721eb62cfbfa93895d0d4cf019436ab6b1df05d
+  revision: e6bb09831bb47803c8b8e0ca50d0218717b4cd2d
   specs:
-    vagrant (1.7.4)
-      bundler (>= 1.5.2, <= 1.10.5)
+    vagrant (1.8.0.dev)
+      bundler (>= 1.5.2, <= 1.10.6)
       childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.1)
@@ -23,7 +23,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-invade (0.3.1)
+    vagrant-invade (0.3.3)
 
 GEM
   remote: https://rubygems.org/
@@ -31,7 +31,7 @@ GEM
     builder (3.2.2)
     childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
-    domain_name (0.5.24)
+    domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     ffi (1.9.10)
@@ -103,4 +103,4 @@ DEPENDENCIES
   vagrant-invade!
 
 BUNDLED WITH
-   1.10.6
+   1.10.5

data/README.md

@@ -1,4 +1,24 @@
 # vagrant-invade
-![alt text](https://github.com/frgmt/vagrant-invade/raw/develop/images/logo-256.png "Logo")
 
-A Vagrant plugin to generate a Vagrantfile from a Configuration
+![Invade Logo](https://github.com/frgmt/vagrant-invade/blob/develop/images/invade-logo-256.png?raw=true)
+
+[![Code Climate](https://codeclimate.com/github/frgmt/vagrant-invade/badges/gpa.svg)](https://codeclimate.com/github/frgmt/vagrant-invade)
+
+**vagrant-invade** is a plugin for Vagrant, the tool for creating and maintain virtual machines.  
+It uses a simple **YAML** configuration file to automatically build a **Vagrantfile** for your projects.
+
+## How to install
+Simply run `vagrant plugin install vagrant-invade`  
+To install a certain version use the `-v 'VERSION'` option.
+
+## Commands
+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.
+
+### 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.

data/invade.yml.dist

@@ -1,6 +1,4 @@
 invade:
-  # auto: true
-  # replace: true
   # debug: true
 
 # Machine settings. Each entry is one box
@@ -11,7 +9,7 @@ machines:
 
     # VM related settings
     vm:
-      box: innogames/debian-jessie-8.1.0
+      box: boxcutter/debian82
       hostname: 'invade.vm'
 
     # Network settings

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

@@ -14,22 +14,23 @@ module VagrantPlugins
 
         def call(env)
 
-          # Get project root and default vagrantfile filename
+          # 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"
 
           # Get generated Vagrantfile from environment
           if @env[:invade]['vagrantfile']
-            generated_vagrantfile = @env[:invade]['vagrantfile']
+            generated_vagrantfile_data = @env[:invade]['vagrantfile']
           else
             raise "[Invade]: No generated data found. Can't build Vagrantfile."
           end
 
-          # Write new Vagrantfile if checksum is not equal and auto mode is enabled
-          unless check_md5_checksum(@env[:ui], root_path, vagrantfile_name, generated_vagrantfile)
+          # Write new Vagrantfile if checksum is not equal
+          unless check_md5_checksum(@env[:ui], root_path, vagrantfile_name, generated_vagrantfile_data)
               @env[:invade_build_force] ?
-              write_vagrantfile(@env[:ui], root_path, generated_vagrantfile, vagrantfile_name, true) :
-              write_vagrantfile(@env[:ui], root_path, generated_vagrantfile, vagrantfile_name, false)
+              write_vagrantfile(@env[:ui], root_path, generated_vagrantfile_data, vagrantfile_name, true) :
+              write_vagrantfile(@env[:ui], root_path, generated_vagrantfile_data, vagrantfile_name, false)
           end
 
           @app.call(env)
@@ -38,11 +39,11 @@ module VagrantPlugins
         private
 
         # Compare md5 strings to replace Vagrantfile
-        def check_md5_checksum(ui, root_path, vagrantfile_name, generated_vagrantfile)
+        def check_md5_checksum(ui, root_path, vagrantfile_name, generated_vagrantfile_data)
 
           require 'digest'
 
-          md5_new = Digest::MD5.hexdigest(generated_vagrantfile)
+          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
@@ -56,10 +57,11 @@ module VagrantPlugins
             ui.warn "[Invade] Checksum not equal!"
             ui.warn "[Invade] Current    : '#{md5_current}'"
             ui.warn "[Invade] Generated  : '#{md5_new}'"
+
             return false
           end
 
-          ui.success "[Invade] Vagrantfile is still valid. No need to rebuild. Or use --force."
+          ui.success "[Invade] Vagrantfile is still valid. Use '--f' to force replacing it."
 
           true
         end

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

@@ -33,7 +33,6 @@ module VagrantPlugins
               # VM
               unless sections['vm'] == nil
                 @env[:ui].info("\n[Invade] #{machine.upcase}: Validating VM configuration...") unless quiet
-                sleep 1 unless quiet
 
                 sections['vm'] = Validator::VM.new(env, sections['vm']).validate
               end
@@ -41,7 +40,6 @@ module VagrantPlugins
               # NETWORK
               unless sections['network'] == nil
                 @env[:ui].info("\n[Invade] #{machine.upcase}: Validating network configuration...") unless quiet
-                sleep 1 unless quiet
 
                 sections['network'].each do |type, network|
                   @env[:ui].info("\tNetwork: #{type}") unless quiet
@@ -61,7 +59,6 @@ module VagrantPlugins
               # PROVIDER
               unless sections['provider'] == nil
                 @env[:ui].info("\n[Invade] #{machine.upcase}: Validating provider configuration...") unless quiet
-                sleep 1 unless quiet
 
                 sections['provider'].each do |type, provider|
                   @env[:ui].info("\tProvider: #{type}") unless quiet
@@ -79,7 +76,6 @@ module VagrantPlugins
               # SYNCED FOLDER
               unless sections['synced_folder'] == nil
                 @env[:ui].info("\n[Invade] #{machine.upcase}: Validating synced folder configuration...") unless quiet
-                sleep 1 unless quiet
 
                 sections['synced_folder'].each do |type, sf|
                   @env[:ui].info("\tSynced Folder: #{type}") unless quiet
@@ -97,7 +93,6 @@ module VagrantPlugins
               # PROVISION
               unless sections['provision'] == nil
                 @env[:ui].info("\n[Invade] #{machine.upcase}: Validating provision configuration...") unless quiet
-                sleep 1 unless quiet
 
                 sections['provision'].each do |type, provision|
                   @env[:ui].info("\tProvision: #{type}") unless quiet
@@ -115,14 +110,12 @@ module VagrantPlugins
               # SSH
               unless sections['ssh'] == nil
                 @env[:ui].info("\n[Invade] #{machine.upcase}: Validating SSH configuration...") unless quiet
-                sleep 1 unless quiet
 
                 sections['ssh'] = Validator::SSH.new(env, sections['ssh']).validate
               end
 
               unless sections['plugin'] == nil
                 @env[:ui].info("\n[Invade] #{machine.upcase}: Validating plugin configuration...") unless quiet
-                sleep 1 unless quiet
 
                 sections['plugin'].each do |type, plugin|
                   @env[:ui].info("\tPlugin: #{type}") unless quiet

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

@@ -10,7 +10,7 @@ module VagrantPlugins
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant invade validate [-f|--force] [-q|--quiet] [-h]"
             o.separator ""
-            o.on("-f", "--force", "Overwrite existing Vagrantfile") do |f|
+            o.on("-f", "--force", "Force replacing current Vagrantfile") do |f|
               options[:force] = f
             end
             o.on("-q", "--quiet", "Just make it whisper.") do |q|

data/lib/vagrant-invade/plugin.rb

@@ -11,16 +11,18 @@ module VagrantPlugins
         Command::Root
       end
 
-      # Hook - Do all the invade magic before Vagrant itself comes alive
-      action_hook(:invade, :machine_action_up) do |hook|
-        require 'vagrant-invade/action'
+      # Disable hook for now. Use commands instead of auto mode
 
-        # 1. Checks config file
-        # 2. Validates config file
-        # 3. Generates Vagrantfile from invade config
-        # 4. Creates generated Vagrantfile
-        hook.prepend(Action.build)
-      end
+      # Hook - Do all the invade magic before Vagrant itself comes alive
+      # action_hook(:invade, :machine_action_up) do |hook|
+      #   require 'vagrant-invade/action'
+      #
+      #   # 1. Checks config file
+      #   # 2. Validates config file
+      #   # 3. Generates Vagrantfile from invade config
+      #   # 4. Creates generated Vagrantfile
+      #   hook.prepend(Action.build)
+      # end
     end
 
     autoload :Action, File.expand_path("../action/", __FILE__)

data/lib/vagrant-invade/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Invade
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

data/vagrant-invade.gemspec

@@ -4,6 +4,7 @@ require File.expand_path('../lib/vagrant-invade/version', __FILE__)
 Gem::Specification.new do |s|
   s.name            = 'vagrant-invade'
   s.version         = VagrantPlugins::Invade::VERSION
+  s.platform        = Gem::Platform::RUBY
   s.date            = Date.today.to_s
   s.summary         = "Create a Vagrantfile with a single YAML configuration file"
   s.description     = "InVaDE is a plugin that uses a YAML configuration file to build a Vagrantfile from it."
@@ -13,6 +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         = 'GNU'
+  s.license         = 'GNUv3'
+
   s.required_ruby_version = '>= 2.0.0'
+
+  s.add_development_dependency 'bundler', '~> 1.10', '>= 1.10.5'
+  s.add_development_dependency 'rake', '~> 0'
 end

metadata

@@ -1,15 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-invade
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Lennart Stein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
-dependencies: []
+date: 2015-10-12 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.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.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
   from it.
 email: frgmt@posteo.de
@@ -17,16 +51,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitattributes"
-- ".gitignore"
+- .gitattributes
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- images/logo-128.png
-- images/logo-256.png
-- images/logo-512.png
+- images/invade-logo-128.png
+- images/invade-logo-256.png
+- images/invade-logo-512.png
 - invade.yml.dist
 - lib/vagrant-invade.rb
 - lib/vagrant-invade/action.rb
@@ -107,7 +141,7 @@ files:
 - vagrant-invade.gemspec
 homepage: https://github.com/frgmt/vagrant-invade
 licenses:
-- GNU
+- GNUv3
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -115,12 +149,12 @@ 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: []