mini_portile2 2.6.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cce9a4c5c119fbab9f241aae304d9aec171a69873a168688132d55e4010ee49
-  data.tar.gz: eb61f44c46b6822aae38027d6c4aecb3c16d6b8d6e7caf008d90110da98c1d69
+  metadata.gz: 2602d6374f46f2b14904b287999ca7da911a08b28fa75517e220796847cd9496
+  data.tar.gz: 450fc92cc01ae557e8ab7f43ddd241d479496160c2f759969531cfa6003321fd
 SHA512:
-  metadata.gz: c943d0ce63b54f9199426af7658f200054a87d151ff30b66183a5afa10096955733bab9a7ccaa167a9052e3826243d779e0579ded63ed1ea2522d35ab5940512
-  data.tar.gz: 476d783710ca21b2893256f39a34f4f958a289ece0230eb7e364f4b1c0714e39f85c74f5f84783279685953ac179fc899959c0fb7302f41856720ceefdb33436
+  metadata.gz: 7ccfdbbb591033e43b155be58a3dd72145886a7c5b38e7f7ba4009adee5b76b6b33d3ee80d7b1d66be7160eeb6ffdf4d87dbd11898b3f624c56d91c316969d13
+  data.tar.gz: 7bd90d3d534b25097e38d748f59286385010ee05f9f4ee06a38b844379bf8fe10b604fe013cc716aa9deab72a02d7e704ef045825acd370db198ec8f1ccb9bea

data/.github/FUNDING.yml

@@ -1 +1,2 @@
-tidelift: "rubygems/mini_portile2"
+github: flavorjones
+tidelift: rubygems/mini_portile2

data/.github/workflows/ci.yml

@@ -1,5 +1,7 @@
 name: Continuous Integration
-
+concurrency:
+  group: "${{github.workflow}}-${{github.ref}}"
+  cancel-in-progress: true
 on:
   workflow_dispatch:
   push:
@@ -20,9 +22,10 @@ jobs:
     env:
       MAKEFLAGS: -j2
     strategy:
+      fail-fast: false
       matrix:
-        platform: [ubuntu-latest, windows-latest]
-        ruby: ["2.3", "2.4", "2.5", "2.6", "2.7", "3.0", "head"]
+        platform: [ubuntu-latest, windows-latest, macos-latest]
+        ruby: ["2.3", "2.4", "2.5", "2.6", "2.7", "3.0", "3.1", "head"]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: configure git crlf on windows
@@ -43,9 +46,10 @@ jobs:
     env:
       MAKEFLAGS: -j2
     strategy:
+      fail-fast: false
       matrix:
-        platform: [ubuntu-latest, windows-latest]
-        ruby: ["3.0"]
+        platform: [ubuntu-latest, windows-latest, macos-latest]
+        ruby: ["3.1"]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: configure git crlf on windows

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 ## mini_portile changelog
 
+### 2.8.0 / 2022-02-20
+
+#### Added
+
+- Support xz-compressed archives (recognized by an `.xz` file extension).
+- When downloading a source archive, default open_timeout and read_timeout to 10 seconds, but allow configuration via open_timeout and read_timeout config parameters.
+
+
+### 2.7.1 / 2021-10-20
+
+#### Packaging
+
+A test artifact that has been included in the gem was being flagged by some users' security scanners because it wasn't a real tarball. That artifact has been updated to be a real tarball. [#108]
+
+
+### 2.7.0 / 2021-08-31
+
+#### Added
+
+The commands used for "make", "compile", and "cmake" are configurable via keyword arguments. [#107] (Thanks, @cosmo0920!)
+
+
 ### 2.6.1 / 2021-05-31
 
 #### Dependencies

data/README.md

@@ -83,11 +83,70 @@ library into a namespaced structure.
 `#activate` ensures GCC will find this library and prefer it over a
 system-wide installation.
 
+Some keyword arguments can be passed to the constructor to configure the commands used:
+
+#### `gcc_command`
+
+The compiler command that is used is configurable, and in order of preference will use:
+
+- the `CC` environment variable (if present)
+- the `gcc_command` value passed in to the constructor
+- `RbConfig::CONFIG["CC"]`
+- `"gcc"`
+
+You can pass it in like so:
+
+``` ruby
+MiniPortile.new("libiconv", "1.13.1", gcc_command: "cc")
+```
+
+#### `make_command`
+
+The configuration/make command that is used is configurable, and in order of preference will use:
+
+- the `MAKE` environment variable (if present)
+- the `make_command` value passed in to the constructor
+- the `make` environment variable (if present)
+- `"make"`
+
+You can pass it in like so:
+
+``` ruby
+MiniPortile.new("libiconv", "1.13.1", make_command: "nmake")
+```
+
+#### `open_timeout`, `read_timeout`
+
+By default, when downloading source archives, MiniPortile will use a timeout value of 10
+seconds. This can be overridden by passing a different value (in seconds):
+
+``` ruby
+MiniPortile.new("libiconv", "1.13.1", open_timeout: 99, read_timeout: 2)
+```
+
 
 ### How to use (for cmake projects)
 
 Same as above, but instead of `MiniPortile.new`, call `MiniPortileCMake.new`.
 
+#### `make_command`
+
+This is configurable as above, except for Windows systems where it's hardcoded to `"nmake"`.
+
+#### `cmake_command`
+
+The cmake command used is configurable, and in order of preference will use:
+
+- the `CMAKE` environment variable (if present)
+- the `cmake_command` value passed in to the constructor
+- `"cmake"`
+
+You can pass it in like so:
+
+``` ruby
+MiniPortileCMake.new("libfoobar", "1.3.5", cmake_command: "cmake3")
+```
+
 
 ### Local source directories
 

data/lib/mini_portile2/mini_portile.rb

@@ -28,6 +28,8 @@ class Net::HTTP
 end
 
 class MiniPortile
+  DEFAULT_TIMEOUT = 10
+
   attr_reader :name, :version, :original_host
   attr_writer :configure_options
   attr_accessor :host, :files, :patch_files, :target, :logger, :source_directory
@@ -46,7 +48,7 @@ class MiniPortile
     RbConfig::CONFIG['target_os'] =~ /mswin/
   end
 
-  def initialize(name, version)
+  def initialize(name, version, **kwargs)
     @name = name
     @version = version
     @target = 'ports'
@@ -57,6 +59,11 @@ class MiniPortile
     @source_directory = nil
 
     @original_host = @host = detect_host
+
+    @gcc_command = kwargs[:gcc_command]
+    @make_command = kwargs[:make_command]
+    @open_timeout = kwargs[:open_timeout] || DEFAULT_TIMEOUT
+    @read_timeout = kwargs[:read_timeout] || DEFAULT_TIMEOUT
   end
 
   def source_directory=(path)
@@ -222,6 +229,14 @@ class MiniPortile
     File.expand_path(port_path)
   end
 
+  def gcc_cmd
+    (ENV["CC"] || @gcc_command || RbConfig::CONFIG["CC"] || "gcc").dup
+  end
+
+  def make_cmd
+    (ENV["MAKE"] || @make_command || ENV["make"] || "make").dup
+  end
+
 private
 
   def tmp_path
@@ -347,6 +362,8 @@ private
         'z'
       when '.bz2', '.tbz2'
         'j'
+      when '.xz'
+        'J'
       when '.Z'
         'Z'
       else
@@ -501,7 +518,9 @@ private
             # Content-Length is unavailable because Transfer-Encoding is chunked
             message "\rDownloading %s " % [filename]
           end
-        }
+        },
+        :open_timeout => @open_timeout,
+        :read_timeout => @read_timeout,
       }
       proxy_uri = URI.parse(url).scheme.downcase == 'https' ?
                   ENV["https_proxy"] :
