vagrant-bundlewrap 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0425eb9a9cb559feea955746ed73bf78a9a8a5fd
-  data.tar.gz: fe15190cbb7dcc968f26af40ca477efd3854c0fd
+  metadata.gz: c3e5ba1df7f6d499f781efa407ee469a95f819ec
+  data.tar.gz: d2c9d5a5c06c1bc1dba794ccbf4f06b61ed36125
 SHA512:
-  metadata.gz: 7fdb4736cc92f7875abbc6de34eaaa5a5e6f5f44ad0219909cd69da569fb8b5f2d046da53ae3f61409d7f1be8102dc02c3d2d4e79d31274dc1ccecd39557aaec
-  data.tar.gz: 7c77d0e3d0608b3d6ccf48ef1441e239ec0815ff48aab071713791a7c571b03a686ce373adc3f595dd2a77100b32c6390bbcf737ab5632c108d33d2cec7a7420
+  metadata.gz: 1b0bc5e696ff8e20468fd93a55b15873b9c1f1b876443e7aba7d9e2979ce4b0d4a7a690ba73fc3fe0e01b6480df7e84f2ff799799203c362b8e99d20c7023835
+  data.tar.gz: 7fd00cbf3063511039687a9386b82f1fcf44a86499f7e08f3ee5d1f835d59b29a49df4a8b3540073dbc9e6498cf29bc0964912a78f2dc0b56b6bf67972064b25

data/Gemfile

@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-group :development do
-  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"
-end

data/Rakefile

@@ -1,3 +1,3 @@
-require "bundler/gem_tasks"
+require 'rubygems'
 require 'bundler/setup'
 Bundler::GemHelper.install_tasks

data/lib/vagrant-bundlewrap/bwmanage.rb

@@ -1,43 +1,46 @@
 module VagrantPlugins
-	module BundleWrap
-		class BwManage
+  module BundleWrap
+    class BwManage
 
-			def initialize(repo_path)
-				@repo_path = repo_path
-			end
+      def initialize(repo_path)
+        @repo_path = repo_path
+      end
 
-			def bw_cli(params, ret_stdout=true)
-				params = params.gsub(/[^a-zA-Z0-9\-\_\.\s]/,'')
-				old_path = Dir.pwd
-				Dir.chdir(@repo_path)
-				if ret_stdout
-					result = `bw #{params}`
-				else
-					result = system("bw #{params}")
-				end
-				Dir.chdir(old_path)
-				return result
-			end
+      def bw_cli(params, ret_stdout=true)
+        params = params.gsub(/[^a-zA-Z0-9\-\_\.\s]/,'')
+        old_path = Dir.pwd
+        Dir.chdir(@repo_path)
+        if ret_stdout
+          result = `bw #{params}`
+        else
+          result = system("bw #{params}")
+        end
+        Dir.chdir(old_path)
+        return result
+      end
 
-			def nodes()
-				nodes = bw_cli("nodes")
-				return nodes.split("\n")
-			end
+      def nodes()
+        nodes = bw_cli("nodes")
+        return nodes.split("\n")
+      end
 
-			def node_hosts()
-				nodes = bw_cli("nodes --hostname")
-				return nodes.split("\n")
-			end
+      def node_hosts()
+        nodes = bw_cli("nodes --hostname")
+        return nodes.split("\n")
+      end
 
-			def apply(node, interactive=false)
-				node = node.gsub(/[^a-zA-Z0-9\-\_\.]/,'')
-				if interactive
-					return bw_cli("apply #{node} -i", ret_stdout=false)
-				else
-					return bw_cli("apply #{node}", ret_stdout=false)
-				end
-			end
-
-		end
-	end
+      def apply(node, debug=false, interactive=false)
+        node = node.gsub(/[^a-zA-Z0-9\-\_\.]/,'')
+        cmd = "--add-host-keys "
+        if debug
+          cmd = cmd + "--debug "
+        end
+        cmd = cmd + "apply "
+        if interactive
+          cmd = cmd + "--interactive "
+        end
+        return bw_cli(cmd + node, ret_stdout=false)
+      end
+    end
+  end
 end

data/lib/vagrant-bundlewrap/config.rb

@@ -1,46 +1,48 @@
 module VagrantPlugins
