vagrant-invade 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0878811b4dac14f3ce59a1c2a1090ff3808757bb
-  data.tar.gz: a04b4eb6bcc368184ae3fa78b04db3b2c0bfee9c
+  metadata.gz: bbd5aa6c473ae3aa46605dfdc897bb28f40fd960
+  data.tar.gz: ae5154aea24128941eb5a4c45d74df16116b4e79
 SHA512:
-  metadata.gz: 4acec5a944f355a5d7f2dc0b0ad7baf15ae5b9fa6b68b74632156228c63cbdbf16e0d3f6dd84355d54cf0c60fcbb1125219a7cdf3795fa2add6ace751d4760eb
-  data.tar.gz: 8c741fe5d9b6a753c488fa3a30172112b1645324e49a9a7c9a0a8be546be1a7cf0ee461db3b0411d6f1bf18957cdb0d9c131a4b1df66cf1388fbded93e5ae702
+  metadata.gz: 7a3253404f1678c2b8d8533c0f596940bb364fd34462d9b506e8edcb4043ee683f177f9c263e2281a23fc0f13bad295c412d2dd50a82224b862661a4a28e8efe
+  data.tar.gz: 7ff9eb2ed32121d31f2c6c955f1ea9af8585c4c90356d6eb9fcc7dee41e81a382c1f2135ecec26bedc4abf1c64858d201d8ff203d932bc5dd0c905da62ce5a62

data/Gemfile.lock

@@ -23,7 +23,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-invade (0.1.0)
+    vagrant-invade (0.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -103,4 +103,4 @@ DEPENDENCIES
   vagrant-invade!
 
 BUNDLED WITH
-   1.10.5
+   1.10.6

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

@@ -15,8 +15,8 @@ module VagrantPlugins
         def call(env)
           root_path = @env[:root_path]
           config_file_path = "#{root_path}/invade.yml"
-          template_file_path = config_file_path + '.dist'
-          default_config_file_path = Dir.pwd + '/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)
@@ -41,9 +41,9 @@ module VagrantPlugins
               @env[:ui].warn '[Invade] Restarting vagrant...'
               sleep 3
               if !Vagrant.in_installer? && !Vagrant.very_quiet?
-                Kernel.exec('bundle exec vagrant up')
+                Kernel.exec('bundle exec vagrant up') if @env[:invade_command]
               else
-                Kernel.exec('vagrant up')
+                Kernel.exec('vagrant up') if @env[:invade_command]
               end
             rescue
               # If not found default invade configuration file will be copied.
@@ -57,9 +57,9 @@ module VagrantPlugins
               @env[:ui].warn '[Invade] Restarting vagrant...'
               sleep 3
               if !Vagrant.in_installer? && !Vagrant.very_quiet?
-                Kernel.exec('bundle exec vagrant up')
+                Kernel.exec('bundle exec vagrant up') if @env[:invade_command]
               else
-                Kernel.exec('vagrant up')
+                Kernel.exec('vagrant up') if @env[:invade_command]
               end
             end
           end

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

@@ -22,7 +22,7 @@ module VagrantPlugins
           generated_vagrantfile = @env[:invade]['vagrantfile']
 
           # Get auto_mode from env
-          auto_mode = @env[:invade]['invade']['auto']
+          auto_mode = @env[:invade_auto]
 
           # 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)

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

@@ -0,0 +1,62 @@
+module VagrantPlugins
+  module Invade
+    module Action
+
+      include Vagrant::Action::Builtin
+
+      class Init
+
+        def initialize(app, env)
+          @app = app
+          @env = env
+          @logger = Log4r::Logger.new('vagrant::invade::action::init')
+        end
+
+        def call(env)
+
+          if !invade_config_exists || @env[:invade_command_init_force]
+            write_invade_config
+          else
+            @env[:ui].error "[Invade] A 'invade.yml' file already exists. Use '--force' to replace file."
+          end
+
+          @app.call(env)
+        end
+
+        def invade_config_exists
+          invade_config_file =  "#{@env[:root_path]}/invade.yml"
+          if File.exist?(invade_config_file)
+            return true
+          end
+
+          false
+        end
+
+        def invade_template_exists
+          template_file_path = "#{@env[:root_path]}/invade.yml.dist"
+          if File.exist?(template_file_path)
+            return true
+          end
+
+          false
+        end
+
+        def write_invade_config
+
+          config_file_path = "#{@env[:root_path]}/invade.yml"
+
+          if invade_template_exists
+            template_file_path = "#{@env[:root_path]}/invade.yml.dist"
+            FileUtils.cp(template_file_path, config_file_path)
+            @env[:ui].success "[Invade] Copy of template 'invade.yml.dist' created successfully. Please make your changes."
+          else
+            default_config_file_path = "#{File.expand_path('../../../../', __FILE__)}/invade.yml.dist"
+            FileUtils.cp(default_config_file_path, config_file_path)
+            @env[:ui].success "[Invade] Copy of default 'invade.yml.dist' created successfully. Please make your changes."
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/vagrant-invade/action.rb

@@ -23,8 +23,16 @@ module VagrantPlugins
         end
       end
 
+      # This middleware sequence will init a InVaDE configuration file
+      def self.init
+        Vagrant::Action::Builder.new.tap do |builder|
+          builder.use Init
+        end
+      end
+
       # The autoload farm
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
+      autoload :Init, action_root.join("init")
       autoload :Config, action_root.join("config")
       autoload :Validate, action_root.join("validate")
       autoload :Generate, action_root.join("generate")

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

@@ -0,0 +1,33 @@
+require 'optparse'
+require_relative 'base'
+
+module VagrantPlugins
+  module Invade
+    module Command
+      class Init < Base
+        def execute
+          options = {}
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant invade init [-f|--force] [-h]"
+            o.separator ""
+            o.on("-f", "--force", "Force creating configuration file.") do |f|
+              options[:force] = f
+            end
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          # Init InVaDE configuration file
+          action(Action.init, {
+            :invade_command_init_force => options[:force]
+          })
+
+          # Success, exit status 0
+          0
+        end
+      end
+    end
+  end
+end

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

@@ -14,6 +14,12 @@ module VagrantPlugins
           @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
           @subcommands = Vagrant::Registry.new
 
+          # INIT COMMAND ("vagrant invade init")
+            @subcommands.register(:init) do
+            require_relative "init"
+            Init
+          end
+
           # VALIDATE COMMAND ("vagrant invade validate")
           @subcommands.register(:validate) do
             require_relative "validate"

data/lib/vagrant-invade/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Invade
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-invade
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Lennart Stein
@@ -33,6 +33,7 @@ files:
 - lib/vagrant-invade/action/config.rb
 - lib/vagrant-invade/action/create.rb
 - lib/vagrant-invade/action/generate.rb
+- lib/vagrant-invade/action/init.rb
 - lib/vagrant-invade/action/validate.rb
 - lib/vagrant-invade/builder.rb
 - lib/vagrant-invade/builder/definition.rb
@@ -54,6 +55,7 @@ files:
 - lib/vagrant-invade/builder/vm.rb
 - lib/vagrant-invade/command/base.rb
 - lib/vagrant-invade/command/build.rb
+- lib/vagrant-invade/command/init.rb
 - lib/vagrant-invade/command/root.rb
 - lib/vagrant-invade/command/validate.rb
 - lib/vagrant-invade/generator.rb