Merge pull request #25 from jtpalmer/xdmod7.0-merge-xdmod6.7

Merge xdmod6.7 into xdmod7.0 (#17, #18, #19, #21, #22, #23, #24)
ubccr · May 15, 2017 · 6c6fb40 · 6c6fb40
2 parents 897e1e1 + 4fc5dbe
commit 6c6fb40
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,9 @@ env:
 matrix:
     allow_failures:
         - env: TEST_SUITE=style
+    exclude:
+        - php: '5.4'
+          env: TEST_SUITE=style
 
 # Add dependency directories to the Travis cache
 cache:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,22 @@
 Open XDMoD Application Kernels Change Log
 =========================================
 
+2017-05-11 v6.6.0
+-----------------
+
+- Miscellaneous
+    - Updated for compatibility with Open XDMoD 6.6.0
+      ([\#14](https://github.com/ubccr/xdmod-appkernels/pull/14),
+       [\#19](https://github.com/ubccr/xdmod-appkernels/pull/19))
+    - Cleaned up old and/or unused code
+      ([\#12](https://github.com/ubccr/xdmod-appkernels/pull/12))
+    - Improved quality assurance
+      ([\#9](https://github.com/ubccr/xdmod-appkernels/pull/9),
+       [\#11](https://github.com/ubccr/xdmod-appkernels/pull/11),
+       [\#13](https://github.com/ubccr/xdmod-appkernels/pull/13),
+       [\#15](https://github.com/ubccr/xdmod-appkernels/pull/15),
+       [\#16](https://github.com/ubccr/xdmod-appkernels/pull/16))
+
 2017-01-10 v6.5.0
 -----------------
 

diff --git a/classes/AppKernel/AppKernelDb.php b/classes/AppKernel/AppKernelDb.php
@@ -379,7 +379,7 @@ public function getResources($start_date = NULL, $end_date = NULL, array $pu_cou
         $resources = array();
         foreach ( $results as $row )
         {
-            $resource = new Resource;
+            $resource = new AKResource;
             $resource->id = $row['resource_id'];
             $resource->nickname = $row['nickname'];
             $resource->name = $row['resource'];
@@ -683,7 +683,7 @@ public function loadResources(array $criteria = NULL)
 
         while ( FALSE !== ($row = current($result)) )
         {
-            $resource = new Resource;
+            $resource = new AKResource;
             $resource->id = $row['resource_id'];
             $resource->nickname = $row['nickname'];
             $resource->name = $row['resource'];

diff --git a/classes/AppKernel/InstanceData.php b/classes/AppKernel/InstanceData.php
@@ -500,15 +500,15 @@ class AppKernelDefinition
 // Resource that application kernels are run on
 // ================================================================================
 
-class Resource
+class AKResource
 {
   public $id = NULL;  // Database id
   public $nickname = NULL;  // Resource nickname (e.g., short name such as "edge")
   public $name = NULL;  // Resource full name (e.g., edge.ccr.buffalo.edu)
   public $description = NULL;  // Resource description
   public $enabled = FALSE;  // TRUE if the resoure is enabled
   public $visible = FALSE;  // TRUE if visible outside of the application kernel tools
-}  // Resource
+}  // AKResource
 
 class ProcessingUnit
 {

diff --git a/configuration/assets.d/appkernels.json b/configuration/assets.d/appkernels.json
@@ -39,7 +39,8 @@
                 "js/Arr/CreateSchedulePanel.js",
                 "js/Arr/EditSchedulePanel.js",
                 "js/Ingestion/AppKernelStore.js",
-                "js/Ingestion/AppKernelGrid.js"
+                "js/Ingestion/AppKernelGrid.js",
+                "js/Ingestion/ReportsPanel.js"
             ],
             "css": [
                 "css/appKer.css"

diff --git a/xdmod-appkernels.spec.in b/xdmod-appkernels.spec.in
@@ -7,8 +7,8 @@ Vendor:        Center for Computational Research, University at Buffalo
 Packager:      Jeffrey T. Palmer <jtpalmer@buffalo.edu>
 Group:         Applications/Internet
 License:       LGPLv3+
-Source:        %{name}-%{version}.tar.gz
-BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Source:        %{name}-%{version}__PRERELEASE__.tar.gz
+BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}__PRERELEASE__-%{release}-XXXXXX)
 BuildArch:     noarch
 BuildRequires: php-cli
 Requires:      xdmod >= 7.0.0
@@ -29,7 +29,7 @@ to rely on users to report failures or underperforming hardware and
 software.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}__PRERELEASE__
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -39,7 +39,7 @@ DESTDIR=$RPM_BUILD_ROOT ./install \
     --libdir=%{_libdir}/xdmod \
     --sysconfdir=%{_sysconfdir}/xdmod \
     --datadir=%{_datadir}/xdmod \
-    --docdir=%{_docdir}/%{name}-%{version} \
+    --docdir=%{_docdir}/%{name}-%{version}__PRERELEASE__ \
     --crondconfdir=%{_sysconfdir}/cron.d
 
 %clean
@@ -50,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/xdmod-akrr-ingestor
 %{_libdir}/xdmod/
 %{_datadir}/xdmod/
-%{_docdir}/%{name}-%{version}/
+%{_docdir}/%{name}-%{version}__PRERELEASE__/
 
 %config(noreplace) %{_sysconfdir}/xdmod/*.d/appkernels.ini
 %config(noreplace) %{_sysconfdir}/xdmod/*.d/appkernels.json
@@ -59,6 +59,12 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
 
 %changelog
+* Thu May 11 2017 Jeffrey T. Palmer <jtpalmer@buffalo.edu> 6.6.0-1.0
+- Miscellaneous
+    - Updated for compatibility with Open XDMoD 6.6.0
+    - Cleaned up old and/or unused code
+    - Improved quality assurance
+
 * Tue Jan 10 2017 Jeffrey T. Palmer <jtpalmer@buffalo.edu> 6.5.0-1.0
 - Spun this module out from the Open XDMoD repository.
 * Wed Sep 21 2016 Jeffrey T. Palmer <jtpalmer@buffalo.edu> 6.0.0-1.0