mini_portile2 2.1.0 → 2.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b90aadf075467a1583841db365f7bd1aafb26790
-  data.tar.gz: 7689b3b467a964185225509458770aa60e1214e7
+  metadata.gz: 7085b002833202ee7455beb829f9fb787bca8129
+  data.tar.gz: 097a89cc3ffe2a742947a3310c284d518ab8a9f6
 SHA512:
-  metadata.gz: 7b0296b213f1e3b0edb2238a660489379ae084beef21ae3dc2b6f22a677d8053111ac0a130f5638c097149294c028676d06b199b8473dd1496552ab62b230e80
-  data.tar.gz: 1a3762db4b474760297a93c9a4a17f29cc96b0999ffca256da2f9124f1fe2a597121ca8d7ef2cb5ace853a569c679a2e6df032d6039741920df3927ec2189ef8
+  metadata.gz: 033fb41be5b3c882e6a02eb806695a22db54ce2b8ef2253b9475822f4bb5764157d411cb2a2da143da8c10ca887e65fc85a0dd60c741867d700ce07afa688e20
+  data.tar.gz: 6b0df87be823d602b38508a924f85de1d1923840d184484bddb7ccf05542e8d9895919593c6e8870c5515b320ddd640aec5f20470ad1b19dd348ff28f1605fac

data/.concourse.yml

@@ -0,0 +1,83 @@
+---
+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,4 +1,4 @@
----
+--
 language: ruby
 sudo: false
 rvm:
@@ -6,6 +6,7 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.0
   - ruby-head
   - jruby-1.7.23
   - jruby-9.0.4.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 2.2.0.rc1 / 2016-03-08
+
+#### Enhancements
+
+* Add experimental support for cmake-based projects
+
+
 ### 2.1.0 / 2016-01-06
 
 #### Enhancements

data/README.md

@@ -46,15 +46,17 @@ appropriate `ENV` variables.)
 
 ## Sounds easy, but where's the catch?
 
-At this time (and highly likely will be always) `mini_portile2` is
-only compatible with **GCC compilers** and **autoconf**- or
-**configure**-based projects.
+At this time `mini_portile2` only supports **autoconf**- or
+**configure**-based projects. (That is, it assumes the library you
+want to build contains a `configure` script, which all the
+autoconf-based libraries do.)
 
-That is, it assumes the library you want to build contains a
-`configure` script, which all the autoconf-based libraries do.
+As of v2.2.0, there is experimental support for **CMake**-based
+projects. We welcome your feedback on this, particularly for Windows
+platforms.
 
 
-### How to use
+### How to use (for autoconf projects)
 
 Now that you know the catch, and you're still reading this, here is a
 quick example:
@@ -82,6 +84,11 @@ library into a namespaced structure.
 system-wide installation.
 
 
+### How to use (for cmake projects)
+
+Same as above, but instead of `MiniPortile.new`, call `MiniPortileCMake.new`.
+
+
 ### Directory Structure Conventions
 
 `mini_portile2` follows the principle of **convention over configuration** and

data/lib/mini_portile2.rb

@@ -1,2 +1,3 @@
 require "mini_portile2/version"
 require "mini_portile2/mini_portile"
+require "mini_portile2/mini_portile_cmake"

data/lib/mini_portile2/mini_portile.rb

@@ -33,6 +33,10 @@ class MiniPortile
   attr_writer :configure_options
   attr_accessor :host, :files, :patch_files, :target, :logger
 
+  def self.windows?
+    RbConfig::CONFIG['target_os'] =~ /mswin|mingw32/
+  end
+
   def initialize(name, version)
     @name = name
     @version = version

data/lib/mini_portile2/mini_portile_cmake.rb

@@ -0,0 +1,41 @@
+require 'mini_portile2/mini_portile'
+
+class MiniPortileCMake < MiniPortile
+  def configure_prefix
+    "-DCMAKE_INSTALL_PREFIX=#{File.expand_path(port_path)}"
+  end
+
+  def configure_defaults
+    if MiniPortile.windows?
+      ['-G "NMake Makefiles"']
+    else
+      []
+    end
+  end
+
+  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 }
+
+    execute('configure', %w(cmake) + computed_options + ["."])
+  end
+
+  def configured?
+    configure = File.join(work_path, 'configure')
+    makefile  = File.join(work_path, 'CMakefile')
+    md5_file  = File.join(tmp_path, 'configure.md5')
+
+    stored_md5  = File.exist?(md5_file) ? File.read(md5_file) : ""
+    current_md5 = Digest::MD5.hexdigest(computed_options.to_s)
+
+    (current_md5 == stored_md5) && newer?(makefile, configure)
+  end
+
+  def make_cmd
+    return "nmake" if MiniPortile.windows?
+    super
+  end
+end

data/lib/mini_portile2/version.rb

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

data/test/assets/test-cmake-1.0/CMakeLists.txt

@@ -0,0 +1,7 @@
+# CMakeLists files in this project can
+# refer to the root source directory of the project as ${HELLO_SOURCE_DIR} and
+# to the root binary directory of the project as ${HELLO_BINARY_DIR}.
+cmake_minimum_required (VERSION 2.8.7)
+project (HELLO)
+add_executable (hello hello.c)
+install (TARGETS hello DESTINATION bin)

data/test/assets/test-cmake-1.0/hello.c

@@ -0,0 +1,4 @@
+int main(int argc, char** argv)
+{
+  return 0 ;
+}

data/test/helper.rb

@@ -37,11 +37,11 @@ class TestCase < Minitest::Test
     end
   end
 
-  def create_tar(tar_path, assets_path)
+  def create_tar(tar_path, assets_path, directory)
     FileUtils.mkdir_p(File.dirname(tar_path))
     Zlib::GzipWriter.open(tar_path) do |fdtgz|
       Dir.chdir(assets_path) do
-        Archive::Tar::Minitar.pack("test mini portile-1.0.0", fdtgz)
+        Archive::Tar::Minitar.pack(directory, fdtgz)
       end
     end
   end
@@ -49,4 +49,12 @@ class TestCase < Minitest::Test
   def work_dir(r=recipe)
     "tmp/#{r.host}/ports/#{r.name}/#{r.version}/#{r.name}-#{r.version}"
   end
+
+  def with_custom_git_dir(dir)
+    old = ENV['GIT_DIR']
+    ENV['GIT_DIR'] = dir
+    yield
+  ensure
+    ENV['GIT_DIR'] = old
+  end
 end

data/test/test_cmake.rb

@@ -0,0 +1,64 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestCMake < TestCase
+  attr_accessor :assets_path, :tar_path, :recipe
+
+  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__)
+
+    # remove any previous test files
+    FileUtils.rm_rf("tmp")
+
+    create_tar(@tar_path, @assets_path, "test-cmake-1.0")
+    start_webrick(File.dirname(@tar_path))
+
+    @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
+      end
+    end
+  end
+
+  def after_all
+    super
+    return if MiniPortile.windows?
+
+    stop_webrick
+    # leave test files for inspection
+  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
+
+    assert_includes(IO.read(cmakecache), "CMAKE_INSTALL_PREFIX:PATH=#{recipe.path}")
+  end
+
+  def test_compile
+    skip if MiniPortile.windows?
+
+    binary = File.join(work_dir, "hello")
+    assert File.exist?(binary), binary
+  end
+
+  def test_install
+    skip if MiniPortile.windows?
+
+    binary = File.join(recipe.path, "bin", "hello")
+    assert File.exist?(binary), binary
+  end
+end

data/test/test_cook.rb

@@ -3,14 +3,6 @@ require File.expand_path('../helper', __FILE__)
 class TestCook < TestCase
   attr_accessor :assets_path, :tar_path, :recipe
 
-  def with_custom_git_dir(dir)
-    old = ENV['GIT_DIR']
-    ENV['GIT_DIR'] = dir
-    yield
-  ensure
-    ENV['GIT_DIR'] = old
-  end
-
   def before_all
     super
     @assets_path = File.expand_path("../assets", __FILE__)
@@ -19,7 +11,7 @@ class TestCook < TestCase
     # remove any previous test files
     FileUtils.rm_rf("tmp")
 
-    create_tar(@tar_path, @assets_path)
+    create_tar(@tar_path, @assets_path, "test mini portile-1.0.0")
     start_webrick(File.dirname(@tar_path))
 
     @recipe = MiniPortile.new("test mini portile", "1.0.0").tap do |recipe|

data/test/test_digest.rb

@@ -11,11 +11,12 @@ class TestDigest < TestCase
     # remove any previous test files
     FileUtils.rm_rf("tmp")
 
-    create_tar(@tar_path, @assets_path)
+    create_tar(@tar_path, @assets_path, "test mini portile-1.0.0")
     start_webrick(File.dirname(@tar_path))
   end
 
   def after_all
+    super
     stop_webrick
     # leave test files for inspection
   end

data/test/test_download.rb

@@ -1,7 +1,5 @@
 require File.expand_path('../helper', __FILE__)
 
-cert_name = [['CN', 'localhost', OpenSSL::ASN1::PRINTABLESTRING]]
-
 describe "recipe download" do
   include Minitest::Hooks
 
@@ -67,5 +65,5 @@ describe "recipe download" do
       @recipe.files << "foo://foo"
       proc { @recipe.download }.must_raise ArgumentError
     end
- end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_portile2
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0.rc1
 platform: ruby
 authors:
 - Luis Lavena
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".concourse.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -100,13 +101,17 @@ files:
 - appveyor.yml
 - lib/mini_portile2.rb
 - lib/mini_portile2/mini_portile.rb
+- lib/mini_portile2/mini_portile_cmake.rb
 - lib/mini_portile2/version.rb
 - mini_portile2.gemspec
 - test/assets/git/config
 - test/assets/patch 1.diff
 - 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_cmake.rb
 - test/test_cook.rb
 - test/test_digest.rb
 - test/test_download.rb
@@ -126,12 +131,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simplistic port-like solution for developers
@@ -139,8 +144,11 @@ test_files:
 - test/assets/git/config
 - test/assets/patch 1.diff
 - 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_cmake.rb
 - test/test_cook.rb
 - test/test_digest.rb
 - test/test_download.rb