Merge pull request #13 from caveman-dick/fixIssueCallingProvisionWithoutFilter

Fix issue calling provision without filter

Author: fabriziopandini

lib/vagrant/compose/config.rb

@@ -22,7 +22,7 @@ def initialize
         @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 = ((['up', 'provision'].include? ARGV[0]) && ARGV.length > 1 && !ARGV[1].start_with?('-')) ? ARGV.drop(1) : [] # detect if running vagrant up/provision MACHINE
   	  end
 
   	  # Implements cluster creation, through the execution of the give code.
@@ -112,7 +112,7 @@ def debug(verbose = false)
             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}"
 

lib/vagrant/compose/declarative/cluster.rb

@@ -17,18 +17,10 @@ class Cluster
         # 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 @@ def pycompose (file)
       end
     end
   end
-end
+end

lib/vagrant/compose/programmatic/cluster.rb

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