RubyGems - mini_portile2 - Versions diffs - 2.4.0 → 2.5.0 - Mend

mini_portile2 2.4.0 → 2.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

checksums.yaml +4 -4
data/.gitignore +0 -1
data/CHANGELOG.md +7 -0
data/Rakefile +7 -5
data/concourse/common_prelude.rb +7 -0
data/concourse/common_resources.yml +6 -0
data/concourse/docker-compose.yml +26 -0
data/concourse/mini_portile-pr.yml +69 -0
data/concourse/mini_portile-pr.yml.generated +94 -0
data/concourse/mini_portile.yml +6 -116
data/concourse/mini_portile.yml.generated +50 -0
data/concourse/tasks/rake-test/task.sh +1 -0
data/lib/mini_portile2/mini_portile.rb +6 -3
data/lib/mini_portile2/version.rb +1 -1
data/mini_portile2.gemspec +15 -15
metadata +11 -6

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6db14d6088d4c74bbc5d10fa15a32af4ba33beb9eb524be48015116e605cd2b
-  data.tar.gz: f4b26f092c63df9cef6b0ef229285cc702c815ccdbf2a61d0a3c9567ba036b76
+  metadata.gz: 719a798ea56a6b28c09752acb391d218edf96f7b355c8d618b7859d9c72b8280
+  data.tar.gz: 88bdcc69362b1ac3584e7565021c4a1991a05691789cba8456cb90df8a1615eb
 SHA512:
-  metadata.gz: 345a62f6f547189901abafa3d7fd2d48b0b600a2c8a3863151a42a5460ab2ea1f2168785cf0eeabaa1075d1c8e35559d9d3b69b8399ea79907988eabf2af4787
-  data.tar.gz: 6b0a083c6044ffa76427338a11719fc71d1673dea51b21fc2533fdab216ebff5f9e45eb8a96edd0edf930b439ae7e58c2baa70cbdf659d53713539512f7e6b3a
+  metadata.gz: b374d78b1a9381ef4b8e1984a6b3a6f836e06a25679251722b3983a17b818263e074e8ef8826bdd1f8ccb0c9f57301b1d5d2ee63f7f793eb97ecfec3ee5fc8f8
+  data.tar.gz: 39f33f93bb4f1aef92a5cadc55d945523a0d0229669855dee9abf4f2daf5b0f4a4e25694da39766664374d42cc115cd5fc899d1ba82d3d06a40bb0d3a15b8019

data/.gitignore CHANGED

@@ -4,4 +4,3 @@ Gemfile.lock
 .bundle
 ports
 concourse/private.yml
-concourse/mini_portile.final.yml

data/CHANGELOG.md CHANGED

