vagrant-compose 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c6ecc542370d381b4e4636b64a51eb34cb90d98
-  data.tar.gz: f7846bf3c0d2956c29cea6faf68a767a2bb6ffe0
+  metadata.gz: 628b11a465d4d3f6a8dccedb14505d02b287ac11
+  data.tar.gz: ce0b125bbc140ff29f0059c5f8982504e3388aa8
 SHA512:
-  metadata.gz: 25546d557103418fe05a94b315c98b56e09c05bfebbe1c8d3117110d82604bca6f2a9b7722fd2244156372c1fbbe975125036ba1bfe592eb5f698ff602ec8000
-  data.tar.gz: 62d8daf320048e2d101222d6ddb49faa0498d258d589b4ff2309fb5da4db6686dc5474487cdf89894439d993134b12b695a2a2eaa997d28580d52faf9ddb1425
+  metadata.gz: 3dcf59e2c862df784886486663e8c56001f2840ac54ed4f28491b8752b1df0134c51e55c543eb092011f3c459fed1732297f190d96c009b441b4f7e1ee4163f6
+  data.tar.gz: bffc8be815784dad1bc8eea420077e2bd60a0c72a24b8272dd5f243e10fbe8b7a244bc29071255e1530061d6207cbf62e37d6d6e153177d41e75c8d6a287a14b

data/CHANGELOG.md

@@ -45,4 +45,9 @@ ansible_group_vars_path and ansible_host_vars_path are not supported anymore
 * issues #11 Allow management of Ansible vars for all hosts
 * issues #9 Create group_vars and host_vars directory only if necessary
 
-* breacking change: custom group of groups all_groups:children removed. Insteal use all (automatically created by ansible)
+* breaking change: custom group of groups all_groups:children removed. Insteal use all (automatically created by ansible)
+
+# 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

@@ -22,7 +22,7 @@ module VagrantPlugins
         @cluster = nil
     		@nodes = {}
         @ansible_groups ={}
-        @multimachine_filter = ((['up', 'provision'].include? ARGV[0]) && ARGV.length > 1) ? ARGV.drop(1) : [] # detect if running vagrant up/provision MACHINE
+        @multimachine_filter = getMultimachine_filter() # detect if running vagrant up/provision MACHINE
   	  end
 
   	  # Implements cluster creation, through the execution of the give code.
@@ -112,7 +112,7 @@ module VagrantPlugins
             puts "     group_index    #{node.group_index}"
           end
 
-          filter = " (NB. filtered by #{@cluster.multimachine_filter})" if not @multimachine_filter.empty?
+          filter = " (NB. filtered by #{@multimachine_filter})" if not @multimachine_filter.empty?
           puts ""
           puts "- ansible_groups #{filter}"
 
@@ -126,6 +126,56 @@ module VagrantPlugins
         end
         puts ""
    	  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) : []
+      end
     end
   end
 end

data/lib/vagrant/compose/declarative/cluster.rb

@@ -17,18 +17,10 @@ module VagrantPlugins
         # The network domain to wich the cluster belongs (used for computing nodes fqdn)
         attr_accessor :domain
 
-        # A variable that reflects if vagrant is tageting a single machine, like f.i. when executing vagrant up machine-name
-        attr_reader   :multimachine_filter
-
         # The root path for ansible playbook; it is used as a base path for computing ansible_group_vars and ansible_host_vars
         # It defaults to current directory/provisioning
         attr_accessor :ansible_playbook_path
 
-        # Costruttore di una istanza di cluster.
-        def initialize()
-          @multimachine_filter = ""
-        end
-
         # Implements cluster creation from a playbook file
         def from (file)
           # calls vagrant-playbook utility for executing the playbook file.
@@ -147,4 +139,4 @@ module VagrantPlugins
       end
     end
   end
-end
+end

data/lib/vagrant/compose/programmatic/cluster.rb

@@ -39,7 +39,6 @@ module VagrantPlugins
           @ansible_context_vars  = {}
           @ansible_group_vars    = {}
           @ansible_host_vars     = {}
-          @multimachine_filter   = ""
           @ansible_playbook_path = File.join(Dir.pwd, 'provisioning')
 
           @name        = name

data/lib/vagrant/compose/version.rb

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

metadata

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