vagrant-managed-servers 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14f7566ccb9f36363dd30feae7caaeefe36db5a7
-  data.tar.gz: ec76f1b2835abe0d17617fd6e76f89e6d9f398ba
+  metadata.gz: 9ff5143d58f5a2edcfa03ca916fbf19b8b72bb18
+  data.tar.gz: 3d508541cf6cd3655ec1cf3da30f0a2efbd26903
 SHA512:
-  metadata.gz: f96cc8598d543ca2c2302f6fd8c6417735d409bd78667258ad21edb6607a864b773134de4c68d68bc5b1f6484b6d8905c68aa73426e4498fba4ad6cc513a9485
-  data.tar.gz: ab80499991a333bed8376397d2aee99183b9162b713d06f9ab5bf7b1e8b160b6fb04b121ee85f469829b6db94bcadeda79526bfc22fafe4730b1e241a586bc88
+  metadata.gz: d2c9f39d7a21a9a3c6756ba567f29dfc1b8c7ff2362af1e9318da099376fb63092b454f6e6a49223ab73a1eaeaf6cb29753920f9e8f97f935008c6960ad5277b
+  data.tar.gz: 1fab8e603951b1fb3c2459895142f1ab20793b5dd7fc2b4d9baa6cdf1e3704ae61cfdbae7af569fc8a1666f005b6c71c1e9f1a8030acc125370794b9269453dc

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 
 # Changelog
 
