vanagon 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9471f41441c2a8aea399d9a08961332b68e94e9a377b783e76d09857ffcec0d7
-  data.tar.gz: ea8ccc12852db54d70c58d17d66815fadc48604eabfdf456623357fef3c3dd21
+  metadata.gz: 958967d126de3ae4bf36c6e13f2aa0dcbe387e7cf52621ba5386ef87e470402d
+  data.tar.gz: 57b2cb0b77c9d0fd82d79a935d2c5fd8676c3e46968c036f21dc86128e97303f
 SHA512:
-  metadata.gz: 67e94d799467fc05efb1e3815c55d71f4ffee9b91126eacae5b24793a7d6cb1478f0aae5c936a946e6d78e0896ea92f970104fbc519f0de45389f36bec228e2e
-  data.tar.gz: 756ebf1259f45d5fd5c9a2e5050423bca7da0cf72d5ab3404551da4c9d868b2b68bfa03043ee3f6e070c1b86884076c43af3891cfa3841a5dec8b6909ee3faf5
+  metadata.gz: c6a328120e33ef21de286bbb5f1d086632ac855507c3c3a3913d392a7a99a04f447c90128cfeaca4f37674c8f541e5c07c326a70c5dde79a069a8a8339c052f3
+  data.tar.gz: 98ffb256fbd7b09fc1c7eea5157036ef666cbb80e9bc686077a2722d64b9371a516b60252a5f70f2956451e83a2f68e3538f3369115e8fdf26cbf18402fb030d

data/lib/vanagon/cli/dependencies.rb

@@ -0,0 +1,89 @@
+require 'docopt'
+require 'json'
+require 'vanagon/logger'
+
+class Vanagon
+  class CLI
+    class Dependencies < Vanagon::CLI
+      DOCUMENTATION = <<~DOCOPT.freeze
+        Usage:
+        dependencies [options] <project-name> <platforms>
+
+        Options:
+          -h, --help                       Display help
+          -c, --configdir DIRECTORY        Configuration directory [default: #{Dir.pwd}/configs]
+          -w, --workdir DIRECTORY          Working directory on the local host
+          -v, --verbose                    Only here for backwards compatibility. Does nothing.
+
+        Project-Name:
+          May be a project name of a project from the configs/projects directory or 'all' to generate dependencies for all projects.
+        Platforms:
+          May be a platform name of a platform from the configs/platforms directory or 'all' to generate dependencies for all platforms.
+      DOCOPT
+
+      def parse(argv)
+        Docopt.docopt(DOCUMENTATION, { argv: argv })
+      rescue Docopt::Exit => e
+        VanagonLogger.error e.message
+        exit 1
+      end
+
+      def run(options) # rubocop:disable Metrics/AbcSize
+        platforms_directory = File.join(options[:configdir], 'platforms')
+        projects_directory = File.join(options[:configdir], 'projects')
+
+        unless Dir.exist?(projects_directory) && Dir.exist?(platforms_directory)
+          VanagonLogger.error "Path to #{platforms_directory} or #{projects_directory} not found."
+          exit 1
+        end
+
+        projects = [options[:project_name]]
+        if projects.include?('all')
+          projects = Dir.children(projects_directory).map do |project|
+            File.basename(project, File.extname(project))
+          end
+        end
+
+        platforms = options[:platforms].split(',')
+        if platforms.include?('all')
+          platforms = Dir.children(platforms_directory).map do |platform|
+            File.basename(platform, File.extname(platform))
+          end
+        end
+
+        failures = []
+
+        projects.each do |project|
+          platforms.each do |platform|
+            begin
+              artifact = Vanagon::Driver.new(platform, project, options)
+              artifact.dependencies
+            rescue RuntimeError => e
+              failures.push("#{project}, #{platform}: #{e}")
+            end
+          end
+        end
+
+        unless failures.empty?
+          VanagonLogger.info "Failed to generate dependencies for the following:"
+          failures.each do |failure|
+            VanagonLogger.info failure
+          end
+        end
+
+        VanagonLogger.info "Finished generating dependencies"
+      end
+
+      def options_translate(docopt_options)
+        translations = {
+          '--verbose' => :verbose,
+          '--workdir' => :workdir,
+          '--configdir' => :configdir,
+          '<project-name>' => :project_name,
+          '<platforms>' => :platforms
+        }
+        return docopt_options.map { |k, v| [translations[k], v] }.to_h
+      end
+    end
+  end
+end

data/lib/vanagon/cli.rb

@@ -14,6 +14,7 @@ require 'vanagon/cli/list'
 require 'vanagon/cli/render'
 require 'vanagon/cli/ship'
 require 'vanagon/cli/sign'
+require 'vanagon/cli/dependencies'
 
 require 'vanagon/logger'
 
@@ -37,6 +38,7 @@ class Vanagon
           render              create local versions of packaging artifacts for project
           sign                sign a package
           ship                upload a package to a distribution server
+          dependencies        write json file to STDOUT that shows all required gems for a given project and platform
           help                print this help
     DOCOPT
 
@@ -64,6 +66,8 @@ class Vanagon
         @sub_parser = Vanagon::CLI::Sign.new
       when 'ship'
         @sub_parser = Vanagon::CLI::Ship.new
+      when 'dependencies'
+        @sub_parser = Vanagon::CLI::Dependencies.new
       when 'help'
         puts DOCUMENTATION
         exit 0

data/lib/vanagon/component/source/git.rb

@@ -13,7 +13,7 @@ class Vanagon
   class Component
     class Source
       class Git
-        attr_accessor :url, :ref, :workdir, :clone_options
+        attr_accessor :url, :log_url, :ref, :workdir, :clone_options
         attr_reader :version, :default_options, :repo
 
         class << self
@@ -73,18 +73,19 @@ class Vanagon
         # @param url [String] url of git repo to use as source
         # @param ref [String] ref to checkout from git repo
         # @param workdir [String] working directory to clone into
-        def initialize(url, workdir:, **options)
+        def initialize(url, workdir:, **options) # rubocop:disable Metrics/AbcSize
           opts = default_options.merge(options.reject { |k, v| v.nil? })
 
           # Ensure that #url returns a URI object
           @url = URI.parse(url.to_s)
+          @log_url = @url.host + @url.path unless @url.host.nil? || @url.path.nil?
           @ref = opts[:ref]
           @dirname = opts[:dirname]
           @workdir = File.realpath(workdir)
           @clone_options = opts[:clone_options] ||= {}
 
           # We can test for Repo existence without cloning
-          raise Vanagon::InvalidRepo, "#{url} not a valid Git repo" unless valid_remote?
+          raise Vanagon::InvalidRepo, "url is not a valid Git repo" unless valid_remote?
         end
 
         # Fetch the source. In this case, clone the repository into the workdir
@@ -157,10 +158,10 @@ class Vanagon
         # Clone a remote repo, make noise about it, and fail entirely
         # if we're unable to retrieve the remote repo
         def clone!
-          VanagonLogger.info "Cloning Git repo '#{url}'"
+          VanagonLogger.info "Cloning Git repo '#{log_url}'"
           VanagonLogger.info "Successfully cloned '#{dirname}'" if clone
         rescue ::Git::GitExecuteError
-          raise Vanagon::InvalidRepo, "Unable to clone from '#{url}'"
+          raise Vanagon::InvalidRepo, "Unable to clone from '#{log_url}'"
         end
         private :clone!
 
@@ -170,7 +171,7 @@ class Vanagon
           VanagonLogger.info "Checking out '#{ref}' from Git repo '#{dirname}'"
           clone.checkout(ref)
         rescue ::Git::GitExecuteError
-          raise Vanagon::CheckoutFailed, "unable to checkout #{ref} from '#{url}'"
+          raise Vanagon::CheckoutFailed, "unable to checkout #{ref} from '#{log_url}'"
         end
         private :checkout!
 

data/lib/vanagon/component/source/http.rb

@@ -108,6 +108,9 @@ class Vanagon
           uri = URI.parse(target_url.to_s)
           target_file ||= File.basename(uri.path)
 
+          # Add X-RPROXY-PASS to request header if the environment variable exists
+          headers['X-RPROXY-PASS'] = ENV['X-RPROXY-PASS'] if ENV['X-RPROXY-PASS']
+
           VanagonLogger.info "Downloading file '#{target_file}' from url '#{target_url}'"
 
           Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|

data/lib/vanagon/driver.rb

@@ -171,7 +171,7 @@ class Vanagon
 
     def render # rubocop:disable Metrics/AbcSize
       # Simple sanity check for the project
-      if @project.version.nil? or @project.version.empty?
+      if @project.version.nil? || @project.version.empty?
         raise Vanagon::Error, "Project requires a version set, all is lost."
       end
 
@@ -182,6 +182,17 @@ class Vanagon
       @project.make_makefile(workdir)
     end
 
+    def dependencies
+      # Simple sanity check for the project
+      if @project.version.nil? || @project.version.empty?
+        raise Vanagon::Error, "Project requires a version set, all is lost."
+      end
+
+      VanagonLogger.info "creating dependencies list"
+      @project.fetch_sources(workdir, retry_count, timeout)
+      @project.cli_manifest_json(@platform)
+    end
+
     # Initialize the logging instance
     def loginit(logfile)
       @@logger = Logger.new(logfile)

data/lib/vanagon/platform/defaults/el-9-aarch64.rb

@@ -0,0 +1,10 @@
+platform "el-9-aarch64" do |plat|
+  plat.servicedir "/usr/lib/systemd/system"
+  plat.defaultdir "/etc/sysconfig"
+  plat.servicetype "systemd"
+
+  packages = %w(autoconf automake createrepo gcc gcc-c++ rsync cmake make rpm-libs rpm-build libarchive)
+  plat.provision_with "dnf install -y --allowerasing #{packages.join(' ')}"
+  plat.install_build_dependencies_with "dnf install -y --allowerasing "
+  plat.vmpooler_template "redhat-9-arm64"
+end

data/lib/vanagon/platform/defaults/el-9-x86_64.rb

@@ -0,0 +1,10 @@
+platform "el-9-x86_64" do |plat|
+  plat.servicedir "/usr/lib/systemd/system"
+  plat.defaultdir "/etc/sysconfig"
+  plat.servicetype "systemd"
+
+  packages = %w(gcc gcc-c++ autoconf automake createrepo rsync cmake make rpm-libs rpm-build rpm-sign libtool libarchive)
+  plat.provision_with "dnf install -y --allowerasing #{packages.join(' ')}"
+  plat.install_build_dependencies_with "dnf install -y --allowerasing "
+  plat.vmpooler_template "redhat-9-x86_64"
+end

data/lib/vanagon/project.rb

@@ -762,6 +762,17 @@ class Vanagon
       end
     end
 
+    # Writes a json file to STDOUT containing information
+    # about what will go into an artifact
+    #
+    # @param platform [String] platform we're writing metadata for
+    def cli_manifest_json(platform)
+      manifest = build_manifest_json
+      metadata = metadata_merge(manifest, @upstream_metadata)
+
+      puts JSON.pretty_generate(metadata)
+    end
+
     # Writes a yaml file at `output/<name>-<version>.<platform>.settings.yaml`
     # containing settings used to build the current project on the platform
     # provided (and a corresponding sha1sum file) if `yaml_settings` has been

data/resources/rpm/project.spec.erb

@@ -81,7 +81,7 @@ Requires:  <%= requires.requirement %><%= requires.version ? " #{requires.versio
 # did not specify a dependency on these.
 # In the future, we will supress pre/post scripts completely if there's nothing
 # specified by the project or the components.
-<%- if @platform.is_fedora? && @platform.os_version.to_i >= 29 -%>
+<%- if @platform.is_fedora? || (@platform.is_el? && @platform.os_version.to_i >= 9) -%>
 Requires(pre): /usr/bin/mkdir
 Requires(pre): /usr/bin/touch
 Requires(post): /usr/bin/mkdir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -118,6 +118,7 @@ files:
 - lib/vanagon/cli/build_host_info.rb
 - lib/vanagon/cli/build_requirements.rb
 - lib/vanagon/cli/completion.rb
+- lib/vanagon/cli/dependencies.rb
 - lib/vanagon/cli/inspect.rb
 - lib/vanagon/cli/list.rb
 - lib/vanagon/cli/render.rb
@@ -164,11 +165,10 @@ files:
 - lib/vanagon/platform/defaults/el-7-x86_64.rb
 - lib/vanagon/platform/defaults/el-8-aarch64.rb
 - lib/vanagon/platform/defaults/el-8-x86_64.rb
-- lib/vanagon/platform/defaults/fedora-30-x86_64.rb
-- lib/vanagon/platform/defaults/fedora-31-x86_64.rb
+- lib/vanagon/platform/defaults/el-9-aarch64.rb
+- lib/vanagon/platform/defaults/el-9-x86_64.rb
 - lib/vanagon/platform/defaults/fedora-32-x86_64.rb
 - lib/vanagon/platform/defaults/fedora-34-x86_64.rb
-- lib/vanagon/platform/defaults/osx-10.14-x86_64.rb
 - lib/vanagon/platform/defaults/osx-10.15-x86_64.rb
 - lib/vanagon/platform/defaults/osx-11-x86_64.rb
 - lib/vanagon/platform/defaults/redhatfips-7-x86_64.rb
@@ -326,42 +326,42 @@ signing_key:
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/project_spec.rb
 - spec/lib/vanagon/utilities/extra_files_signer_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/extensions/string_spec.rb
 - spec/lib/vanagon/extensions/set/json_spec.rb
 - spec/lib/vanagon/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/extensions/string_spec.rb
+- spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/cli_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/osx_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
+- spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/platform_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
 - spec/lib/vanagon/engine/always_be_scheduling_spec.rb
-- spec/lib/vanagon/engine/ec2_spec.rb
-- spec/lib/vanagon/engine/pooler_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/component/source_spec.rb
+- spec/lib/vanagon/engine/ec2_spec.rb
+- spec/lib/vanagon/engine/pooler_spec.rb
 - spec/lib/vanagon/component/source/rewrite_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
-- spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/source/local_spec.rb
+- spec/lib/vanagon/component/source/git_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/cli_spec.rb
-- spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/driver_spec.rb
-- spec/lib/makefile_spec.rb
 - spec/lib/git/rev_list_spec.rb
+- spec/lib/makefile_spec.rb

data/lib/vanagon/platform/defaults/fedora-30-x86_64.rb

@@ -1,11 +0,0 @@
-platform "fedora-30-x86_64" do |plat|
-  plat.servicedir "/usr/lib/systemd/system"
-  plat.defaultdir "/etc/sysconfig"
-  plat.servicetype "systemd"
-  plat.dist "fc30"
-
-  packages = %w(autoconf automake createrepo rsync gcc gcc-c++ make rpmdevtools rpm-libs cmake rpm-sign yum-utils)
-  plat.provision_with "/usr/bin/dnf install -y --best --allowerasing #{packages.join(' ')}"
-  plat.install_build_dependencies_with "/usr/bin/dnf install -y --best --allowerasing"
-  plat.vmpooler_template "fedora-30-x86_64"
-end

data/lib/vanagon/platform/defaults/fedora-31-x86_64.rb

@@ -1,11 +0,0 @@
-platform "fedora-31-x86_64" do |plat|
-  plat.servicedir "/usr/lib/systemd/system"
-  plat.defaultdir "/etc/sysconfig"
-  plat.servicetype "systemd"
-  plat.dist "fc31"
-
-  packages = %w(autoconf automake cmake createrepo rsync gcc gcc-c++ make rpmdevtools rpm-libs rpm-sign)
-  plat.provision_with "/usr/bin/dnf install -y --best --allowerasing  #{packages.join(' ')}"
-  plat.install_build_dependencies_with "/usr/bin/dnf install -y --best --allowerasing"
-  plat.vmpooler_template "fedora-31-x86_64"
-end

data/lib/vanagon/platform/defaults/osx-10.14-x86_64.rb

@@ -1,21 +0,0 @@
-platform "osx-10.14-x86_64" do |plat|
-  plat.servicetype "launchd"
-  plat.servicedir "/Library/LaunchDaemons"
-  plat.codename "mojave"
-
-  plat.provision_with "export HOMEBREW_NO_EMOJI=true"
-  plat.provision_with "export HOMEBREW_VERBOSE=true"
-  plat.provision_with "sudo dscl . -create /Users/test"
-  plat.provision_with "sudo dscl . -create /Users/test UserShell /bin/bash"
-  plat.provision_with "sudo dscl . -create /Users/test UniqueID 1001"
-  plat.provision_with "sudo dscl . -create /Users/test PrimaryGroupID 1000"
-  plat.provision_with "sudo dscl . -create /Users/test NFSHomeDirectory /Users/test"
-  plat.provision_with "sudo dscl . -passwd /Users/test password"
-  plat.provision_with "sudo dscl . -merge /Groups/admin GroupMembership test"
-  plat.provision_with "echo 'test ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/username"
-  plat.provision_with "mkdir -p /etc/homebrew"
-  plat.provision_with "cd /etc/homebrew"
-  plat.provision_with %Q(su test -c 'echo | /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"')
-  plat.provision_with "sudo chown -R test:admin /Users/test/"
-  plat.vmpooler_template "osx-1014-x86_64"
-end