vagrant-compose 0.7.2 → 0.7.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4c6ecc542370d381b4e4636b64a51eb34cb90d98
4
- data.tar.gz: f7846bf3c0d2956c29cea6faf68a767a2bb6ffe0
3
+ metadata.gz: 628b11a465d4d3f6a8dccedb14505d02b287ac11
4
+ data.tar.gz: ce0b125bbc140ff29f0059c5f8982504e3388aa8
5
5
  SHA512:
6
- metadata.gz: 25546d557103418fe05a94b315c98b56e09c05bfebbe1c8d3117110d82604bca6f2a9b7722fd2244156372c1fbbe975125036ba1bfe592eb5f698ff602ec8000
7
- data.tar.gz: 62d8daf320048e2d101222d6ddb49faa0498d258d589b4ff2309fb5da4db6686dc5474487cdf89894439d993134b12b695a2a2eaa997d28580d52faf9ddb1425
6
+ metadata.gz: 3dcf59e2c862df784886486663e8c56001f2840ac54ed4f28491b8752b1df0134c51e55c543eb092011f3c459fed1732297f190d96c009b441b4f7e1ee4163f6
7
+ data.tar.gz: bffc8be815784dad1bc8eea420077e2bd60a0c72a24b8272dd5f243e10fbe8b7a244bc29071255e1530061d6207cbf62e37d6d6e153177d41e75c8d6a287a14b
data/CHANGELOG.md CHANGED
@@ -45,4 +45,9 @@ ansible_group_vars_path and ansible_host_vars_path are not supported anymore
45
45
  * issues #11 Allow management of Ansible vars for all hosts
46
46
  * issues #9 Create group_vars and host_vars directory only if necessary
47
47
 
48
- * breacking change: custom group of groups all_groups:children removed. Insteal use all (automatically created by ansible)
48
+ * breaking change: custom group of groups all_groups:children removed. Insteal use all (automatically created by ansible)
49
+
50
+ # 0.7.3 (May 20, 2017)
51
+
52
+ * PR Fix issue calling provision without filter #13 (now mutlimachine filter works properly even if mixed with other POSIX options)
53
+ * breaking change: removed cluster.multimachine_filter property (use instead config.multimachine_filter)
@@ -22,7 +22,7 @@ module VagrantPlugins
22
22
  @cluster = nil
23
23
  @nodes = {}
24
24
  @ansible_groups ={}
25
- @multimachine_filter = ((['up', 'provision'].include? ARGV[0]) && ARGV.length > 1) ? ARGV.drop(1) : [] # detect if running vagrant up/provision MACHINE
25
+ @multimachine_filter = getMultimachine_filter() # detect if running vagrant up/provision MACHINE
26
26
  end
27
27
 
28
28
  # Implements cluster creation, through the execution of the give code.
@@ -112,7 +112,7 @@ module VagrantPlugins
112
112
  puts " group_index #{node.group_index}"
113
113
  end
114
114
 
115
- filter = " (NB. filtered by #{@cluster.multimachine_filter})" if not @multimachine_filter.empty?
115
+ filter = " (NB. filtered by #{@multimachine_filter})" if not @multimachine_filter.empty?
116
116
  puts ""
117
117
  puts "- ansible_groups #{filter}"
118
118
 
@@ -126,6 +126,56 @@ module VagrantPlugins
126
126
  end
127
127
  puts ""
128
128
  end
129
+
130
+ def getMultimachine_filter
131
+ args = OptionParser.new do |o|
132
+ # Options for all commands with vmname
133
+ # vagrant/plugins/commands/destroy/command.rb
134
+ # "-f", "--force"
135
+ # vagrant/plugins/commands/halt/command.rb
136
+ # "-f", "--force"
137
+ # vagrant/plugins/commands/port/command.rb
138
+ # "--guest PORT",
139
+ # "--machine-readable"
140
+ # vagrant/plugins/commands/provision/command.rb
141
+ # "--provision-with x,y,z"
142
+ # vagrant/plugins/commands/reload/command.rb
143
+ # "--[no-]provision"
144
+ # "--provision-with x,y,z"
145
+ # vagrant/plugins/commands/resume/command.rb
146
+ # "--[no-]provision"
147
+ # "--provision-with x,y,z"
148
+ # vagrant/plugins/commands/ssh/command.rb
149
+ # "-c", "--command COMMAND"
150
+ # "-p", "--plain"
151
+ # vagrant/plugins/commands/ssh_config/command.rb
152
+ # "--host NAME"
153
+ # vagrant/plugins/commands/status/command.rb
154
+ # vagrant/plugins/commands/suspend/command.rb
155
+ # vagrant/plugins/commands/up/command.rb
156
+ # "--[no-]destroy-on-error"
157
+ # "--[no-]parallel"
158
+ # "--provider PROVIDER"
159
+ # "--[no-]install-provider"
160
+ # "--[no-]provision"
161
+ # "--provision-with x,y,z"
162
+
163
+ o.on("-f", "--force", "Destroy without confirmation.")
164
+ o.on("--guest PORT", "Output the host port that maps to the given guest port")
165
+ o.on("--machine-readable", "Display machine-readable output")
166
+ o.on("--provision-with x,y,z", Array, "Enable only certain provisioners, by type or by name.")
167
+ o.on("--[no-]provision", "Enable or disable provisioning")
168
+ o.on("-c", "--command COMMAND", "Execute an SSH command directly")
169
+ o.on("-p", "--plain", "Plain mode, leaves authentication up to user")
170
+ o.on("--host NAME", "Name the host for the config")
171
+ o.on("--[no-]destroy-on-error", "Destroy machine if any fatal error happens (default to true)")
172
+ o.on("--[no-]parallel", "Enable or disable parallelism if provider supports it")
173
+ o.on("--provider PROVIDER", String, "Back the machine with a specific provider")
174
+ o.on("--[no-]install-provider", "If possible, install the provider if it isn't installed")
175
+ end.permute! #Parses command line arguments argv in permutation mode and returns list of non-option arguments.
176
+
177
+ return args.length > 1 ? args.drop(1) : []
178
+ end
129
179
  end
130
180
  end
131
181
  end
@@ -17,18 +17,10 @@ module VagrantPlugins
17
17
  # The network domain to wich the cluster belongs (used for computing nodes fqdn)
18
18
  attr_accessor :domain
19
19
 
20
- # A variable that reflects if vagrant is tageting a single machine, like f.i. when executing vagrant up machine-name
21
- attr_reader :multimachine_filter
22
-
23
20
  # The root path for ansible playbook; it is used as a base path for computing ansible_group_vars and ansible_host_vars
24
21
  # It defaults to current directory/provisioning
25
22
  attr_accessor :ansible_playbook_path
26
23
 
27
- # Costruttore di una istanza di cluster.
28
- def initialize()
29
- @multimachine_filter = ""
30
- end
31
-
32
24
  # Implements cluster creation from a playbook file
33
25
  def from (file)
34
26
  # calls vagrant-playbook utility for executing the playbook file.
@@ -147,4 +139,4 @@ module VagrantPlugins
147
139
  end
148
140
  end
149
141
  end
150
- end
142
+ end
@@ -39,7 +39,6 @@ module VagrantPlugins
39
39
  @ansible_context_vars = {}
40
40
  @ansible_group_vars = {}
41
41
  @ansible_host_vars = {}
42
- @multimachine_filter = ""
43
42
  @ansible_playbook_path = File.join(Dir.pwd, 'provisioning')
44
43
 
45
44
  @name = name
@@ -1,5 +1,5 @@
1
1
  module Vagrant
2
2
  module Compose
3
- VERSION = "0.7.2"
3
+ VERSION = "0.7.3"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-compose
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.2
4
+ version: 0.7.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Fabrizio Pandini
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-12-22 00:00:00.000000000 Z
11
+ date: 2017-05-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake