Store 'gem dependency' return value in files

Store return value of command 'gem dependency' in files rather than using a dictionnary to use the same output as when the check_output method is not mocked /reviewed-by @kirr /reviewed-on !6

Store 'gem dependency' return value in files
Store return value of command 'gem dependency' in files rather than using a dictionnary to use the same output as when the check_output method is not mocked /reviewed-by @kirr /reviewed-on !6
c225114e · Léo-Paul Géneau · Kirill Smelkov · 96ddcde9 · c225114e · c225114e
Commit c225114e authored Jul 06, 2021 by Léo-Paul Géneau 👾 Committed by Kirill Smelkov Jul 13, 2021
31 changed files
--- a/rubygems.py
+++ b/rubygems.py
@@ -162,7 +162,7 @@ class Recipe(object):
        env.update({k: (v % env) for k, v in env_override})
        return env

-    def _get_gem_dict(self, gem_str):
+    def get_gem_dict(self, gem_str):
        parsed_gem = gem_str.split('==', 1)
        gem_dict = {'gemname': parsed_gem[0].strip()}
        if len(parsed_gem) > 1:
@@ -326,7 +326,7 @@ class Recipe(object):
            self._install_rubygems()
            gem_executable = self.get_gem_executable(bindir)

-        gem_dict_list = list(map(self._get_gem_dict, self.gems))
+        gem_dict_list = list(map(self.get_gem_dict, self.gems))
        for gem_dict in gem_dict_list:
            if self.deployment:
                if 'version' not in gem_dict:

--- a/tests/test_data/dependency_activesupport-3.2.0.txt
+++ b/tests/test_data/dependency_activesupport-3.2.0.txt
+Gem activesupport-3.2.0
+  i18n (~> 0.6)
+  multi_json (~> 1.0)
+
--- a/tests/test_data/dependency_atomic-0.0.1.txt
+++ b/tests/test_data/dependency_atomic-0.0.1.txt
+Gem atomic-0.0.1
+
--- a/tests/test_data/dependency_backports-3.8.0.txt
+++ b/tests/test_data/dependency_backports-3.8.0.txt
+Gem backports-3.8.0
+
--- a/tests/test_data/dependency_cucumber-core-3.0.0.txt
+++ b/tests/test_data/dependency_cucumber-core-3.0.0.txt
+Gem cucumber-core-3.0.0
+  backports (>= 3.8.0)
+  bundler (>= 1.3.5, development)
+  coveralls (~> 0.7, development)
+  cucumber-tag_expressions (>= 1.0.1)
+  gherkin (>= 4.1.3)
+  kramdown (~> 1.4.2, development)
+  rake (>= 0.9.2, development)
+  rspec (~> 3, development)
+  unindent (>= 1.0, development)
+  yard (>= 0, development)
+
--- a/tests/test_data/dependency_cucumber-core-7.1.0.txt
+++ b/tests/test_data/dependency_cucumber-core-7.1.0.txt
+Gem cucumber-core-7.1.0
+  coveralls (>= 0.8.23, ~> 0.8, development)
+  cucumber-gherkin (>= 14.0.1, ~> 14.0)
+  cucumber-messages (>= 12.2.0, ~> 12.2)
+  cucumber-tag-expressions (>= 2.0.4, ~> 2.0)
+  rake (>= 13.0.0, ~> 13.0, development)
+  rspec (>= 3.9.0, ~> 3.9, development)
+  rubocop (>= 0.78.0, ~> 0.78, development)
+  unindent (>= 1.0, ~> 1.0, development)
+
--- a/tests/test_data/dependency_cucumber-gherkin-14.1.0.txt
+++ b/tests/test_data/dependency_cucumber-gherkin-14.1.0.txt
+Gem cucumber-gherkin-14.1.0
+  cucumber-messages (~> 12.3, >= 12.3.2)
+  rake (~> 13.0, >= 13.0.1, development)
+  rspec (~> 3.9, >= 3.9.0, development)
+
--- a/tests/test_data/dependency_cucumber-gherkin-9.1.0.txt
+++ b/tests/test_data/dependency_cucumber-gherkin-9.1.0.txt
+Gem cucumber-gherkin-9.1.0
+  coveralls (~> 0.8, >= 0.8.23, development)
+  cucumber-messages (~> 9.0, >= 9.0.3)
+  rake (~> 13.0, >= 13.0.1, development)
+  rspec (~> 3.9, >= 3.9.0, development)
--- a/tests/test_data/dependency_cucumber-messages-12.2.0.txt
+++ b/tests/test_data/dependency_cucumber-messages-12.2.0.txt
+Gem cucumber-messages-12.2.0
+  protobuf-cucumber (>= 3.10.8, ~> 3.10)
+  rake (>= 13.0.1, ~> 13.0, development)
+  rspec (>= 3.9.0, ~> 3.9, development)
+
--- a/tests/test_data/dependency_cucumber-messages-12.3.2.txt
+++ b/tests/test_data/dependency_cucumber-messages-12.3.2.txt
+Gem cucumber-messages-12.3.2
+  protobuf-cucumber (>= 3.10.8, ~> 3.10)
+  rake (>= 13.0.1, ~> 13.0, development)
+  rspec (>= 3.9.0, ~> 3.9, development)
+
--- a/tests/test_data/dependency_cucumber-messages-6.0.1.txt
+++ b/tests/test_data/dependency_cucumber-messages-6.0.1.txt
+Gem cucumber-messages-6.0.1
+  coveralls (>= 0.8.23, ~> 0.8, development)
+  google-protobuf (<= 3.8, >= 3.2)
+  rake (>= 13.0.0, ~> 13.0, development)
+  rspec (>= 3.8.0, ~> 3.8, development)
+
--- a/tests/test_data/dependency_cucumber-messages-9.0.2.txt
+++ b/tests/test_data/dependency_cucumber-messages-9.0.2.txt
+Gem cucumber-messages-9.0.2
+  coveralls (>= 0.8.23, ~> 0.8, development)
+  json (>= 2.3.0, ~> 2.3)
+  protobuf-cucumber (>= 3.10.4, ~> 3.10)
+  rake (>= 13.0.1, ~> 13.0, development)
+  rspec (>= 3.9.0, ~> 3.9, development)
+
--- a/tests/test_data/dependency_cucumber-messages-9.0.3.txt
+++ b/tests/test_data/dependency_cucumber-messages-9.0.3.txt
+Gem cucumber-messages-9.0.3
+  coveralls (>= 0.8.23, ~> 0.8, development)
+  json (>= 2.3.0, ~> 2.3)
+  protobuf-cucumber (>= 3.10.4, ~> 3.10)
+  rake (>= 13.0.1, ~> 13.0, development)
+  rspec (>= 3.9.0, ~> 3.9, development)
+
--- a/tests/test_data/dependency_cucumber-tag-expressions-2.0.4.txt
+++ b/tests/test_data/dependency_cucumber-tag-expressions-2.0.4.txt
+Gem cucumber-tag-expressions-2.0.4
+  coveralls (>= 0.8.23, ~> 0.8, development)
+  rake (>= 13.0.1, ~> 13.0, development)
+  rspec (>= 3.9.0, ~> 3.9, development)
+
--- a/tests/test_data/dependency_cucumber-tag_expressions-1.0.1.txt
+++ b/tests/test_data/dependency_cucumber-tag_expressions-1.0.1.txt
+Gem cucumber-tag_expressions-1.0.1
+  bundler (>= 0, development)
+  coveralls (>= 0, development)
+  rake (~> 10.5, development)
+  rspec (~> 3.5, development)
+
--- a/tests/test_data/dependency_gherkin-8.0.0.txt
+++ b/tests/test_data/dependency_gherkin-8.0.0.txt
+Gem gherkin-8.0.0
+  coveralls (>= 0.8.23, ~> 0.8, development)
+  cucumber-messages (~> 6.0, >= 6.0.1)
+  rake (>= 13.0.0, ~> 13.0, development)
+  rspec (>= 3.8.0, ~> 3.8, development)
+
--- a/tests/test_data/dependency_google-protobuf-3.2.0.txt
+++ b/tests/test_data/dependency_google-protobuf-3.2.0.txt
+Gem google-protobuf-3.2.0
+  rake-compiler (~> 0.9.5, development)
+  rake-compiler-dock (~> 0.6.0, development)
+  rubygems-tasks (~> 0.2.4, development)
+  test-unit (>= 3.0.9, ~> 3.0, development)
+
+Gem google-protobuf-3.2.0-x86_64-linux
+  rake-compiler (~> 0.9.5, development)
+  rake-compiler-dock (~> 0.6.0, development)
+  rubygems-tasks (~> 0.2.4, development)
+  test-unit (>= 3.0.9, ~> 3.0, development)
+
--- a/tests/test_data/dependency_hashie-0.3.1.txt
+++ b/tests/test_data/dependency_hashie-0.3.1.txt
+Gem hashie-0.3.1
+  rspec (>= 0, development)
+
--- a/tests/test_data/dependency_hashie-1.0.0.txt
+++ b/tests/test_data/dependency_hashie-1.0.0.txt
+Gem hashie-1.0.0
+  rspec (>= 0, development)
+
--- a/tests/test_data/dependency_hoe-3.4.0.txt
+++ b/tests/test_data/dependency_hoe-3.4.0.txt
+Gem hoe-3.4.0
+  minitest (~> 4.3, development)
+  rake (< 11.0, >= 0.8)
+  rdoc (~> 3.10, development)
+
--- a/tests/test_data/dependency_i18n-0.6.0.txt
+++ b/tests/test_data/dependency_i18n-0.6.0.txt
+Gem i18n-0.6.0
+  activesupport (~> 3.0.0, development)
+  mocha (>= 0, development)
+  sqlite3 (>= 0, development)
+  test_declarative (>= 0, development)
+
--- a/tests/test_data/dependency_json-2.3.0.txt
+++ b/tests/test_data/dependency_json-2.3.0.txt
+Gem json-2.3.0
+  rake (>= 0, development)
+  test-unit (~> 2.0, development)
+
--- a/tests/test_data/dependency_middleware-0.1.0.txt
+++ b/tests/test_data/dependency_middleware-0.1.0.txt
+Gem middleware-0.1.0
+  rake (>= 0, development)
+  redcarpet (~> 2.1.0, development)
+  rspec-core (~> 2.8.0, development)
+  rspec-expectations (~> 2.8.0, development)
+  rspec-mocks (~> 2.8.0, development)
+  yard (~> 0.7.5, development)
+
--- a/tests/test_data/dependency_multi_json-1.0.0.txt
+++ b/tests/test_data/dependency_multi_json-1.0.0.txt
+Gem multi_json-1.0.0
+
--- a/tests/test_data/dependency_protobuf-cucumber-3.10.8.txt
+++ b/tests/test_data/dependency_protobuf-cucumber-3.10.8.txt
+Gem protobuf-cucumber-3.10.8
+  activesupport (>= 3.2)
+  benchmark-ips (>= 0, development)
+  ffi-rzmq (>= 0, development)
+  middleware (>= 0)
+  parser (= 2.3.0.6, development)
+  pry-byebug (>= 0, development)
+  pry-stack_explorer (>= 0, development)
+  rake (< 11.0, development)
+  rspec (>= 3.0, development)
+  rubocop (~> 0.38.0, development)
+  ruby-prof (>= 0, development)
+  simplecov (>= 0, development)
+  thor (>= 0)
+  thread_safe (>= 0)
+  timecop (>= 0, development)
+  varint (>= 0, development)
+  yard (>= 0, development)
+
--- a/tests/test_data/dependency_rake-10.0.1.txt
+++ b/tests/test_data/dependency_rake-10.0.1.txt
+Gem rake-10.0.1
+  minitest (~> 2.1, development)
+
--- a/tests/test_data/dependency_rash-0.1.0.txt
+++ b/tests/test_data/dependency_rash-0.1.0.txt
+Gem rash-0.1.0
+  hashie (>= 0.3.1)
+  rspec (>= 1.2.9, development)
+
--- a/tests/test_data/dependency_rash-0.3.0.txt
+++ b/tests/test_data/dependency_rash-0.3.0.txt
+Gem rash-0.3.0
+  hashie (~> 1.0.0)
+  rspec (~> 2.5.0, development)
+
--- a/tests/test_data/dependency_thor-0.9.2.txt
+++ b/tests/test_data/dependency_thor-0.9.2.txt
+Gem thor-0.9.2
+
--- a/tests/test_data/dependency_thread_safe-0.1.0.txt
+++ b/tests/test_data/dependency_thread_safe-0.1.0.txt
+Gem thread_safe-0.1.0
+  atomic (>= 0)
+
--- a/tests/test_rubygems.py
+++ b/tests/test_rubygems.py