vagrant-devcommands 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbb951d035fb1ae4e0101196fe520f470a328e5a
-  data.tar.gz: 2f1b1e9a87828c3a3d04e87b716cf29204c82896
+  metadata.gz: dd051c66c3c698629e9eeac65aab7f359e7ee230
+  data.tar.gz: e607628cc652b04882a226f7b10def7b32152298
 SHA512:
-  metadata.gz: fe416e3190fcefbf46795fa521cd9a04e2d4c536e831d4976e5c43b3a07ca19574452eabf11cd0d7998c1c744c42e3c32da278877942c31669abcdaf9094eaa3
-  data.tar.gz: feea83ec520f4fa46cbee8048b38ef9ca7ccc97ad1e02571f3ee8729efeaddfc48293be2035a57c4b1c06b943351e931d59d4495d50b1162a0ef632b2f342875
+  metadata.gz: 25c8ef756decf39dbce7050799b841e4c4e2aefb4091fd13e12ee221e593efd0434e05e6bfb70b54fc096d473907afe2045d4427960b1878f7f19f2b75fcc1bb
+  data.tar.gz: 8cfa604c43f53e037666378517df766b54ba936b9c428ae89e90fa950d3f2729fc66827c2911ed56e9d494e32234587dc09e935d771afff33d01772b4cc74faa

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.11.1 (2017-10-04)
+
+- Bug fixes
+  - The machine of a command alias definition is now correctly preferred over
+    the machine of the command definition
+
 ## v0.11.0 (2017-10-02)
 
 - Enhancements

data/lib/vagrant/devcommands/model/command_alias.rb

@@ -9,6 +9,8 @@ module VagrantPlugins
 
         attr_reader :argv
         attr_reader :command
+
+        attr_reader :machine
         attr_reader :desc
         attr_reader :help
         attr_reader :usage
@@ -18,6 +20,8 @@ module VagrantPlugins
 
           @argv    = spec[:argv] || []
           @command = spec[:command]
+
+          @machine = spec[:machine]
           @desc    = spec[:desc]
           @help    = spec[:help]
           @usage   = spec[:usage]

data/lib/vagrant/devcommands/runner/command_alias.rb

@@ -22,15 +22,28 @@ module VagrantPlugins
         private
 
         def argv_for(command_alias)
-          argv  = @argv.dup
+          argv = @argv.dup
+          argv = patch_machine(argv, command_alias)
+          argv = patch_command(argv, command_alias)
+
+          return argv unless command_alias.argv.is_a?(Array)
+
+          argv + command_alias.argv
+        end
+
+        def patch_command(argv, command_alias)
           index = 0
           index = 1 if UTIL.machine_name?(argv[0].to_s, @env.machine_index)
 
           argv[index] = command_alias.command
+          argv
+        end
 
-          return argv unless command_alias.argv.is_a?(Array)
+        def patch_machine(argv, command_alias)
+          return argv if UTIL.machine_name?(argv[0].to_s, @env.machine_index)
 
-          argv + command_alias.argv
+          argv.unshift(command_alias.machine) if command_alias.machine
+          argv
         end
 
         def runnable_for(command_alias)

data/lib/vagrant/devcommands/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   # Defines the current plugin version
   module DevCommands
-    VERSION = '0.11.0'.freeze
+    VERSION = '0.11.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-devcommands
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Marc Neudert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls