apt_stage_artifacts 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93eab470ef8684eb79b47dafcc7f08b345d232542d96666e853ea8ac7e553d3e
-  data.tar.gz: bfee3c314fdd1eecd75253d7ad3c71e7debb8d4c396a43a379541e44c3347b5b
+  metadata.gz: 8e43d6a863a30baa1254fc13176928c876311967637ee2c94aaa525db1d59434
+  data.tar.gz: 04c20925c5ffceac9f3861d0e5783cc3ffec3b30acc992bb7e8384acbcf6fcfa
 SHA512:
-  metadata.gz: b9ce4b50d62011ae52277ca427de4c6ecbbba6116687fe240097d70327c99b3b0b870c2deb63fea2a3630719f2d89d0f499f69416b7e81c79ac65d02d60e54c0
-  data.tar.gz: d71e6d727e0cc5a8ffa56eb7360174eed2de96af56e1877a9235a1e4f02ca3da7c2ec8d57b51f83ee1e197fabafd77fc101295fbb169b5086b187619bc79aa51
+  metadata.gz: f9eab7e0f70f96fa3f960a33c3013f7957e0eb863a7cf381b975e7d1de484ea157ad71635e792dbab50b449c7590bfa996e36959fd98d831f0ebb20795f773e8
+  data.tar.gz: 71c0f29097b376bb4d7e169e48b97d8e2377cc3a7c0267e7dbd21cba360a78e91b42e1e5aa6626c0b5818ca1b44faf17e1db2b2b4c7d62dd83cc6f1fd58912af

data/lib/apt_stage_artifacts.rb

@@ -16,14 +16,17 @@ class AptStageArtifacts
     Stages .deb artifacts into a freight library from a Vanagon or packaging directory.
 
     Usage:
-        apt-stage-artifacts [--version]
-        apt-stage-artifacts [--version] <top_directory>
+        apt-stage-artifacts [--repo-type=<repo-type>] [<top_directory>]
+        apt-stage-artifacts --version
+        apt-stage-artifacts --help
+
   DOCOPT
 
   def initialize(argv)
     @script_name = File.basename($PROGRAM_NAME)
     @log_level = Logger::INFO
     @user_options = parse_options(argv)
+    @repo_type = @user_options['--repo-type'] || 'stable'
     @version_string = "Version #{AptStageArtifacts::VERSION}"
 
     @artifacts_tarball_name = 'artifacts.tgz'
@@ -44,6 +47,10 @@ class AptStageArtifacts
   def run
     logger.info @version_string
     exit 0 if @user_options['--version']
+    unless AptStageArtifacts::VALID_REPO_TYPES.include? @repo_type
+      fatal "Unknown repo_type: \"#{@repo_type}\". Valid repo types are: " +
+            AptStageArtifacts::VALID_REPO_TYPES.join(', ')
+    end
     load_builder_data_yaml
     collect_artifacts
     create_remote_staging_directory
@@ -114,10 +121,11 @@ class AptStageArtifacts
 
   # A manifest is a staging to-do list represented in JSON as an array of hashes
   # containing:
-  #   deb_file_path:
-  #   codename:
-  #   puppet_version:
-  #   repo_type:
+  #   deb_file_path: relative path to the .deb file
+  #   codename: debian codename for this artifact, needed by freight
+  #   puppet_version: part of the destination apt repo. We maintain apt repos by puppet major
+  #     version
+  #   repo_type: either 'stable' or 'nightly' typically. 'archive' is supported but unused.
   def generate_manifest
     manifest = []
 
@@ -126,15 +134,8 @@ class AptStageArtifacts
 
       repo_name = artifact_components[-2]
       case repo_name
-      when /^puppet(\d+)-nightly$/
-        puppet_version = Regexp.last_match(1)
-        repo_type = 'nightly'
-      when /^puppet(\d+)-archive/
-        puppet_version = Regexp.last_match(1)
-        repo_type = 'archive'
       when /^puppet(\d+)+$/
         puppet_version = Regexp.last_match(1)
-        repo_type = 'stable'
       else
         fatal("Unknown repo name \"#{repo_name}\" in #{deb_file_path}")
       end
@@ -148,7 +149,7 @@ class AptStageArtifacts
         deb_file_path: deb_file_path,
         puppet_version: puppet_version,
         codename: codename,
-        repo_type: repo_type
+        repo_type: @repo_type
       }
     end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 class AptStageArtifacts
-  VERSION = '0.5.4'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apt_stage_artifacts
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Puppet Release Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry