landrush-ip 0.2.1 → 0.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTJjMDkwMWVkMTQyMzJmNWQwOTBjMGJlYmE2MmJkZjk3NjNiODYyOA==
+    OTRkYWM4YjI0NmRlYzhhNTE0NjU1NmZlZDM0ODM5NGIxMDFlYTIyYQ==
   data.tar.gz: !binary |-
-    NTU1ZDY2ODFjYTAyYzEzYmJlMGJiOGYxZmUyYmYwMDlmZTVkNTQ2MA==
+    YjJkYzdhNTJiZTgxNmQxZjg0NjcxOGUwYTJmN2ExMzYyM2Y5Y2I5ZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTg4OTdiZmVhNmRlMTE4NTk2OGJiODY5ODBmN2JhYzI0ZjU2NDJiODY0YzRh
-    YTdhZWIwM2Q3YjBhN2Y0OGE4ZDI5YWJjMDM0MzViYzU5N2VhNzNjODgxZGM5
-    ZTc5NzY0NmYzYzM1ODljMjllM2UwMjkwMmNiNTI0YjMwYmFmY2M=
+    MzIyNGUyZmUwMDJiMTQ2YTliMDE1YmQyOTJlZjBjOGUyMGI5YzNlZDVkNWQ0
+    MDgyMDE3NGI0ZjQwMWQ3ODZlNTFhZmNkOTM3NmY1YTAzMGM1ZWFmN2NiNGJj
+    MDMwYzYyNzQzNWY3Nzk3ZDdlZmRhMGVkZWMyMjAyZDkwODkxYTU=
   data.tar.gz: !binary |-
-    ZWU4MWM1ZTk1NjYxNzllZjc3YWNkZjg3MjcxYmZjODAwNGY4MzU4MGU2ODQ0
-    Zjc2MmFkMmJmNTkwM2Y5Yjg4M2YyYzRhNzY1YmFkMTIyNjYzZjgyZDMyYzVm
-    YWIzNjdiMjg3N2E2NzllZDJjMjZhNWRkOWMyNDQxNTI3YTliMzI=
+    NTVlZjRmMmU4YWVlZTE3NTg4OTZmZjE1YjBhY2I1YjhkMDMyOGUxMTI0ZGMz
+    YzVjZWE4ODE0YzhiMmE0ZDk0ODRhYmEzMzQzMzM1M2NmZjRjNWMzZjQ0ZDY1
+    YmU0ZDhmMDFkZDYwMTU1YmY3MTM5MTA2NTdhZDQxYTdjZjFiODI=

data/lib/landrush-ip/cap/linux.rb

@@ -0,0 +1,9 @@
+module LandrushIp
+  module Cap
+    module Linux
+      def self.binary_path
+        '/usr/local/bin/landrush-ip'
+      end
+    end
+  end
+end

data/lib/landrush-ip/cap/linux/landrush_ip_get.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'landrush-ip/cap/linux'
 
 module LandrushIp
   module Cap
@@ -14,7 +15,7 @@ module LandrushIp
         end
 
         def self.command
-          '/usr/local/bin/landrush-ip -yaml'
+          "#{LandrushIp::Cap::Linux.binary_path} -yaml"
         end
       end
     end

data/lib/landrush-ip/cap/linux/landrush_ip_install.rb

@@ -1,3 +1,5 @@
+require 'landrush-ip/cap/linux'
+
 module LandrushIp
   module Cap
     module Linux
@@ -23,12 +25,11 @@ module LandrushIp
           binary = determine_binary result
 
           machine.communicate.tap do |comm|
-            guest_path = '/usr/local/bin/landrush-ip'
             host_path  = File.expand_path("util/dist/#{binary}", LandrushIp.source_root)
 
             comm.upload(host_path, '/tmp/landrush-ip')
-            comm.sudo("mv /tmp/landrush-ip #{guest_path}")
-            comm.sudo("chmod +x #{guest_path}", error_check: false)
+            comm.sudo("mv /tmp/landrush-ip #{LandrushIp::Cap::Linux.binary_path}")
+            comm.sudo("chmod +x #{LandrushIp::Cap::Linux.binary_path}", error_check: false)
           end
         end
       end

data/lib/landrush-ip/cap/linux/landrush_ip_installed.rb

@@ -1,4 +1,5 @@
 require 'landrush-ip/version'
+require 'landrush-ip/cap/linux'
 
 module LandrushIp
   module Cap
@@ -14,7 +15,7 @@ module LandrushIp
         end
 
         def self.command
-          '/usr/local/bin/landrush-ip -v || echo 0'
+          "#{LandrushIp::Cap::Linux.binary_path} -v || echo 0"
         end
       end
     end

data/lib/landrush-ip/cap/windows.rb

@@ -0,0 +1,9 @@
+module LandrushIp
+  module Cap
+    module Windows
+      def self.binary_path
+        'C:\\landrush-ip.exe'
+      end
+    end
+  end
+end

data/lib/landrush-ip/cap/windows/landrush_ip_get.rb

@@ -0,0 +1,23 @@
+require 'yaml'
+require 'landrush-ip/cap/windows'
+
+module LandrushIp
+  module Cap
+    module Windows
+      module LandrushIpGet
+        def self.landrush_ip_get(machine)
+          result = ''
+          machine.communicate.execute(command) do |type, data|
+            result << data if type == :stdout
+          end
+
+          YAML.load(result)
+        end
+
+        def self.command
+          "#{LandrushIp::Cap::Windows.binary_path} -yaml"
+        end
+      end
+    end
+  end
+end

