puppet-herald 0.2.0 → 0.8.0

data/lib/puppet-herald/javascript.rb

@@ -1,6 +1,3 @@
-require 'puppet-herald'
-require 'uglifier'
-
 # A module for Herald
 module PuppetHerald
   # A javascript processing class
@@ -14,11 +11,13 @@ module PuppetHerald
     # Returns a list of JS files to be inserted into main HTML
     # @return [Array] list of JS's
     def files
+      require 'puppet-herald'
       @files = nil if PuppetHerald.in_dev?
       if @files.nil?
         public_dir = PuppetHerald.relative_dir(@base)
         all = Dir.chdir(public_dir) { Dir.glob('**/*.js') }
-        @files = all.reverse.reject { |file| file.match(/_test\.js$/) }
+        all = all.reverse.reject { |file| file.match(/_test\.js$/) }
+        @files = all.reject { |file| file.match(/bower_components/) }
       end
       @files
     end
@@ -27,14 +26,21 @@ module PuppetHerald
     # @param mapname [String] name of source map to be put into uglified JS
     # @return [Hash] a hash with uglified JS and source map
     def uglify(mapname)
-      sources = files.collect { |file| File.read("#{@base}/#{file}") }
+      require 'uglifier'
+      filenames = files
+      sources = filenames.collect { |file| File.read("#{@base}/#{file}") }
       source = sources.join "\n"
