vagrant-windows 0.1.2 → 1.0.0

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Paul Morton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,41 +20,22 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.1
-- !ruby/object:Gem::Dependency
-  name: vagrant
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Windows Guest Support for Vagrant
@@ -71,42 +50,44 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
-- lib/vagrant-windows/communication/winrm.rb
+- lib/vagrant-windows.rb
+- lib/vagrant-windows/communication/winrmcommunicator.rb
 - lib/vagrant-windows/config/windows.rb
 - lib/vagrant-windows/config/winrm.rb
 - lib/vagrant-windows/errors.rb
 - lib/vagrant-windows/guest/windows.rb
-- lib/vagrant-windows/monkey_patches/driver.rb
-- lib/vagrant-windows/monkey_patches/vm.rb
+- lib/vagrant-windows/monkey_patches/chef_solo.rb
+- lib/vagrant-windows/monkey_patches/machine.rb
+- lib/vagrant-windows/monkey_patches/puppet.rb
+- lib/vagrant-windows/plugin.rb
 - lib/vagrant-windows/scripts/command_alias.ps1
 - lib/vagrant-windows/scripts/mount_volume.ps1.erb
+- lib/vagrant-windows/scripts/ps_runas.ps1.erb
 - lib/vagrant-windows/version.rb
-- lib/vagrant-windows/winrm.rb
-- lib/vagrant_init.rb
+- locales/en.yml
 - vagrant-windows.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A small gem that adds windows guest support to vagrant, uses WinRM as the
   Communication Channel
 test_files: []

data/lib/vagrant-windows/communication/winrm.rb