@@ -1,3 +1,10 @@
+### 2.5.0 / 2020-02-24
+#### Enhancements
+* When verifying GPG signatures, remove all imported pubkeys from keyring [#90] (Thanks, @hanazuki!)
 ### 2.4.0 / 2018-12-02
 #### Enhancements

data/Rakefile CHANGED

@@ -1,11 +1,10 @@
 require "rake/clean"
-require 'bundler/gem_tasks'
-require 'concourse'
+require "bundler/gem_tasks"
 namespace :test do
   desc "Test MiniPortile by running unit tests"
   task :unit do
-    sh "ruby -w -W2 -I. -Ilib -e \"#{Dir["test/test_*.rb"].map{|f| "require '#{f}';"}.join}\" -- #{ENV['TESTOPTS']} -v"
+    sh "ruby -w -W2 -I. -Ilib -e \"#{Dir["test/test_*.rb"].map { |f| "require '#{f}';" }.join}\" -- #{ENV["TESTOPTS"]} -v"
   end
   desc "Test MiniPortile by compiling examples"
@@ -25,5 +24,8 @@ task :test => ["test:unit", "test:examples"]
 task :default => [:test]
-Concourse.new("mini_portile").create_tasks!
+require "concourse"
+Concourse.new("mini_portile", fly_target: "ci") do |c|
+  c.add_pipeline "mini_portile", "mini_portile.yml"
+  c.add_pipeline "mini_portile-pr", "mini_portile-pr.yml"
+end

data/concourse/common_prelude.rb ADDED

@@ -0,0 +1,7 @@
+require "json"
+$common_ignore_paths = [
+  "CHANGELOG.md",
+  "README.md",
+  "concourse/**",
+].to_json

data/concourse/common_resources.yml ADDED

@@ -0,0 +1,6 @@
+  - name: ci
+    type: git
+    source:
+      uri: https://github.com/flavorjones/mini_portile/
+      branch: master
+      disable_ci_skip: true # always get the latest pipeline configuration

data/concourse/docker-compose.yml ADDED

@@ -0,0 +1,26 @@
+version: '3'
+services:
+  concourse-db:
+    image: postgres
+    environment:
+      POSTGRES_DB: concourse
+      POSTGRES_PASSWORD: concourse_pass
+      POSTGRES_USER: concourse_user
+      PGDATA: /database
+  concourse:
+    image: concourse/concourse
+    command: quickstart
+    privileged: true
+    depends_on: [concourse-db]
+    ports: ["8080:8080"]
+    environment:
+      CONCOURSE_POSTGRES_HOST: concourse-db
+      CONCOURSE_POSTGRES_USER: concourse_user
+      CONCOURSE_POSTGRES_PASSWORD: concourse_pass
+      CONCOURSE_POSTGRES_DATABASE: concourse
+      CONCOURSE_EXTERNAL_URL: http://localhost:8080
+      CONCOURSE_ADD_LOCAL_USER: test:test
+      CONCOURSE_MAIN_TEAM_LOCAL_USER: test
+      CONCOURSE_WORKER_BAGGAGECLAIM_DRIVER: overlay

data/concourse/mini_portile-pr.yml ADDED

@@ -0,0 +1,69 @@
+% require "common_prelude.rb"
+resource_types:
+- name: pull-request
+  type: docker-image
+  source:
+    repository: jtarchie/pr
+resources:
+<%= erbify_file "common_resources.yml" -%>
+  - name: mini_portile-pr
+    type: pull-request
+    source:
+      repo: flavorjones/mini_portile
+      access_token: ((github-repo-status-access-token))
+      ignore_paths: <%= $common_ignore_paths %>
+jobs:
+  - name: pr-pending
+    public: true
+    plan:
+      - get: ci
+      - get: mini_portile-pr
+        trigger: true
+        version: every
+      - put: mini_portile-pr
+        params: {path: mini_portile-pr, status: pending}
+% RUBIES[:mri].last(2).each do |ruby_version|
+  - name: ruby-<%= ruby_version %>-pr
+    public: true
+    serial_groups: [pr]
+    plan:
+      - get: ci
+      - get: mini_portile-pr
+        trigger: true
+        version: every
+        passed: [pr-pending]
+      - task: rake-test
+        config:
+          platform: linux
+          image_resource:
+            type: registry-image
+            source: {repository: ruby, tag: "<%= ruby_version %>"}
+          inputs:
+            - name: ci
+            - name: mini_portile-pr
+              path: mini_portile
+          run:
+            path: ci/concourse/tasks/rake-test/task.sh
+        on_failure:
+          put: mini_portile-pr
+          params: {path: mini_portile-pr, status: failure}
+% end
+  - name: pr-success
+    public: true
+    serial_groups: [pr]
+    disable_manual_trigger: true
+    plan:
+      - get: mini_portile-pr
+        trigger: true
+        version: every
+        passed:
+% RUBIES[:mri].last(2).each do |ruby_version|
+          - ruby-<%= ruby_version %>-pr
+% end
+      - put: mini_portile-pr
+        params: {path: mini_portile-pr, status: success}

data/concourse/mini_portile-pr.yml.generated ADDED

@@ -0,0 +1,94 @@
+resource_types:
+- name: pull-request
+  type: docker-image
+  source:
+    repository: jtarchie/pr
+resources:
+  - name: ci
+    type: git
+    source:
+      uri: https://github.com/flavorjones/mini_portile/
+      branch: master
+      disable_ci_skip: true # always get the latest pipeline configuration
+  - name: mini_portile-pr
+    type: pull-request
+    source:
+      repo: flavorjones/mini_portile
+      access_token: ((github-repo-status-access-token))
+      ignore_paths: ["CHANGELOG.md","README.md","concourse/**"]
+jobs:
+  - name: pr-pending
+    public: true
+    plan:
+      - get: ci
+      - get: mini_portile-pr
+        trigger: true
+        version: every
+      - put: mini_portile-pr
+        params: {path: mini_portile-pr, status: pending}
+  - name: ruby-2.6-pr
+    public: true
+    serial_groups: [pr]
+    plan:
+      - get: ci
+      - get: mini_portile-pr
+        trigger: true
+        version: every
+        passed: [pr-pending]
+      - task: rake-test
+        config:
+          platform: linux
+          image_resource:
+            type: registry-image
+            source: {repository: ruby, tag: "2.6"}
+          inputs:
+            - name: ci
+            - name: mini_portile-pr
+              path: mini_portile
+          run:
+            path: ci/concourse/tasks/rake-test/task.sh
+        on_failure:
+          put: mini_portile-pr
+          params: {path: mini_portile-pr, status: failure}
+  - name: ruby-2.7-pr
+    public: true
+    serial_groups: [pr]
+    plan:
+      - get: ci
+      - get: mini_portile-pr
+        trigger: true
+        version: every
+        passed: [pr-pending]
+      - task: rake-test
+        config:
+          platform: linux
+          image_resource:
+            type: registry-image
+            source: {repository: ruby, tag: "2.7"}
+          inputs:
+            - name: ci
+            - name: mini_portile-pr
+              path: mini_portile
+          run:
+            path: ci/concourse/tasks/rake-test/task.sh
+        on_failure:
+          put: mini_portile-pr
+          params: {path: mini_portile-pr, status: failure}
+  - name: pr-success
+    public: true
+    serial_groups: [pr]
+    disable_manual_trigger: true
+    plan:
+      - get: mini_portile-pr
+        trigger: true
+        version: every
+        passed:
+          - ruby-2.6-pr
+          - ruby-2.7-pr
+      - put: mini_portile-pr
+        params: {path: mini_portile-pr, status: success}

data/concourse/mini_portile.yml CHANGED

@@ -1,54 +1,16 @@
-groups:
-  - name: master
-    jobs:
-      <% RUBIES[:mri].last(2).each do |ruby_version| %>
-      - ruby-<%= ruby_version %>
-      <% end %>
-      <% RUBIES[:windows].last(2).each do |ruby_version| %>
-      - win-ruby-<%= ruby_version %>-devkit
-      <% end %>
-  - name: PRs
-    jobs:
-      - pr-pending
-      - ruby-<%= RUBIES[:mri].last %>-pr
-      - pr-success
-resource_types:
-- name: pull-request
-  type: docker-image
-  source:
-    repository: jtarchie/pr
+% require "common_prelude.rb"
 resources:
-  - name: ci
-    type: git
-    source:
-      uri: https://github.com/flavorjones/mini_portile/
-      branch: master
-      disable_ci_skip: true # always get the latest pipeline configuration
+<%= erbify_file "common_resources.yml" -%>
   - name: mini_portile
     type: git
     source:
       uri: https://github.com/flavorjones/mini_portile/
       branch: master
-      ignore_paths:
-        - concourse/**
-  - name: mini_portile-pr
-    type: pull-request
-    source:
-      repo: flavorjones/mini_portile
-      access_token: {{github-repo-status-access-token}}
-      ignore_paths:
-        - concourse/**
+      ignore_paths: <%= $common_ignore_paths %>
 jobs:
-  #
-  #  master
-  #
-  <% RUBIES[:mri].last(2).each do |ruby_version| %>
+% RUBIES[:mri].last(2).each do |ruby_version|
   - name: ruby-<%= ruby_version %>
     public: true
     plan:
@@ -59,83 +21,11 @@ jobs:
         config:
           platform: linux
           image_resource:
-            type: docker-image
+            type: registry-image
             source: {repository: ruby, tag: "<%= ruby_version %>"}
           inputs:
             - name: ci
             - name: mini_portile
           run:
             path: ci/concourse/tasks/rake-test/task.sh
-  <% end %>
-  <% RUBIES[:windows].last(2).each do |ruby_version| %>
-  - name: win-ruby-<%= ruby_version %>-devkit
-    public: true
-    plan:
-      - get: ci
-      - get: mini_portile
-        trigger: true
-      - task: rake-test
-        config:
-          platform: windows
-          inputs:
-            - name: ci
-            - name: mini_portile
-          params:
-            WIN_RUBY_VERSION: "<%= ruby_version %>"
-          run:
-            path: powershell
-            args: ["-File", "ci/concourse/tasks/rake-test/task.ps1"]
-  <% end %>
-  #
-  #  PRs
-  #
-  - name: pr-pending
-    public: true
-    plan:
-      - get: ci
-      - get: mini_portile-pr
-        trigger: true
-        version: every
-      - put: mini_portile-pr
-        params: {path: mini_portile-pr, status: pending}
-% ruby_version = RUBIES[:mri].last
-  - name: ruby-<%= ruby_version %>-pr
-    public: true
-    serial_groups: [pr]
-    plan:
-      - get: ci
-      - get: mini_portile-pr
-        trigger: true
-        version: every
-        passed: [pr-pending]
-      - task: rake-test
-        config:
-          platform: linux
-          image_resource:
-            type: docker-image
-            source: {repository: ruby, tag: "<%= ruby_version %>"}
-          inputs:
-            - name: ci
-            - name: mini_portile-pr
-              path: mini_portile
-          run:
-            path: ci/concourse/tasks/rake-test/task.sh
-        on_failure:
-          put: mini_portile-pr
-          params: {path: mini_portile-pr, status: failure}
-  - name: pr-success
-    public: true
-    serial_groups: [pr]
-    disable_manual_trigger: true
-    plan:
-      - get: mini_portile-pr
-        trigger: true
-        version: every
-        passed:
-          - ruby-<%= ruby_version %>-pr
-      - put: mini_portile-pr
-        params: {path: mini_portile-pr, status: success}
+% end

data/concourse/mini_portile.yml.generated ADDED

@@ -0,0 +1,50 @@
+resources:
+  - name: ci
+    type: git
+    source:
+      uri: https://github.com/flavorjones/mini_portile/
+      branch: master
+      disable_ci_skip: true # always get the latest pipeline configuration
+  - name: mini_portile
+    type: git
+    source:
+      uri: https://github.com/flavorjones/mini_portile/
+      branch: master
+      ignore_paths: ["CHANGELOG.md","README.md","concourse/**"]
+jobs:
+  - name: ruby-2.6
+    public: true
+    plan:
+      - get: ci
+      - get: mini_portile
+        trigger: true
+      - task: rake-test
+        config:
+          platform: linux
+          image_resource:
+            type: registry-image
+            source: {repository: ruby, tag: "2.6"}
+          inputs:
+            - name: ci
+            - name: mini_portile
+          run:
+            path: ci/concourse/tasks/rake-test/task.sh
+  - name: ruby-2.7
+    public: true
+    plan:
+      - get: ci
+      - get: mini_portile
+        trigger: true
+      - task: rake-test
+        config:
+          platform: linux
+          image_resource:
+            type: registry-image
+            source: {repository: ruby, tag: "2.7"}
+          inputs:
+            - name: ci
+            - name: mini_portile
+          run:
+            path: ci/concourse/tasks/rake-test/task.sh

data/concourse/tasks/rake-test/task.sh CHANGED

@@ -7,6 +7,7 @@ apt-get install -y cmake
 pushd mini_portile
+  gem install bundler
   bundle install
   bundle exec rake test

data/lib/mini_portile2/mini_portile.rb CHANGED

@@ -270,15 +270,18 @@ private
         io.close_write
         io.read
       end
-      raise "invalid gpg key provided" unless /\[GNUPG:\] IMPORT_OK \d+ (?<key_id>[0-9a-f]+)/i =~ gpg_status
+      key_ids = gpg_status.scan(/\[GNUPG:\] IMPORT_OK \d+ (?<key_id>[0-9a-f]+)/i).map(&:first)
+      raise "invalid gpg key provided" if key_ids.empty?
       # verify the signature against our keyring
       gpg_status = IO.popen([gpg_exe, "--status-fd", "1", "--no-default-keyring", "--keyring", KEYRING_NAME, "--verify", signature_file, file[:local_path]], &:read)
       # remove the key from our keyring
-      IO.popen([gpg_exe, "--batch", "--yes", "--no-default-keyring", "--keyring", KEYRING_NAME, "--delete-keys", key_id], &:read)
+      key_ids.each do |key_id|
+        IO.popen([gpg_exe, "--batch", "--yes", "--no-default-keyring", "--keyring", KEYRING_NAME, "--delete-keys", key_id], &:read)
+        raise "unable to delete the imported key" unless $?.exitstatus==0
+      end
-      raise "unable to delete the imported key" unless $?.exitstatus==0
       raise "signature mismatch" unless gpg_status.match(/^\[GNUPG:\] VALIDSIG/)
     else

data/lib/mini_portile2/version.rb CHANGED

@@ -1,3 +1,3 @@
 class MiniPortile
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

data/mini_portile2.gemspec CHANGED

@@ -1,37 +1,37 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'mini_portile2/version'
+require "mini_portile2/version"
 Gem::Specification.new do |spec|
-  spec.name          = "mini_portile2"
-  spec.version       = MiniPortile::VERSION
+  spec.name = "mini_portile2"
+  spec.version = MiniPortile::VERSION
-  spec.authors       = ['Luis Lavena', 'Mike Dalessio', 'Lars Kanis']
-  spec.email         = 'mike.dalessio@gmail.com'
+  spec.authors = ["Luis Lavena", "Mike Dalessio", "Lars Kanis"]
+  spec.email = "mike.dalessio@gmail.com"
-  spec.summary       = "Simplistic port-like solution for developers"
-  spec.description   = "Simplistic port-like solution for developers. It provides a standard and simplified way to compile against dependency libraries without messing up your system."
+  spec.summary = "Simplistic port-like solution for developers"
+  spec.description = "Simplistic port-like solution for developers. It provides a standard and simplified way to compile against dependency libraries without messing up your system."
-  spec.homepage      = 'http://github.com/flavorjones/mini_portile'
-  spec.licenses      = ['MIT']
+  spec.homepage = "http://github.com/flavorjones/mini_portile"
+  spec.licenses = ["MIT"]
   begin
-    spec.files         = `git ls-files -z`.split("\x0")
+    spec.files = `git ls-files -z`.split("\x0")
   rescue Exception => e
     warn "WARNING: could not set spec.files: #{e.class}: #{e}"
   end
   # omit the `examples` directory from the gem, because it's large and
   # not necessary to be packaged in the gem.
-  example_files      = spec.files.grep(%r{^examples/})
+  example_files = spec.files.grep(%r{^examples/})
   spec.files -= example_files
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features|examples)/})
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features|examples)/})
   spec.require_paths = ["lib"]
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "minitest", "~> 5.11"
   spec.add_development_dependency "minitest-hooks", "~> 1.5.0"

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_portile2
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Luis Lavena
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-02 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +113,13 @@ files:
 - README.md
 - Rakefile
 - appveyor.yml
+- concourse/common_prelude.rb
+- concourse/common_resources.yml
+- concourse/docker-compose.yml
+- concourse/mini_portile-pr.yml
+- concourse/mini_portile-pr.yml.generated
 - concourse/mini_portile.yml
+- concourse/mini_portile.yml.generated
 - concourse/tasks/rake-test/task.ps1
 - concourse/tasks/rake-test/task.sh
 - lib/mini_portile2.rb
@@ -155,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 3.0.0.beta2
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Simplistic port-like solution for developers