vagrant-compose 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 628b11a465d4d3f6a8dccedb14505d02b287ac11
-  data.tar.gz: ce0b125bbc140ff29f0059c5f8982504e3388aa8
+  metadata.gz: 09e9236ae1250c53a87954029f56c278fd751a72
+  data.tar.gz: c6537a3462a8c91043bb0104f084683dfd296abb
 SHA512:
-  metadata.gz: 3dcf59e2c862df784886486663e8c56001f2840ac54ed4f28491b8752b1df0134c51e55c543eb092011f3c459fed1732297f190d96c009b441b4f7e1ee4163f6
-  data.tar.gz: bffc8be815784dad1bc8eea420077e2bd60a0c72a24b8272dd5f243e10fbe8b7a244bc29071255e1530061d6207cbf62e37d6d6e153177d41e75c8d6a287a14b
+  metadata.gz: ad4ed218e7830d8fc803fe2ba1e839487e5487ae3b1017b24c87b0213a03f10d8bc45138dcbf309758c20915c21b295574b9c8bba3b2f27957bc996c45b0434a
+  data.tar.gz: e8f78b5c7d83fdf6ddc733361442a60a0bb71b46bbb129622380bf84850bfb677cd6273f29d97df3f71c7ad7f470292ed3ca962c29c3b1e879a1d4572d167750

data/CHANGELOG.md

@@ -1,28 +1,26 @@
-# 0.1.0 (December 27, 2015)
+# 0.7.4 (May 20, 2017)
 
-* Initial release.
+* fix multimachine_filter error with commands without vmname
 
+# 0.7.3 (May 20, 2017)
 
-# 0.2.2 (December 31, 2015)
+* PR Fix issue calling provision without filter #13 (now mutlimachine filter works properly even if mixed with other POSIX options)
+* breaking change: removed cluster.multimachine_filter property (use instead config.multimachine_filter)
 
-breaking changes!
-* nodes instances number defined into node method (instances attributes removed)
-* cluster.nodes return only nodes (before nodes with index were returned)
+# 0.7.2 (November 16, 2016)
 
-other changes:
-* Improved documentation.
-* cluster domain now is optional
-* nodes code block now is optional
-* improved detection of multimachine_filter
-* minor fixes
+* issues #11 Allow management of Ansible vars for all hosts
+* issues #9 Create group_vars and host_vars directory only if necessary
 
-# 0.2.3 (April 2, 2016)
+* breaking change: custom group of groups all_groups:children removed. Insteal use all (automatically created by ansible)
 
-* Now custer name can be omitted (thanks to jaydoane)
+# 0.7.1 (November 04, 2016)
 
-other changes:
-* Documented cluster.debug feature
-* Improved code inline documentation
+* Minor fix
+
+# 0.7.0 (November 02, 2016)
+
+* introduced support for declarative cluster definition
 
 # 0.2.4 (June 26, 2016)
 
@@ -32,22 +30,29 @@ other changes:
 NB. breaking change
 ansible_group_vars_path and ansible_host_vars_path are not supported anymore
 
-# 0.7.0 (November 02, 2016)
+# 0.2.3 (April 2, 2016)
 
-* introduced support for declarative cluster definition
+* Now custer name can be omitted (thanks to jaydoane)
 
-# 0.7.1 (November 04, 2016)
+other changes:
+* Documented cluster.debug feature
+* Improved code inline documentation
 
-* Minor fix
+# 0.2.2 (December 31, 2015)
 
-# 0.7.2 (November 16, 2016)
+breaking changes!
+* nodes instances number defined into node method (instances attributes removed)
+* cluster.nodes return only nodes (before nodes with index were returned)
 
-* issues #11 Allow management of Ansible vars for all hosts
-* issues #9 Create group_vars and host_vars directory only if necessary
+other changes:
+* Improved documentation.
+* cluster domain now is optional
+* nodes code block now is optional
+* improved detection of multimachine_filter
+* minor fixes
 
-* breaking change: custom group of groups all_groups:children removed. Insteal use all (automatically created by ansible)
+# 0.1.0 (December 27, 2015)
+
+* Initial release.
 
-# 0.7.3 (May 20, 2017)
 
-* PR Fix issue calling provision without filter #13 (now mutlimachine filter works properly even if mixed with other POSIX options)
-* breaking change: removed cluster.multimachine_filter property (use instead config.multimachine_filter)

data/lib/vagrant/compose/config.rb

@@ -128,53 +128,63 @@ module VagrantPlugins
    	  end
 
       def getMultimachine_filter
