<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository upt-macports.
</pre>
<p><a href="https://github.com/macports/upt-macports/commit/93aded6ce6f7f6c4329564401adf491353b99890">https://github.com/macports/upt-macports/commit/93aded6ce6f7f6c4329564401adf491353b99890</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 93aded6 Add Ruby Support and tests
</span>93aded6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 93aded6ce6f7f6c4329564401adf491353b99890
</span>Author: Korusuke <karan.sheth@somaiya.edu>
AuthorDate: Mon Jun 3 18:32:04 2019 +0530
<span style='display:block; white-space:pre;color:#404040;'> Add Ruby Support and tests
</span>---
upt_macports/templates/base.Portfile | 6 ++++--
upt_macports/templates/ruby.Portfile | 34 +++++++++++++++++++++++++++++++++
upt_macports/tests/test_ruby_package.py | 22 +++++++++++++++++++++
upt_macports/upt_macports.py | 8 ++++++++
4 files changed, 68 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/upt_macports/templates/base.Portfile b/upt_macports/templates/base.Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b469821..685b4fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/upt_macports/templates/base.Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/upt_macports/templates/base.Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,8 +12,10 @@ PortSystem 1.0
</span>
# categories-append
platforms darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+{% if pkg.upt_pkg.frontend != 'rubygems' -%}
</span> ## uncomment the following line if no architecture-dependent files are installed, otherwise remove
# supported_archs noarch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+{% endif %}
</span> license {{ pkg.licenses }}
## If you would like to keep maintaining this port in the future as described in
## https://guide.macports.org/chunked/project.contributing.html then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,9 +30,9 @@ long_description ${description}
</span> {% block dist_info %}
{% endblock -%}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-{% if pkg.archive_type == 'unknown' -%}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% if pkg.archive_type == 'unknown' and pkg.upt_pkg.frontend != 'rubygems' -%}
</span> # Detection of archive type failed
<span style='display:block; white-space:pre;background:#ffe0e0;'>-{% elif pkg.archive_type != 'gz' %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% elif pkg.archive_type != 'gz' and pkg.upt_pkg.frontend != 'rubygems' %}
</span> {{ "use_%-15s yes"|format(pkg.archive_type) }}
{% endif %}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/upt_macports/templates/ruby.Portfile b/upt_macports/templates/ruby.Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9e779c2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/upt_macports/templates/ruby.Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% extends 'base.Portfile' %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% block portgroup %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup ruby 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% endblock %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% block nameversion %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ruby.setup {{ pkg._pkgname() }} {{ pkg.upt_pkg.version }} gem {} rubygems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ruby.branches 2.5 2.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% endblock %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% block versions %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% if pkg.upt_pkg.requirements.run or pkg.upt_pkg.requirements.test %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} ne ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {% if pkg.upt_pkg.requirements.run %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {% for i in pkg.upt_pkg.requirements.run|sort(attribute='name') %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:rb${ruby.version}-{{i.name}}{% if not loop.last %} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {% endif %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {% endfor %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {% endif %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {% if pkg.upt_pkg.requirements.test %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_test-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {% for i in pkg.upt_pkg.requirements.test|sort(attribute='name') %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:rb${ruby.version}-{{i.name}}{% if not loop.last %} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {% endif %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {% endfor %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {% endif %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% endif %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% endblock %}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/upt_macports/tests/test_ruby_package.py b/upt_macports/tests/test_ruby_package.py
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..22d231f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/upt_macports/tests/test_ruby_package.py
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+import unittest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+import upt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+from upt_macports.upt_macports import MacPortsRubyPackage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+class TestMacPortsRubyPackage(unittest.TestCase):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def setUp(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.package = MacPortsRubyPackage()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.package.upt_pkg = upt.Package('test-pkg', '13.37')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def test_pkgname(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ expected = ['Foo', 'foo', 'Foo-bar', 'foo-bar']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ names = ['Foo', 'foo', 'Foo-bar', 'foo-bar']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (name, expected_name) in zip(names, expected):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.package.upt_pkg = upt.Package(name, '13.37')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.assertEqual(self.package._pkgname(), expected_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if __name__ == '__main__':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unittest.main()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/upt_macports/upt_macports.py b/upt_macports/upt_macports.py
</span><span style='display:block; white-space:pre;color:#808080;'>index d29df7f..35be19d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/upt_macports/upt_macports.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/upt_macports/upt_macports.py
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,6 +135,14 @@ class MacPortsPerlPackage(MacPortsPackage):
</span> class MacPortsRubyPackage(MacPortsPackage):
template = 'ruby.Portfile'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ def _pkgname(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports_name = self._normalized_macports_name(self.upt_pkg.name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return macports_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @staticmethod
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def _normalized_macports_name(name):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
class MacPortsBackend(upt.Backend):
name = 'macports'
</pre><pre style='margin:0'>
</pre>