vagrant-managed-servers 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4053a0343379e7e40a9e80a0e9ec9cceb26fc50
-  data.tar.gz: 6237484b9a9618bb9bb36f88f5d132c3787b6af3
+  metadata.gz: 9bcb3b23240b46d355b5b2cf1c4ec8c6b8d3835a
+  data.tar.gz: cc618c2e2f2ba4639a9736997b5cddc6a1271ac3
 SHA512:
-  metadata.gz: 9fade113ac4c6c2ca9d3bbacdebc5c1181d5a4ca3dce9591a1330ffe5dc338dc07086738d93b9fb8fcf3872eb31157ba76ef565130e85cba6c52b7190eb3af31
-  data.tar.gz: 3f4e50f96c0cd21cafaa8af43a35ae582daa6d064e5f74fb35a1cc40058212018e32da300437deac49f2344f460d92a8d808c03f9723dcec79db8eeec49b2922
+  metadata.gz: 50427cdd98b0afc5f39bb17cedc8d679bb0ebf50e11c8fd28bdbf9e360fd8ecc4f1d18837047d80db4dba2f8b95675b4933945d5e562a927870489b21eae17f6
+  data.tar.gz: 3b332208c37d114be59daa43114201eae97faeaa4b8176109b7b423982d6a52995c1366285f85e869cb8df71d3ce909fd902391b9c14c3371ce9d50d3c3173d0

data/.travis.yml

@@ -1,5 +1,11 @@
 language: ruby
+
 rvm:
-  - 2.0.0
+  - 2.2.5
+
+before_install:
+  - rvm @global do gem uninstall bundler --executables
+  - gem install bundler --version '1.12.5'
+
 script:
-  - bundle exec rake spec
+  - bundle exec rake spec

data/CHANGELOG.md

@@ -1,9 +1,20 @@
 
