cmetrics 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7718f2df26fa25f74be30a4ac65f555b53576641df5ceb5fcb4db8e67ed8b1d0
-  data.tar.gz: 7e154efbf9beaff565af8f812bd63932ebf0594faf800fda4b82790d11911fe1
+  metadata.gz: 2886740550218bbb68b6248676ffefa606939d2c2f6fabb5043e9b08f2cb152f
+  data.tar.gz: 4b73350710d2c56349fdb83af9e45565e4e38cffb62f48344f25244c27688cce
 SHA512:
-  metadata.gz: 807d890634944b9bc738fd518af39a28cfea55a2daad19c0435786ece2535bd94c5fe34c8ab9ebae4c3408180e8005b75ee97377ace9fb6c67c802baad39da1d
-  data.tar.gz: '0698fef3a0195bd4499cedff46f3146aff5a49831e23ef3bc6ce6789df77cb36ef2b956cbcb99d254fabbd44709f964c44612c03c64a9f49b67b9fb4819f2a6c'
+  metadata.gz: 0e93ebcde84cfd9c2835f68516891f6616c3c77785b789d195c3bf0fe2d5b384314c700f34413f640680da91190cbe16f03961f540dd326515647dc754237265
+  data.tar.gz: b1c4c88fb1416047862f5d5027ce7c92bed28fe0e1172707fa3394af947cc320a64833ab9cbbcfa510ced7f14201ab4ea6b9958a16b5af9fd28a1be26bd00d98

data/.github/workflows/apt.yml

@@ -0,0 +1,39 @@
+name: Apt based Linux
+on:
+  push:
+  pull_request:
+jobs:
+  build:
+    name: Build
+    strategy:
+      fail-fast: false
+      matrix:
+        label:
+          - Debian GNU/Linux Bullseye amd64
+          - Debian GNU/Linux Buster amd64
+          - Ubuntu Bionic amd64
+          - Ubuntu Focal amd64
+        include:
+          - label: Debian GNU/Linux Bullseye amd64
+            test-docker-image: debian:bullseye
+            test-script: ci/apt-test.sh
+          - label: Debian GNU/Linux Buster amd64
+            test-docker-image: debian:buster
+            test-script: ci/apt-test.sh
+          - label: Ubuntu Bionic amd64
+            test-docker-image: ubuntu:bionic
+            test-script: ci/apt-test.sh
+          - label: Ubuntu Focal amd64
+            test-docker-image: ubuntu:focal
+            test-script: ci/apt-test.sh
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: rake compile & rake test
+        run: |
+          docker run \
+          --rm \
+          --tty \
+          --volume ${PWD}:/cmetrics-ruby \
+          ${{ matrix.test-docker-image }} \
+          /cmetrics-ruby/${{ matrix.test-script }}

data/.github/workflows/yum.yml

@@ -0,0 +1,39 @@
+name: Yum based Linux
+on:
+  push:
+  pull_request:
+jobs:
+  build:
+    name: Build
+    strategy:
+      fail-fast: false
+      matrix:
+        label:
+          - CentOS 7 x86_64
+          - CentOS 8 x86_64
+          - Fedora 34 x86_64
+          - AmazonLinux 2 x86_64
+        include:
+          - label: CentOS 7 x86_64
+            test-docker-image: centos:7
+            test-script: ci/yum-test.sh
+          - label: CentOS 8 x86_64
+            test-docker-image: centos:8
+            test-script: ci/yum-test.sh
+          - label: Fedora 34 x86_64
+            test-docker-image: fedora:34
+            test-script: ci/yum-test.sh
+          - label: AmazonLinux 2 x86_64
+            test-docker-image: amazonlinux:2
+            test-script: ci/yum-test.sh
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: rake compile & rake test
+        run: |
+          docker run \
+          --rm \
+          --tty \
+          --volume ${PWD}:/cmetrics-ruby \
+          ${{ matrix.test-docker-image }} \
+          /cmetrics-ruby/${{ matrix.test-script }}

data/Gemfile

@@ -7,4 +7,10 @@ gemspec
 
 gem "rake", "~> 13.0"
 
-gem "test-unit", "~> 3.0"
+gem "test-unit", "~> 3.4"
+
+local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
+if File.exist?(local_gemfile)
+  puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
+  instance_eval File.read(local_gemfile)
+end

data/ci/apt-test.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -exu
+
+export DEBIAN_FRONTEND=noninteractive
+
+if [ -f /etc/lsb-release ]; then
+    . /etc/lsb-release
+    distribution=$DISTRIB_ID
+    version=${DISTRIB_RELEASE%%.*}
+    codename=${DISTRIB_CODENAME%%.*}
+else
+    distribution="Debian"
+    version=$(cat /etc/debian_version | cut -d'.' -f1)
+fi
+
+apt update
+
+case "$distribution" in
+    "Ubuntu")
+        case "$codename" in
+            "bionic")
+                apt install -V -y wget gpg
+                wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
+                echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
+                apt update
+                ;;
+            *)
+                ;;
+        esac
+        ;;
+esac
+
+apt install -V -y lsb-release
+
+apt install -V -y ruby-dev git build-essential pkg-config cmake
+cd /cmetrics-ruby && \
+    gem install bundler --no-document && \
+    bundle install && \
+    bundle exec rake

data/ci/yum-test.sh

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+set -exu
+
+USE_SCL=0
+USE_AMZN_EXT=0
+
+distribution=$(cat /etc/system-release-cpe | awk '{print substr($0, index($1, "o"))}' | cut -d: -f2)
+version=$(cat /etc/system-release-cpe | awk '{print substr($0, index($1, "o"))}' | cut -d: -f4)
+USE_SCL=0
+USE_AMZN_EXT=0
+
+case ${distribution} in
+  amazon)
+    case ${version} in
+      2)
+        DNF=yum
+        USE_AMZN_EXT=1
+        ;;
+    esac
+    ;;
+  centos)
+    case ${version} in
+      7)
+        DNF=yum
+        USE_SCL=1
+        ;;
+      *)
+        DNF="dnf --enablerepo=powertools"
+        ;;
+    esac
+    ;;
+  fedoraproject)
+    case ${version} in
+      33|34)
+        DNF=yum
+        ;;
+    esac
+    ;;
+esac
+
+${DNF} groupinstall -y "Development Tools"
+
+if [ $USE_SCL -eq 1 ]; then
+    ${DNF} install -y centos-release-scl && \
+    ${DNF} install -y epel-release && \
+    ${DNF} install -y \
+    rh-ruby26-ruby-devel \
+    rh-ruby26-rubygems \
+    rh-ruby26-rubygem-rake \
+    rpm-build \
+    cmake3
+elif [ $USE_AMZN_EXT -eq 1 ]; then
+    yum update -y && \
+    yum install -y yum-utils && \
+    yum-config-manager --enable epel && \
+    amazon-linux-extras install -y ruby2.6 && \
+    ${DNF} install -y ruby-devel \
+           cmake3
+else
+    ${DNF} install -y ruby-devel \
+           rubygems \
+           rpm-build \
+           cmake \
+           libarchive
+fi
+
+if [ $USE_SCL -eq 1 ]; then
+    # For unbound variable error
+    export MANPATH=
+    cd /cmetrics-ruby && source /opt/rh/rh-ruby26/enable && gem install bundler --no-document && bundle install && bundle exec rake
+else
+    if [ $USE_AMZN_EXT -eq 1 ]; then
+        echo 'gem "io-console"' > /cmetrics-ruby/Gemfile.local
+    fi
+    cd /cmetrics-ruby && gem install bundler --no-document && bundle install && bundle exec rake
+fi

data/cmetrics-ruby.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake-compiler", "~> 1.0"
   spec.add_development_dependency "rake-compiler-dock", "~> 1.0"
 
-  spec.add_dependency 'mini_portile2', '~> 2.1'
+  spec.add_dependency 'mini_portile2', '~> 2.7'
 end

data/ext/cmetrics/cmetrics_serde.c

@@ -135,13 +135,14 @@ rb_cmetrics_serde_from_msgpack_feed_each_impl(VALUE self, VALUE rb_msgpack_buffe
     struct CMetricsSerde* cmetricsSerde;
     struct cmt *cmt = NULL;
     int ret = 0;
+    size_t offset = 0;
 
     RETURN_ENUMERATOR(self, 0, 0);
 
     TypedData_Get_Struct(
             self, struct CMetricsSerde, &rb_cmetrics_serde_type, cmetricsSerde);
 
-    for (size_t offset = 0; offset <= msgpack_length; ) {
+    for (offset = 0; offset <= msgpack_length; ) {
         ret = cmt_decode_msgpack_create(&cmt, StringValuePtr(rb_msgpack_buffer), msgpack_length, &offset);
         if (ret == 0) {
             cmetricsSerde->instance = cmt;

data/ext/cmetrics/extconf.rb

@@ -13,17 +13,35 @@ def windows?
   RUBY_PLATFORM =~ /mingw|mswin/
 end
 
+def determine_preferred_command(bin, default_bin)
+  printf "checking for whether %s or %s is usable... ", bin, default_bin
+  STDOUT.flush
+  bin += RbConfig::CONFIG['EXEEXT']
+  path = ENV['PATH'].split(RbConfig::CONFIG['PATH_SEPARATOR'])
+  for dir in path
+    file = File.join(dir, bin)
+    if FileTest.executable?(file)
+      printf "%s\n", bin
+      return bin
+    else
+      next
+    end
+  end
+  printf "%s\n", default_bin
+  return default_bin
+end
+
 class BuildCMetrics
 
   attr_reader :recipe
 
-  def initialize(version=nil)
+  def initialize(version=nil, **kwargs)
     @version = if version
                 version
               else
                 "master".freeze
               end
-    @recipe = MiniPortileCMake.new("cmetrics", @version)
+    @recipe = MiniPortileCMake.new("cmetrics", @version, **kwargs)
     @checkpoint = ".#{@recipe.name}-#{@recipe.version}.installed"
     @recipe.target = File.join(ROOT, "ports")
     @recipe.files << {
@@ -52,7 +70,7 @@ class BuildCMetrics
   end
 end
 
-cmetrics = BuildCMetrics.new("0.2.1")
+cmetrics = BuildCMetrics.new("0.2.1", cmake_command: determine_preferred_command("cmake3", "cmake"))
 cmetrics.build
 
 libdir = RbConfig::CONFIG["libdir"]

data/lib/cmetrics/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CMetrics
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmetrics
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.7'
 description: C binding for cmetric library.
 email:
 - cosmo0920.oucc@gmail.com
@@ -88,9 +88,11 @@ extensions:
 - ext/cmetrics/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/apt.yml"
 - ".github/workflows/linux.yml"
 - ".github/workflows/macos.yml"
 - ".github/workflows/windows.yml"
+- ".github/workflows/yum.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE
@@ -98,6 +100,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- ci/apt-test.sh
+- ci/yum-test.sh
 - cmetrics-ruby.gemspec
 - ext/cmetrics/cmetrics.c
 - ext/cmetrics/cmetrics_c.h