vanagon 0.18.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f2bcc876c2ab62d16237b4af431f8c25d93db9c4cd204f8f07667f48451b9be
-  data.tar.gz: 231ba1237f8f5c7b1656271e6d627955ebed719c00ee6c59f1070266f698c276
+  metadata.gz: 1e832c071ba2d54e8c938fbeace5fe1c0287bc25b2ff405b6b2d1ca5dbc9f44f
+  data.tar.gz: 1af5c0c38870de680a4cc1f037a94fa6595d22d0e9b70147371650beb11d7130
 SHA512:
-  metadata.gz: 871d364f36c00ba3f8ecfa6a2e0bb593c12577c14cfe961f9a285b4beb105153de4f3e34adf457fdca1ac066570209c3882691531aa7e9db99158c3f61c5dddd
-  data.tar.gz: 4cd3a458968855eafb4f2643215ae59a9f0b508985b002aa7ef1a42cba0c3f484579b585dc0817f690f6f81ea8fb13b1984c1c89c82141311bebb7d047f6f868
+  metadata.gz: 53756b8e737fbe884d6e5ce934442778d07407b638d34186c1b19f658981b5e36a79d0c7c272b0efe82a7f86ded6479ab0a5e1fc7962b0112dfd85732168095c
+  data.tar.gz: 21b9ebef8bb1d8a54650c4a35551abdf8142d9e28689d843f96278ad81d5081877ec9eb6d4d9432799feb464a2f682754d78d3af6cf4b8c20d17bc0ea3c94145

data/README.md

@@ -197,8 +197,8 @@ Port of the system where redis is running. Defaults to *6379*.
 ##### `VANAGON_USE_MIRRORS`
 Controls whether component sources are downloaded directly from upstream URLs
 or from configured mirrors. Most Puppet projects using Vanagon default to
-fetching components from internal mirrors. Set this variable to `n` when
-building outside of the Puppet private network to download directly from
+fetching components from internal mirrors. Set this variable to `n` or `false`
+when building outside of the Puppet private network to download directly from
 upstream sources.
 
 ##### `VANAGON_RETRY_COUNT`

data/bin/build

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
+require 'vanagon/logger'
+
 script = File.basename($0)
 
-warn "#{script}: Warning: use of stand alone '#{script}' command is deprecated and may be removed.
+VanagonLogger.info "#{script}: Warning: use of stand alone '#{script}' command is deprecated and may be removed.
      Use: 'vanagon #{script}' instead."
 
 exec "vanagon", script, *ARGV

data/bin/build_host_info

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
+require 'vanagon/logger'
+
 script = File.basename($0)
 
-warn "#{script}: Warning: use of stand alone '#{script}' command is deprecated and may be removed.
+VanagonLogger.info "#{script}: Warning: use of stand alone '#{script}' command is deprecated and may be removed.
      Use: 'vanagon #{script}' instead."
 
 exec "vanagon", script, *ARGV

data/bin/build_requirements

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
+require 'vanagon/logger'
+
 script = File.basename($0)
 
-warn "#{script}: Warning: use of stand alone '#{script}' command is deprecated and may be removed.
+VanagonLogger.info "#{script}: Warning: use of stand alone '#{script}' command is deprecated and may be removed.
      Use: 'vanagon #{script}' instead."
 
 exec "vanagon", script, *ARGV

data/bin/inspect

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
+require 'vanagon/logger'
+
 script = File.basename($0)
 
-warn "#{script}: Warning: use of stand alone '#{script}' command is deprecated and may be removed.
+VanagonLogger.info "#{script}: Warning: use of stand alone '#{script}' command is deprecated and may be removed.
      Use: 'vanagon #{script}' instead."
 
 exec "vanagon", script, *ARGV

data/bin/render

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
+require 'vanagon/logger'
+
 script = File.basename($0)
 
-warn "#{script}: Warning: use of stand alone '#{script}' command is deprecated and may be removed.
+VanagonLogger.info "#{script}: Warning: use of stand alone '#{script}' command is deprecated and may be removed.
      Use: 'vanagon #{script}' instead."
 
 exec "vanagon", script, *ARGV

