Gemfile: Add version to the gemfile generation

Set GemRequirement of puppet-lint to 2.1.1 and add version to the gemfile generation.
tupaschoal · Mar 28, 2017 · e0e1d05 · e0e1d05
1 parent 63d31e1
commit e0e1d05
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/.ci/Gemfile.jinja2 b/.ci/Gemfile.jinja2
@@ -1,5 +1,14 @@
 source 'https://rubygems.org'
 ruby '2.2.2'
-
-{% for gem in gems %}gem "{{gem.name + '"' if gem.required == '' else gem.name + '", require: false'}}
-{% endfor %}
+{% for gem in gems %}
+{%- if gem.version != '' and gem.required != '' %}
+gem "{{ gem.name + '", "' + gem.version + '", require: false' }}
+{%-  elif gem.version == '' and gem.required == '' %}
+gem "{{ gem.name + '"' }}
+{%-  elif gem.version != '' and gem.required == '' %}
+gem "{{ gem.name + '", "' + gem.version + '"' }}
+{%- else %}
+gem "{{ gem.name + '", require: false' }}
+{%- endif %}
+{%- endfor %}
+{{ '' }}
diff --git a/.ci/generate_bear_requirements.py b/.ci/generate_bear_requirements.py
@@ -125,8 +125,9 @@ def write_gem_requirements(requirements):
 
     for requirement in requirements:
         gem_dependencies.append(
-            {'name' : requirement.package,
-             'required' : requirement.require})
+            {'name': requirement.package,
+             'version': requirement.version,
+             'required': requirement.require})
 
     gemfile_string = template.render(
         gems=gem_dependencies

diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 ruby '2.2.2'
 
 gem "csvlint"
-gem "puppet-lint"
+gem "puppet-lint", "2.1.1"
 gem "reek"
 gem "rubocop"
 gem "scss_lint", require: false

diff --git a/bears/configfiles/PuppetLintBear.py b/bears/configfiles/PuppetLintBear.py
@@ -14,7 +14,7 @@ class PuppetLintBear:
     '''
 
     LANGUAGES = {'Puppet'}
-    REQUIREMENTS = {GemRequirement('puppet-lint', '2')}
+    REQUIREMENTS = {GemRequirement('puppet-lint', '2.1.1')}
     AUTHORS = {'The coala developers'}
     AUTHORS_EMAILS = {'[email protected]'}
     LICENSE = 'AGPL-3.0'