-# Changelog
+# CHANGELOG
+
+## 0.8.0 (released 2016-11-04)
+
+* add Vagrant 1.8.5 compatibility and fix TravisCI build (see [#64](https://github.com/tknerr/vagrant-managed-servers/pull/64))
+* decouple from [vagrant-winrm-syncedfolders](https://github.com/Cimpress-MCP/vagrant-winrm-syncedfolders), which now needs to be installed separately (see [#65](https://github.com/tknerr/vagrant-managed-servers/pull/65), which reverts [#51](https://github.com/tknerr/vagrant-managed-servers/pull/51) and applies [#50](https://github.com/tknerr/vagrant-managed-servers/pull/50). thanks @chrisbaldauf!)
+* ensure rsync does not keep stale files by adding the `--del` option (see [#61](https://github.com/tknerr/vagrant-managed-servers/issues/61), thanks @stephencooke!)
+* add support for `vagrant share` command (see [#67](https://github.com/tknerr/vagrant-managed-servers/pull/67), thanks @nigelgbanks!)
+* using the vagrant builtin SyncedFolder implementation (see [#68](https://github.com/tknerr/vagrant-managed-servers/pull/68)), which also fixes:
+   * [#17](https://github.com/tknerr/vagrant-managed-servers/pull/17) Reuse Rsync Action from Vagrant Core
+   * [#24](https://github.com/tknerr/vagrant-managed-servers/pull/24) rsync__exclude does not work
+   * [#52](https://github.com/tknerr/vagrant-managed-servers/pull/52) vagrant rsync and vagrant rsync-auto not working
 
 ## 0.7.1 (released 2015-05-22)
 
-* fix bug where the vagrant-winrm-syncedfolders plugin dependency is not properly loaded (see [#49](https://github.com/tknerr/vagrant-managed-servers/issues/49), thanks @chrisbaldauf for the fix!) 
+* fix bug where the vagrant-winrm-syncedfolders plugin dependency is not properly loaded (see [#49](https://github.com/tknerr/vagrant-managed-servers/issues/49), thanks @chrisbaldauf for the fix!)
 
 ## 0.7.0 (released 2015-05-22)
 

data/Gemfile

@@ -1,17 +1,19 @@
 source "https://rubygems.org"
 
+ruby ">= 2.2.3"
+
 gemspec
 
 group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", ref: "v1.7.2"
+  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", ref: "v1.8.5"
 end
 
 group :plugins do
   gem "vagrant-managed-servers", path: "."
   gem "vagrant-omnibus", "1.4.1"
   gem "vagrant-berkshelf", "4.0.4"
-  gem "vagrant-winrm-syncedfolders"
+  gem "vagrant-winrm-syncedfolders", "0.1.0"
 end

data/README.md

@@ -6,20 +6,19 @@ This is a [Vagrant](http://www.vagrantup.com) 1.6+ plugin that adds a provider f
 
 Since you don't control the lifecycle:
  * `up` and `destroy` are re-interpreted as "linking" / "unlinking" vagrant with a managed server
- * once "linked", the `ssh` and `provision` commands work as expected and `status` shows the managed server as either "running" or "not reachable"
+ * once "linked", the `ssh`, `provision` and `share` commands work as expected, and `status` shows the managed server as either "running" or "not reachable"
  * `reload` will issue a reboot command on the managed server (cross your fingers ;-))
  * `halt`, `suspend` and `resume` are no-ops in this provider
 
 Credits: this provider was initially based on the [vagrant-aws](https://github.com/mitchellh/vagrant-aws) provider with the AWS-specific functionality stripped out.
 
-**NOTE:** This plugin requires Vagrant 1.2+
-
 ## Features
 
 * SSH into managed servers.
 * Provision managed servers with any built-in Vagrant provisioner.
 * Reboot a managed server.
 * Synced folder support.
+* Provide access to a managed server via Vagrant Share.
 
 ## Usage
 
@@ -90,7 +89,7 @@ If you try any of the other VM lifecycle commands like `halt`, `suspend`, `resum
 
 Every provider in Vagrant must introduce a custom box format. This provider introduces a "dummy box" for the `managed` provider which is really nothing more than the required `metadata.json` with the provider name set to "managed".
 
-For Vagrant 1.5+ you can use the [tknerr/managed-server-dummy](https://vagrantcloud.com/tknerr/managed-server-dummy) vagrantcloud box:
+You can use the [tknerr/managed-server-dummy](https://atlas.hashicorp.com/tknerr/boxes/managed-server-dummy) box like that:
 ```ruby
 Vagrant.configure("2") do |config|
   config.vm.box = "tknerr/managed-server-dummy"
@@ -98,15 +97,6 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-For Vagrant < 1.5 you can point to the [dummy.box](https://github.com/tknerr/vagrant-managed-servers/raw/master/dummy.box) URL directly:
-```ruby
-Vagrant.configure("2") do |config|
-  config.vm.box = "managed-server-dummy"
-  config.vm.box_url = "https://github.com/tknerr/vagrant-managed-servers/raw/master/dummy.box"
-  ...
-end
-```
-
 ## Configuration
 
 This provider currently exposes only a single provider-specific configuration option:
@@ -120,7 +110,7 @@ Vagrant.configure("2") do |config|
   # ... other stuff
 
   config.vm.provider :managed do |managed|
-    managed.server = "some-server.org"
+    managed.server = "myserver.mydomain.com"
   end
 end
 ```
@@ -164,7 +154,7 @@ end
 ```
 
 ### Synced Folders (Windows)
-Vagrant Managed Servers will try several different mechanisms to sync folders for Windows guests. In order of priority:
+It is recommended that you install the `vagrant-winrm-syncedfolders` plugin for communicating with Windows guests (`vagrant plugin install vagrant-winrm-syncedfolders`). Once installed, Vagrant Managed Servers will try several different mechanisms to sync folders for Windows guests. In order of priority:
 
 1. [SMB](http://docs.vagrantup.com/v2/synced-folders/smb.html) - requires running from a Windows host, an Administrative console, and Powershell 3 or greater. Note that there is a known [bug](https://github.com/mitchellh/vagrant/issues/3139) which causes the Powershell version check to hang for Powershell 2
 2. [WinRM](https://github.com/cimpress-mcp/vagrant-winrm-syncedfolders) - uses the WinRM communicator and is reliable, but can be slow for large numbers of files.

data/lib/vagrant-managed-servers.rb

@@ -1,7 +1,6 @@
 require "pathname"
 
 require "vagrant-managed-servers/plugin"
-require "vagrant-winrm-syncedfolders/plugin"
 
 module VagrantPlugins
   module ManagedServers

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

@@ -62,15 +62,9 @@ module VagrantPlugins
               end
 
               b3.use Provision
-              if env[:machine].config.vm.communicator == :winrm
-                # Use the builtin vagrant folder sync for Windows target servers.
-                # This gives us SMB folder sharing, which is much faster than the
-                # WinRM uploader for any non-trivial number of files.
-                b3.use Vagrant::Action::Builtin::SyncedFolders
-              else
-                # Vagrant managed servers custom implementation
-                b3.use SyncFolders
-              end
+              b3.use WarnWinRMSyncedFolders
+              b3.use Vagrant::Action::Builtin::SyncedFolderCleanup
+              b3.use Vagrant::Action::Builtin::SyncedFolders
             end
           end
         end
@@ -152,11 +146,11 @@ module VagrantPlugins
       autoload :MessageNotLinked, action_root.join("message_not_linked")
       autoload :MessageAlreadyLinked, action_root.join("message_already_linked")
       autoload :ReadState, action_root.join("read_state")
-      autoload :SyncFolders, action_root.join("sync_folders")
       autoload :WarnNetworks, action_root.join("warn_networks")
       autoload :LinkServer, action_root.join("link_server")
       autoload :UnlinkServer, action_root.join("unlink_server")
       autoload :RebootServer, action_root.join("reboot_server")
+      autoload :WarnWinRMSyncedFolders, action_root.join("warn_winrm_syncedfolders")
     end
   end
 end

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

@@ -0,0 +1,19 @@
+module VagrantPlugins
+  module ManagedServers
+    module Action
+      class WarnWinRMSyncedFolders
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          if env[:machine].config.vm.communicator == :winrm && !Vagrant.has_plugin?("vagrant-winrm-syncedfolders")
+            env[:ui].warn(I18n.t("vagrant_managed_servers.warn_winrm_syncedfolders"))
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module VagrantPlugins
+  module ManagedServers
+    module Cap
+      # Returns guest's IP address that can be used to access the VM from the
+      # host machine.
+      #
+      # @return [String] Guest's IP address
+      def self.public_address(machine)
+        return nil if machine.state.id != :running
+
+        ssh_info = machine.ssh_info
+        return nil if !ssh_info
+        ssh_info[:host]
+      end
+    end
+  end
+end

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

@@ -33,6 +33,11 @@ module VagrantPlugins
         Provider
       end
 
+      provider_capability(:managed, :public_address) do
+        require_relative 'cap'
+        Cap
+      end
+
       # This initializes the internationalization strings.
       def self.setup_i18n
         I18n.load_path << File.expand_path("locales/en.yml", ManagedServers.source_root)

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ManagedServers
-    VERSION = "0.7.1"
+    VERSION = "0.8.0"
   end
 end

data/locales/en.yml

@@ -3,6 +3,10 @@ en:
     warn_networks: |-
       Warning! The ManagedServers provider doesn't support any of the Vagrant
       high-level network configurations (`config.vm.network`). They will be ignored.
+    warn_winrm_syncedfolders: |-
+      Warning! The vagrant-winrm-syncedfolders plugin was not found and
+      is recommended for Windows guests. Install it with
+      `vagrant plugin install vagrant-winrm-syncedfolders`.
     rsync_not_found_warning: |-
       Warning! Folder sync disabled because the rsync binary is missing.
       Make sure rsync is installed and the binary can be found in the PATH.

data/vagrant-managed-servers.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "vagrant-managed-servers"
 
-  s.add_runtime_dependency "vagrant-winrm-syncedfolders"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec-core", "~> 2.14.7"
   s.add_development_dependency "rspec-expectations", "~> 2.14.5"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-managed-servers
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Torben Knerr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: vagrant-winrm-syncedfolders
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,9 +92,10 @@ files:
 - lib/vagrant-managed-servers/action/message_not_reachable.rb
 - lib/vagrant-managed-servers/action/read_state.rb
 - lib/vagrant-managed-servers/action/reboot_server.rb
-- lib/vagrant-managed-servers/action/sync_folders.rb
 - lib/vagrant-managed-servers/action/unlink_server.rb
 - lib/vagrant-managed-servers/action/warn_networks.rb
+- lib/vagrant-managed-servers/action/warn_winrm_syncedfolders.rb
+- lib/vagrant-managed-servers/cap.rb
 - lib/vagrant-managed-servers/config.rb
 - lib/vagrant-managed-servers/errors.rb
 - lib/vagrant-managed-servers/plugin.rb
@@ -138,9 +125,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-managed-servers
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to ssh into and provision managed servers.
 test_files: []
-has_rdoc: 

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

@@ -1,88 +0,0 @@
-require "log4r"
-
-require "vagrant/util/subprocess"
-
-require "vagrant/util/scoped_hash_override"
-
-require "vagrant/util/which"
-
-module VagrantPlugins
-  module ManagedServers
-    module Action
-      # This middleware uses `rsync` to sync the folders over to the
-      # AWS instance.
-      class SyncFolders
-        include Vagrant::Util::ScopedHashOverride
-        include Vagrant::Util::Retryable
-
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_managed_servers::action::sync_folders")
-        end
-
-        def call(env)
-          @app.call(env)
-
-          ssh_info = env[:machine].ssh_info
-
-          env[:machine].config.vm.synced_folders.each do |id, data|
-            data = scoped_hash_override(data, :aws)
-
-            # Ignore disabled shared folders
-            next if data[:disabled]
-
-            hostpath  = File.expand_path(data[:hostpath], env[:root_path])
-            guestpath = data[:guestpath]
-
-            unless Vagrant::Util::Which.which('rsync')
-              env[:ui].warn(I18n.t('vagrant_managed_servers.rsync_not_found_warning'))
-              break
-            end
-
-            # Make sure there is a trailing slash on the host path to
-            # avoid creating an additional directory with rsync
-            hostpath = "#{hostpath}/" if hostpath !~ /\/$/
-
-            # on windows rsync.exe requires cygdrive-style paths
-            if Vagrant::Util::Platform.windows?
-              hostpath = hostpath.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
-            end
-
-            env[:ui].info(I18n.t("vagrant_managed_servers.rsync_folder",
-                                :hostpath => hostpath,
-                                :guestpath => guestpath))
-
-            # Create the guest path
-            env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
-            env[:machine].communicate.sudo(
-              "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
-            ssh_proxy_commands = Array(ssh_info[:proxy_command]).map { |command| "-o ProxyCommand='#{command}' "}.join
-            command = [
-              "rsync", "--verbose", "--archive", "-z",
-              "--exclude", ".vagrant/", "--exclude", "Vagrantfile",
-              "-e", "ssh -l '#{ssh_info[:username]}' -p #{ssh_info[:port]} -o StrictHostKeyChecking=no #{ssh_key_options} #{ssh_proxy_commands}",
-              hostpath,
-              "#{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
-            if Vagrant::Util::Platform.windows?
-              command.insert(1, "--chmod", "ugo=rwX")
-            end
-
-            r = Vagrant::Util::Subprocess.execute(*command)
-            if r.exit_code != 0
-              raise Errors::RsyncError,
-                :guestpath => guestpath,
-                :hostpath => hostpath,
-                :stderr => r.stderr
-            end
-          end
-        end
-      end
-    end
-  end
-end