-        args = OptionParser.new do |o|
-          # Options for all commands with vmname
-          # vagrant/plugins/commands/destroy/command.rb
-          #   "-f", "--force"
-          # vagrant/plugins/commands/halt/command.rb
-          #   "-f", "--force"
-          # vagrant/plugins/commands/port/command.rb
-          #   "--guest PORT",
-          #   "--machine-readable"
-          # vagrant/plugins/commands/provision/command.rb
-          #   "--provision-with x,y,z"
-          # vagrant/plugins/commands/reload/command.rb
-          #   "--[no-]provision"
-          #   "--provision-with x,y,z"
-          # vagrant/plugins/commands/resume/command.rb
-          #   "--[no-]provision"
-          #   "--provision-with x,y,z"
-          # vagrant/plugins/commands/ssh/command.rb
-          #   "-c", "--command COMMAND"
-          #   "-p", "--plain"
-          # vagrant/plugins/commands/ssh_config/command.rb
-          #   "--host NAME"
-          # vagrant/plugins/commands/status/command.rb
-          # vagrant/plugins/commands/suspend/command.rb
-          # vagrant/plugins/commands/up/command.rb
-          #   "--[no-]destroy-on-error"
-          #   "--[no-]parallel"
-          #   "--provider PROVIDER"
-          #   "--[no-]install-provider"
-          #   "--[no-]provision"
-          #   "--provision-with x,y,z"
-
-          o.on("-f", "--force", "Destroy without confirmation.")
-          o.on("--guest PORT", "Output the host port that maps to the given guest port")
-          o.on("--machine-readable", "Display machine-readable output")
-          o.on("--provision-with x,y,z", Array, "Enable only certain provisioners, by type or by name.")
-          o.on("--[no-]provision", "Enable or disable provisioning")
-          o.on("-c", "--command COMMAND", "Execute an SSH command directly")
-          o.on("-p", "--plain", "Plain mode, leaves authentication up to user")
-          o.on("--host NAME", "Name the host for the config")
-          o.on("--[no-]destroy-on-error", "Destroy machine if any fatal error happens (default to true)")
-          o.on("--[no-]parallel", "Enable or disable parallelism if provider supports it")
-          o.on("--provider PROVIDER", String, "Back the machine with a specific provider")
-          o.on("--[no-]install-provider", "If possible, install the provider if it isn't installed")
-        end.permute! #Parses command line arguments argv in permutation mode and returns list of non-option arguments.
-
-        return args.length > 1 ? args.drop(1) : []
+        if ARGV.length <= 1 
+          return []
+        # commands with vmname filter
+        elsif ["destroy", "halt", "port", "provision", 
+              "reload", "resume", "ssh", "ssh_config", 
+              "status", "suspend", "up"].include?(ARGV[0].downcase)
+
+          args = OptionParser.new do |o|
+            # Options for all commands with vmname
+            # vagrant/plugins/commands/destroy/command.rb
+            #   "-f", "--force"
+            # vagrant/plugins/commands/halt/command.rb
+            #   "-f", "--force"
+            # vagrant/plugins/commands/port/command.rb
+            #   "--guest PORT",
+            #   "--machine-readable"
+            # vagrant/plugins/commands/provision/command.rb
+            #   "--provision-with x,y,z"
+            # vagrant/plugins/commands/reload/command.rb
+            #   "--[no-]provision"
+            #   "--provision-with x,y,z"
+            # vagrant/plugins/commands/resume/command.rb
+            #   "--[no-]provision"
+            #   "--provision-with x,y,z"
+            # vagrant/plugins/commands/ssh/command.rb
+            #   "-c", "--command COMMAND"
+            #   "-p", "--plain"
+            # vagrant/plugins/commands/ssh_config/command.rb
+            #   "--host NAME"
+            # vagrant/plugins/commands/status/command.rb
+            # vagrant/plugins/commands/suspend/command.rb
+            # vagrant/plugins/commands/up/command.rb
+            #   "--[no-]destroy-on-error"
+            #   "--[no-]parallel"
+            #   "--provider PROVIDER"
+            #   "--[no-]install-provider"
+            #   "--[no-]provision"
+            #   "--provision-with x,y,z"
+
+            o.on("-f", "--force", "Destroy without confirmation.")
+            o.on("--guest PORT", "Output the host port that maps to the given guest port")
+            o.on("--machine-readable", "Display machine-readable output")
+            o.on("--provision-with x,y,z", Array, "Enable only certain provisioners, by type or by name.")
+            o.on("--[no-]provision", "Enable or disable provisioning")
+            o.on("-c", "--command COMMAND", "Execute an SSH command directly")
+            o.on("-p", "--plain", "Plain mode, leaves authentication up to user")
+            o.on("--host NAME", "Name the host for the config")
+            o.on("--[no-]destroy-on-error", "Destroy machine if any fatal error happens (default to true)")
+            o.on("--[no-]parallel", "Enable or disable parallelism if provider supports it")
+            o.on("--provider PROVIDER", String, "Back the machine with a specific provider")
+            o.on("--[no-]install-provider", "If possible, install the provider if it isn't installed")
+          end.permute! #Parses command line arguments argv in permutation mode and returns list of non-option arguments.
+
+          return args.length > 1 ? args.drop(1) : []
+        else
+          return []
+        end
       end
     end
   end

data/lib/vagrant/compose/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Compose
-    VERSION = "0.7.3"
+    VERSION = "0.7.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-compose
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Fabrizio Pandini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-20 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake