mini_portile2 2.4.0 → 2.8.5

data/test/test_mkmf_config.rb

@@ -0,0 +1,202 @@
+require File.expand_path('../helper', __FILE__)
+
+require "mkmf" # initialize $LDFLAGS et al here, instead of in the middle of a test
+
+class TestMkmfConfig < TestCase
+  attr_reader :recipe
+
+  LIBXML_PCP = File.join(__dir__, "assets", "pkgconf", "libxml2")
+  LIBXSLT_PCP = File.join(__dir__, "assets", "pkgconf", "libxslt")
+
+  def make_recipe(name, version)
+    MiniPortile.new(name, version).tap do |recipe|
+      recipe.logger = StringIO.new # hush output
+    end
+  end
+
+  def setup
+    super
+
+    @save_env = %w[PATH CPATH LIBRARY_PATH LDFLAGS PKG_CONFIG_PATH].inject({}) do |env, var|
+      env.update(var => ENV[var])
+    end
+    $INCFLAGS = "-I/xxx"
+    $LIBPATH = ["xxx"]
+    $CFLAGS = "-xxx"
+    $CXXFLAGS = "-xxx"
+    $libs = "-lxxx"
+    $MINI_PORTILE_STATIC_LIBS = {}
+
+    FileUtils.rm_rf(["tmp", "ports"]) # remove any previous test files
+
+    @recipe = make_recipe("libfoo", "1.0.0")
+  end
+
+  def teardown
+    FileUtils.rm_rf(["tmp", "ports"]) # remove any previous test files
+
+    $INCFLAGS = ""
+    $LIBPATH = []
+    $CFLAGS = ""
+    $CXXFLAGS = ""
+    $libs = ""
+    $MINI_PORTILE_STATIC_LIBS = {}
+    @save_env.each do |var, val|
+      ENV[var] = val
+    end
+
+    super
+  end
+
+  def test_mkmf_config_recipe_LIBPATH_global_lib_dir_does_not_exist
+    recipe.mkmf_config
+
+    refute_includes($LIBPATH, recipe.lib_path)
+    refute_includes($libs.shellsplit, "-lfoo")
+  end
+
+  def test_mkmf_config_recipe_LIBPATH_global_not_static
+    FileUtils.mkdir_p(recipe.lib_path)
+
+    recipe.mkmf_config
+
+    assert_includes($LIBPATH, recipe.lib_path)
+    assert_operator($LIBPATH.index(recipe.lib_path), :<, $LIBPATH.index("xxx")) # prepend
+
+    assert_includes($libs.shellsplit, "-lfoo") # note the recipe name is "libfoo"
+    assert_match(%r{-lfoo.*-lxxx}, $libs) # prepend
+  end
+
+  def test_mkmf_config_recipe_LIBPATH_global_static
+    FileUtils.mkdir_p(recipe.lib_path)
+    static_lib_path = File.join(recipe.lib_path, "libfoo.#{$LIBEXT}")
+
+    recipe.mkmf_config(static: "foo")
+
+    refute_includes($LIBPATH, recipe.lib_path)
+
+    refute_includes($libs.shellsplit, "-lfoo") # note the recipe name is "libfoo"
+    assert_includes($libs.shellsplit, static_lib_path)
+    assert_match(%r{#{static_lib_path}.*-lxxx}, $libs) # prepend
+  end
+
+  def test_mkmf_config_recipe_INCFLAGS_global_include_dir_does_not_exist
+    recipe.mkmf_config
+
+    refute_includes($INCFLAGS.shellsplit, "-I#{recipe.include_path}")
+  end
+
+  def test_mkmf_config_recipe_INCFLAGS_global
+    FileUtils.mkdir_p(recipe.include_path)
+
+    recipe.mkmf_config
+
+    assert_includes($INCFLAGS.shellsplit, "-I#{recipe.include_path}")
+    assert_match(%r{-I#{recipe.include_path}.*-I/xxx}, $INCFLAGS) # prepend
+  end
+
+  def test_mkmf_config_pkgconf_does_not_exist
+    assert_raises(ArgumentError) do
+      recipe.mkmf_config(pkg: "foo")
+    end
+  end
+
+  def test_mkmf_config_pkgconf_LIBPATH_global_not_static
+    # can't get the pkgconf utility to install on windows with ruby 2.3 in CI
+    skip if MiniPortile.windows? && RUBY_VERSION < "2.4"
+
+    recipe.mkmf_config(pkg: "libxml-2.0", dir: LIBXML_PCP)
+
+    assert_includes($LIBPATH, "/foo/libxml2/2.11.5/lib")
+    assert_operator($LIBPATH.index("/foo/libxml2/2.11.5/lib"), :<, $LIBPATH.index("xxx")) # prepend
+    refute_includes($LIBPATH, "/foo/zlib/1.3/lib")
+
+    assert_includes($libs.shellsplit, "-lxml2")
+    assert_match(%r{-lxml2.*-lxxx}, $libs) # prepend
+    refute_includes($libs.shellsplit, "-lz")
+  end
+
+  def test_mkmf_config_pkgconf_LIBPATH_global_static
+    # can't get the pkgconf utility to install on windows with ruby 2.3 in CI
+    skip if MiniPortile.windows? && RUBY_VERSION < "2.4"
+
+    static_lib_path = "/foo/libxml2/2.11.5/lib/libxml2.#{$LIBEXT}"
+
+    recipe.mkmf_config(pkg: "libxml-2.0", dir: LIBXML_PCP, static: "xml2")
+
+    refute_includes($LIBPATH, "/foo/libxml2/2.11.5/lib")
+    refute_includes($libs.shellsplit, "-lxml2")
+    assert_includes($libs.shellsplit, static_lib_path)
+    assert_match(%r{#{static_lib_path}.*-lxxx}, $libs) # prepend
+
+    assert_includes($LIBPATH, "/foo/zlib/1.3/lib") # from --static
+    assert_includes($libs.shellsplit, "-lz") # from --static
+  end
+
+  def test_mkmf_config_pkgconf_CFLAGS_global
+    # can't get the pkgconf utility to install on windows with ruby 2.3 in CI
+    skip if MiniPortile.windows? && RUBY_VERSION < "2.4"
+
+    recipe.mkmf_config(pkg: "libxml-2.0", dir: LIBXML_PCP)
+
+    assert_includes($INCFLAGS.shellsplit, "-I/foo/libxml2/2.11.5/include/libxml2")
+    assert_match(%r{-I/foo/libxml2/2.11.5/include/libxml2.*-I/xxx}, $INCFLAGS) # prepend
+
+    assert_includes($CFLAGS.shellsplit, "-ggdb3")
+    assert_match(%r{-xxx.*-ggdb3}, $CFLAGS) # append
+
+    assert_includes($CXXFLAGS.shellsplit, "-ggdb3")
+    assert_match(%r{-xxx.*-ggdb3}, $CXXFLAGS) # append
+  end
+
+  def test_mkmf_config_pkgconf_path_accumulation
+    # can't get the pkgconf utility to install on windows with ruby 2.3 in CI
+    skip if MiniPortile.windows? && RUBY_VERSION < "2.4"
+
+    (ENV["PKG_CONFIG_PATH"] || "").split(File::PATH_SEPARATOR).tap do |pcpaths|
+      refute_includes(pcpaths, LIBXML_PCP)
+      refute_includes(pcpaths, LIBXSLT_PCP)
+    end
+
+    make_recipe("libxml2", "2.11.5").tap do |recipe|
+      recipe.mkmf_config(pkg: "libxml-2.0", dir: LIBXML_PCP, static: "xml2")
+
+      ENV["PKG_CONFIG_PATH"].split(File::PATH_SEPARATOR).tap do |pcpaths|
+        assert_includes(pcpaths, LIBXML_PCP)
+        refute_includes(pcpaths, LIBXSLT_PCP)
+      end
+    end
+
+    make_recipe("libxslt", "1.13.8").tap do |recipe|
+      recipe.mkmf_config(pkg: "libxslt", dir: LIBXSLT_PCP, static: "xslt")
+
+      ENV["PKG_CONFIG_PATH"].split(File::PATH_SEPARATOR).tap do |pcpaths|
+        assert_includes(pcpaths, LIBXML_PCP)
+        assert_includes(pcpaths, LIBXSLT_PCP)
+      end
+
+      recipe.mkmf_config(pkg: "libexslt", dir: LIBXSLT_PCP, static: "exslt")
+    end
+
+    $INCFLAGS.shellsplit.tap do |incflags|
+      assert_includes(incflags, "-I/foo/libxml2/2.11.5/include/libxml2")
+      assert_includes(incflags, "-I/foo/libxslt/1.1.38/include")
+    end
+    $CFLAGS.shellsplit.tap do |cflags|
+      assert_includes(cflags, "-ggdb3")
+      assert_includes(cflags, "-Wno-deprecated-enum-enum-conversion")
+    end
+    refute_includes($LIBPATH, "/foo/libxml2/2.11.5/lib")
+    refute_includes($LIBPATH, "/foo/libxslt/1.1.38/lib")
+    assert_includes($LIBPATH, "/foo/zlib/1.3/lib") # from `--static`
+    $libs.shellsplit.tap do |libflags|
+      refute_includes(libflags, "-lxml2")
+      assert_includes(libflags, "/foo/libxml2/2.11.5/lib/libxml2.#{$LIBEXT}")
+      refute_includes(libflags, "-lxslt")
+      assert_includes(libflags, "/foo/libxslt/1.1.38/lib/libxslt.#{$LIBEXT}")
+      refute_includes(libflags, "-lexslt")
+      assert_includes(libflags, "/foo/libxslt/1.1.38/lib/libexslt.#{$LIBEXT}")
+      assert_includes(libflags, "-lz") # from `--static`
+    end
+  end
+end

data/test/test_recipe.rb

@@ -0,0 +1,18 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestRecipe < TestCase
+  def test_path
+    recipe = MiniPortile.new("libfoo", "1.0.0")
+    assert_equal(File.expand_path(File.join(recipe.target, recipe.host, recipe.name, recipe.version)), recipe.path)
+  end
+
+  def test_lib_path
+    recipe = MiniPortile.new("libfoo", "1.0.0")
+    assert_equal(File.join(recipe.path, "lib"), recipe.lib_path)
+  end
+
+  def test_include_path
+    recipe = MiniPortile.new("libfoo", "1.0.0")
+    assert_equal(File.join(recipe.path, "include"), recipe.include_path)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_portile2
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.8.5
 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: 2023-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,104 +18,102 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.15'
 - !ruby/object:Gem::Dependency
   name: minitest-hooks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: minitar
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: concourse
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
-description: Simplistic port-like solution for developers. It provides a standard
-  and simplified way to compile against dependency libraries without messing up your
-  system.
+        version: '1.7'
+description: |
+  Simple autoconf and cmake builder for developers. It provides a standard way to compile against
+  dependency libraries without requiring system-wide installation. It also simplifies
+  vendoring and cross-compilation by providing a consistent build interface.
 email: mike.dalessio@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".concourse.yml"
+- ".github/FUNDING.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- appveyor.yml
-- concourse/mini_portile.yml
-- concourse/tasks/rake-test/task.ps1
-- concourse/tasks/rake-test/task.sh
+- SECURITY.md
 - lib/mini_portile2.rb
 - lib/mini_portile2/mini_portile.rb
 - lib/mini_portile2/mini_portile_cmake.rb
@@ -126,17 +124,24 @@ files:
 - test/assets/gpg-fixtures/data.asc
 - test/assets/gpg-fixtures/data.invalid.asc
 - test/assets/patch 1.diff
+- test/assets/pkgconf/libxml2/libxml-2.0.pc
+- test/assets/pkgconf/libxslt/libexslt.pc
+- test/assets/pkgconf/libxslt/libxslt.pc
 - test/assets/test mini portile-1.0.0/configure
 - test/assets/test-cmake-1.0/CMakeLists.txt
 - test/assets/test-cmake-1.0/hello.c
 - test/assets/test-download-archive.tar.gz
 - test/helper.rb
+- test/test_activate.rb
 - test/test_cmake.rb
 - test/test_cook.rb
 - test/test_digest.rb
 - test/test_download.rb
+- test/test_execute.rb
+- test/test_mkmf_config.rb
 - test/test_proxy.rb
-homepage: http://github.com/flavorjones/mini_portile
+- test/test_recipe.rb
+homepage: https://github.com/flavorjones/mini_portile
 licenses:
 - MIT
 metadata: {}
@@ -148,31 +153,37 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 3.0.0.beta2
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
-summary: Simplistic port-like solution for developers
+summary: Simple autoconf and cmake builder for developers
 test_files:
 - test/assets/git/config
 - test/assets/gpg-fixtures/data
 - test/assets/gpg-fixtures/data.asc
 - test/assets/gpg-fixtures/data.invalid.asc
 - test/assets/patch 1.diff
+- test/assets/pkgconf/libxml2/libxml-2.0.pc
+- test/assets/pkgconf/libxslt/libexslt.pc
+- test/assets/pkgconf/libxslt/libxslt.pc
 - test/assets/test mini portile-1.0.0/configure
 - test/assets/test-cmake-1.0/CMakeLists.txt
 - test/assets/test-cmake-1.0/hello.c
 - test/assets/test-download-archive.tar.gz
 - test/helper.rb
+- test/test_activate.rb
 - test/test_cmake.rb
 - test/test_cook.rb
 - test/test_digest.rb
 - test/test_download.rb
+- test/test_execute.rb
+- test/test_mkmf_config.rb
 - test/test_proxy.rb
+- test/test_recipe.rb

data/.concourse.yml

@@ -1,83 +0,0 @@
----
-resources:
-- name: mini_portile
-  type: git
-  source:
-    uri: https://github.com/flavorjones/mini_portile
-    branch: master
-jobs:
-- name: "Minitest"
-  plan:
-  - get: mini_portile
-  - task: With version 1.9.3
-    config:
-      platform: linux
-      image: docker:///ruby#1.9.3
-      inputs:
-      - name: mini_portile
-      run:
-        path: bash
-        args:
-        - "-c"
-        - cd mini_portile && bundle install && rake
-    privileged: false
-  - task: With version 2.0
-    config:
-      platform: linux
-      image: docker:///ruby#2.0
-      inputs:
-      - name: mini_portile
-      run:
-        path: bash
-        args:
-        - "-c"
-        - cd mini_portile && bundle install && rake
-    privileged: false
-  - task: With version 2.1
-    config:
-      platform: linux
-      image: docker:///ruby#2.1
-      inputs:
-      - name: mini_portile
-      run:
-        path: bash
-        args:
-        - "-c"
-        - cd mini_portile && bundle install && rake
-    privileged: false
-  - task: With version 2.2
-    config:
-      platform: linux
-      image: docker:///ruby#2.2
-      inputs:
-      - name: mini_portile
-      run:
-        path: bash
-        args:
-        - "-c"
-        - cd mini_portile && bundle install && rake
-    privileged: false
-  - task: With version jruby-1.7.23
-    config:
-      platform: linux
-      image: docker:///jruby#1.7.23
-      inputs:
-      - name: mini_portile
-      run:
-        path: bash
-        args:
-        - "-c"
-        - cd mini_portile && bundle install && rake
-    privileged: false
-  - task: With version jruby-9.0.4.0
-    config:
-      platform: linux
-      image: docker:///jruby#9.0.4.0
-      inputs:
-      - name: mini_portile
-      run:
-        path: bash
-        args:
-        - "-c"
-        - cd mini_portile && bundle install && rake
-    privileged: false

data/.travis.yml

@@ -1,15 +0,0 @@
----
-language: ruby
-sudo: false
-matrix:
-  include:
-  - rvm: 1.9.3
-  - rvm: 2.0
-  - rvm: 2.1
-  - rvm: 2.2.5
-  - rvm: 2.3.1
-  - rvm: 2.4.0
-    env:
-      - RUBYOPT="--enable-frozen-string-literal --debug=frozen-string-literal"
-  - rvm: jruby-1.7
-  - rvm: jruby-9.1.5.0

data/appveyor.yml

@@ -1,25 +0,0 @@
----
-install:
-  - ps: ((New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/bagder/ca-bundle/master/ca-bundle.crt', "$env:TMP\ca-bundle.crt"))
-  - SET SSL_CERT_FILE=%TMP%\ca-bundle.crt
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - SET RAKEOPT=-rdevkit
-  - ruby --version
-  - gem --version
-  - bundle install
-  - gpg --version
-
-build: off
-
-test_script:
-  - bundle exec rake
-
-environment:
-  matrix:
-    - ruby_version: "22-x64"
-    - ruby_version: "22"
-    - ruby_version: "21-x64"
-    - ruby_version: "21"
-    - ruby_version: "200-x64"
-    - ruby_version: "200"
-    - ruby_version: "193"

data/concourse/mini_portile.yml

@@ -1,141 +0,0 @@
-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
-
-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:
-        - concourse/**
-
-  - name: mini_portile-pr
-    type: pull-request
-    source:
-      repo: flavorjones/mini_portile
-      access_token: {{github-repo-status-access-token}}
-      ignore_paths:
-        - concourse/**
-
-jobs:
-  #
-  #  master
-  #
-  <% RUBIES[:mri].last(2).each do |ruby_version| %>
-  - name: ruby-<%= ruby_version %>
-    public: true
-    plan:
-      - get: ci
-      - get: mini_portile
-        trigger: true
-      - task: rake-test
-        config:
-          platform: linux
-          image_resource:
-            type: docker-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}