vagrant-managed-servers 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 445f04ad575586e20633baf0ead9e159cec90776
-  data.tar.gz: dd27205055a9462408469606fed28f33e1335ca7
+  metadata.gz: 14f7566ccb9f36363dd30feae7caaeefe36db5a7
+  data.tar.gz: ec76f1b2835abe0d17617fd6e76f89e6d9f398ba
 SHA512:
-  metadata.gz: 377246085b0eeeebc8a9a8731f740742f349b42661f6d6cd180cad5561ca2073def2a986eef0bd2b04b03cec9801f4b862e85e38e6313341345e40108af02239
-  data.tar.gz: ca0ed566920828ed83284144a41cd2b9b9dc601bad82b5b0e110409dd18d7fc87ef3ac87c951b262c054fd112fd48551e5019026f48290bf6944bd98aec9c9fa
+  metadata.gz: f96cc8598d543ca2c2302f6fd8c6417735d409bd78667258ad21edb6607a864b773134de4c68d68bc5b1f6484b6d8905c68aa73426e4498fba4ad6cc513a9485
+  data.tar.gz: ab80499991a333bed8376397d2aee99183b9162b713d06f9ab5bf7b1e8b160b6fb04b121ee85f469829b6db94bcadeda79526bfc22fafe4730b1e241a586bc88

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 
 # Changelog
 