-      uglifier = Uglifier.new(source_map_url: mapname)
-      uglified, source_map = uglifier.compile_with_map(source)
-      {
-        'js'     => uglified,
-        'js.map' => source_map
+      options = {
+        source_map_url:  mapname,
+        source_filename: filenames[0],
+        compress: {
+          angular:    true,
+          hoist_vars: true
+        }
       }
+      uglifier = Uglifier.new(options)
+      uglified, source_map = uglifier.compile_with_map(source)
+      { 'js' => uglified, 'js.map' => source_map }
     end
   end
 end

data/lib/puppet-herald/models.rb

@@ -0,0 +1,47 @@
+# A module for Herald
+module PuppetHerald
+  # module for models
+  module Models
+    # Pagianation object
+    class Pagination
+      # Pagination headers
+      KEYS = {
+        page: 'X-Paginate-Page',
+        limit: 'X-Paginate-Limit',
+        total: 'X-Paginate-Elements',
+        pages: 'X-Paginate-Pages'
+      }
+      # Pagination attribute limit
+      # @return [Integer] pagination
+      attr_reader :page, :limit, :pages, :total
+      # Pagination attribute offset
+      # @return [Integer] pagination
+      def offset
+        (page - 1) * limit
+      end
+      # Sets a total elements for pagination
+      # @param total [Integer] a total number of elements
+      # @return [nil]
+      def total=(total)
+        @total = total.to_i
+        @pages = (@total / @limit.to_f).ceil
+        nil
+      end
+      # A constructor
+      #
+      # @param page [Integer] page to fetch
+      # @param limit [Integer] pagination limit
+      def initialize(page, limit)
+        msg = 'Invalid value for pagination'
+        fail ArgumentError, "#{msg} limit - #{limit.inspect}" unless limit.to_i >= 1
+        fail ArgumentError, "#{msg} page #{page.inspect}" if page.to_i < 1
+        @limit = limit.to_i
+        @page = page.to_i
+        @total = nil
+        @pages = nil
+      end
+      # A default pagination settings
+      DEFAULT = PuppetHerald::Models::Pagination.new(1, 20)
+    end
+  end
+end

data/lib/puppet-herald/models/log-entry.rb

@@ -1,3 +1,5 @@
+require 'sinatra/activerecord'
+
 # A module for Herald
 module PuppetHerald
   # module for models

data/lib/puppet-herald/models/node.rb

@@ -1,3 +1,7 @@
+require 'puppet-herald/models'
+require 'puppet-herald/models/report'
+require 'sinatra/activerecord'
+
 # A module for Herald
 module PuppetHerald
   # module for models
@@ -6,11 +10,54 @@ module PuppetHerald
     class Node < ActiveRecord::Base
       has_many :reports, dependent: :delete_all
 
+      # Paginete thru nodes reports
+      #
+      # @param pagination [PuppetHerald::Models::Pagination] a pagination
+      # @return [Node] fetched node
+      def paginate_reports(pagination)
+        pagination.total = no_of_reports
+        paginated = reports.order(time: :desc).limit(pagination.limit)
+                    .offset(pagination.offset)
+        duplicate = dup
+        duplicate.reports = paginated
+        duplicate.id = id
+        duplicate.readonly!
+        duplicate
+      end
+
+      # Gets number of reports for node
+      #
+      # @return [Integer] number of node's reports
+      def no_of_reports
+        PuppetHerald::Models::Report.where(node_id: id).count
+      end
+
+      # Deletes nodes that doesn't have reports
+      #
+      # @return [Integer] number of empty node deleted
+      def self.delete_empty
+        joinsql = 'LEFT JOIN "reports" ON "reports"."node_id" = "nodes"."id"'
+        wheresql = '"reports"."node_id" IS NULL'
+        joins(joinsql).where(wheresql).delete_all if joins(joinsql).where(wheresql).count > 0
+      end
+
       # Gets a node with prefetched reports
+      #
       # @param id [Integer] a in of node to get
+      # @param pagination [PuppetHerald::Models::Pagination] a pagination
       # @return [Node, nil] fetched node or nil
-      def self.get_with_reports(id)
-        Node.joins(:reports).includes(:reports).find_by_id(id)
+      def self.with_reports(id, pagination = PuppetHerald::Models::Pagination::DEFAULT)
+        node = find_by_id(id)
+        node.paginate_reports pagination unless node.nil?
+      end
+
+      # Gets a paginated nodes
+      #
+      # @param pagination [PuppetHerald::Models::Pagination] a pagination
+      # @return [Node[]] nodes
+      def self.paginate(pagination)
+        pagination.total = count
+        order(last_run: :desc).limit(pagination.limit).offset(pagination.offset)
       end
     end
   end

data/lib/puppet-herald/models/report.rb

@@ -1,6 +1,7 @@
 require 'puppet-herald/models/log-entry'
 require 'puppet-herald/models/node'
 require 'puppet-herald/stubs/puppet'
+require 'sinatra/activerecord'
 
 # A module for Herald
 module PuppetHerald
@@ -15,7 +16,7 @@ module PuppetHerald
         # Gets a report with prefetched log entries
         # @param id [Integer] a in of report to get
         # @return [Report, nil] fetched report or nil
-        def get_with_log_entries(id)
+        def with_log_entries(id)
           Report.joins(:log_entries).includes(:log_entries).find_by_id(id)
         end
 
@@ -24,17 +25,38 @@ module PuppetHerald
         # @return [Report] created report
         def create_from_yaml(yaml)
           parsed = parse_yaml yaml
-          report = Report.new
+          report = nil
+          transaction do
+            report = Report.new
 
-          parse_properties parsed, report
-          parse_logs parsed, report
-          node = parse_node parsed, report
+            parse_properties parsed, report
+            parse_logs parsed, report
+            node = parse_node parsed, report
 
-          report.save
-          node.save
+            report.save
+            node.save
+          end
           report
         end
 
+        # Purges older reports then given date
+        #
+        # @param date [DateTime] a date that will be border to
+        # @return [Integer] number of
+        def purge_older_then(date)
+          deleted = 0
+          query = ['"reports"."time" < ?', date]
+          return 0 if where(query).count == 0
+          transaction do
+            idss = joins(:log_entries).where(query).collect(&:id).uniq
+            PuppetHerald::Models::LogEntry.where(['"report_id" IN (?)', idss]).delete_all unless idss.empty?
+            where(['"id" IN (?)', idss]).delete_all unless idss.empty?
+            PuppetHerald::Models::Node.delete_empty
+            deleted = idss.length
+          end
+          deleted
+        end
+
         private
 
         def parse_node(parsed, report)
@@ -42,11 +64,9 @@ module PuppetHerald
           if node.nil?
             node = Node.new
             node.name = parsed.host
-            node.no_of_reports = 0
           end
           report.node = node
           node.reports << report
-          node.no_of_reports += 1
           node.status = parsed.status
           node.last_run = parsed.time
           node
@@ -62,6 +82,10 @@ module PuppetHerald
             log = LogEntry.new
             attr_to_copy = %w(level message source time)
             copy_attrs in_log, log, attr_to_copy
+            if log.message.include?('(noop)') && report.status != 'failed'
+              report.status = 'pending'
+              parsed.status = 'pending'
+            end
             log.report = report
             report.log_entries << log
           end

data/lib/puppet-herald/project.js

@@ -0,0 +1,46 @@
+'use strict';
+
+var fs = require('fs');
+var wiredep = require('wiredep');
+var globby = require('globby');
+
+var cwd = '../..';
+var root = fs.realpathSync(__dirname + '/' + cwd);
+var publicDir = 'lib/puppet-herald/public';
+var dependencies = wiredep({
+  cwd: publicDir,
+  dependencies: true,
+  devDependencies: false
+}).js.map(function(file) {
+  return file.replace(root + '/', '');
+});
+var devDependencies = wiredep({
+  cwd: 'test/javascript',
+  dependencies: false,
+  devDependencies: true,
+  exclude: 'angular/angular.js'
+}).js.map(function(file) {
+  return file.replace(root + '/', '');
+});
+var files = {
+  html: globby.sync([publicDir+'/**/*.html', '!**/bower_components/**']),
+  js: globby.sync([publicDir+'/**/*.js', '!**/bower_components/**']),
+  tests: globby.sync(['test/javascript/src/**/*_test.js'])
+};
+var search = {
+  coverage: publicDir + '/!(*bower_components)/**/*.js',
+  html2js: publicDir + '/!(*bower_components)/**/*.html'
+};
+var preprocessors = {};
+preprocessors[search.coverage] = ['coverage'];
+preprocessors[search.html2js] = ['ng-html2js'];
+
+module.exports = {
+  cwd: cwd,
+  root: root,
+  publicDir: publicDir,
+  dependencies: dependencies,
+  devDependencies: devDependencies,
+  preprocessors: preprocessors,
+  files: files
+};

data/lib/puppet-herald/public/app.js

@@ -2,8 +2,10 @@
   'use strict';
 
   var app = angular.module('herald' , [
-    'ngRoute',
+    'ui.router',
+    'herald.router',
     'herald.page',
+    'herald.settings',
     'herald.nodes',
     'herald.node',
     'herald.report',
@@ -11,17 +13,17 @@
     'herald.artifact'
   ]);
 
-  app.config(['$routeProvider', function($routeProvider) {
-    $routeProvider.otherwise({redirectTo: '/nodes'});
-  }]);
+  app.controller('AppController', 
+    ['Page', '$rootScope', 'Settings', '$scope',
+      function(Page, $rootScope, Settings, $scope) {
 
-  app.controller('AppController', ['Page', '$rootScope', function(Page, $rootScope) {
     var ctrl = this;
-    this.page = null;
-    this.target = null;
+    $scope.page = null;
+    $scope.target = null;
+    $scope.settings = Settings;
     $rootScope.$on('Page::titleChanged', function(event, title, target) {
-      ctrl.page = title;
-      ctrl.target = target;
+      $scope.page = title;
+      $scope.target = target;
     });
   }]);
 

data/lib/puppet-herald/public/bower.json

@@ -1,13 +1,20 @@
 {
   "name": "puppet-herald",
   "description": "Report processor for Puppet",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "homepage": "https://github.com/wavesoftware/gem-puppet-herald",
-  "license": "Apache 2.0",
+  "license": "Apache-2.0",
   "private": false,
   "dependencies": {
     "angular": "1.3.x",
-    "angular-route": "1.3.x",
+    "angular-moment": "0.10.x",
+    "angular-ui-router": "0.2.x",
+    "bootstrap": "3.3.x",
+    "angular-utils-pagination": "0.6.x",
+    "angular-breadcrumb": "0.3.x",
+    "ngstorage": "0.3.x"
+  },
+  "devDependencies": {
     "angular-loader": "1.3.x",
     "angular-mocks": "1.3.x"
   }

data/lib/puppet-herald/public/components/artifact/artifact-directive.js

@@ -1,3 +1,5 @@
+(function(){
+
 'use strict';
 
 angular.module('herald.artifact.artifact-directive', [])
@@ -10,3 +12,5 @@ angular.module('herald.artifact.artifact-directive', [])
     template: '<span>{{ artifact.version }}</span>'
   };
 });
+
+})();

data/lib/puppet-herald/public/components/artifact/artifact.js

@@ -1,5 +1,3 @@
-'use strict';
-
 (function(){
 
   'use strict';
@@ -25,7 +23,7 @@
       self.package  = data.package;
       self.license  = data.license;
       self.name     = data.name;
-    })
+    });
   }]);
 
 })();

