60
60
when_invoked do |options |
61
61
Puppet ::ModuleTool . set_option_defaults ( options )
62
62
environment = options [ :environment_instance ]
63
+ modules_by_path = environment . modules_by_path
63
64
64
65
{
65
66
:environment => environment ,
66
- :modules_by_path => environment . modules_by_path ,
67
+ :modules_by_path => modules_by_path ,
68
+ :unmet_dependencies => unmet_dependencies ( environment ) ,
67
69
}
68
70
end
69
71
103
105
end
104
106
end
105
107
106
- def warn_unmet_dependencies ( environment )
108
+
109
+ def unmet_dependencies ( environment )
107
110
error_types = [ :non_semantic_version , :version_mismatch , :missing ]
108
111
109
- @ unmet_deps = { }
112
+ unmet_deps = { }
110
113
error_types . each do |type |
111
- @ unmet_deps[ type ] = Hash . new do |hash , key |
114
+ unmet_deps [ type ] = Hash . new do |hash , key |
112
115
hash [ key ] = { :errors => [ ] , :parent => nil }
113
116
end
114
117
end
@@ -130,16 +133,22 @@ def warn_unmet_dependencies(environment)
130
133
parent_version = dep [ :parent ] [ :version ]
131
134
132
135
msg = _ ( "'%{parent_name}' (%{parent_version}) requires '%{dependency_name}' (%{dependency_version})" ) % { parent_name : parent_name , parent_version : parent_version , dependency_name : dep_name , dependency_version : version_constraint }
133
- @ unmet_deps[ type ] [ dep [ :name ] ] [ :errors ] << msg
134
- @ unmet_deps[ type ] [ dep [ :name ] ] [ :parent ] = {
136
+ unmet_deps [ type ] [ dep [ :name ] ] [ :errors ] << msg
137
+ unmet_deps [ type ] [ dep [ :name ] ] [ :parent ] = {
135
138
:name => dep [ :parent ] [ :name ] ,
136
139
:version => parent_version
137
140
}
138
- @ unmet_deps[ type ] [ dep [ :name ] ] [ :version ] = installed_version
141
+ unmet_deps [ type ] [ dep [ :name ] ] [ :version ] = installed_version
139
142
end
140
143
end
141
144
end
142
145
end
146
+ unmet_deps
147
+ end
148
+
149
+
150
+ def warn_unmet_dependencies ( environment )
151
+ @unmet_deps = unmet_dependencies ( environment )
143
152
144
153
# Display unmet dependencies by category.
145
154
error_display_order = [ :non_semantic_version , :version_mismatch , :missing ]
0 commit comments