vagrant-adbinfo 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 588d0db71d2a61c13683f51d90d2c518f5bd2063
-  data.tar.gz: 7860a8b536c595971661f7f5fe1c4c2ee832f1ef
+  metadata.gz: cc166e336921f93c13a2f97ea669a3b370021f9b
+  data.tar.gz: 771e12607bf9b39c14bf242e519c217fc11c298a
 SHA512:
-  metadata.gz: dfd0a2c04047353a07da79861cef9b08df003fc04eb425aab74b86f05043d91a23fb6b90225c01ebb8bb9864d4b3d04a97d75dadb8e1ad3c325d0fd4a3883638
-  data.tar.gz: c5c6ccde72ae89c8308afa077de0218d7cf6ad195a90d8bf3ab31e4ca2dcf7aba488466df5f4e261c9156be7f9e968808b414b3f5dfa6a0920099194f6484902
+  metadata.gz: cf2bde35fcecd567abb736389428847f42b1135933982bd83cdf1a5b036dbf4717dced5c82c6a22f511f590a630cffdba4e80022c04a1ed00391728d70919faa
+  data.tar.gz: 144915b2dfcffde6f1ff52be22b10623c68f4033de9d2d9330e7e45047c7c5403bddecb240fe008faba352f7827de0bf82cc4c7a4d91fde540f069aef1164b90

data/lib/command.rb

@@ -24,6 +24,7 @@ module VagrantPlugins
       # Vagrant box password as defined in the Kickstart for the box <https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/build_tools/kickstarts/centos-7-kubernetes-vagrant.ks>
       # On Windows, pscp utility is used to copy the client side certs on the host, this password is used in the pscp command because the ssh keys can not be used. Details: <https://github.com/bexelbie/vagrant-adbinfo/issues/14>
       @@vagrant_box_password = "vagrant"
+
       def self.synopsis
         'provides the IP address:port and tls certificate file location for a docker daemon'
       end
@@ -33,45 +34,68 @@ module VagrantPlugins
           # Path to the private_key and where we will store the TLS Certificates
           secrets_path = machine.data_dir
 
+          hIP = machine.ssh_info[:host]
+          hport = machine.ssh_info[:port]
+          husername = machine.ssh_info[:username]
+	  guest_ip = "127.0.0.1"
+          # Finds the host machine port forwarded from guest docker
+          port = machine.provider.capability(:forwarded_ports).key(2376)
+          
           # First, get the TLS Certificates, if needed
           if !File.directory?(File.expand_path(".docker", secrets_path)) then
-            # Find the ssh information
-            hIP = machine.ssh_info[:host]
-            hport = machine.ssh_info[:port]
-            husername = machine.ssh_info[:username]
-
-	          if !OS.windows? then
+	    if !OS.windows? then
               hprivate_key_path = machine.ssh_info[:private_key_path][0]
               # scp over the client side certs from guest to host machine
               `scp -r -P #{hport} -o LogLevel=FATAL -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i #{hprivate_key_path} #{husername}@#{hIP}:/home/vagrant/.docker #{secrets_path}`
-              # extending the .docker path to include         
-              secrets_path = File.expand_path(".docker", secrets_path)
             else
               `pscp -r -P #{hport} -pw #@@vagrant_box_password -p #{husername}@#{hIP}:/home/vagrant/.docker #{secrets_path}`
-              # extending the .docker path to include         
-              secrets_path = File.expand_path(".docker", secrets_path)
-              secrets_path = secrets_path.split('/').join('\\') + '\\'
             end
           end
+         
+         # display the information, irrespective of the copy operation
+         print_info(guest_ip, port, secrets_path, machine.index_uuid)
+        end
+      end
+    end
+  end
+end
 
-          # Finds the host machine port forwarded from guest docker
-           port = machine.provider.capability(:forwarded_ports).key(2376)
-	         guest_ip = "127.0.0.1"
 
-           # Print configuration information for accesing the docker daemon
-           message =
-                <<-eos
-Set the following environment variables to enable access to the
-docker daemon running inside of the vagrant virtual machine:
+def print_info(guest_ip, port, secrets_path, machine_uuid)
+  # Print configuration information for accesing the docker daemon
+  
+  # extending the .docker path to include         
+  secrets_path = File.expand_path(".docker", secrets_path)
+
+  if !OS.windows? then
+    message =
+    <<-eos
+# Set the following environment variables to enable access to the
+# docker daemon running inside of the vagrant virtual machine:
 
 export DOCKER_HOST=tcp://#{guest_ip}:#{port}
 export DOCKER_CERT_PATH=#{secrets_path}
 export DOCKER_TLS_VERIFY=1
-export DOCKER_MACHINE_NAME=#{machine.index_uuid[0..6]}
-                eos
-          @env.ui.info(puts(message))
-        end
-      end
-    end
-  end
+export DOCKER_MACHINE_NAME=#{machine_uuid[0..6]}
+
+# run following command to configure your shell:
+# eval "$(vagrant adb-info)"
+    eos
+    @env.ui.info(message)
+  else
+    # replace / with \ for path in Windows
+    secrets_path = secrets_path.split('/').join('\\') + '\\'
+    message =
+    <<-eos
+# Set the following environment variables to enable access to the
+# docker daemon running inside of the vagrant virtual machine:
+
+setx DOCKER_HOST tcp://#{guest_ip}:#{port}
+setx DOCKER_CERT_PATH #{secrets_path}
+setx DOCKER_TLS_VERIFY 1
+setx DOCKER_MACHINE_NAME #{machine_uuid[0..6]}
+    eos
+    # puts is used here to escape and render the back slashes in Windows path
+    @env.ui.info(puts(message))
+  end 
 end

data/vagrant-adbinfo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'vagrant-adbinfo'
-  spec.version       = '0.0.4'
+  spec.version       = '0.0.5'
   spec.homepage      = 'https://github.com/bexelbie/vagrant-adbinfo'
   spec.summary       = 'Vagrant plugin that provides the IP address:port and tls certificate file location for a docker daemon'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-adbinfo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Brian Exelbierd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler