pkgforge 0.26.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db428168b67ebc4529a958db211c17b5dc15048026dbb8d7a4008c8164fe7524
-  data.tar.gz: 74f9a10516ce116473e41bc35d2dcbb2ff4674fef1e8cbf05e6c5c07cfe6f674
+  metadata.gz: abb836ade461f7c09cd0f2e23a2219291ee0a93cc431b903ff32e44cdddf4f87
+  data.tar.gz: 3ec234443d2a0a42df6061bb5bb466936ad896dc0da11a83b53a45338af32514
 SHA512:
-  metadata.gz: d733b393180ee74dc3c271f98884c1e89c9639b5b379315d4068566f50bcff7fc596d1b2cdd6104c5625fbf03cda4e288e73c8823cc4f0c08f8281937d8348c0
-  data.tar.gz: 941c164622cbe2629045994784abb31921893b1a7f5bf19927c1ffdcfa48dbac0576e28a9f606f2528c480567669a81c9b61ff94e213b5a15c48460add663eed
+  metadata.gz: a680525d1ffb74fb7f56743225383bf41b37b6e6c0226bedc4bc7a8540fa3a4139aa04b8ac7b9beddbe34fa7c6c95b781aa31ee2738ee6f772e57aef1e346b66
+  data.tar.gz: 4ef6d12818959faa64b7650a79fea350a8d8541038ebe7a3d94f6b5ee4d54ef476b2918ef1bc400d6d16ee85432ac871dcb1b33c6d38c15df19b274ea58d8fbc

data/.github/workflows/build.yml

@@ -0,0 +1,46 @@
+name: Build
+on:
+  pull_request:
+  push:
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: write
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.1'
+        bundler-cache: true
+    - name: Build
+      run: bundle exec rake
+    - name: Release
+      if: github.ref_type == 'tag'
+      run: bundle exec rake release
+      env:
+        GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }}
+    - name: Post to a Slack channel
+      if: ${{ failure() }}
+      uses: slackapi/slack-github-action@v1.18.0
+      env:
+        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+      with:
+        payload: |
+          {
+            "text": "*${{ github.repository }}*\nBuild failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+            "blocks": [
+              {
+                "type": "section",
+                "text": {
+                  "type": "mrkdwn",
+                  "text": "*${{ github.repository }}*\nBuild failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+                }
+              }
+            ]
+          }

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Les Aker
+Copyright (c) 2022 Les Aker
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -2,9 +2,7 @@ pkgforge
 =========
 
 [![Gem Version](https://img.shields.io/gem/v/pkgforge.svg)](https://rubygems.org/gems/pkgforge)
-[![Build Status](https://img.shields.io/travis/com/akerl/pkgforge.svg)](https://travis-ci.com/akerl/pkgforge)
-[![Coverage Status](https://img.shields.io/codecov/c/github/akerl/pkgforge.svg)](https://codecov.io/github/akerl/pkgforge)
-[![Code Quality](https://img.shields.io/codacy/fb7636f572b04067801ac9024ed71228.svg)](https://www.codacy.com/app/akerl/pkgforge)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/akerl/pkgforge/Build)](https://github.com/akerl/pkgforge/actions)
 [![MIT Licensed](https://img.shields.io/badge/license-MIT-green.svg)](https://tldrlegal.com/license/mit-license)
 
 DSL engine for building Arch packages

data/bin/pkgforge

@@ -6,11 +6,9 @@ require 'mercenary'
 FILE_NAME = '.pkgforge'.freeze
 
 def add_common_opts(cmd)
-  # rubocop:disable Metrics/LineLength
   cmd.option :directory, '-d DIR', '--directory DIR', 'Change to directory before loading'
   cmd.option :skipcleanup, '-s', '--skipcleanup', 'Skip cleanup of tmpdirs and tmpfiles'
   cmd.option :statefile, '--statefile FILE', 'State file to re-use build directories'
-  # rubocop:enable Metrics/LineLength
 end
 
 def get_file(options)

data/lib/pkgforge/components/cflags.rb

@@ -30,7 +30,7 @@ module PkgForge
       Contract Maybe[ArrayOf[String]] => nil
       def libs(value = nil)
         value ||= @forge.deps.keys
-        value.map! { |x| '-l' + x.to_s }
+        value.map! { |x| "-l#{x}" }
         @forge.libs += value
         nil
       end

data/lib/pkgforge/components/deps.rb

@@ -47,7 +47,7 @@ module PkgForge
     def download_file(dep_name, dep_hash, file)
       dep_hash[:org] ||= org
       dep_hash[:site] ||= 'https://github.com'
-      url = "#{dep_hash[:site]}/#{dep_hash[:org]}/#{dep_name}/releases/download/#{dep_hash[:version]}/#{dep_name}.tar.gz" # rubocop:disable Metrics/LineLength
+      url = "#{dep_hash[:site]}/#{dep_hash[:org]}/#{dep_name}/releases/download/#{dep_hash[:version]}/#{dep_name}.tar.gz" # rubocop:disable Layout/LineLength
       File.open(file, 'wb') do |fh|
         fh << open(url, 'rb').read # rubocop:disable Security/Open
       end
@@ -64,7 +64,7 @@ module PkgForge
       else
         actual = Digest::SHA256.file(file).hexdigest
         return if actual == expected
-        raise "Checksum fail for #{file}: #{actual} (actual) != #{expected} (expected)" # rubocop:disable Metrics/LineLength
+        raise "Checksum fail for #{file}: #{actual} (actual) != #{expected} (expected)"
       end
     end
 
@@ -75,7 +75,7 @@ module PkgForge
 
     Contract None => nil
     def remove_linker_archives!
-      deps.keys.each do |dep_name|
+      deps.each_key do |dep_name|
         File.unlink(*Dir.glob("#{tmpdir(dep_name)}/**/*.la"))
       end
       nil
@@ -83,7 +83,7 @@ module PkgForge
 
     Contract None => nil
     def remove_pkgconfig_files!
-      deps.keys.each do |dep_name|
+      deps.each_key do |dep_name|
         File.unlink(*Dir.glob("#{tmpdir(dep_name)}/**/*.pc"))
       end
       nil
@@ -97,7 +97,7 @@ module PkgForge
       Contract HashOf[Symbol => Or[String, Hash]] => nil
       def deps(value)
         value = value.map { |k, v| [k, v.is_a?(Hash) ? v : { version: v }] }
-        @forge.deps = Hash[value]
+        @forge.deps = value.to_h
         nil
       end
 

data/lib/pkgforge/components/upload.rb

@@ -39,7 +39,7 @@ module PkgForge
     def upload_artifacts!
       return unless state[:artifacts]
       state[:artifacts].each do |artifact|
-        args = ['targit', '--authfile', '.creds_github', '--create']
+        args = ['targit', '--authfile', '.creds_github', '--create', '--force']
         args += ['--name', artifact[:name]]
         args += ['--endpoint', endpoint] if endpoint
         args += ["#{org}/#{name}", version, artifact[:source]]

data/lib/pkgforge/version.rb

@@ -1,5 +1,5 @@
 ##
 # Declare version number
 module PkgForge
-  VERSION = '0.26.0'.freeze
+  VERSION = '0.28.0'.freeze
 end

data/pkgforge.gemspec

@@ -5,7 +5,8 @@ require 'pkgforge/version'
 Gem::Specification.new do |s|
   s.name        = 'pkgforge'
   s.version     = PkgForge::VERSION
-  s.date        = Time.now.strftime('%Y-%m-%d')
+
+  s.required_ruby_version = '>= 3.0'
 
   s.summary     = 'DSL engine for building Arch packages'
   s.description = 'DSL engine for building Arch packages'
@@ -15,17 +16,12 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
 
   s.files       = `git ls-files`.split
-  s.test_files  = `git ls-files spec/*`.split
   s.executables = ['pkgforge']
 
-  s.add_dependency 'contracts', '~> 0.16.0'
+  s.add_dependency 'contracts', '~> 0.17.0'
   s.add_dependency 'cymbal', '~> 2.0.0'
-  s.add_dependency 'mercenary', '~> 0.3.4'
+  s.add_dependency 'mercenary', '~> 0.4.0'
 
-  s.add_development_dependency 'codecov', '~> 0.1.1'
-  s.add_development_dependency 'fuubar', '~> 2.5.0'
-  s.add_development_dependency 'goodcop', '~> 0.8.0'
-  s.add_development_dependency 'rake', '~> 13.0.0'
-  s.add_development_dependency 'rspec', '~> 3.9.0'
-  s.add_development_dependency 'rubocop', '~> 0.76.0'
+  s.add_development_dependency 'goodcop', '~> 0.9.5'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

data/spec/spec_helper.rb

@@ -1,11 +1,2 @@
-if ENV['CI'] == 'true'
-  require 'simplecov'
-  require 'codecov'
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
-  SimpleCov.start do
-    add_filter '/spec/'
-  end
-end
-
 require 'rspec'
 require 'pkgforge'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgforge
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2022-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: cymbal
   requirement: !ruby/object:Gem::Requirement
@@ -44,98 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
-- !ruby/object:Gem::Dependency
-  name: codecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: goodcop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.0.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.76.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.76.0
+        version: 0.9.5
 description: DSL engine for building Arch packages
 email: me@lesaker.org
 executables:
@@ -143,12 +73,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circle-ruby"
+- ".github/workflows/build.yml"
 - ".gitignore"
-- ".prospectus"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -177,7 +105,8 @@ files:
 homepage: https://github.com/akerl/pkgforge
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -186,17 +115,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: DSL engine for building Arch packages
-test_files:
-- spec/pkgforge_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.circle-ruby

@@ -1,4 +0,0 @@
-2.6.1
-2.5.3
-2.4.5
-2.3.8

data/.prospectus

@@ -1,11 +0,0 @@
-my_slug = 'akerl/pkgforge'
-
-Prospectus.extra_dep('file', 'prospectus_travis')
-Prospectus.extra_dep('file', 'prospectus_gems')
-
-item do
-  noop
-
-  extend ProspectusGems::Gemspec.new
-  extend ProspectusTravis::Build.new(my_slug)
-end

data/.travis.yml

@@ -1,10 +0,0 @@
-dist: xenial
-install:
-- for i in $(cat .circle-ruby) ; do rvm install $i || exit 1 ; done
-- for i in $(cat .circle-ruby) ; do rvm-exec $i bundle install || exit 1 ; done
-script:
-- for i in $(cat .circle-ruby) ; do rvm-exec $i bundle exec rake || exit 1 ; done
-notifications:
-  email: false
-  slack:
-    secure: hiSpJYwTPJUSw9aS2AG28isKW8Sel209yOVRRwr5U0LV5XLsiMCIHjc8sUPliTIcHNEZgBkoBdVe9cEMpcIwV5oeHWJi/tPt0dMISJ5P8K1mG0i2ULk5Up7vOUDN0WctL8CzhiGCcMr/H1lk3VbHKsxgcozIitnocCIwZuswJqNwu2XpkRw5xxVIMAK9tIZGfH+XMwFZcLghQsAF55fHyKYUVVI5n7PMLVbiDY8u9cVlZKL4qa3dBuus903f/zPGSJXbLcPqnVbuyOlIewxSNaPDX7YjIAdgkNk4IE+gCO82FnNpkWqVdtGT8Nx0PLOkt5FICl7aBFjIanFV1NnMo7qVXj0XNRdIoMBqx5T3WKp9k1EaYnaZwDax1zEDamyUSikwc0BPjnW1gZX5Hv6bQAVMWoXIZz9xJVd1Opv2sH1v534e+eCdcqHBv5sIFbYofeN3KvBEfdFBE4YHorT0u/rtBOBoNBVwrstjvNs3W9CbGqgubH2JUtCky2W+4mXwpmndXTYG8DZkMZ7YCqlQYgJLyPuLdxUjSz6IdMVaz/g8c5/d71jlJuiBl+VX6vFMmtec0/e9ivwH5RhkcsYrGw6dkKh3qymmdoHgc65K5dOLluNvZf/AQyInVXZAivKb2ppIW1t9pjaWN2wX6hEP7Vb8516OwJYzuGHUJFrBpUY=