data/lib/puppet-herald/public/components/directives/directives.js

@@ -1,5 +1,9 @@
+(function(){
+
 'use strict';
 
 angular.module('herald.directives', [
   'herald.directives.status-button'
-]);
+]);
+
+})();

data/lib/puppet-herald/public/components/directives/status-button.html

@@ -3,5 +3,5 @@
     btn btn-xs btn-{{ status | colorizeStatus }}
     glyphicon glyphicon-{{ status | iconizeStatus }}
     "
-  ng-click="navigate(route, id)"
+  ng-click="navigate(route, idname, id)"
   aria-hidden="true"> {{ status | uppercase }}</button>

data/lib/puppet-herald/public/components/directives/status-button.js

@@ -2,27 +2,27 @@
 
   'use strict';
 
-  var module = angular.module('herald.directives.status-button', [
+  var module = angular.module('herald.directives.status-button', [ 'ui.router' ]);
 
-  ]);
+  module.controller('StatusButtonController', ['$state', '$scope', function($state, $scope) {
 
-  module.controller('StatusButtonController', ['$location', '$scope', function($location, $scope) {
+    $scope.$state = $state;
 
-    $scope.$location = $location;
-
-    $scope.navigate = function(route, id) {
-      var target = route.replace(':id', id);
-      this.$location.path(target);
+    $scope.navigate = function(route, idName, id) {
+      var params = {};
+      params[idName] = id;
+      this.$state.go(route, params);
     };
 
   }]);
 
-  module.directive('ngStatusButton', function() {
+  module.directive('wsStatusButton', function() {
     return {
       restrict: 'E',
       scope: {
         status: '=',
         id: '=',
+        idname: '=',
         route: '='
       },
       controller: 'StatusButtonController',
@@ -39,7 +39,7 @@
         case 'pending':   return 'warning';
         default:          return 'default';
       }
-    }
+    };
   });
 
   module.filter('iconizeStatus', function() {
@@ -51,6 +51,6 @@
         case 'pending':   return 'asterisk';
         default:          return 'sign';
       }
-    }
+    };
   });
 })();