mini_portile2 2.2.0.rc1 → 2.5.1

data/lib/mini_portile2/mini_portile_cmake.rb

@@ -6,8 +6,10 @@ class MiniPortileCMake < MiniPortile
   end
 
   def configure_defaults
-    if MiniPortile.windows?
-      ['-G "NMake Makefiles"']
+    if MiniPortile.mswin?
+      ['-G', 'NMake Makefiles']
+    elsif MiniPortile.mingw?
+      ['-G', 'MSYS Makefiles']
     else
       []
     end
@@ -16,9 +18,8 @@ class MiniPortileCMake < MiniPortile
   def configure
     return if configured?
 
-    md5_file = File.join(tmp_path, 'configure.md5')
-    digest   = Digest::MD5.hexdigest(computed_options.to_s)
-    File.open(md5_file, "w") { |f| f.write digest }
+    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 + ["."])
   end
@@ -26,16 +27,16 @@ class MiniPortileCMake < MiniPortile
   def configured?
     configure = File.join(work_path, 'configure')
     makefile  = File.join(work_path, 'CMakefile')
-    md5_file  = File.join(tmp_path, 'configure.md5')
+    cache_file  = File.join(tmp_path, 'configure.options_cache')
 
-    stored_md5  = File.exist?(md5_file) ? File.read(md5_file) : ""
-    current_md5 = Digest::MD5.hexdigest(computed_options.to_s)
+    stored_options  = File.exist?(cache_file) ? File.read(cache_file) : ""
+    current_options = computed_options.to_s
 
-    (current_md5 == stored_md5) && newer?(makefile, configure)
+    (current_options == stored_options) && newer?(makefile, configure)
   end
 
   def make_cmd
-    return "nmake" if MiniPortile.windows?
+    return "nmake" if MiniPortile.mswin?
     super
   end
-end
+end

data/lib/mini_portile2/version.rb

@@ -1,3 +1,3 @@
 class MiniPortile
-  VERSION = "2.2.0.rc1"
+  VERSION = "2.5.1"
 end

data/mini_portile2.gemspec

@@ -1,37 +1,42 @@
 # 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 = "https://github.com/flavorjones/mini_portile"
+  spec.licenses = ["MIT"]
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  begin
+    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.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.8.0"
-  spec.add_development_dependency "minitest-hooks", "~> 1.4.0"
-  spec.add_development_dependency "minitar", "~> 0.5.4"
+  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 "rake", "~> 13.0"
+  spec.add_development_dependency "webrick", "~> 1.0"
 
-  spec.required_ruby_version = ">= 1.9.2"
+  spec.required_ruby_version = ">= 2.3.0"
 end

data/test/assets/gpg-fixtures/data

@@ -0,0 +1 @@
+test

data/test/assets/gpg-fixtures/data.asc

@@ -0,0 +1,9 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iJwEAAECAAYFAlcFOD8ACgkQZeg+SWTDcLNIswP/XvVRoJ+eQ2u2v+WjXdBBKBSW
+pzM216aJPRBxPl98xNUUKjqga+tjKmIHJn5T4CIxHqis1toPxtE5tKnc6cVO1aqY
+bCUfkWyt/A3qRHQuniRUWSBKZWdk+j3AopTpd3i/r/s0pDj3bMHJ7bDOTsEskNcM
+KpgFfNM1ieFRQmIWPWg=
+=kbKc
+-----END PGP SIGNATURE-----

data/test/assets/gpg-fixtures/data.invalid.asc

@@ -0,0 +1,9 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iJwEAQECAAYFAlcFLEgACgkQZeg+SWTDcLPVwgQAg8KTI91Ryx38YplzgWV9tUPj
+o7J7IEzb8faE7m2mgtq8m62DvA4h/PJzmbh1EJJ4VkO+A4O2LVh/bTgnyYXv+kMu
+sEmvK35PnAC8r7pv98VSbMEXyV/rK3+uGhTvnXZYkULvMVYkN/EHIh2bCQJ3R14X
+MY8El95QST8/dR/yBkw=
+=qbod
+-----END PGP SIGNATURE-----

data/test/test_cmake.rb

@@ -5,8 +5,6 @@ class TestCMake < TestCase
 
   def before_all
     super
-    return if MiniPortile.windows?
-
     @assets_path = File.expand_path("../assets", __FILE__)
     @tar_path = File.expand_path("../../tmp/test-cmake-1.0.tar.gz", __FILE__)
 
@@ -19,7 +17,6 @@ class TestCMake < TestCase
     @recipe = MiniPortileCMake.new("test-cmake", "1.0").tap do |recipe|
       recipe.files << "http://localhost:#{HTTP_PORT}/#{ERB::Util.url_encode(File.basename(@tar_path))}"
       recipe.patch_files << File.join(@assets_path, "patch 1.diff")
-      recipe.configure_options << "--option=\"path with 'space'\""
       git_dir = File.join(@assets_path, "git")
       with_custom_git_dir(git_dir) do
         recipe.cook
@@ -29,19 +26,22 @@ class TestCMake < TestCase
 
   def after_all
     super
-    return if MiniPortile.windows?
-
     stop_webrick
     # leave test files for inspection
   end
 
+  def exe_name
+    case
+      when MiniPortile.windows? then "hello.exe"
+      else "hello"
+    end
+  end
+
   def test_cmake_inherits_from_base
     assert(MiniPortileCMake <= MiniPortile)
   end
 
   def test_configure
-    skip if MiniPortile.windows?
-
     cmakecache = File.join(work_dir, "CMakeCache.txt")
     assert File.exist?(cmakecache), cmakecache
 
@@ -49,16 +49,12 @@ class TestCMake < TestCase
   end
 
   def test_compile
-    skip if MiniPortile.windows?
-
-    binary = File.join(work_dir, "hello")
+    binary = File.join(work_dir, exe_name)
     assert File.exist?(binary), binary
   end
 
   def test_install
-    skip if MiniPortile.windows?
-
-    binary = File.join(recipe.path, "bin", "hello")
+    binary = File.join(recipe.path, "bin", exe_name)
     assert File.exist?(binary), binary
   end
 end

data/test/test_cook.rb

@@ -8,8 +8,7 @@ class TestCook < TestCase
     @assets_path = File.expand_path("../assets", __FILE__)
     @tar_path = File.expand_path("../../tmp/test mini portile-1.0.0.tar.gz", __FILE__)
 
-    # remove any previous test files
-    FileUtils.rm_rf("tmp")
+    FileUtils.rm_rf("tmp") # remove any previous test files
 
     create_tar(@tar_path, @assets_path, "test mini portile-1.0.0")
     start_webrick(File.dirname(@tar_path))
@@ -28,7 +27,7 @@ class TestCook < TestCase
   def after_all
     super
     stop_webrick
-    # leave test files for inspection
+    FileUtils.rm_rf("tmp") # remove test files
   end
 
   def test_download
@@ -67,3 +66,50 @@ class TestCook < TestCase
     assert_equal( ["install"].inspect, IO.read(txt).chomp )
   end
 end
+
+class TestCookWithBrokenGitDir < TestCase
+  #
+  #  this is a test for #69
+  #  https://github.com/flavorjones/mini_portile/issues/69
+  #
+  attr_accessor :assets_path, :tar_path, :recipe
+
+  def before_all
+    super
+    @assets_path = File.expand_path("../assets", __FILE__)
+    @tar_path = File.expand_path("../../tmp/test-mini-portile-1.0.0.tar.gz", __FILE__)
+
+    @git_dir = File.join(@assets_path, "git-broken")
+    FileUtils.rm_rf @git_dir
+    FileUtils.mkdir_p @git_dir
+    Dir.chdir(@git_dir) do
+      File.open ".git", "w" do |f|
+        f.write "gitdir: /nonexistent"
+      end
+    end
+
+    create_tar(@tar_path, @assets_path, "test mini portile-1.0.0")
+
+    @recipe = MiniPortile.new("test mini portile", "1.0.0").tap do |recipe|
+      recipe.files << "file://#{@tar_path}"
+      recipe.patch_files << File.join(@assets_path, "patch 1.diff")
+      recipe.configure_options << "--option=\"path with 'space'\""
+    end
+
+    Dir.chdir(@git_dir) do
+      @recipe.cook
+    end
+  end
+
+  def after_all
+    FileUtils.rm_rf @git_dir
+  end
+
+  def test_patch
+    Dir.chdir(@git_dir) do
+      patch1 = File.join(work_dir, "patch 1.txt")
+      assert File.exist?(patch1), patch1
+      assert_match( /^\tchange 1/, IO.read(patch1) )
+    end
+  end
+end

data/test/test_digest.rb

@@ -66,5 +66,150 @@ class TestDigest < TestCase
   def test_wrong_md5
     download_with_wrong_digest(:md5)
   end
+
+  def public_key
+    <<-KEY
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mI0EVwUhJQEEAMYxFhgaAdM2Ul5r+XfpqAaI7SOxB14eRjhFjhchy4ylgVxetyLq
+di3zeANXBIHsLBl7quYTlnmhJr/+GQRkCnXWiUp0tJsBVzGM3puK7c534gakEUH6
+AlDtj5p3IeygzSyn8u7KORv+ainXfhwkvTO04mJmxAb2uT8ngKYFdPa1ABEBAAG0
+J1Rlc3QgTWluaXBvcnRpbGUgPHRlc3RAbWluaXBvcnRpbGUub3JnPoi4BBMBAgAi
+BQJXBSElAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBl6D5JZMNwswAK
+A/90Cdb+PX21weBR2Q6uR06M/alPexuXXyJL8ZcwbQMJ/pBBgcS5/h1+rQkBI/CN
+qpXdDlw2Xys2k0sNwdjIw3hmYRzBrddXlCSW3Sifq/hS+kfPZ1snQmIjCgy1Xky5
+QGCcPUxBUxzmra88LakkDO+euKK3hcrfeFIi611lTum1NLiNBFcFISUBBADoyY6z
+2PwH3RWUbqv0VX1s3/JO3v3xMjCRKPlFwsNwLTBtZoWfR6Ao1ajeCuZKfzNKIQ2I
+rn86Rcqyrq4hTj+7BTWjkIPOBthjiL1YqbEBtX7jcYRkYvdQz/IG2F4zVV6X4AAR
+Twx7qaXNt67ArzbHCe5gLNRUK6e6OArkahMv7QARAQABiJ8EGAECAAkFAlcFISUC
+GwwACgkQZeg+SWTDcLNFiwP/TR33ClqWOz0mpjt0xPEoZ0ORmV6fo4sjjzgQoHH/
+KTdsabJbGp8oLQGW/mx3OxgbsAkyZymb5H5cjaF4HtSd4cxI5t1C9ZS/ytN8pqfR
+e29SBje8DAAJn2l57s2OddXLPQ0DUwCcdNEaqgHwSk/Swxc7K+IpfvjLKHKUZZBP
+4Ko=
+=SVWi
+-----END PGP PUBLIC KEY BLOCK-----
+KEY
+  end
+
+  def test_with_valid_gpg_signature
+    data_file = File.expand_path(File.join(File.dirname(__FILE__), 'assets', 'gpg-fixtures', 'data'))
+
+    @recipe.files << {
+      :url => "file://#{data_file}",
+      :gpg => {
+        :key => public_key,
+        :signature_url => "file://#{data_file}.asc"
+      }
+    }
+    @recipe.download
+  end
+
+  def test_optional_gpg_signature_url
+    data_file = File.expand_path(File.join(File.dirname(__FILE__), 'assets', 'gpg-fixtures', 'data'))
+
+    @recipe.files << {
+      :url => "file://#{data_file}",
+      :gpg => {
+        :key => public_key
+      }
+    }
+    @recipe.download
+  end
+
+  def test_with_invalid_gpg_signature
+    data_file = File.expand_path(File.join(File.dirname(__FILE__), 'assets', 'gpg-fixtures', 'data'))
+
+    @recipe.files << {
+      :url => "file://#{data_file}",
+      :gpg => {
+        :key => public_key,
+        :signature_url => "file://#{data_file}.invalid.asc"
+      }
+    }
+    exception = assert_raises(RuntimeError){
+      @recipe.download
+    }
+    assert_equal("signature mismatch", exception.message)
+  end
+
+  def test_with_invalid_key
+    data_file = File.expand_path(File.join(File.dirname(__FILE__), 'assets', 'gpg-fixtures', 'data'))
+
+    @recipe.files << {
+      :url => "file://#{data_file}",
+      :gpg => {
+        :key => "thisisaninvalidkey",
+        :signature_url => "file://#{data_file}.asc"
+      }
+    }
+    exception = assert_raises(RuntimeError){ @recipe.download }
+    assert_equal("invalid gpg key provided", exception.message)
+  end
+
+  def test_with_different_key_than_one_used_to_sign
+    puts "################"
+
+    key = <<-KEY
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+=4JAR
+-----END PGP PUBLIC KEY BLOCK-----
+KEY
+
+    data_file = File.expand_path(File.join(File.dirname(__FILE__), 'assets', 'gpg-fixtures', 'data'))
+
+    @recipe.files << {
+      :url => "file://#{data_file}",
+      :gpg => {
+        :key => key,
+        :signature_url => "file://#{data_file}.asc"
+      }
+    }
+    exception = assert_raises(RuntimeError){ @recipe.download }
+    assert_equal("signature mismatch", exception.message)
+  end
 end
 

data/test/test_download.rb

@@ -5,22 +5,24 @@ describe "recipe download" do
 
   attr :recipe
 
-  def server_must_receive_connection &block
+  def server_must_receive_connection(connections = 3, &block)
     request_count = 0
 
     server = TCPServer.open('localhost', TestCase::HTTP_PORT)
     thread = Thread.new do
-      conn = server.accept
-      request_count += 1
-      conn.puts "CONNECTION SUCESSFULLY MADE"
-      conn.close
+      connections.times do
+        conn = server.accept
+        request_count += 1
+        conn.puts "CONNECTION SUCESSFULLY MADE" rescue SystemCallError
+        conn.close
+      end
     end
 
     block.call
 
     thread.kill
     server.close
-    
+
     request_count.must_be :>, 0
   end
 
@@ -32,21 +34,21 @@ describe "recipe download" do
   describe "urls" do
     it "ftp" do
       @recipe.files << "ftp://localhost:#{TestCase::HTTP_PORT}/foo"
-      server_must_receive_connection do
+      server_must_receive_connection 1 do
         @recipe.download
       end
     end
 
     it "handles http" do
       @recipe.files << "http://localhost:#{TestCase::HTTP_PORT}/foo"
-      server_must_receive_connection do
+      server_must_receive_connection 3 do
         @recipe.download
       end
     end
 
     it "handles https" do
       @recipe.files << "https://localhost:#{TestCase::HTTP_PORT}/foo"
-      server_must_receive_connection do
+      server_must_receive_connection 3 do
         @recipe.download
       end
     end