+## 0.6.1 (released 2015-04-02)
+
+* quote ssh usernames to support active directory style `domain/user` logins ([#38](https://github.com/tknerr/vagrant-managed-servers/issues/38), thanks @chrisbaldauf!)
+* document / validate vagrant 1.6+ compatibility which is required for winrm ([#40](https://github.com/tknerr/vagrant-managed-servers/issues/40), thanks @LiamK for reporting!)
+
 ## 0.6.0 (released 2015-03-16)
 
 * add missing translation for `vagrant status` ([#35](https://github.com/tknerr/vagrant-managed-servers/issues/35), thanks @warrenseine for reporting!)

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/tknerr/vagrant-managed-servers.png?branch=master)](https://travis-ci.org/tknerr/vagrant-managed-servers)
 
-This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds a provider for "managed servers" to Vagrant, i.e. servers for which you have SSH access but no control over their lifecycle.
+This is a [Vagrant](http://www.vagrantup.com) 1.6+ plugin that adds a provider for "managed servers" to Vagrant, i.e. servers for which you have SSH access but no control over their lifecycle.
 
 Since you don't control the lifecycle:
  * `up` and `destroy` are re-interpreted as "linking" / "unlinking" vagrant with a managed server

data/lib/vagrant-managed-servers/action/sync_folders.rb

@@ -65,7 +65,7 @@ module VagrantPlugins
             # Create the guest path
             env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
             env[:machine].communicate.sudo(
-              "chown -R #{ssh_info[:username]} '#{guestpath}'")
+              "chown -R '#{ssh_info[:username]}' '#{guestpath}'")
 
             # Rsync over to the guest path using the SSH info
             ssh_key_options = Array(ssh_info[:private_key_path]).map { |path| "-i '#{path}' " }.join
@@ -73,9 +73,9 @@ module VagrantPlugins
             command = [
               "rsync", "--verbose", "--archive", "-z",
               "--exclude", ".vagrant/", "--exclude", "Vagrantfile",
-              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no #{ssh_key_options} #{ssh_proxy_commands}",
+              "-e", "ssh -l '#{ssh_info[:username]}' -p #{ssh_info[:port]} -o StrictHostKeyChecking=no #{ssh_key_options} #{ssh_proxy_commands}",
               hostpath,
-              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
+              "#{ssh_info[:host]}:#{guestpath}"]
 
             # we need to fix permissions when using rsync.exe on windows, see
             # http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions

data/lib/vagrant-managed-servers/plugin.rb

@@ -1,72 +1,72 @@
-begin
-  require "vagrant"
-rescue LoadError
-  raise "The Vagrant ManagedServers plugin must be run within Vagrant."
-end
-
-# This is a sanity check to make sure no one is attempting to install
-# this into an early Vagrant version.
-if Vagrant::VERSION < "1.2.0"
-  raise "The Vagrant ManagedServers plugin is only compatible with Vagrant 1.2+"
-end
-
-module VagrantPlugins
-  module ManagedServers
-    class Plugin < Vagrant.plugin("2")
-      name "ManagedServers"
-      description <<-DESC
-      This plugin installs a provider that allows Vagrant to interact with managed servers.
-      DESC
-
-      config(:managed, :provider) do
-        require_relative "config"
-        Config
-      end
-
-      provider(:managed, parallel: true) do
-        # Setup logging and i18n
-        setup_logging
-        setup_i18n
-
-        # Return the provider
-        require_relative "provider"
-        Provider
-      end
-
-      # This initializes the internationalization strings.
-      def self.setup_i18n
-        I18n.load_path << File.expand_path("locales/en.yml", ManagedServers.source_root)
-        I18n.reload!
-      end
-
-      # This sets up our log level to be whatever VAGRANT_LOG is.
-      def self.setup_logging
-        require "log4r"
-
-        level = nil
-        begin
-          level = Log4r.const_get(ENV["VAGRANT_LOG"].upcase)
-        rescue NameError
-          # This means that the logging constant wasn't found,
-          # which is fine. We just keep `level` as `nil`. But
-          # we tell the user.
-          level = nil
-        end
-
-        # Some constants, such as "true" resolve to booleans, so the
-        # above error checking doesn't catch it. This will check to make
-        # sure that the log level is an integer, as Log4r requires.
-        level = nil if !level.is_a?(Integer)
-
-        # Set the logging level on all "vagrant" namespaced
-        # logs as long as we have a valid level.
-        if level
-          logger = Log4r::Logger.new("vagrant_managed_servers")
-          logger.outputters = Log4r::Outputter.stderr
-          logger.level = level
-          logger = nil
-        end
-      end
-    end
-  end
-end
+begin
+  require "vagrant"
+rescue LoadError
+  raise "The Vagrant ManagedServers plugin must be run within Vagrant."
+end
+
+# This is a sanity check to make sure no one is attempting to install
+# this into an early Vagrant version.
+if Vagrant::VERSION < "1.6.0"
+  raise "The Vagrant ManagedServers plugin is only compatible with Vagrant 1.6+"
+end
+
+module VagrantPlugins
+  module ManagedServers
+    class Plugin < Vagrant.plugin("2")
+      name "ManagedServers"
+      description <<-DESC
+      This plugin installs a provider that allows Vagrant to interact with managed servers.
+      DESC
+
+      config(:managed, :provider) do
+        require_relative "config"
+        Config
+      end
+
+      provider(:managed, parallel: true) do
+        # Setup logging and i18n
+        setup_logging
+        setup_i18n
+
+        # Return the provider
+        require_relative "provider"
+        Provider
+      end
+
+      # This initializes the internationalization strings.
+      def self.setup_i18n
+        I18n.load_path << File.expand_path("locales/en.yml", ManagedServers.source_root)
+        I18n.reload!
+      end
+
+      # This sets up our log level to be whatever VAGRANT_LOG is.
+      def self.setup_logging
+        require "log4r"
+
+        level = nil
+        begin
+          level = Log4r.const_get(ENV["VAGRANT_LOG"].upcase)
+        rescue NameError
+          # This means that the logging constant wasn't found,
+          # which is fine. We just keep `level` as `nil`. But
+          # we tell the user.
+          level = nil
+        end
+
+        # Some constants, such as "true" resolve to booleans, so the
+        # above error checking doesn't catch it. This will check to make
+        # sure that the log level is an integer, as Log4r requires.
+        level = nil if !level.is_a?(Integer)
+
+        # Set the logging level on all "vagrant" namespaced
+        # logs as long as we have a valid level.
+        if level
+          logger = Log4r::Logger.new("vagrant_managed_servers")
+          logger.outputters = Log4r::Outputter.stderr
+          logger.level = level
+          logger = nil
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-managed-servers/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ManagedServers
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-managed-servers
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Torben Knerr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake