Merge pull request #67 from essentialkaos/develop

Version 2.3.0

.travis.yml

@@ -1,4 +1,4 @@
-language: bash
+language: generic
 
 sudo: required
 
@@ -14,11 +14,15 @@ env:
 
 before_install:
   - wget https://storage.googleapis.com/shellcheck/shellcheck-latest.linux.x86_64.tar.xz
+  - wget -O hadolint "https://github.com/hadolint/hadolint/releases/download/v1.15.0/hadolint-Linux-x86_64"
   - tar xf shellcheck-latest.linux.x86_64.tar.xz
-  - ./shellcheck-latest/shellcheck --version
   - docker pull "$IMAGE"
   - wget https://kaos.sh/perfecto/perfecto-docker
   - chmod +x perfecto-docker
+  - chmod +x hadolint
+  - ./perfecto-docker --version
+  - ./shellcheck-latest/shellcheck --version
+  - ./hadolint --version
 
 script:
  - bash -c 'shopt -s globstar; ./shellcheck-latest/shellcheck SOURCES/rpmbuilder SOURCES/libexec/*.shx'
@@ -29,3 +33,5 @@ script:
  - bash -c 'shopt -s globstar; ./shellcheck-latest/shellcheck SOURCES/docker-entrypoint'
  - ./perfecto-docker rpmbuilder.spec
  - ./perfecto-docker rpmbuilder-node.spec
+ - ./hadolint centos6.docker
+ - ./hadolint centos7.docker

SOURCES/libexec/build-local.shx

@@ -273,7 +273,7 @@ localBuildProcess() {
         if [[ -n "$sign" ]] ; then
           localSign "$package"
         else
-          show "Result: ${CL_CYAN}$package_name${CL_NORM}"
+          show "${CL_BOLD}+${CL_NORM} ${CL_CYAN}$package_name${CL_NORM}"
         fi
 
         if [[ -n "$dest_dir" ]] ; then

SOURCES/libexec/build-remote.shx

@@ -363,9 +363,9 @@ remoteBuildProcess() {
       fi
 
       if [[ $? -eq 0 ]] ; then
-        show "Result: ${CL_CYAN}$package_name${CL_NORM}"
+        show "${CL_BOLD}+${CL_NORM} ${CL_CYAN}$package_name${CL_NORM}"
       else
-        show "Result: ${CL_CYAN}$package_name${CL_NORM} ${CL_DARK}(ALREADY EXIST)${CL_NORM}"
+        show "${CL_BOLD}+${CL_NORM} ${CL_CYAN}$package_name${CL_NORM} ${CL_DARK}(ALREADY EXIST)${CL_NORM}"
       fi
     done
 

SOURCES/libexec/package.shx

@@ -10,35 +10,47 @@
 # Code: Yes
 # Echo: No
 validatePackage() {
-  local rpm_file rpm_name has_errors
+  local rpm_file rpm_name
 
   rpm_file="$1"
   rpm_name=$(basename "$rpm_file")
 
   showm "${CL_CYAN}${rpm_name}:${CL_NORM} "
 
   if rpm -qp --scripts "$rpm_file" 2>&1 | grep -E -q '\%\{.*\}' ; then
-    has_errors=true
     error "ERROR\n" $RED
     error "RPM package ${CL_BL_YELLOW}${rpm_name}${CL_YELLOW} contains unexpanded macroses in scriptlets:" $YELLOW
     error "${CL_GREY}"
     rpm -qp --scripts "$rpm_file" 2>&1 | grep -E -A1 -B1 '\%\{.*\}' | sed '/^$/d' | sed 's/^/  /g' 1>&2
     error "${CL_NORM}"
+
+    return 1
   fi
 
   if rpm -qlp "$rpm_file" 2>&1 | grep -E -q '\%\{.*\}' ; then
-    has_errors=true
     error "ERROR\n" $RED
     error "RPM package ${CL_BL_YELLOW}${rpm_name}${CL_YELLOW} contains unexpanded macroses in files section:" $YELLOW
     error "${CL_GREY}"
     rpm -qlp "$rpm_file" 2>&1 | grep -E -A1 -B1 '\%\{.*\}' | sed '/^$/d' | sed 's/^/  /g' 1>&2
     error "${CL_NORM}"
+
+    return 1
   fi
 
-  if [[ -z "$has_errors" ]] ; then
-    show "OK" $GREEN
-    return 0
+  if [[ "$rpm_name" =~ \.src\. ]] ; then
+    local pver cver
+
+    pver=$(rpm -qp --qf "%{version}" "$rpm_file")
+    cver=$(rpm -qp --changelog "$rpm_file" | head -1 | cut -d"-" -f2 | tr -d " ")
+
+    if [[ "$pver" != "$cver" ]] ; then
+      error "WARNING" $YELLOW
+      error "RPM package version not equal to the version from the latest record in the changelog ($pver ≠ $cver)\n" $YELLOW
+
+      return 0
+    fi
   fi
 
-  return 1
+  show "OK" $GREEN
+  return 0
 }

SOURCES/rpmbuilder

@@ -5,7 +5,7 @@
 APP="RPMBuilder"
 
 # Utility version (String)
-VER="2.2.3"
+VER="2.3.0"
 
 ####################################################################
 

rpmbuilder.spec

@@ -2,7 +2,7 @@
 
 Summary:         RPM package build helper
 Name:            rpmbuilder
-Version:         2.2.3
+Version:         2.3.0
 Release:         0%{?dist}
 License:         EKOL
 Group:           Development/Tools
@@ -55,6 +55,10 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Sat Nov 03 2018 Anton Novojilov <[email protected]> - 2.3.0-0
+- Improved package validation
+- Minor UI improvements
+
 * Thu Sep 13 2018 Anton Novojilov <[email protected]> - 2.2.3-0
 - Minor UI bugfixes