data/bin/repo

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'vanagon/logger'
+
 ENV["PROJECT_ROOT"] = Dir.pwd
 
 # Begin warning: This ship script is an internal tool.
@@ -21,7 +23,7 @@ when 'rpm'
 when 'deb'
   Pkg::Util::RakeUtils.invoke_task('pl:jenkins:deb_repos')
 when 'none'
-  $stdout.puts "Skipping repo generation since repo target is set to 'none'"
+  VanagonLogger.warn "Skipping repo generation since repo target is set to 'none'"
 else
   Pkg::Util::RakeUtils.invoke_task('pl:jenkins:rpm_repos')
   Pkg::Util::RakeUtils.invoke_task('pl:jenkins:deb_repos')

data/bin/ship

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
+require 'vanagon/logger'
+
 script = File.basename($0)
 
-warn "#{script}: Warning: use of stand alone '#{script}' command is deprecated and may be removed.
+VanagonLogger.info "#{script}: Warning: use of stand alone '#{script}' command is deprecated and may be removed.
      Use: 'vanagon #{script}' instead."
 
 exec "vanagon", script, *ARGV

data/bin/sign

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
+require 'vanagon/logger'
+
 script = File.basename($0)
 
-warn "#{script}: Warning: use of stand alone '#{script}' command is deprecated and may be removed.
+VanagonLogger.info "#{script}: Warning: use of stand alone '#{script}' command is deprecated and may be removed.
      Use: 'vanagon #{script}' instead."
 
 exec "vanagon", script, *ARGV

data/lib/vanagon/cli.rb

@@ -15,6 +15,8 @@ require 'vanagon/cli/render'
 require 'vanagon/cli/ship'
 require 'vanagon/cli/sign'
 
+require 'vanagon/logger'
+
 
 class Vanagon
   class InvalidArgument < StandardError
@@ -66,7 +68,7 @@ class Vanagon
         puts DOCUMENTATION
         exit 0
       else
-        warn "vanagon: Error: unknown command: \"#{sub_command}\"\n\n#{DOCUMENTATION}"
+        VanagonLogger.error "vanagon: Error: unknown command: \"#{sub_command}\"\n\n#{DOCUMENTATION}"
         exit 1
       end
 
@@ -95,7 +97,7 @@ class Vanagon
     def parse_options(argv)
       Docopt.docopt(DOCUMENTATION, { argv: argv, options_first: true })
     rescue Docopt::Exit => e
-      puts e.message
+      VanagonLogger.error e.message
       exit 1
     end
   end

data/lib/vanagon/cli/build.rb

@@ -1,4 +1,5 @@
 require 'docopt'
+require 'vanagon/logger'
 
 class Vanagon
   class CLI
@@ -32,7 +33,7 @@ class Vanagon
       def parse(argv)
         Docopt.docopt(DOCUMENTATION, { argv: argv })
       rescue Docopt::Exit => e
-        puts e.message
+        VanagonLogger.error e.message
         exit 1
       end
 

data/lib/vanagon/cli/build_host_info.rb

@@ -1,4 +1,5 @@
 require 'docopt'
+require 'vanagon/logger'
 
 class Vanagon
   class CLI
@@ -26,7 +27,7 @@ class Vanagon
       def parse(argv)
         Docopt.docopt(DOCUMENTATION, { argv: argv })
       rescue Docopt::Exit => e
-        puts e.message
+        VanagonLogger.error e.message
         exit 1
       end
 
@@ -36,7 +37,7 @@ class Vanagon
 
         platforms.each do |platform|
           driver = Vanagon::Driver.new(platform, project, options)
-          $stdout.puts JSON.generate(driver.build_host_info)
+          VanagonLogger.warn JSON.generate(driver.build_host_info)
         end
       end
 

data/lib/vanagon/cli/build_requirements.rb

@@ -1,5 +1,6 @@
 require 'docopt'
 require 'json'
+require 'vanagon/logger'
 
 class Vanagon
   class CLI
@@ -27,7 +28,7 @@ class Vanagon
       def parse(argv)
         Docopt.docopt(DOCUMENTATION, { argv: argv })
       rescue Docopt::Exit => e
-        puts e.message
+        VanagonLogger.error e.message
         exit 1
       end
 
@@ -47,9 +48,8 @@ class Vanagon
           end
         end
 
-        $stdout.puts
-        $stdout.puts "**** External packages required to build #{project} on #{platform}: ***"
-        $stdout.puts JSON.pretty_generate(build_requirements.flatten.uniq.sort)
+        VanagonLogger.warn "**** External packages required to build #{project} on #{platform}: ***"
+        VanagonLogger.warn JSON.pretty_generate(build_requirements.flatten.uniq.sort)
       end
 
       def options_translate(docopt_options)

data/lib/vanagon/cli/completion.rb

@@ -1,4 +1,5 @@
 require 'docopt'
+require 'vanagon/logger'
 
 class Vanagon
   class CLI
@@ -15,7 +16,7 @@ class Vanagon
       def parse(argv)
         Docopt.docopt(DOCUMENTATION, { argv: argv })
       rescue Docopt::Exit => e
-        puts e.message
+        VanagonLogger.error e.message
         exit 1
       end
 
@@ -24,10 +25,10 @@ class Vanagon
         completion_file = File.expand_path(File.join('..', '..', '..', '..', 'extras', 'completions', "vanagon.#{shell}"), __FILE__)
 
         if File.exist?(completion_file)
-          puts completion_file
+          VanagonLogger.warn completion_file
           exit 0
         else
-          puts "Could not find completion file for '#{shell}': No such file #{completion_file}"
+          VanagonLogger.error "Could not find completion file for '#{shell}': No such file #{completion_file}"
           exit 1
         end
       end

data/lib/vanagon/cli/inspect.rb

@@ -1,5 +1,6 @@
 require 'docopt'
 require 'json'
+require 'vanagon/logger'
 
 class Vanagon
   class CLI
@@ -30,7 +31,7 @@ class Vanagon
       def parse(argv)
         Docopt.docopt(DOCUMENTATION, { argv: argv })
       rescue Docopt::Exit => e
-        puts e.message
+        VanagonLogger.error e.message
         exit 1
       end
 
@@ -41,7 +42,7 @@ class Vanagon
         platforms.each do |platform|
           driver = Vanagon::Driver.new(platform, project, options)
           components = driver.project.components.map(&:to_hash)
-          $stdout.puts JSON.pretty_generate(components)
+          VanagonLogger.warn JSON.pretty_generate(components)
         end
       end
 

data/lib/vanagon/cli/list.rb

@@ -1,4 +1,5 @@
 require 'docopt'
+require 'vanagon/logger'
 
 class Vanagon
   class CLI
@@ -10,6 +11,7 @@ class Vanagon
         Options:
           -h, --help                       Display help
           -c, --configdir DIRECTORY        Configuration directory [default: #{Dir.pwd}/configs]
+          -d, --defaults                   Display the list of default platforms
           -l, --platforms                  Display a list of platforms
           -r, --projects                   Display a list of projects
           -s, --use-spaces                 Displays the list as space separated
@@ -18,7 +20,7 @@ class Vanagon
       def parse(argv)
         Docopt.docopt(DOCUMENTATION, { argv: argv })
       rescue Docopt::Exit => e
-        puts e.message
+        VanagonLogger.error e.message
         exit 1
       end
 
@@ -31,10 +33,14 @@ class Vanagon
         if Dir.exist?(File.join(options[:configdir], 'platforms')) == false ||
            Dir.exist?(File.join(options[:configdir], 'projects')) == false
 
-          warn "Path to #{File.join(options[:configdir], 'platforms')} or #{File.join(options[:configdir], 'projects')} not found."
+          VanagonLogger.error "Path to #{File.join(options[:configdir], 'platforms')} or #{File.join(options[:configdir], 'projects')} not found."
           exit 1
         end
 
+        default_list = Dir.children(File.join(File.dirname(__FILE__), '..', 'platform', 'defaults')).map do |platform|
+          File.basename(platform, File.extname(platform))
+        end
+
         platform_list = Dir.children(File.join(options[:configdir], 'platforms')).map do |platform|
           File.basename(platform, File.extname(platform))
         end
@@ -43,20 +49,23 @@ class Vanagon
           File.basename(project, File.extname(project))
         end
 
+        if options[:defaults]
+          puts "- Defaults", output(default_list, options[:use_spaces])
+          return
+        end
+
         if options[:projects] == options[:platforms]
           puts "- Projects", output(project_list, options[:use_spaces]), "\n", "- Platforms", output(platform_list, options[:use_spaces])
           return
         end
 
         if options[:projects]
-          puts "- Projects"
-          puts output(project_list, options[:use_spaces])
+          puts "- Projects", output(project_list, options[:use_spaces])
           return
         end
 
         if options[:platforms]
-          puts "- Platforms"
-          puts output(platform_list, options[:use_spaces])
+          puts "- Platforms", output(platform_list, options[:use_spaces])
           return
         end
       end
@@ -64,6 +73,7 @@ class Vanagon
       def options_translate(docopt_options)
         translations = {
           '--configdir' => :configdir,
+          '--defaults' => :defaults,
           '--platforms' => :platforms,
           '--projects' => :projects,
           '--use-spaces' => :use_spaces,

data/lib/vanagon/cli/render.rb

@@ -1,5 +1,6 @@
 require 'docopt'
 require 'json'
+require 'vanagon/logger'
 
 class Vanagon
   class CLI
@@ -27,7 +28,7 @@ class Vanagon
       def parse(argv)
         Docopt.docopt(DOCUMENTATION, { argv: argv })
       rescue Docopt::Exit => e
-        puts e.message
+        VanagonLogger.error e.message
         exit 1
       end
 

data/lib/vanagon/cli/ship.rb

@@ -1,4 +1,5 @@
 require 'docopt'
+require 'vanagon/logger'
 
 class Vanagon
   class CLI
@@ -14,38 +15,22 @@ class Vanagon
       def parse(argv)
         Docopt.docopt(DOCUMENTATION, { argv: argv })
       rescue Docopt::Exit => e
-        puts e.message
+        VanagonLogger.error e.message
         exit 1
       end
 
       def run(_)
         ENV['PROJECT_ROOT'] = Dir.pwd
 
-        artifactory_warning = <<-DOC
-          Unable to ship packages to artifactory. Please make sure you are pointing to a
-          recent version of packaging in your Gemfile. Please also make sure you include
-          the artifactory gem in your Gemfile.
-
-          Examples:
-            gem 'packaging', :github => 'puppetlabs/packaging', branch: '1.0.x'
-            gem 'artifactory'
-        DOC
-
         if Dir['output/**/*'].select { |entry| File.file?(entry) }.empty?
-          warn 'vanagon: Error: No packages to ship in the "output" directory. Maybe build some first?'
+          VanagonLogger.error 'vanagon: Error: No packages to ship in the "output" directory. Maybe build some first?'
           exit 1
         end
 
         require 'packaging'
         Pkg::Util::RakeUtils.load_packaging_tasks
         Pkg::Util::RakeUtils.invoke_task('pl:jenkins:ship', 'artifacts', 'output')
-        begin
-          Pkg::Util::RakeUtils.invoke_task('pl:jenkins:ship_to_artifactory', 'output')
-        rescue LoadError
-          warn artifactory_warning
-        rescue StandardError
-          warn artifactory_warning
-        end
+        Pkg::Util::RakeUtils.invoke_task('pl:jenkins:ship_to_artifactory', 'output')
       end
     end
   end

data/lib/vanagon/cli/sign.rb

@@ -1,4 +1,5 @@
 require 'docopt'
+require 'vanagon/logger'
 
 class Vanagon
   class CLI
@@ -14,14 +15,14 @@ class Vanagon
       def parse(argv)
         Docopt.docopt(DOCUMENTATION, { argv: argv })
       rescue Docopt::Exit => e
-        puts e.message
+        VanagonLogger.error e.message
         exit 1
       end
 
       def run(_)
         ENV['PROJECT_ROOT'] = Dir.pwd
         if Dir['output/**/*'].select { |entry| File.file?(entry) }.empty?
-          warn 'sign: Error: No packages to sign in the "output" directory. Maybe build some first?'
+          VanagonLogger.error 'sign: Error: No packages to sign in the "output" directory. Maybe build some first?'
           exit 1
         end
 

data/lib/vanagon/component.rb

@@ -3,6 +3,8 @@ require 'vanagon/component/rules'
 require 'vanagon/component/source'
 require 'vanagon/component/source/rewrite'
 
+require 'vanagon/logger'
+
 class Vanagon
   class Component
     include Vanagon::Utilities
@@ -138,9 +140,9 @@ class Vanagon
       dsl.instance_eval(File.read(compfile), compfile, 1)
       dsl._component
     rescue StandardError => e
-      warn "Error loading project '#{name}' using '#{compfile}':"
-      warn e
-      warn e.backtrace.join("\n")
+      VanagonLogger.error "Error loading project '#{name}' using '#{compfile}':"
+      VanagonLogger.error e
+      VanagonLogger.error e.backtrace.join("\n")
       raise e
     end
 
@@ -178,6 +180,7 @@ class Vanagon
       @preremove_actions = []
       @postremove_actions = []
       @install_only = false
+      @service = []
     end
 
     # Adds the given file to the list of files and returns @files.
@@ -254,18 +257,18 @@ class Vanagon
     def fetch_mirrors(options)
       mirrors.to_a.shuffle.each do |mirror|
         begin
-          warn %(Attempting to fetch from mirror URL "#{mirror}")
+          VanagonLogger.info %(Attempting to fetch from mirror URL "#{mirror}")
           @source = Vanagon::Component::Source.source(mirror, options)
           return true if source.fetch
         rescue SocketError
           # SocketError means that there was no DNS/name resolution
           # for whatever remote protocol the mirror tried to use.
-          warn %(Unable to resolve mirror URL "#{mirror}")
+          VanagonLogger.error %(Unable to resolve mirror URL "#{mirror}")
         rescue RuntimeError
           # Source retrieval does not consistently return a meaningful
           # namespaced error message, which means we're brute-force rescuing
           # RuntimeError. Not a good look, and we should fix this.
-          warn %(Unable to retrieve mirror URL "#{mirror}")
+          VanagonLogger.error %(Unable to retrieve mirror URL "#{mirror}")
         end
       end
       false
@@ -277,7 +280,7 @@ class Vanagon
     # @return [Boolean] return True if the source can be retrieved,
     #   or False otherwise
     def fetch_url(options)
-      warn %(Attempting to fetch from canonical URL "#{url}")
+      VanagonLogger.info %(Attempting to fetch from canonical URL "#{url}")
       @source = Vanagon::Component::Source.source(url, options)
       # Explicitly coerce the return value of #source.fetch,
       # because each subclass of Vanagon::Component::Source returns
@@ -303,7 +306,7 @@ class Vanagon
     def get_source(workdir) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
       opts = options.merge({ workdir: workdir })
       if url || !mirrors.empty?
-        if ENV['VANAGON_USE_MIRRORS'] == 'n'
+        if ENV['VANAGON_USE_MIRRORS'] == 'n' or ENV['VANAGON_USE_MIRRORS'] == 'false'
           fetch_url(opts)
         else
           fetch_mirrors(opts) || fetch_url(opts)
@@ -319,7 +322,7 @@ class Vanagon
           @version ||= source.version
         end
       else
-        warn "No source given for component '#{@name}'"
+        VanagonLogger.info "No source given for component '#{@name}'"
 
         # If there is no source, we don't want to try to change directories, so we just change to the current directory.
         @dirname = './'
@@ -407,7 +410,7 @@ class Vanagon
     # @return [String] environment suitable for inclusion in a Makefile
     # @deprecated
     def get_environment
-      warn <<-WARNING.undent
+      VanagonLogger.info <<-WARNING.undent
         #get_environment is deprecated; environment variables have been moved
         into the Makefile, and should not be used within a Makefile's recipe.
         The #get_environment method will be removed by Vanagon 1.0.0.