@@ -526,7 +545,7 @@ private
         return download_file(redirect.url, full_path, count-1)
       rescue => e
         count = count - 1
-        puts "#{count} retrie(s) left for #{filename}"
+        puts "#{count} retrie(s) left for #{filename} (#{e.message})"
         if count > 0
           sleep 1
           return download_file_http(url, full_path, count)
@@ -553,7 +572,9 @@ private
         :progress_proc => lambda{|bytes|
           new_progress = (bytes * 100) / total
           message "\rDownloading %s (%3d%%) " % [filename, new_progress]
-        }
+        },
+        :open_timeout => @open_timeout,
+        :read_timeout => @read_timeout,
       }
       if ENV["ftp_proxy"]
         _, userinfo, _p_host, _p_port = URI.split(ENV['ftp_proxy'])
@@ -583,14 +604,4 @@ private
     FileUtils.mkdir_p File.dirname(full_path)
     FileUtils.mv temp_file.path, full_path, :force => true
   end
-
-  def gcc_cmd
-    cc = ENV["CC"] || RbConfig::CONFIG["CC"] || "gcc"
-    return cc.dup
-  end
-
-  def make_cmd
-    m = ENV['MAKE'] || ENV['make'] || 'make'
-    return m.dup
-  end
 end

data/lib/mini_portile2/mini_portile_cmake.rb

@@ -5,6 +5,11 @@ class MiniPortileCMake < MiniPortile
     "-DCMAKE_INSTALL_PREFIX=#{File.expand_path(port_path)}"
   end
 
+  def initialize(name, version, **kwargs)
+    super(name, version, **kwargs)
+    @cmake_command = kwargs[:cmake_command]
+  end
+
   def configure_defaults
     if MiniPortile.mswin?
       ['-G', 'NMake Makefiles']
@@ -21,7 +26,7 @@ class MiniPortileCMake < MiniPortile
     cache_file = File.join(tmp_path, 'configure.options_cache')
     File.open(cache_file, "w") { |f| f.write computed_options.to_s }
 
-    execute('configure', %w(cmake) + computed_options + ["."])
+    execute('configure', [cmake_cmd] + computed_options + ["."])
   end
 
   def configured?
@@ -39,4 +44,8 @@ class MiniPortileCMake < MiniPortile
     return "nmake" if MiniPortile.mswin?
     super
   end
+
+  def cmake_cmd
+    (ENV["CMAKE"] || @cmake_command || "cmake").dup
+  end
 end

data/lib/mini_portile2/version.rb

@@ -1,3 +1,3 @@
 class MiniPortile
-  VERSION = "2.6.1"
+  VERSION = "2.8.0"
 end

data/mini_portile2.gemspec

@@ -33,10 +33,10 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.3.0"
 
-  spec.add_development_dependency "bundler", "~> 2.1"
-  spec.add_development_dependency "minitar", "~> 0.7"
-  spec.add_development_dependency "minitest", "~> 5.11"
-  spec.add_development_dependency "minitest-hooks", "~> 1.5.0"
+  spec.add_development_dependency "bundler", "~> 2.3"
+  spec.add_development_dependency "minitar", "~> 0.9"
+  spec.add_development_dependency "minitest", "~> 5.15"
+  spec.add_development_dependency "minitest-hooks", "~> 1.5"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "webrick", "~> 1.0"
+  spec.add_development_dependency "webrick", "~> 1.7"
 end

data/test/helper.rb

@@ -57,4 +57,20 @@ class TestCase < Minitest::Test
   ensure
     ENV['GIT_DIR'] = old
   end
+
+  def with_env(env)
+    before = ENV.to_h.dup
+    env.each { |k, v| ENV[k] = v }
+    yield
+  ensure
+    ENV.replace(before)
+  end
+
+  def without_env(*keys, &blk)
+    before = ENV.to_h.dup
+    keys.flatten.each { |k| ENV.delete(k) }
+    yield
+  ensure
+    ENV.replace(before)
+  end
 end

