puppet_fixtures 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2da2aad2b8bb2ff1f802d3cb47675a3163d8e5d6007e7c820380e4c6d728d0f7
-  data.tar.gz: 9d5c18705abde2484db94bfb3f6cb28c161f0027b1ffda25766129ede6c6da3d
+  metadata.gz: 1e780bf760c791a11e97ce20aeb04526e513f33d87c2649f7fe78b1c1aa470cf
+  data.tar.gz: cf4b77f4291d6b2a9aec9243d08a8732b6e7e4b7f27bba86b468f771da387ce9
 SHA512:
-  metadata.gz: 4adfefd73703e4911e1f26276523da32a9eceb11535e66206f4b79458902d013beeb106760d8c93c07bbd30ab4da9bad9d03e132f83175232a768beefc9a9321
-  data.tar.gz: 56369dba5f9e398fa625fb51a2261858cf08b26eca0f249f870be63bc2488ed67c0849d8fa1a50acf883c1a0b9de32a009bc748eeeffaa3371abf95c22943d75
+  metadata.gz: 331ee8832ad15fb77a1f174c8d76c7243c56017716b282cd5f28ee541b843d2d1fc172812eabc249c3c662cd3fba98bfd8a17041261a1a17bf1ec6a0b7e5ec00
+  data.tar.gz: 87dd05abaed4fada6bcb5fa0523d850ed901855ffd269751d08d5b9d5f1b81fab5676d033a71cdf2b303522e2204e667b55a94369cd1c46e25eaf7e7b176fa1a

data/bin/puppet-fixtures

@@ -1,15 +1,18 @@
 #!/usr/bin/env ruby
 
+# frozen_string_literal: true
+
 require 'pathname'
 require 'optparse'
+require 'English'
 
 require 'puppet_fixtures'
 
-COMMANDS = ['clean', 'install', 'show']
+COMMANDS = %w[clean install show].freeze
 
 command = ARGV[0]
 unless COMMANDS.include?(command)
-  $stderr.puts "Usage: #{$0} #{COMMANDS.join('|')}"
+  warn "Usage: #{$PROGRAM_NAME} #{COMMANDS.join('|')}"
   exit 1
 end
 
@@ -21,20 +24,20 @@ when 'clean'
 when 'install'
   fixtures.download
 when 'show'
-  if (path = fixtures.fixture_path)
+  if fixtures.fixture_path
     puts "Parsing #{fixtures.fixture_path}"
 
     if fixtures.symlinks.any?
       puts
-      puts "Symlinks"
-      fixtures.symlinks.each do |_target, symlink|
+      puts 'Symlinks'
+      fixtures.symlinks.each_value do |symlink|
         puts "  #{symlink}"
       end
     end
 
     if fixtures.forge_modules.any?
       puts
-      puts "Forge modules"
+      puts 'Forge modules'
       fixtures.forge_modules.each do |mod, opts|
         dir = Pathname.new(opts[:target]).relative_path_from(fixtures.module_target_dir)
         description = mod
@@ -45,7 +48,7 @@ when 'show'
 
     if fixtures.repositories.any?
       puts
-      puts "Repositories"
+      puts 'Repositories'
       fixtures.repositories.each do |repository, opts|
         dir = Pathname.new(opts[:target]).relative_path_from(fixtures.module_target_dir)
         description = ["#{opts[:scm]}+#{repository}", opts[:ref]]
@@ -54,6 +57,6 @@ when 'show'
       end
     end
   else
-    $stderr.puts "No fixture file found"
+    warn 'No fixture file found'
   end
 end

data/lib/puppet_fixtures/tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../puppet_fixtures'
 
 require 'rake'

data/lib/puppet_fixtures.rb

@@ -65,67 +65,65 @@ module PuppetFixtures
 
     def fixtures
       @fixtures ||= begin
-                      categories = read_fixtures_file['fixtures']
-
-                      categories['symlinks'] ||= begin
-                                                   metadata = PuppetFixtures::Metadata.new(File.join(source_dir, 'metadata.json'))
-                                                   { metadata.name.split('-').last => source_dir }
-                                                 rescue ArgumentError
-                                                   {}
-                                                 end
-                      categories['forge_modules'] ||= {}
-                      categories['repositories'] ||= {}
-
-                      defaults = { 'target' => module_target_dir }
-
-                      ['symlinks', 'forge_modules', 'repositories'].to_h do |category|
-                        # load defaults from the `.fixtures.yml` `defaults` section
-                        # for the requested category and merge them into my defaults
-                        if (category_defaults = categories.dig('defaults', category))
-                          category_defaults = defaults.merge(category_defaults)
-                        else
-                          category_defaults = defaults
-                        end
-
-                        entries = categories[category].to_h do |fixture, opts|
-                          # convert a simple string fixture to a hash, by
-                          # using the string fixture as the `repo` option of the hash.
-                          if opts.instance_of?(String)
-                            opts = { 'repo' => opts }
-                          end
-                          # there should be a warning or something if it's not a hash...
-                          next unless opts.instance_of?(Hash)
-
-                          # merge our options into the defaults to get the
-                          # final option list
-                          opts = category_defaults.merge(opts)
-
-                          next unless include_repo?(opts['puppet_version'])
-
-                          entry = validate_fixture_hash!(
-                            target: File.join(opts['target'], fixture),
-                            ref: opts['ref'] || opts['tag'],
-                            branch: opts['branch'],
-                            scm: opts.fetch('scm', 'git'),
-                            flags: opts['flags'],
-                            subdir: opts['subdir'],
-                          )
-
-                          case category
-                          when 'forge_modules'
-                            entry.delete(:scm)
-                            entry.delete(:branch)
-                            entry.delete(:subdir)
-                          when 'symlinks'
-                            entry = PuppetFixtures::Symlink.new(link: entry[:target], target: opts['repo'])
-                          end
-
-                          [opts['repo'], entry]
-                        end
-
-                        [category, entries]
-                      end
-                    end
+        categories = read_fixtures_file['fixtures']
+
+        categories['symlinks'] ||= begin
+          metadata = PuppetFixtures::Metadata.new(File.join(source_dir, 'metadata.json'))
+          { metadata.name.split('-').last => source_dir }
+        rescue ArgumentError
+          {}
+        end
+        categories['forge_modules'] ||= {}
+        categories['repositories'] ||= {}
+
+        defaults = { 'target' => module_target_dir }
+
+        %w[symlinks forge_modules repositories].to_h do |category|
+          # load defaults from the `.fixtures.yml` `defaults` section
+          # for the requested category and merge them into my defaults
+          category_defaults = if (category_defaults = categories.dig('defaults', category))
+                                defaults.merge(category_defaults)
+                              else
+                                defaults
+                              end
+
+          entries = categories[category].to_h do |fixture, opts|
+            # convert a simple string fixture to a hash, by
+            # using the string fixture as the `repo` option of the hash.
+            opts = { 'repo' => opts } if opts.instance_of?(String)
+            # there should be a warning or something if it's not a hash...
+            next unless opts.instance_of?(Hash)
+
+            # merge our options into the defaults to get the
+            # final option list
+            opts = category_defaults.merge(opts)
+
+            next unless include_repo?(opts['puppet_version'])
+
+            entry = validate_fixture_hash!(
+              target: File.join(opts['target'], fixture),
+              ref: opts['ref'] || opts['tag'],
+              branch: opts['branch'],
+              scm: opts.fetch('scm', 'git'),
+              flags: opts['flags'],
+              subdir: opts['subdir'],
+            )
+
+            case category
+            when 'forge_modules'
+              entry.delete(:scm)
+              entry.delete(:branch)
+              entry.delete(:subdir)
+            when 'symlinks'
+              entry = PuppetFixtures::Symlink.new(link: entry[:target], target: opts['repo'])
+            end
+
+            [opts['repo'], entry]
+          end
+
+          [category, entries]
+        end
+      end
     end
 
     # @param [String] remote
@@ -171,13 +169,14 @@ module PuppetFixtures
         end
       end
 
-      command = ['puppet', 'module', 'install']
+      command = %w[puppet module install]
       command << '--version' << ref if ref
       command += flags if flags
       command += ['--ignore-dependencies', '--force', '--target-dir', module_target_dir, remote]
 
-      unless run_command(command)
-        raise "Failed to install module #{remote} to #{module_target_dir}"
+      Dir.mktmpdir do |working_dir|
+        command += ['--module_working_dir', working_dir]
+        raise "Failed to install module #{remote} to #{module_target_dir}" unless run_command(command)
       end
 
       true
@@ -215,14 +214,20 @@ module PuppetFixtures
       thread_count = [@max_thread_limit, queue.size].min
       logger.debug("Download queue size: #{queue.size}; using #{thread_count} threads")
 
-      threads = thread_count.times.map do |i|
+      threads = Array.new(thread_count) do |_i|
         Thread.new do
-          type, remote, opts = queue.pop(true)
-          case type
-          when :repository
-            instance.download_repository(remote, **opts)
-          when :forge
-            instance.download_module(remote, **opts)
+          loop do
+            begin
+              type, remote, opts = queue.pop(true)
+            rescue ThreadError
+              break # Queue is empty
+            end
+            case type
+            when :repository
+              instance.download_repository(remote, **opts)
+            when :forge
+              instance.download_module(remote, **opts)
+            end
           end
         end
       end
@@ -260,8 +265,6 @@ module PuppetFixtures
         '.fixtures.yml'
       elsif File.exist?('.fixtures.yaml')
         '.fixtures.yaml'
-      else
-        nil
       end
     end
 
@@ -294,9 +297,9 @@ module PuppetFixtures
     # creates a logger so we can log events with certain levels
     def logger
       @logger ||= begin
-                    require 'logger'
-                    Logger.new($stderr, level: ENV['ENABLE_LOGGER'] ? Logger::DEBUG : Logger::INFO)
-                  end
+        require 'logger'
+        Logger.new($stderr, level: ENV['ENABLE_LOGGER'] ? Logger::DEBUG : Logger::INFO)
+      end
     end
 
     def read_fixtures_file
@@ -366,7 +369,7 @@ module PuppetFixtures
     # @return [String[1]] The module name
     def name
       n = @metadata['name']
-      raise ArgumentError "No module name found" if !n || n.empty?
+      raise ArgumentError 'No module name found' if !n || n.empty?
 
       n
     end
@@ -374,7 +377,7 @@ module PuppetFixtures
     # @return [String[1]] The module version
     def version
       v = @metadata['version']
-      raise ArgumentError "No module name found" if !v || v.empty?
+      raise ArgumentError 'No module name found' if !v || v.empty?
 
       v
     end
@@ -399,6 +402,7 @@ module PuppetFixtures
         begin
           require 'win32/dir'
         rescue LoadError
+          # the require only works on windows
         end
         target = File.join(File.dirname(@link), @target) unless Pathname.new(@target).absolute?
         if Dir.respond_to?(:create_junction)
@@ -472,9 +476,9 @@ module PuppetFixtures
 
       def remove_subdirectory(subdir)
         Dir.mktmpdir do |tmpdir|
-          FileUtils.mv(Dir.glob(File.join(@target, subdir, "{.[^\.]*,*}")), tmpdir)
+          FileUtils.mv(Dir.glob(File.join(@target, subdir, '{.[^.]*,*}')), tmpdir)
           FileUtils.rm_rf(File.join(@target, subdir))
-          FileUtils.mv(Dir.glob(File.join(tmpdir, "{.[^\.]*,*}")), @target.to_s)
+          FileUtils.mv(Dir.glob(File.join(tmpdir, '{.[^.]*,*}')), @target.to_s)
         end
       end
 
@@ -498,16 +502,16 @@ module PuppetFixtures
       def logger
         # TODO: duplicated
         @logger ||= begin
-                      require 'logger'
-                      # TODO: progname?
-                      Logger.new($stderr, level: ENV['ENABLE_LOGGER'] ? Logger::DEBUG : Logger::INFO)
-                    end
+          require 'logger'
+          # TODO: progname?
+          Logger.new($stderr, level: ENV['ENABLE_LOGGER'] ? Logger::DEBUG : Logger::INFO)
+        end
       end
     end
 
     class Git < Base
       def clone(flags = nil)
-        command = ['git', 'clone']
+        command = %w[git clone]
         command.push('--depth', '1') unless @ref
         command.push('-b', @branch) if @branch
         command.push(flags) if flags
@@ -518,7 +522,7 @@ module PuppetFixtures
 
       def update
         # TODO: should this pull?
-        command = ['git', 'fetch']
+        command = %w[git fetch]
         command.push('--unshallow') if shallow_git_repo?
 
         run_command(command, chdir: @target)
@@ -529,7 +533,7 @@ module PuppetFixtures
 
         command = ['git', 'reset', '--hard', @ref]
         result = run_command(command, chdir: @target)
-        raise "Invalid ref #{ref} for #{@target}" unless result
+        raise "Invalid ref #{@ref} for #{@target}" unless result
 
         result
       end
@@ -552,7 +556,7 @@ module PuppetFixtures
 
     class Mercurial < Base
       def clone(flags = nil)
-        command = ['hg', 'clone']
+        command = %w[hg clone]
         command.push('-b', @branch) if @branch
         command.push(flags) if flags
         command.push(@remote, @target)
@@ -561,7 +565,7 @@ module PuppetFixtures
       end
 
       def update
-        run_command(['hg', 'pull'])
+        run_command(%w[hg pull])
       end
 
       def revision
@@ -569,7 +573,7 @@ module PuppetFixtures
 
         command = ['hg', 'update', '--clean', '-r', @ref]
         result = run_command(command, chdir: @target)
-        raise "Invalid ref #{ref} for #{@target}" unless result
+        raise "Invalid ref #{@ref} for #{@target}" unless result
 
         result
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_fixtures
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ewoud Kohl van Wijngaarden
@@ -23,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: voxpupuli-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 description: |
   Originally part of puppetlabs_spec_helper, but with a significant
   refactoring to make it available standalone.
@@ -47,7 +61,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4'
@@ -57,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Set up fixtures for Puppet testing
 test_files: []