@@ -1,185 +0,0 @@
-require 'timeout'
-
-require 'log4r'
-#require 'em-winrm'
-require 'winrm'
-require 'highline'
-
-require 'vagrant/util/ansi_escape_code_remover'
-require 'vagrant/util/file_mode'
-require 'vagrant/util/platform'
-require 'vagrant/util/retryable'
-
-module Vagrant
-  module Communication
-    # Provides communication with the VM via WinRM.
-    class WinRM < Base
-
-      include Util::ANSIEscapeCodeRemover
-      include Util::Retryable
-
-      attr_reader :logger
-      attr_reader :vm
-
-      def initialize(vm)
-        @vm     = vm
-        @logger = Log4r::Logger.new("vagrant::communication::winrm")
-        @co = nil
-      end
-
-      def ready?
-        logger.debug("Checking whether WinRM is ready...")
-
-        Timeout.timeout(@vm.config.winrm.timeout) do
-          execute "hostname"
-        end
-
-        # If we reached this point then we successfully connected
-        logger.info("WinRM is ready!")
-        true
-      rescue Timeout::Error, HTTPClient::KeepAliveDisconnected => e
-        #, Errors::SSHConnectionRefused, Net::SSH::Disconnect => e
-        # The above errors represent various reasons that WinRM may not be
-        # ready yet. Return false.
-        logger.info("WinRM not up yet: #{e.inspect}")
-
-        return false
-      end
-
-      # Wrap Sudo in execute.... One day we could integrate with UAC, but Icky
-      def sudo(command, opts=nil, &block)
-        execute(command,opts,&block)
-      end
-      
-      def execute(command, opts=nil, &block)
-
-        # Connect to WinRM, giving it a few tries
-        logger.info("Connecting to WinRM: #{@vm.winrm.info[:host]}:#{@vm.winrm.info[:port]}")
-
-        opts = {
-          :error_check => true,
-          :error_class => Errors::VagrantError,
-          :error_key   => :winrm_bad_exit_status,
-          :command     => command,
-          :sudo        => false,
-          :shell      => :powershell
-        }.merge(opts || {})
-
-        # Connect via WinRM and execute the command in the shell.
-        exceptions = [HTTPClient::KeepAliveDisconnected] 
-        exit_status = retryable(:tries => @vm.config.winrm.max_tries,   :on => exceptions, :sleep => 10) do
-          logger.debug "WinRM Trying to connect"
-          shell_execute(command,opts[:shell], &block)
-        end
-
-        logger.debug("#{command} EXIT STATUS #{exit_status.inspect}")
-
-        # Check for any errors
-        if opts[:error_check] && exit_status != 0
-          # The error classes expect the translation key to be _key,
-          # but that makes for an ugly configuration parameter, so we
-          # set it here from `error_key`
-          error_opts = opts.merge(:_key => opts[:error_key])
-          raise opts[:error_class], error_opts
-        end
-
-        # Return the exit status
-        exit_status
-      end
-
-      def new_session
-        opts = {
-          :user => vm.config.winrm.username,
-          :pass => vm.config.winrm.password,
-          :host => vm.config.winrm.host,
-          :port => vm.winrm.info[:port],
-          :operation_timeout => vm.config.winrm.timeout,
-          :basic_auth_only => true
-        }.merge ({})
-
-        # create a session
-        logger.info("Attempting WinRM session with options: #{opts}")
-        begin
-          endpoint = "http://#{opts[:host]}:#{opts[:port]}/wsman"
-          client = ::WinRM::WinRMWebService.new(endpoint, :plaintext, opts)
-          client.set_timeout(opts[:operation_timeout]) if opts[:operation_timeout]
-        rescue ::WinRM::WinRMAuthorizationError => error
-          raise ::WinRM::WinRMAuthorizationError.new("#{error.message}@#{opts[:host]}")
-        end
-
-        client
-      end
-      
-      def session
-        @session ||= new_session
-      end
-      
-      def h
-        @highline ||= HighLine.new
-      end
-      
-      def print_data(data, color = :green)
-        if data =~ /\n/
-          data.split(/\n/).each { |d| print_data(d, color) }
-        else
-          puts h.color(data.chomp, color)
-        end
-      end
-
-      def upload(from, to)
-        file = "winrm-upload-#{rand()}"
-        file_name = (session.cmd("echo %TEMP%\\#{file}"))[:data][0][:stdout].chomp
-        session.powershell <<-EOH
-          if(Test-Path #{to})
-          {
-            rm #{to}
-          }
-        EOH
-        Base64.encode64(IO.binread(from)).gsub("\n",'').chars.to_a.each_slice(8000-file_name.size) do |chunk|
-          out = session.cmd( "echo #{chunk.join} >> \"#{file_name}\"" )
-        end
-        execute "mkdir [System.IO.Path]::GetDirectoryName(\"#{to}\")"
-        execute <<-EOH
-          $base64_string = Get-Content \"#{file_name}\"
-          $bytes  = [System.Convert]::FromBase64String($base64_string) 
-          $new_file = [System.IO.Path]::GetFullPath(\"#{to}\")
-          [System.IO.File]::WriteAllBytes($new_file,$bytes)
-        EOH
-      end
-
-      protected
-
-      # Executes the command on an SSH connection within a login shell.
-      def shell_execute(command,shell = :powershell)
-        logger.info("Execute: #{command}")
-        exit_status = nil
-
-        if shell.eql? :cmd
-          output = session.cmd(command) do |out,error|
-            print_data(out) if out
-            print_data(error, :red) if error
-          end  
-        elsif shell.eql? :powershell
-          new_command = File.read(File.expand_path("#{File.dirname(__FILE__)}/../scripts/command_alias.ps1"))
-          new_command << "\r\n"
-          new_command << command
-          output = session.powershell(new_command) do |out,error|
-            print_data(out) if out
-            print_data(error, :red) if error
-          end
-        else
-          raise Vagrant::Errors::WinRMInvalidShell, "#{shell} is not a valid type of shell"
-        end
-
-        
-        exit_status = output[:exitcode]
-        logger.debug exit_status.inspect
-
-        # Return the final exit status
-        return exit_status
-      rescue ::WinRM::WinRMHTTPTransportError => e
-          raise Vagrant::Errors::WinRMTimeout, e.message
-      end  
-    end
-  end
-end

data/lib/vagrant-windows/monkey_patches/driver.rb

@@ -1,57 +0,0 @@
-require 'vagrant/driver/virtualbox_base'
-require 'vagrant/driver/virtualbox'
-
-
-module Vagrant
-  module Driver
-
-    class VirtualBox_4_2 < VirtualBoxBase
-      def read_mac_addresses
-        macs = {}
-        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
-        info.split("\n").each do |line|
-          if matcher = /^macaddress(\d+)="(.+?)"$/.match(line)
-            adapter = matcher[1].to_i
-            mac = matcher[2].to_s
-            macs[adapter] = mac
-          end
-        end
-        macs
-      end
-    end
-
-    class VirtualBox_4_1 < VirtualBoxBase
-      def read_mac_addresses
-        macs = {}
-        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
-        info.split("\n").each do |line|
-          if matcher = /^macaddress(\d+)="(.+?)"$/.match(line)
-            adapter = matcher[1].to_i
-            mac = matcher[2].to_s
-            macs[adapter] = mac
-          end
-        end
-        macs
-      end
-    end
-
-    class VirtualBox_4_0 < VirtualBoxBase
-      def read_mac_addresses
-        macs = {}
-        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
-        info.split("\n").each do |line|
-          if matcher = /^macaddress(\d+)="(.+?)"$/.match(line)
-            adapter = matcher[1].to_i
-            mac = matcher[2].to_s
-            macs[adapter] = mac
-          end
-        end
-        macs
-      end
-    end
-
-    class VirtualBox < VirtualBoxBase
-      def_delegator :@driver, :read_mac_addresses
-    end
-  end
-end

data/lib/vagrant-windows/monkey_patches/vm.rb

@@ -1,16 +0,0 @@
-module Vagrant
-  class VM
-    def winrm
-      @winrm ||= WinRM.new(self)
-    end
-
-    def channel
-      if @guest.class.eql? Vagrant::Guest::Windows
-        @channel ||= Communication::WinRM.new(self)
-      else
-        @channel ||= Communication::SSH.new(self)
-      end
-      @channel 
-    end
-  end
-end

data/lib/vagrant-windows/winrm.rb

@@ -1,82 +0,0 @@
-require 'log4r'
-#require 'em-winrm'
-
-module Vagrant
-  # Manages WINRM access to a specific environment. Allows an environment to
-  # run commands, upload files, and check if a host is up.
-  class WinRM
-    include Util::SafeExec
-
-    def initialize(vm)
-      @vm = vm
-      @logger = Log4r::Logger.new("vagrant::winrm")
-    end
-
-    # Returns a hash of information necessary for accessing this
-    # virtual machine via WINRM.
-    #
-    # @return [Hash]
-    def info
-      results = {
-        :host          => @vm.config.winrm.host,
-        :port          => @vm.config.winrm.port || @vm.driver.ssh_port(@vm.config.winrm.guest_port),
-        :username      => @vm.config.winrm.username
-      }
-
-      # This can happen if no port is set and for some reason Vagrant
-      # can't detect an SSH port.
-      raise Errors::WinRMPortNotDetected if !results[:port]
-
-      # Return the results
-      return results
-    end
-
-    # Checks if this environment's machine is up (i.e. responding to WINRM).
-    #
-    # @return [Boolean]
-    def up?
-      # We have to determine the port outside of the block since it uses
-      # API calls which can only be used from the main thread in JRuby on
-      # Windows
-      ssh_port = port
-
-      require 'timeout'
-      Timeout.timeout(@env.config.ssh.timeout) do
-        execute 'hostname'
-      end
-
-      true
-    rescue Timeout::Error, Errno::ECONNREFUSED
-      return false
-    end
-
-    # Returns the port which is either given in the options hash or taken from
-    # the config by finding it in the forwarded ports hash based on the
-    # `config.ssh.forwarded_port_key`.
-    def port(opts={})
-      # Check if port was specified in options hash
-      return opts[:port] if opts[:port]
-
-      # Check if a port was specified in the config
-      return @env.config.winrm.port if @env.config.winrm.port
-
-      # Check if we have an SSH forwarded port
-      pnum_by_name = nil
-      pnum_by_destination = nil
-      @logger.info("Looking for winrm port: #{opts}")
-      @logger.info("Looking for winrm port: #{env.config.winrm.inspect}")
-
-      env.vm.vm.network_adapters.each do |na| 
-        # Look for the port number by destination...
-        pnum_by_destination = na.nat_driver.forwarded_ports.detect do |fp|
-          fp.guestport == env.config.winrm.guest_port
-        end
-      end
-
-      return pnum_by_destination.hostport if pnum_by_destination
-
-      # This should NEVER happen.
-      raise Errors::WinRMPortNotDetected
-    end
-  end
-end

data/lib/vagrant_init.rb

@@ -1,21 +0,0 @@
-#Add Windows Guest Defintion
-require 'vagrant-windows/guest/windows'
-
-#Add Configuration Items
-require 'vagrant-windows/config/windows'
-require 'vagrant-windows/config/winrm'
-
-# Add WinRM Communication Channel
-require 'vagrant-windows/communication/winrm'
-
-#Monkey Patch the VM object to support multiple channels
-require 'vagrant-windows/monkey_patches/vm'
-
-#Monkey Patch the driver to support returning a mapping of mac addresses to nics
-require 'vagrant-windows/monkey_patches/driver'
-
-require 'vagrant-windows/winrm'
-
-#Errors are good
-require 'vagrant-windows/errors'
-