data/test/test_cmake.rb

@@ -58,3 +58,33 @@ class TestCMake < TestCase
     assert File.exist?(binary), binary
   end
 end
+
+class TestCMakeConfig < TestCase
+  def test_make_command_configuration
+    MiniPortile.stub(:mswin?, false) do
+      without_env("MAKE") do
+        assert_equal("make", MiniPortileCMake.new("test", "1.0.0").make_cmd)
+        assert_equal("xyzzy", MiniPortileCMake.new("test", "1.0.0", make_command: "xyzzy").make_cmd)
+      end
+      with_env("MAKE"=>"asdf") do
+        assert_equal("asdf", MiniPortileCMake.new("test", "1.0.0").make_cmd)
+        assert_equal("asdf", MiniPortileCMake.new("test", "1.0.0", make_command: "xyzzy").make_cmd)
+      end
+    end
+
+    MiniPortile.stub(:mswin?, true) do
+      assert_equal("nmake", MiniPortileCMake.new("test", "1.0.0").make_cmd)
+    end
+  end
+
+  def test_cmake_command_configuration
+    without_env("CMAKE") do
+      assert_equal("cmake", MiniPortileCMake.new("test", "1.0.0").cmake_cmd)
+      assert_equal("xyzzy", MiniPortileCMake.new("test", "1.0.0", cmake_command: "xyzzy").cmake_cmd)
+    end
+    with_env("CMAKE"=>"asdf") do
+      assert_equal("asdf", MiniPortileCMake.new("test", "1.0.0").cmake_cmd)
+      assert_equal("asdf", MiniPortileCMake.new("test", "1.0.0", cmake_command: "xyzzy").cmake_cmd)
+    end
+  end
+end

data/test/test_cook.rb

@@ -67,6 +67,32 @@ class TestCook < TestCase
   end
 end
 
+class TestCookConfiguration < TestCase
+  def test_make_command_configuration
+    without_env("MAKE") do
+      assert_equal("make", MiniPortile.new("test", "1.0.0").make_cmd)
+      assert_equal("xyzzy", MiniPortile.new("test", "1.0.0", make_command: "xyzzy").make_cmd)
+    end
+    with_env("MAKE"=>"asdf") do
+      assert_equal("asdf", MiniPortile.new("test", "1.0.0").make_cmd)
+      assert_equal("asdf", MiniPortile.new("test", "1.0.0", make_command: "xyzzy").make_cmd)
+    end
+  end
+
+  def test_gcc_command_configuration
+    without_env("CC") do
+      expected_compiler = RbConfig::CONFIG["CC"] || "gcc"
+      assert_equal(expected_compiler, MiniPortile.new("test", "1.0.0").gcc_cmd)
+      assert_equal("xyzzy", MiniPortile.new("test", "1.0.0", gcc_command: "xyzzy").gcc_cmd)
+    end
+    with_env("CC"=>"asdf") do
+      assert_equal("asdf", MiniPortile.new("test", "1.0.0").gcc_cmd)
+      assert_equal("asdf", MiniPortile.new("test", "1.0.0", gcc_command: "xyzzy").gcc_cmd)
+    end
+  end
+end
+
+
 class TestCookWithBrokenGitDir < TestCase
   #
   #  this is a test for #69

data/test/test_download.rb

@@ -62,7 +62,7 @@ describe "recipe download" do
       @recipe.files << "file://#{path}"
       @recipe.download
       assert File.exist?(dest)
-      Digest::MD5.file(dest).hexdigest.must_equal "5deffb997041bbb5f11bdcafdbb47975"
+      Digest::MD5.file(dest).hexdigest.must_equal "ee0e9f44e72213015ef976d5ac23931d"
     end
 
     it "other" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_portile2
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Luis Lavena
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2022-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
 description: Simplistic port-like solution for developers. It provides a standard
   and simplified way to compile against dependency libraries without messing up your
   system.
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Simplistic port-like solution for developers