-	module BundleWrap
-    	class Config < Vagrant.plugin("2", :config)
-            attr_accessor :repo_path
-    		attr_accessor :node_name
-    		attr_accessor :node_host
-            attr_accessor :interactive
-
-
-    		def initialize
-                @repo_path = UNSET_VALUE
-    			@node_name = UNSET_VALUE
-    			@node_host = UNSET_VALUE
-                @interactive = UNSET_VALUE
-    		end
-
-    		def finalize!
-    			@repo_path = "bundlewrap/" if @repo_path == UNSET_VALUE
-                @node_name = nil if @node_name == UNSET_VALUE
-    			@node_host = nil if @node_host == UNSET_VALUE
-                @interactive = false if @interactive == UNSET_VALUE
-    		end
-
-            def validate(machine)
-                errors = _detected_errors
-
-                unless File.directory?(repo_path) and File.exist?("#{repo_path}/nodes.py") and File.exist?("#{repo_path}/groups.py")
-                    errors << "BundleWrap repository is missing in repo_path='#{repo_path}'.\n" +
-                        "  Create a new one with 'bw repo create'."
-                end
-
-                unless @node_name
-                    errors << "BundleWrap config 'node_name' is not set. Use the node name from your BundleWrap nodes.py."
-                end
-
-                unless @node_host
-                    errors << "BundleWrap config 'node_host' is not set. Use the node host from your BundleWrap nodes.py.\n" +
-                        "  This does not have to be a valid host name (e.g. 'node1.vm'), but it should be a unique one,\n" +
-                        "  because it will be written in your ssh config file."
-                end
-
-                { "vagrant-bundlewrap" => errors }
-              end
-    	end
-	end
-end
+  module BundleWrap
+    class Config < Vagrant.plugin("2", :config)
+      attr_accessor :repo_path
+      attr_accessor :node_name
+      attr_accessor :node_host
+      attr_accessor :debug
+      attr_accessor :interactive
+
+      def initialize
+        @repo_path = UNSET_VALUE
+        @node_name = UNSET_VALUE
+        @node_host = UNSET_VALUE
+        @interactive = UNSET_VALUE
+        @debug = UNSET_VALUE
+      end
+
+      def finalize!
+        @repo_path = "bundlewrap/" if @repo_path == UNSET_VALUE
+        @node_name = nil if @node_name == UNSET_VALUE
+        @node_host = nil if @node_host == UNSET_VALUE
+        @debug = false if @debug == UNSET_VALUE
+        @interactive = false if @interactive == UNSET_VALUE
+      end
+
+      def validate(machine)
+        errors = _detected_errors
+
+        unless File.directory?(repo_path) and File.exist?("#{repo_path}/nodes.py") and File.exist?("#{repo_path}/groups.py")
+            errors << "BundleWrap repository is missing in repo_path='#{repo_path}'.\n" +
+                "  Create a new one with 'bw repo create'."
+        end
+
+        unless @node_name
+            errors << "BundleWrap config 'node_name' is not set. Use the node name from your BundleWrap nodes.py."
+        end
+
+        unless @node_host
+            errors << "BundleWrap config 'node_host' is not set. Use the node host from your BundleWrap nodes.py.\n" +
+                "  This does not have to be a valid host name (e.g. 'node1.vm'), but it should be a unique one,\n" +
+                "  because it will be written in your ssh config file."
+        end
+
+        { "vagrant-bundlewrap" => errors }
+      end
+    end
+  end
+end

data/lib/vagrant-bundlewrap/plugin.rb

@@ -1,19 +1,19 @@
 require "vagrant"
 
 module VagrantPlugins
-	module BundleWrap
-		class Plugin < Vagrant.plugin("2")
-  			name "vagrant-bundlewrap"
+  module BundleWrap
+    class Plugin < Vagrant.plugin("2")
+      name "vagrant-bundlewrap"
 
-			config(:bundlewrap, :provisioner) do
-				require_relative "config"
-				Config
-			end
+      config(:bundlewrap, :provisioner) do
+        require_relative "config"
+        Config
+      end
 
-  			provisioner(:bundlewrap) do
-  				require_relative "provisioner"
-    			Provisioner
-  			end
-  		end
-  	end
+      provisioner(:bundlewrap) do
+        require_relative "provisioner"
+        Provisioner
+      end
+    end
+  end
 end

data/lib/vagrant-bundlewrap/provisioner.rb

@@ -3,30 +3,29 @@ require_relative "bwmanage"
 require_relative "sshconf"
 
 module VagrantPlugins
-	module BundleWrap
-		class Provisioner < Vagrant.plugin("2", :provisioner)
+  module BundleWrap
+    class Provisioner < Vagrant.plugin("2", :provisioner)
 
-			def initialize(machine, config)
-				super(machine, config)
-				@logger = Log4r::Logger.new("vagrant::provisioners::bundlewrap")
-			end
+      def initialize(machine, config)
+        super(machine, config)
+        @logger = Log4r::Logger.new("vagrant::provisioners::bundlewrap")
+      end
 
-			def configure(root_config)
-			end
+      def configure(root_config)
+      end
 
-			def provision
-				ssh = SshConf.new
-				ssh.update(config.node_host, @machine.ssh_info)
-				bw = BwManage.new(config.repo_path)
-				bw.apply(config.node_name, config.interactive)
-			end
+      def provision
+        ssh = SshConf.new
+        ssh.update(config.node_host, @machine.ssh_info)
+        bw = BwManage.new(config.repo_path)
+        bw.apply(config.node_name, config.debug, config.interactive)
+      end
 