+## 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!)
+* actually check whether a server is linked before doing any other action (fixes [#34](https://github.com/tknerr/vagrant-managed-servers/issues/34), thanks @warrenseine for reporting!)
+* fix the annoying network configuration warning so that it's shown only when necessary ([#37](https://github.com/tknerr/vagrant-managed-servers/pull/37))
+
 ## 0.5.1 (released 2015-02-15)
 
 * fix bug where `vagrant help` failed due a leftover command declaration ([#32](https://github.com/tknerr/vagrant-managed-servers/pull/32), thanks @chrisbaldauf for reporting!)

data/Vagrantfile

@@ -1,38 +1,38 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-
-  #
-  # fake a managed server by bringing up a virtualbox vm
-  #
-  config.vm.define :fake_managed_server do |fms_config|
-    fms_config.vm.box = "chef/ubuntu-12.04-i386"
-    fms_config.vm.network :private_network, ip: "192.168.40.35"
-    fms_config.berkshelf.enabled = false
-  end
-
-  #
-  # configure managed provider to connect to `fake_managed_server`
-  #
-  config.vm.define :my_server do |ms_config|
-
-    ms_config.vm.box = "tknerr/managed-server-dummy"
-
-    ms_config.omnibus.chef_version = "12.0.3"
-    ms_config.berkshelf.enabled = true
-  
-    ms_config.vm.provider :managed do |managed_config, override|
-      managed_config.server = "192.168.40.35"
-      override.ssh.username = "vagrant"
-      override.ssh.private_key_path = ".vagrant/machines/fake_managed_server/virtualbox/private_key"
-    end
-
-    ms_config.vm.provision :chef_solo do |chef|
-      chef.cookbooks_path = [ './cookbooks' ]
-      chef.add_recipe "apt"
-      chef.add_recipe "apache2"
-    end
-  end
-
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+
+  #
+  # fake a managed server by bringing up a virtualbox vm
+  #
+  config.vm.define :fake_managed_server do |fms_config|
+    fms_config.vm.box = "chef/ubuntu-12.04-i386"
+    fms_config.vm.network :private_network, ip: "192.168.40.35"
+    fms_config.berkshelf.enabled = false
+  end
+
+  #
+  # configure managed provider to connect to `fake_managed_server`
+  #
+  config.vm.define :my_server do |ms_config|
+
+    ms_config.vm.box = "tknerr/managed-server-dummy"
+
+    ms_config.omnibus.chef_version = "12.0.3"
+    ms_config.berkshelf.enabled = true
+  
+    ms_config.vm.provider :managed do |managed_config, override|
+      managed_config.server = "192.168.40.35"
+      override.ssh.username = "vagrant"
+      override.ssh.private_key_path = ".vagrant/machines/fake_managed_server/virtualbox/private_key"
+    end
+
+    ms_config.vm.provision :chef_solo do |chef|
+      chef.cookbooks_path = [ './cookbooks' ]
+      chef.add_recipe "apt"
+      chef.add_recipe "apache2"
+    end
+  end
+
+end

data/lib/vagrant-managed-servers/action/{is_created.rb → is_linked.rb}

@@ -2,14 +2,14 @@ module VagrantPlugins
   module ManagedServers
     module Action
       # This can be used with "Call" built-in to check if the machine
-      # is created and branch in the middleware.
-      class IsCreated
+      # is linked and branch in the middleware.
+      class IsLinked
         def initialize(app, env)
           @app = app
         end
 
         def call(env)
-          env[:result] = env[:machine].state.id != :not_created
+          env[:result] = env[:machine].state.id != :not_linked
           @app.call(env)
         end
       end

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

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module ManagedServers
+    module Action
+      class MessageAlreadyLinked
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info(I18n.t("vagrant_managed_servers.states.long_already_linked"))
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module ManagedServers
+    module Action
+      class MessageNotLinked
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info(I18n.t("vagrant_managed_servers.states.long_not_linked"))
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:ui].info(I18n.t("vagrant_managed_servers.host_not_reachable"))
+          env[:ui].info(I18n.t("vagrant_managed_servers.states.long_not_reachable"))
           @app.call(env)
         end
       end

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

@@ -17,7 +17,7 @@ module VagrantPlugins
         end
 
         def read_state(machine)
-          return :not_created if machine.id.nil?
+          return :not_linked if machine.id.nil?
 
           ip_address = machine.id
 =begin

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

@@ -7,12 +7,55 @@ module VagrantPlugins
         end
 
         def call(env)
-          if env[:machine].config.vm.networks.length > 0
+          if custom_networking_defined?(env)
             env[:ui].warn(I18n.t("vagrant_managed_servers.warn_networks"))
           end
 
           @app.call(env)
         end
+
+        def custom_networking_defined?(env)
+          communicator = env[:machine].config.vm.communicator
+          network_configs = env[:machine].config.vm.networks
+          custom_network_configs = (network_configs - default_network_configs(communicator))
+          custom_network_configs.any?
+        end
+
+        #
+        # these are the port forwardings which are always created by default, see:
+        # https://github.com/mitchellh/vagrant/blob/a8dcf92f14/plugins/kernel_v2/config/vm.rb#L393-417
+        #
+        def default_network_configs(communicator)
+          winrm = [:forwarded_port, {
+            guest: 5985,
+            host: 55985,
+            host_ip: "127.0.0.1",
+            id: "winrm",
+            auto_correct: true,
+            protocol: "tcp"
+          }]
+          winrm_ssl = [:forwarded_port, {
+            guest: 5986,
+            host: 55986,
+            host_ip: "127.0.0.1",
+            id: "winrm-ssl",
+            auto_correct: true,
+            protocol: "tcp"
+          }]
+          ssh = [:forwarded_port, {
+            guest: 22,
+            host: 2222,
+            host_ip: "127.0.0.1",
+            id: "ssh",
+            auto_correct: true,
+            protocol: "tcp"
+          }]
+          if communicator == :winrm
+            [ winrm, winrm_ssl ]
+          else
+            [ ssh ]
+          end
+        end
       end
     end
   end

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

@@ -1,124 +1,169 @@
-require "pathname"
-
-require "vagrant/action/builder"
-
-module VagrantPlugins
-  module ManagedServers
-    module Action
-      # Include the built-in modules so we can use them as top-level things.
-      include Vagrant::Action::Builtin
-
-      # This action is called to establish linkage between vagrant and the managed server
-      def self.action_up
-        Vagrant::Action::Builder.new.tap do |b|
-          if Vagrant::VERSION < '1.5.0'
-            b.use HandleBoxUrl
-          else
-            b.use HandleBox
-          end
-          b.use ConfigValidate
-          b.use WarnNetworks
-          b.use LinkServer
-=begin
-          b.use HandleBoxUrl
-          b.use ConfigValidate
-          b.use Call, IsReachable do |env, b2|
-            if env[:result]
-              b2.use !MessageNotReachable
-              next
-            end
-
-            b2.use Provision
-            b2.use SyncFolders
-            b2.use WarnNetworks
-            b2.use LinkServer
-          end
-=end
-        end
-      end
-
-      # This action is called to "unlink" vagrant from the managed server
-      def self.action_destroy
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use UnlinkServer
-        end
-      end
-
-      # This action is called when `vagrant provision` is called.
-      def self.action_provision
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use WarnNetworks
-          b.use Call, IsReachable do |env, b2|
-            if !env[:result]
-              b2.use MessageNotReachable
-              next
-            end
-
-            b2.use Provision
-            b2.use SyncFolders
-          end
-        end
-      end
-
-      # This action is called to read the state of the machine. The
-      # resulting state is expected to be put into the `:machine_state_id`
-      # key.
-      def self.action_read_state
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use ReadState
-        end
-      end
-
-      # This action is called to SSH into the machine.
-      def self.action_ssh
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use WarnNetworks
-          b.use Call, IsReachable do |env, b2|
-            if !env[:result]
-              b2.use MessageNotReachable
-              next
-            end
-
-            b2.use SSHExec
-          end
-        end
-      end
-
-      def self.action_ssh_run
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use WarnNetworks
-          b.use Call, IsReachable do |env, b2|
-            if !env[:result]
-              b2.use MessageNotReachable
-              next
-            end
-
-            b2.use SSHRun
-          end
-        end
-      end
-
-      def self.action_reload
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use RebootServer
-        end
-      end
-
-      # The autoload farm
-      action_root = Pathname.new(File.expand_path("../action", __FILE__))
-      autoload :IsReachable, action_root.join("is_reachable")
-      autoload :MessageNotReachable, action_root.join("message_not_reachable")
-      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")
-    end
-  end
-end
+require "pathname"
+
+require "vagrant/action/builder"
+
+module VagrantPlugins
+  module ManagedServers
+    module Action
+      # Include the built-in modules so we can use them as top-level things.
+      include Vagrant::Action::Builtin
+
+      # This action is called to establish linkage between vagrant and the managed server
+      def self.action_up
+        Vagrant::Action::Builder.new.tap do |b|
+          if Vagrant::VERSION < '1.5.0'
+            b.use HandleBoxUrl
+          else
+            b.use HandleBox
+          end
+          b.use ConfigValidate
+          b.use WarnNetworks
+          b.use Call, IsLinked do |env, b2|
+            if env[:result]
+              b2.use MessageAlreadyLinked
+              next
+            end
+
+            b2.use LinkServer
+          end
+=begin
+          b.use HandleBoxUrl
+          b.use ConfigValidate
+          b.use Call, IsReachable do |env, b2|
+            if env[:result]
+              b2.use !MessageNotReachable
+              next
+            end
+
+            b2.use Provision
+            b2.use SyncFolders
+            b2.use WarnNetworks
+            b2.use LinkServer
+          end
+=end
+        end
+      end
+
+      # This action is called to "unlink" vagrant from the managed server
+      def self.action_destroy
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsLinked do |env, b2|
+            if !env[:result]
+              b2.use MessageNotLinked
+              next
+            end
+
+            b2.use UnlinkServer
+          end
+        end
+      end
+
+      # This action is called when `vagrant provision` is called.
+      def self.action_provision
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use WarnNetworks
+          b.use Call, IsLinked do |env, b2|
+            if !env[:result]
+              b2.use MessageNotLinked
+              next
+            end
+
+            b2.use Call, IsReachable do |env, b3|
+              if !env[:result]
+                b3.use MessageNotReachable
+                next
+              end
+
+              b3.use Provision
+              b3.use SyncFolders
+            end
+          end
+        end
+      end
+
+      # This action is called to read the state of the machine. The
+      # resulting state is expected to be put into the `:machine_state_id`
+      # key.
+      def self.action_read_state
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ReadState
+        end
+      end
+
+      # This action is called to SSH into the machine.
+      def self.action_ssh
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use WarnNetworks
+          b.use Call, IsLinked do |env, b2|
+            if !env[:result]
+              b2.use MessageNotLinked
+              next
+            end
+
+            b2.use Call, IsReachable do |env, b3|
+              if !env[:result]
+                b3.use MessageNotReachable
+                next
+              end
+
+              b3.use SSHExec
+            end
+          end
+        end
+      end
+
+      def self.action_ssh_run
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use WarnNetworks
+          b.use Call, IsLinked do |env, b2|
+            if !env[:result]
+              b2.use MessageNotLinked
+              next
+            end
+
+            b2.use Call, IsReachable do |env, b3|
+              if !env[:result]
+                b3.use MessageNotReachable
+                next
+              end
+
+              b3.use SSHRun
+            end
+          end
+        end
+      end
+
+      def self.action_reload
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use Call, IsLinked do |env, b2|
+            if !env[:result]
+              b2.use MessageNotLinked
+              next
+            end
+
+            b2.use RebootServer
+          end
+        end
+      end
+
+      # The autoload farm
+      action_root = Pathname.new(File.expand_path("../action", __FILE__))
+      autoload :IsLinked, action_root.join("is_linked")
+      autoload :IsReachable, action_root.join("is_reachable")
+      autoload :MessageNotReachable, action_root.join("message_not_reachable")
+      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")
+    end
+  end
+end

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

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

data/locales/en.yml

@@ -1,46 +1,51 @@
-en:
-  vagrant_managed_servers:
-    host_not_reachable: |-
-      The host specified in `config.managed.server` is not reachable.
-    warn_networks: |-
-      Warning! The ManagedServers provider doesn't support any of the Vagrant
-      high-level network configurations (`config.vm.network`). They
-      will be silently ignored.
-    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.
-    rsync_folder: |-
-      Rsyncing folder: %{hostpath} => %{guestpath}
-    winrm_upload: |-
-      Uploading with WinRM: %{hostpath} => %{guestpath}
-    linking_server: |-
-      Linking vagrant with managed server %{host}
-    unlinking_server: |-
-      Unlinking vagrant from managed server %{host}
-    rebooting_server: |-
-      Rebooting managed server %{host}
-    waiting_for_server: |-
-      Waiting for %{host} to reboot
-    states:
-      short_not_reachable: |-
-        not reachable
-      long_not_reachable: |-
-        The managed server is not reachable. Check if the `config.managed.server` is correct.
-      short_running: |-
-        running
-      long_running: |-
-        The managed server is running. To ssh into this machine, you can run
-        `vagrant ssh`. To provision the machine, you can run `vagrant provision`.
-    config:
-      server_required: |-
-        The IP or hostname of the server must be configured via "server"
-      private_key_missing: |-
-        The specified private key could not be found
-    errors:
-      rsync_error: |-
-        There was an error when attemping to rsync a shared folder.
-        Please inspect the error message below for more info.
-
-        Host path: %{hostpath}
-        Guest path: %{guestpath}
-        Error: %{stderr}
+en:
+  vagrant_managed_servers:
+    warn_networks: |-
+      Warning! The ManagedServers provider doesn't support any of the Vagrant
+      high-level network configurations (`config.vm.network`). They will be ignored.
+    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.
+    rsync_folder: |-
+      Rsyncing folder: %{hostpath} => %{guestpath}
+    winrm_upload: |-
+      Uploading with WinRM: %{hostpath} => %{guestpath}
+    linking_server: |-
+      Linking with managed server %{host}
+    unlinking_server: |-
+      Unlinking from managed server %{host}
+    rebooting_server: |-
+      Rebooting managed server %{host}
+    waiting_for_server: |-
+      Waiting for %{host} to reboot
+    states:
+      short_not_linked: |-
+        not linked
+      long_not_linked: |-
+        The managed server is not linked.
+      short_already_linked: |-
+        already linked
+      long_already_linked: |-
+        The managed server is already linked.
+      short_not_reachable: |-
+        not reachable
+      long_not_reachable: |-
+        The managed server is not reachable. Check if the `config.managed.server` is correct.
+      short_running: |-
+        running
+      long_running: |-
+        The managed server is running. To ssh into this machine, you can run
+        `vagrant ssh`. To provision the machine, you can run `vagrant provision`.
+    config:
+      server_required: |-
+        The IP or hostname of the server must be configured via "server"
+      private_key_missing: |-
+        The specified private key could not be found
+    errors:
+      rsync_error: |-
+        There was an error when attemping to rsync a shared folder.
+        Please inspect the error message below for more info.
+
+        Host path: %{hostpath}
+        Guest path: %{guestpath}
+        Error: %{stderr}

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-managed-servers
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Torben Knerr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.7
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.5
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.6
 description: Enables Vagrant to ssh into and provision managed servers.
@@ -72,8 +72,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Berksfile
 - CHANGELOG.md
 - Gemfile
@@ -84,9 +84,11 @@ files:
 - dummy.box
 - lib/vagrant-managed-servers.rb
 - lib/vagrant-managed-servers/action.rb
-- lib/vagrant-managed-servers/action/is_created.rb
+- lib/vagrant-managed-servers/action/is_linked.rb
 - lib/vagrant-managed-servers/action/is_reachable.rb
 - lib/vagrant-managed-servers/action/link_server.rb
+- lib/vagrant-managed-servers/action/message_already_linked.rb
+- lib/vagrant-managed-servers/action/message_not_linked.rb
 - 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
@@ -112,19 +114,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-managed-servers
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to ssh into and provision managed servers.
 test_files: []
-has_rdoc: