apt_stage_artifacts 0.8.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b9075c27ac41c8d3e0863b08e398bfa37aaa0be45db5d3829ee520a7bdd61b71
-  data.tar.gz: 68800922f370cae55767a88ab3db242ff1fdb16c11dd78f70431bd9fb7f9387f
+SHA1:
+  metadata.gz: 4f50352d05718bbbe350ea4c6dfc1bca13c3286d
+  data.tar.gz: 021f50e22c595261541fec6db58c9fe9ffff7588
 SHA512:
-  metadata.gz: 257be870ddd630e3c9120698581f23796c0e3ffb98051c85808ebc249fe45a4ca6a4a487aa3cfd90c3d5de168a17f2fdf9b80c306a48b767f29f8f893465de05
-  data.tar.gz: 1620ec2cb8e999c3d5444b9043c71187f564d527f7110a78c03f28f827abf03132ac48d92677d1220f118568a570df995793acd9c6ea72b2e24f6580bb0b8bed
+  metadata.gz: 1222f2be4b58acfa9fb5c42afa719b5025e7504351e3ae8d42e3048d116ea7c8ac3658558411835650fa712f624b035c00f3d4c18c0cf6618ae4fb05bc15bb17
+  data.tar.gz: 11ee72ca13adbbb277edad093915a4febc524cc61e179a8c895616407cf8278e8434da55641c14632f37f698354ebddd352762f30999710e8aae51fc5599ccfe

data/.rubocop.yml

@@ -3,150 +3,49 @@
 require: rubocop-rake
 
 AllCops:
+  TargetRubyVersion: 2.3
+
   Exclude:
   - Rakefile
   - Gemfile
   - bin/*
   - spec/**/*.rb
+  - '*.gemspec'
   - templates/*
 
-Gemspec/DateAssignment:
-  Enabled: true
-
-Layout/FirstArrayElementIndentation:
+Style/FrozenStringLiteralComment:
   Enabled: false
 
-Layout/MultilineMethodCallIndentation:
+Style/MutableConstant:
   Enabled: false
 
-Layout/SpaceBeforeBrackets:
-  Enabled: true
-
-Lint/AmbiguousAssignment:
-  Enabled: true
-
-Lint/DeprecatedConstants:
-  Enabled: true
-
-Lint/DuplicateBranch:
-  Enabled: true
-
-Lint/DuplicateRegexpCharacterClassElement:
-  Enabled: true
-
-Lint/EmptyBlock:
-  Enabled: true
-
-Lint/EmptyClass:
-  Enabled: true
-
-Lint/LambdaWithoutLiteralBlock:
-  Enabled: true
-
-Lint/NoReturnInBeginEndBlocks:
-  Enabled: true
-
-Lint/NumberedParameterAssignment:
-  Enabled: true
-
-Lint/OrAssignmentToConstant:
-  Enabled: true
-
-Lint/RedundantDirGlobSort:
-  Enabled: true
+Layout/LineLength:
+  Max: 100
 
-Lint/SymbolConversion:
-  Enabled: true
-
-Lint/ToEnumArguments:
-  Enabled: true
-
-Lint/TripleQuotes:
-  Enabled: true
-
-Lint/UnexpectedBlockArity:
-  Enabled: true
-
-Lint/UnmodifiedReduceAccumulator:
-  Enabled: true
-
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/ClassLength:
+Style/Documentation:
   Enabled: false
 
-Metrics/CyclomaticComplexity:
+Metrics/AbcSize:
   Enabled: false
 
 Metrics/MethodLength:
   Enabled: false
 
-Metrics/ModuleLength:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Enabled: false
-
-Style/ArgumentsForwarding:
-  Enabled: true
-
-Style/CollectionCompact:
-  Enabled: true
-
-Style/DocumentDynamicEvalDefinition:
-  Enabled: true
-
-Style/Documentation:
-  Enabled: false
-
-Style/EachWithObject:
-  Enabled: false
-
-Style/EndlessMethod:
-  Enabled: true
-
-Style/FormatString:
-  Enabled: false
+Style/CommandLiteral:
+  EnforcedStyle: percent_x
 
-Style/FormatStringToken:
+Metrics/ClassLength:
   Enabled: false
 
-Style/FrozenStringLiteralComment:
+Style/RedundantReturn:
   Enabled: false
 
-Style/HashConversion:
-  Enabled: true
-
-Style/HashExcept:
-  Enabled: true
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    default: '()'
 
 Style/IfUnlessModifier:
   Enabled: false
 
-Style/IfWithBooleanLiteralBranches:
-  Enabled: true
-
-Style/MutableConstant:
-  Enabled: false
-
-Style/NegatedIfElseCondition:
-  Enabled: true
-
-Style/NilLambda:
-  Enabled: true
-
-Style/RedundantArgument:
-  Enabled: true
-
-Style/RedundantReturn:
-  Enabled: false
-
-Style/StringChars:
-  Enabled: true
-
-Style/SwapValues:
-  Enabled: true
-
-Style/CommandLiteral:
+Metrics/CyclomaticComplexity:
   Enabled: false

data/apt_stage_artifacts.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Stages .deb artifacts to a remote freight repository'
   spec.homepage      = 'https://github.com/puppetlabs/apt_stage_artifacts'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
@@ -29,6 +29,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-byebug', '~> 3.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+
+  # Rubocop 0.81 as the last to support Ruby 2.3. Drop this whenever we can stop
+  # supporting older rubies
+  spec.add_development_dependency 'rubocop', '0.81'
   spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'yard', '~> 0.9'

data/lib/apt_add_to_freight_library.rb

@@ -92,9 +92,9 @@ class AptAddToFreightLibrary
 
     freight_config_file = File.join(
       AptStageArtifacts::FREIGHT_CONFIG_DIRECTORY,
-      "puppet_#{@puppet_version}.conf"
+      "puppet#{@puppet_version}.conf"
     )
-    fatal "Cannot read '#{freight_config_file} on #{`hostname`.chomp}." unless
+    fatal "Cannot read '#{freight_config_file} on #{%x(hostname).chomp}." unless
       File.readable?(freight_config_file)
 
     logger.info "Using '#{freight_config_file}'"
@@ -102,7 +102,7 @@ class AptAddToFreightLibrary
 
     Dir.mktmpdir do |temporary_directory|
       deb_artifacts.each do |artifact_path|
-        logger.info "Adding #{artifact_path} to puppet_#{@puppet_version}/#{@apt_component}"
+        logger.info "Adding #{artifact_path} to puppet#{@puppet_version}/#{@apt_component}"
         deb_artifact_path = artifact_path
         if deb_artifact_path.start_with?('https://', 'http://')
           download_data = URI.parse(deb_artifact_path).open
@@ -115,9 +115,9 @@ class AptAddToFreightLibrary
         end
 
         freight_add_command = %W[
-         sudo --user=jenkins --set-home
-         #{AptStageArtifacts::FREIGHT_COMMAND} add #{@verbose} --conf="#{freight_config_file}"
-         #{deb_artifact_path} "apt/#{@codename}/#{@apt_component}"
+          sudo --user=jenkins --set-home
+          #{AptStageArtifacts::FREIGHT_COMMAND} add #{@verbose} --conf="#{freight_config_file}"
+          #{deb_artifact_path} "apt/#{@codename}/#{@apt_component}"
         ].join(' ')
 
         %x(#{freight_add_command})

data/lib/apt_stage_artifacts.rb

@@ -77,22 +77,27 @@ class AptStageArtifacts
       if File.directory?(File.join(@top_directory, 'deb'))
         @top_directory = File.join(@top_directory, 'deb')
       end
+      unless File.directory?(@top_directory)
+        fatal "Artifact directory \"#{@top_directory}\" does not exist"
+      end
     elsif File.directory?('./output/deb')
       @top_directory = './output/deb'
     elsif File.directory?('./pkg/deb')
       @top_directory = './pkg/deb'
     else
-      logger.error 'Cannot find .deb artifacts. Neither pkg/deb nor output/deb exist.'
-      exit 1
+      logger.warn 'Cannot find .deb artifacts. Neither pkg/deb nor output/deb exist. Skipping.'
+      exit 0
     end
 
-    logger.info "Searching for .deb packages in #{@top_directory}"
+    logger.info "Searching for puppetN/*.deb packages in #{@top_directory}"
     Dir.chdir(@top_directory) do
-      @debian_artifacts = Dir['**/*.deb']
+      @debian_artifacts = Dir['*/puppet*/*.deb']
     end
     return unless @debian_artifacts.empty?
 
-    logger.error 'No .deb files found. Nothing to do.'
+    logger.warn 'This project does not contain artifacts suitable for shipping to the ' \
+                'APT server. Expected repo layout is "pkg/<debian codename>/puppet<N>/*.deb". ' \
+                'Skipping.'
     exit 0
   end
 
@@ -137,7 +142,7 @@ class AptStageArtifacts
       when /^puppet(\d+)+$/
         puppet_version = Regexp.last_match(1)
       else
-        fatal("Unknown repo name \"#{repo_name}\" in #{deb_file_path}")
+        fatal "Puppet version not found in \"#{deb_file_path}\"."
       end
 
       codename = deb_file_path.split('/')[-3]
@@ -153,6 +158,10 @@ class AptStageArtifacts
       }
     end
 
+    if manifest.empty?
+      fatal 'No manifest was generated from the artifact list. This is unexpected.'
+    end
+
     manifest_path = File.join(@top_directory, AptStageArtifacts::MANIFEST_JSON_FILENAME)
     File.open(manifest_path, 'w') do |f|
       f.write(manifest.to_json)
@@ -190,7 +199,9 @@ class AptStageArtifacts
 
   # Invoke the remote staging of the sent artifacts
   def invoke_remote_staging
-    %x(ssh #{@staging_server} #{@remote_staging_command} #{@remote_tarball_path})
+    # Do this in a login shell so we get rvm PATH goodness
+    staging_command = "#{@remote_staging_command} #{@remote_tarball_path}"
+    %x(ssh #{@staging_server} '/bin/bash -l -c "#{staging_command}"')
     return if $CHILD_STATUS.success?
 
     fatal "'ssh #{@staging_server} #{@remote_staging_command} #{@remote_tarball_path}' failed."

data/lib/apt_stage_from_tarball.rb

@@ -31,7 +31,7 @@ class AptStageFromTarball
     extract_tarball
     add_artifacts_to_freight_library
     update_freight_cache
-    # cleanup_tarball_directory
+    cleanup_tarball_directory
     logger.info 'Freight artifact staging successful.'
   end
 
@@ -46,9 +46,10 @@ class AptStageFromTarball
   end
 
   def extract_tarball
-    fatal "'#{@tarball_path}' does not exist." unless File.exist?(@tarball_path)
-    fatal "'#{@tarball_path}' is not a regular file." unless File.file?(@tarball_path)
-    fatal "'#{@tarball_path}' is not readable." unless File.readable?(@tarball_path)
+    fatal "Missing tarball_path command argument." if !@tarball_path
+    fatal "'#{@tarball_path}' does not exist" unless File.exist?(@tarball_path)
+    fatal "'#{@tarball_path}' is not a regular file" unless File.file?(@tarball_path)
+    fatal "'#{@tarball_path}' is not readable" unless File.readable?(@tarball_path)
 
     @tarball_directory = File.dirname(@tarball_path)
 
@@ -69,6 +70,11 @@ class AptStageFromTarball
     logger.info("'#{@tarball_path}' extracted.")
   end
 
+  def cleanup_tarball_directory
+    FileUtils.rm_r @tarball_directory
+    logger.info("'#{@tarball_directory}' deleted.")
+  end
+
   # Read through the staging manifest, adding each line into the correct apt freight
   # library.
   def add_artifacts_to_freight_library
@@ -76,12 +82,12 @@ class AptStageFromTarball
       manifest_file = File.read(@manifest_path)
       JSON.parse(manifest_file, symbolize_names: true).each do |artifact|
         add_to_freight_library_command = %W[
-           #{@apt_add_to_freight_library_command}
-           --verbose
-           --puppet-version=#{artifact[:puppet_version]}
-           --component=#{artifact[:apt_component]}
-           --codename=#{artifact[:codename]}
-           #{File.join(Dir.pwd, artifact[:deb_file_path])}
+          #{@apt_add_to_freight_library_command}
+          --verbose
+          --puppet-version=#{artifact[:puppet_version]}
+          --component=#{artifact[:apt_component]}
+          --codename=#{artifact[:codename]}
+          #{File.join(Dir.pwd, artifact[:deb_file_path])}
         ].join(' ')
 
         %x(#{add_to_freight_library_command})
@@ -102,7 +108,7 @@ class AptStageFromTarball
         #{@apt_update_freight_cache_command}
         --verbose
         --puppet-version=#{puppet_version}
-        ].join(' ')
+      ].join(' ')
 
       %x(#{update_freight_cache_command})
       fatal "#{update_freight_cache_command} failed." unless $CHILD_STATUS.success?

data/lib/apt_update_freight_cache.rb

@@ -72,7 +72,7 @@ class AptUpdateFreightCache
     end
 
     freight_config_file = "/etc/freight.conf.d/puppet#{@puppet_version}.conf"
-    fatal "Cannot read '#{freight_config_file} on #{`hostname`.chomp}." unless
+    fatal "Cannot read '#{freight_config_file} on #{%x(hostname).chomp}." unless
       File.readable?(freight_config_file)
 
     logger.info "Using '#{freight_config_file}'"

data/lib/mixins/constants.rb

@@ -12,8 +12,8 @@ class AptStageArtifacts
 
   # Debian/Ubuntu codenames that we care about.
   # Some codenames are skipped because we don't/haven't shipped for them.
-  DEBIAN_CODENAMES = %w[jessie stretch buster bullseye bookworm trixie]
-  UBUNTU_CODENAMES = %w[xenial bionic focal groovy]
+  DEBIAN_CODENAMES = %w[wheezy jessie stretch buster bullseye bookworm trixie]
+  UBUNTU_CODENAMES = %w[lucid precise trusty xenial bionic focal groovy]
   VALID_CODENAMES = DEBIAN_CODENAMES | UBUNTU_CODENAMES
 
   # Validation constraints
@@ -21,7 +21,7 @@ class AptStageArtifacts
 
   # From freight-add:
   # freight-add registers package with one or more manager/distro[/component] pairs (or triples).
-  # component is optional and for apt defaults to 'main'.
+  # component is optional and for apt defaults to 'stable'.
 
   # These are valid APT components. We use 'stable' instead of 'main' established by convention
   # from docker dists (see https://download.docker.com/linux/ubuntu/dists/groovy)

data/lib/version.rb

@@ -1,3 +1,3 @@
 class AptStageArtifacts
-  VERSION = '0.8.0'
+  VERSION = '0.10.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apt_stage_artifacts
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Puppet Release Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.81'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.81'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -172,14 +186,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubyforge_project: 
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Stages .deb artifacts to a remote freight repository