-			def cleanup
-				bw = BwManage.new(config.repo_path)
-				ssh = SshConf.new
-				ssh.remove_hosts(bw.node_hosts)
-			end
-
-		end
-	end
-end
+      def cleanup
+        bw = BwManage.new(config.repo_path)
+        ssh = SshConf.new
+        ssh.remove_hosts(bw.node_hosts)
+      end
+    end
+  end
+end

data/lib/vagrant-bundlewrap/sshconf.rb

@@ -1,63 +1,62 @@
 require "ssh-config"
 
 module VagrantPlugins
-	module BundleWrap
-		class SshConf
-
-			def initialize()
-				touch()
-				@ssh_config = ConfigFile.new
-			end
-
-			def touch()
-				unless File.directory?(ENV['HOME'] + "/.ssh")
-  					FileUtils.mkdir_p(ENV['HOME'] + "/.ssh")
-				end
-				FileUtils.touch(ENV['HOME'] + "/.ssh/config")
-			end
-
-			def update(host, ssh_info)
-				@ssh_config.set(host, 'HostName', ssh_info[:host])
-				@ssh_config.set(host, 'Port', ssh_info[:port])
-				@ssh_config.set(host, 'User', ssh_info[:username])
-				
-				ssh_keys = ssh_info[:private_key_path]
-				ssh_keys.each do |ssh_key|
-					@ssh_config.set(host, 'IdentityFile', ssh_key)
-				end
-
-				if ssh_info[:forward_agent]
-					@ssh_config.set(host, 'ForwardAgent', 'yes')
-				end
-
-				if ssh_info[:forward_x11]
-					@ssh_config.set(host, 'ForwardX11', 'yes')
-				end
-
-				if ssh_info[:proxy_command]
-					@ssh_config.set(host, 'ProxyCommand', ssh_info[:proxy_command])
-				end
-
-				@ssh_config.set(host, 'UserKnownHostsFile', '/dev/null')
-				@ssh_config.set(host, 'StrictHostKeyChecking', 'no')
-				@ssh_config.set(host, 'PasswordAuthentication', 'no')
-				@ssh_config.set(host, 'IdentitiesOnly', 'yes')
-				@ssh_config.set(host, 'LogLevel', 'FATAL')
-				
-				@ssh_config.save()
-			end
-
-			def remove_host(host)
-				@ssh_config.rm!(host)
-			end
-
-			def remove_hosts(hosts)
-				hosts.each do |host|
-					@ssh_config.rm(host)
-				end
-				@ssh_config.save()
-			end
-
-		end
-	end
+  module BundleWrap
+    class SshConf
+
+      def initialize()
+        touch()
+        @ssh_config = ConfigFile.new
+      end
+
+      def touch()
+        unless File.directory?(ENV['HOME'] + "/.ssh")
+            FileUtils.mkdir_p(ENV['HOME'] + "/.ssh")
+        end
+        FileUtils.touch(ENV['HOME'] + "/.ssh/config")
+      end
+
+      def update(host, ssh_info)
+        @ssh_config.set(host, 'HostName', ssh_info[:host])
+        @ssh_config.set(host, 'Port', ssh_info[:port])
+        @ssh_config.set(host, 'User', ssh_info[:username])
+
+        ssh_keys = ssh_info[:private_key_path]
+        ssh_keys.each do |ssh_key|
+          @ssh_config.set(host, 'IdentityFile', ssh_key)
+        end
+
+        if ssh_info[:forward_agent]
+          @ssh_config.set(host, 'ForwardAgent', 'yes')
+        end
+
+        if ssh_info[:forward_x11]
+          @ssh_config.set(host, 'ForwardX11', 'yes')
+        end
+
+        if ssh_info[:proxy_command]
+          @ssh_config.set(host, 'ProxyCommand', ssh_info[:proxy_command])
+        end
+
+        @ssh_config.set(host, 'UserKnownHostsFile', '/dev/null')
+        @ssh_config.set(host, 'StrictHostKeyChecking', 'no')
+        @ssh_config.set(host, 'PasswordAuthentication', 'no')
+        @ssh_config.set(host, 'IdentitiesOnly', 'yes')
+        @ssh_config.set(host, 'LogLevel', 'FATAL')
+
+        @ssh_config.save()
+      end
+
+      def remove_host(host)
+        @ssh_config.rm!(host)
+      end
+
+      def remove_hosts(hosts)
+        hosts.each do |host|
+          @ssh_config.rm(host)
+        end
+        @ssh_config.save()
+      end
+    end
+  end
 end

data/lib/vagrant-bundlewrap/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module BundleWrap
-    VERSION = "0.1.5"
+    VERSION = "0.2.0"
   end
 end

data/vagrant-bundlewrap.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_runtime_dependency "ssh-config", "~> 0.1.3"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bundlewrap
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Benjamin Kendinibilir
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement