packaging 0.99.45 → 0.99.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ac7070ff94ebd455cb676a068b288cf6a66bd67cb9b9fae886b939cd122f33e
-  data.tar.gz: 2f54c6d07e0c1dfa1a1a8e08e95d818727da0d2e3857f7673e3fa16f1aac7d3b
+  metadata.gz: f58f5443ce0197dd86632df5eeb3fa20da1e74ad85ca1ed746f13fc928fd868a
+  data.tar.gz: 8b98f3e69e792ec60cc1d59e380d0db082af3fdcfbbeb719ca32b1565b50f702
 SHA512:
-  metadata.gz: 0ad7a909bf0daaa570ca54266efe75aff45e0b3f48b8a0553c26048d5f694c2db92f5e5571a8bc4ee142f1776d55b7ee3f7816fbd63ac4ec5d3eed4ac08c29f6
-  data.tar.gz: 515edd1fc993713e6c465ce085f97470208d070ca0bb16dd3e2ebc7f61b319b9edd60a8263a4ed5087574b6bfeb81e3dbb75a553a6860804370607ca2be20144
+  metadata.gz: cf46758ead2f5d0f3296227e0bf2868b3132b6bc927e3d042eaec111013080dea4ba6372b083f70dec61f4948b2c1ba3fb2abbf822b4be18879f2c754cd57a23
+  data.tar.gz: 1e1d53b77254e2d12f15bbd09b7f72a9d2483cfda6ed60dec6a753aea3124073d8abf4df6a3ddd931d951e6c73b943dca1bdd57fd4380e228f5b02804f140da7

data/lib/packaging.rb

@@ -19,6 +19,7 @@ module Pkg
   require 'packaging/retrieve'
   require 'packaging/sign'
   require 'packaging/archive'
+  require 'packaging/metrics'
 
   # Load configuration defaults
   Pkg::Config.load_defaults

data/lib/packaging/metrics.rb

@@ -0,0 +1,15 @@
+module Pkg::Metrics
+  module_function
+
+  def update_release_metrics
+    metrics_repo = 'release-metrics'
+    command = <<CMD
+git clone git@github.com:puppetlabs/#{metrics_repo}.git
+cd #{metrics_repo}
+bundle exec add-release --date #{Pkg::Util::Date.today} --project #{Pkg::Config.project} --version #{Pkg::Config.ref}
+cd ..
+rm -r #{metrics_repo}
+CMD
+    Pkg::Util::Execution.capture3(command)
+  end
+end

data/lib/packaging/util/date.rb

@@ -11,5 +11,10 @@ module Pkg::Util::Date
       end
       Time.now.strftime(format)
     end
+
+    def today
+      format = "%m/%d/%Y"
+      Time.now.strftime(format)
+    end
   end
 end

data/tasks/jenkins.rake

@@ -267,6 +267,12 @@ namespace :pl do
       end
       # mark the build as successfully shipped
       Rake::Task["pl:jenkins:ship"].invoke("shipped")
+      # add the release to release-metrics
+      begin
+        Rake::Task["pl:update_release_metrics"].invoke
+      rescue => e
+        puts "Uh oh! Something went wrong updating release-metrics:\n#{e}\nPlease add this release manually. Proceeding..."
+      end
     end
 
     task :stage_nightlies => "pl:fetch" do

data/tasks/ship.rake

@@ -434,6 +434,11 @@ namespace :pl do
     Pkg::Util::Ship.ship_msi('pkg', Pkg::Config.nonfinal_msi_path, excludes: ["#{Pkg::Config.project}-x(86|64).msi"], nonfinal: true)
   end
 
+  desc "Add #{Pkg::Config.project} version #{Pkg::Config.ref} to release-metrics"
+  task :update_release_metrics => "pl:fetch" do
+    Pkg::Metrics.update_release_metrics
+  end
+
   desc 'UBER ship: ship all the things in pkg'
   task uber_ship: 'pl:fetch' do
     if Pkg::Util.confirm_ship(FileList['pkg/**/*'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.45
+  version: 0.99.46
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: release-metrics
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Packaging automation written in Rake and Ruby. Easily build native packages
   for most platforms with a few data files and git.
 email: info@puppetlabs.com
@@ -98,6 +112,7 @@ files:
 - lib/packaging/deb.rb
 - lib/packaging/deb/repo.rb
 - lib/packaging/gem.rb
+- lib/packaging/metrics.rb
 - lib/packaging/nuget.rb
 - lib/packaging/paths.rb
 - lib/packaging/platforms.rb