data/lib/landrush-ip/cap/windows/landrush_ip_install.rb

@@ -0,0 +1,47 @@
+require 'landrush-ip/cap/windows'
+
+module LandrushIp
+  module Cap
+    module Windows
+      module LandrushIpInstall
+        def self.determine_binary(uname)
+          if uname =~ /(x64)/i
+            'landrush-ip-windows_amd64.exe'
+          elsif result =~ /(x86)/i
+            'landrush-ip-windows_386.exe'
+          else
+            raise LandrushIp::Error, :unsupported_arch
+          end
+        end
+
+        def self.landrush_ip_install(machine)
+          result = ''
+          machine.communicate.execute(command) do |type, data|
+            result << data if type == :stdout
+          end
+
+          binary = determine_binary result
+
+          machine.communicate.tap do |comm|
+            host_path = File.expand_path("util/dist/#{binary}", LandrushIp.source_root)
+
+            comm.upload(host_path, LandrushIp::Cap::Windows.binary_path)
+          end
+        end
+
+        def self.command
+          <<-CMD
+            $Arch = "x64"
+            if ("%PROCESSOR_ARCHITECTURE%" -eq "x86") {
+              if (not defined PROCESSOR_ARCHITEW6432) {
+                $Arch = "x86"
+              }
+            }
+            Write-Host $Arch
+            exit 0
+          CMD
+        end
+      end
+    end
+  end
+end

data/lib/landrush-ip/cap/windows/landrush_ip_installed.rb

@@ -0,0 +1,33 @@
+require 'landrush-ip/version'
+require 'landrush-ip/cap/windows'
+
+module LandrushIp
+  module Cap
+    module Windows
+      module LandrushIpInstalled
+        def self.landrush_ip_installed(machine)
+          result = ''
+          machine.communicate.execute(command) do |type, data|
+            result << data if type == :stdout
+          end
+
+          result.strip! == LandrushIp::VERSION
+        end
+
+        def self.command
+          <<-CMD
+            try {
+              if(Get-Command #{LandrushIp::Cap::Windows.binary_path}){
+                #{LandrushIp::Cap::Windows.binary_path} -v
+                exit 0
+              }
+            } Catch {
+              Write-Host "0"
+              exit 0
+            }
+          CMD
+        end
+      end
+    end
+  end
+end

data/lib/landrush-ip/plugin.rb

@@ -27,11 +27,40 @@ module LandrushIp
       Cap::Linux::LandrushIpGet
     end
 
+    guest_capability('windows', 'landrush_ip_installed') do
+      require 'landrush-ip/cap/windows/landrush_ip_installed'
+      Cap::Windows::LandrushIpInstalled
+    end
+
+    guest_capability('windows', 'landrush_ip_install') do
+      require 'landrush-ip/cap/windows/landrush_ip_install'
+      Cap::Windows::LandrushIpInstall
+    end
+
+    guest_capability('windows', 'landrush_ip_get') do
+      require 'landrush-ip/cap/windows/landrush_ip_get'
+      Cap::Windows::LandrushIpGet
+    end
+
     require 'landrush-ip/action/install'
 
     %w(up reload).each do |action|
       action_hook(:landrush_ip, "machine_action_#{action}".to_sym) do |hook|
-        hook.before(Landrush::Action::RedirectDns, Action::Install, :provision)
+        if defined?(VagrantPlugins::ProviderVirtualBox)
+          hook.before(VagrantPlugins::ProviderVirtualBox::Action::Network, Action::Install, :provision)
+        end
+
+        if defined?(VagrantPlugins::ProviderLibvirt)
+          hook.after(VagrantPlugins::ProviderLibvirt::Action::CreateNetworks, Action::Install, :provision)
+        end
+
+        if defined?(HashiCorp::VagrantVMwarefusion)
+          hook.before(HashiCorp::VagrantVMwarefusion::Action::Network, Action::Install, :provision)
+        end
+
+        if defined?(VagrantPlugins::Parallels)
+          hook.before(VagrantPlugins::Parallels::Action::Network, Action::Install, :provision)
+        end
       end
     end
   end

data/lib/landrush-ip/version.rb

@@ -1,3 +1,3 @@
 module LandrushIp
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.3'.freeze
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: landrush-ip
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Paul Werelds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: 
 email:
 - paul@neverbland.com
@@ -36,9 +36,14 @@ files:
 - README.md
 - lib/landrush-ip.rb
 - lib/landrush-ip/action/install.rb
+- lib/landrush-ip/cap/linux.rb
 - lib/landrush-ip/cap/linux/landrush_ip_get.rb
 - lib/landrush-ip/cap/linux/landrush_ip_install.rb
 - lib/landrush-ip/cap/linux/landrush_ip_installed.rb
+- lib/landrush-ip/cap/windows.rb
+- lib/landrush-ip/cap/windows/landrush_ip_get.rb
+- lib/landrush-ip/cap/windows/landrush_ip_install.rb
+- lib/landrush-ip/cap/windows/landrush_ip_installed.rb
 - lib/landrush-ip/config.rb
 - lib/landrush-ip/errors.rb
 - lib/landrush-ip/plugin.rb
@@ -47,6 +52,8 @@ files:
 - util/dist/landrush-ip-linux_386
 - util/dist/landrush-ip-linux_amd64
 - util/dist/landrush-ip-linux_arm
+- util/dist/landrush-ip-windows_386.exe
+- util/dist/landrush-ip-windows_amd64.exe
 homepage: https://github.com/Werelds/landrush-ip
 licenses:
 - MIT