puppet-herald 0.2.0 → 0.8.0

data/spec/integration/fixtures/reports.yml

@@ -0,0 +1,61 @@
+---
+
+master_r1:
+ id: 1
+ status: 'changed'
+ environment: 'production'
+ transaction_uuid: '4dda18fb-c4cf-412a-94f6-43d9420e9582'
+ configuration_version: '12345678'
+ puppet_version: '3.7.3'
+ kind: 'apply'
+ host: 'master.vm'
+ time: '2014-12-17T15:34:08'
+ node_id: 1
+
+master_r2:
+ id: 2
+ status: 'failed'
+ environment: 'production'
+ transaction_uuid: '1d9a613b-a8b1-44d4-87fa-ab8143c8d403'
+ configuration_version: '12345698'
+ puppet_version: '3.7.3'
+ kind: 'apply'
+ host: 'master.vm'
+ time: '2014-12-17T16:04:08'
+ node_id: 1
+
+master_r3:
+ id: 3
+ status: 'unchanged'
+ environment: 'production'
+ transaction_uuid: 'd28a1795-cc74-42b3-ab9d-88df5fff14cc'
+ configuration_version: '12345712'
+ puppet_version: '3.7.3'
+ kind: 'apply'
+ host: 'master.vm'
+ time: '2014-12-17T16:34:08'
+ node_id: 1
+
+master_r4:
+ id: 4
+ status: 'unchanged'
+ environment: 'production'
+ transaction_uuid: 'e33516ae-1b28-40b5-89da-615cd73cf324'
+ configuration_version: '12345721'
+ puppet_version: '3.7.3'
+ kind: 'apply'
+ host: 'master.vm'
+ time: '2014-12-17T17:04:08'
+ node_id: 1
+
+master_r5:
+ id: 5
+ status: 'changed'
+ environment: 'production'
+ transaction_uuid: '7b639655-ba23-4e2c-b81b-80c7dbefd157'
+ configuration_version: '12345756'
+ puppet_version: '3.7.3'
+ kind: 'apply'
+ host: 'master.vm'
+ time: '2014-12-17T17:34:08'
+ node_id: 1

data/spec/integration/models/node_spec.rb

@@ -2,13 +2,14 @@ require 'model_helper'
 require 'puppet-herald/models/report'
 require 'puppet-herald/models/log-entry'
 require 'puppet-herald/models/node'
+require 'puppet-herald/models'
 
-describe PuppetHerald::Models::Node, '.get_with_reports', :rollback => true do
+describe PuppetHerald::Models::Node, '.with_reports', :rollback => true do
   let(:yaml) { File.read(File.expand_path("../../fixtures/changed-notify.yaml", __FILE__)) }
   let(:id)   { PuppetHerald::Models::Report.create_from_yaml(yaml).node_id }
 
   context 'fetching an existing node' do
-    subject { PuppetHerald::Models::Node.get_with_reports id }
+    subject { PuppetHerald::Models::Node.with_reports id }
     
     it "should return value that isn't nil" do
       subject.should_not be_nil
@@ -17,10 +18,18 @@ describe PuppetHerald::Models::Node, '.get_with_reports', :rollback => true do
       subject.class.should eq(PuppetHerald::Models::Node)
     end
     it "should return persisted node" do
-      subject.persisted?.should be_truthy
+      subject.persisted?.should be_falsy
     end
     it "should have status 'changed'" do
       subject.status.should eq('changed')
     end
   end
+
+  context 'paginating nodes' do
+    let(:pagination) { PuppetHerald::Models::Pagination.new(1, 10) }
+    subject { PuppetHerald::Models::Node.paginate(pagination) }
+    it "should return value that isn't nil" do
+      expect(subject).to_not be_nil
+    end
+  end
 end

data/spec/integration/models/report_spec.rb

@@ -3,7 +3,7 @@ require 'puppet-herald/models/report'
 require 'puppet-herald/models/log-entry'
 
 describe PuppetHerald::Models::Report, ".create_from_yaml", :rollback => true do
-  context 'for valid YAML' do
+  context 'for `changed` status report' do
     let(:yaml) { File.read(File.expand_path("../../fixtures/changed-notify.yaml", __FILE__)) }
     it 'that is really not empty' do
       yaml.should_not be_empty
@@ -28,21 +28,53 @@ describe PuppetHerald::Models::Report, ".create_from_yaml", :rollback => true do
           log.persisted?.should be_truthy
         end
       end
-      it "should have parent node, that is persistedand has status 'changed'" do
+      it "should have parent node, that is persisted and has status 'changed'" do
         subject.node.should_not be_nil
         subject.node.status.should eq('changed')
         subject.node.persisted?.should be_truthy
       end
     end
   end
+  context 'for `pending` status report' do
+    let(:yaml) { File.read(File.expand_path("../../fixtures/pending-notify.yaml", __FILE__)) }
+    it 'that is really not empty' do
+      expect(yaml).to_not be_empty
+    end
+    context 'running on real sqlite3 db' do
+      subject { PuppetHerald::Models::Report.create_from_yaml yaml }
+      it "should return value that isn't nil" do
+        subject.should_not be_nil
+      end
+      it "should return a report object" do
+        subject.class.should eq(PuppetHerald::Models::Report)
+      end
+      it "should return persisted report" do
+        subject.persisted?.should be_truthy
+      end
+      it "should have status 'pending'" do
+        subject.status.should eq('pending')
+      end
+      it "should have 11 log entries, also persisted" do
+        subject.log_entries.size.should eq(11)
+        subject.log_entries.each do |log|
+          log.persisted?.should be_truthy
+        end
+      end
+      it "should have parent node, that is persisted and has status 'pending'" do
+        subject.node.should_not be_nil
+        subject.node.status.should eq('pending')
+        subject.node.persisted?.should be_truthy
+      end
+    end
+  end
 end
 
-describe PuppetHerald::Models::Report, '.get_with_log_entries', :rollback => true do
+describe PuppetHerald::Models::Report, '.with_log_entries', :rollback => true do
   let(:yaml) { File.read(File.expand_path("../../fixtures/changed-notify.yaml", __FILE__)) }
   let(:id)   { PuppetHerald::Models::Report.create_from_yaml(yaml).id }
 
   context 'fetching an existing report' do
-    subject { PuppetHerald::Models::Report.get_with_log_entries id }
+    subject { PuppetHerald::Models::Report.with_log_entries id }
     
     it "should return value that isn't nil" do
       subject.should_not be_nil
@@ -68,4 +100,28 @@ describe PuppetHerald::Models::Report, '.get_with_log_entries', :rollback => tru
       subject.node.persisted?.should be_truthy
     end
   end
+end
+
+describe PuppetHerald::Models::Report, '.purge_older_then', :rollback => true do
+  let(:yaml1) { File.read(File.expand_path("../../fixtures/changed-notify.yaml", __FILE__)) }
+  let(:yaml2) { File.read(File.expand_path("../../fixtures/pending-notify.yaml", __FILE__)) }
+  let(:date) { DateTime.new(2015, 4, 8, 14, 20, 0, '+2') }
+  before(:each) do
+    PuppetHerald::Models::LogEntry.delete_all
+    PuppetHerald::Models::Report.delete_all
+    PuppetHerald::Models::Node.delete_all
+    PuppetHerald::Models::Report.create_from_yaml(yaml1)
+    PuppetHerald::Models::Report.create_from_yaml(yaml1)
+    PuppetHerald::Models::Report.create_from_yaml(yaml2)
+  end
+  subject { PuppetHerald::Models::Report.purge_older_then(date) }
+  context 'running on real sqlite3 db with date `2015-04-08 14:20:00+0200`' do
+    it 'return `2` as a number of a reports purged' do
+      expect(PuppetHerald::Models::Node.count).to eq(1)
+      expect(PuppetHerald::Models::Report.count).to eq(3)
+      expect(subject).to eq(2)
+      expect(PuppetHerald::Models::Report.count).to eq(1)
+      expect(PuppetHerald::Models::Node.count).to eq(1)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,12 @@ require 'rspec/its'
 begin
   gem 'simplecov'
   require 'simplecov'
+  require 'simplecov-lcov'
+  SimpleCov::Formatter::LcovFormatter.report_with_single_file = true
+  SimpleCov.formatters = [
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::LcovFormatter,
+  ]
   SimpleCov.start do
     add_filter '/test/'
     add_filter '/spec/'
@@ -21,16 +27,6 @@ rescue Gem::LoadError
   # do nothing
 end
 
-begin
-  gem 'coveralls'
-  require 'coveralls'  
-  if ENV['TRAVIS']
-    Coveralls.wear!
-  end
-rescue Gem::LoadError
-  # do nothing
-end
-
 begin
   gem 'pry'
   require 'pry'

data/spec/support/active_record.rb

@@ -1,4 +1,5 @@
 require 'support/reconnectdb'
+require 'support/fixtures'
 
 reconnectdb
 

data/spec/support/fixtures.rb

@@ -0,0 +1,16 @@
+require 'sinatra/activerecord'
+require 'rspec-activerecord'
+
+RSpec.configure do |c|
+  c.fixture_path = File.expand_path("../../integration/fixtures", __FILE__)
+  c.use_transactional_fixtures = true
+end
+
+def fixtures(symbol)
+  ActiveRecord::FixtureSet.create_fixtures(RSpec.configuration.fixture_path, symbol.to_s)
+end
+
+def fixture(type, name)
+  fixture_set = ActiveRecord::FixtureSet.all_loaded_fixtures[type.to_s]
+  fixture_set.fixtures.find { |k, v| k == name.to_s }.second
+end

data/spec/unit/puppet-herald/cli_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'puppet-herald'
 require 'puppet-herald/cli'
 require 'sinatra/base'
+require 'sinatra/activerecord'
 
 class TestCLI < PuppetHerald::CLI
   def test_parse(argv)
@@ -14,9 +15,9 @@ context 'With silenced loggers' do
   let(:cli) { TestCLI.new }
 
   before :each do
-    cli.logger.level = 100
-    cli.errlogger.level = 100
-    PuppetHerald::database::logger.level = 100
+    PuppetHerald.environment = :test
+    PuppetHerald.logger.level = 100
+    PuppetHerald.errlogger.level = 100
     PuppetHerald::database::dbconn = nil
     allow(FileUtils).to receive(:touch)
   end
@@ -43,7 +44,6 @@ context 'With silenced loggers' do
     context 'on defaults' do
       let(:argv) { [] }
       before :each do
-        expect(PuppetHerald).to receive(:in_dev?).at_least(:once).and_return(false)
         expect(Kernel).to receive(:exit).with(0)
         expect(Sinatra::Application).to receive(:run!).and_return :none
         dbconn = { :adapter => 'sqlite3', :database => ':memory:' }

data/spec/unit/puppet-herald/database_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 require 'puppet-herald'
 
 describe PuppetHerald::Database, '.spec' do
+  before(:each) do
+    PuppetHerald.environment = :test
+    PuppetHerald.logger.level = 100
+    PuppetHerald.errlogger.level = 100
+  end
   let(:tempdir) { Dir.tmpdir }
   let(:echo) { false }
   subject { PuppetHerald::database::spec echo }
@@ -26,9 +31,6 @@ describe PuppetHerald::Database, '.spec' do
       its(:size) { should eq 2 }
       context 'while echoing!!' do
         let(:echo) { true }
-        before :each do
-          PuppetHerald::database::logger.level = Logger::FATAL
-        end
         its(:class) { should be Hash }
         its(:size) { should eq 2 }
       end

data/spec/unit/puppet-herald/purgecronjob_spec.rb

@@ -0,0 +1,37 @@
+require 'puppet-herald/purgecronjob'
+
+describe PuppetHerald::PurgeCronJob do
+  let(:job) { PuppetHerald::PurgeCronJob.new }
+  let(:now) { DateTime.new(2015,4,9,20,3,2,'+2') }
+  let(:minus30d) { DateTime.new(2015,3,10,20,3,2,'+2') }
+  let(:minus45d) { DateTime.new(2015,2,23,20,3,2,'+2') }
+  before(:each) do
+    expect(DateTime).to receive(:now).and_return(now)
+    ENV['PUPPET_HERALD_PURGE_CRON'] = '*/15 * * * * *'
+    ENV['PUPPET_HERALD_PURGE_LIMIT'] = '45d'
+  end
+  describe '.parse_limit' do
+    it 'with "30d" to be equal to `2015-03-10 20:03:02 +0200`' do
+      expect(job.parse_limit '30d').to eq(minus30d)
+    end
+    it 'with "45d" to be equal to `2015-02-23 20:03:02 +0200`' do
+      expect(job.parse_limit '45d').to eq(minus45d)
+    end
+  end
+  describe '.run!' do
+    level = nil
+    before(:each) do
+      require 'puppet-herald'
+      require 'puppet-herald/models/report'
+      expect(PuppetHerald::Models::Report).to receive(:purge_older_then).with(minus45d).and_return(2)
+      level = PuppetHerald.logger.level
+      PuppetHerald.logger.level = 100
+    end
+    after(:each) do
+      PuppetHerald.logger.level = level
+    end
+    it 'executes properlly' do
+      expect(job.run!).to be_nil
+    end
+  end
+end

data/test/javascript/.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "bower_components"
+}

data/test/javascript/bower.json

@@ -0,0 +1,21 @@
+{
+  "name": "puppet-herald",
+  "description": "Report processor for Puppet",
+  "version": "0.2.0",
+  "homepage": "https://github.com/wavesoftware/gem-puppet-herald",
+  "license": "Apache-2.0",
+  "private": false,
+  "dependencies": {
+    "angular": "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/test/javascript/karma.conf.js

@@ -1,7 +1,15 @@
+var project = require('../../lib/puppet-herald/project');
+
+var files = project.dependencies.
+    concat(project.devDependencies).
+    concat(project.files.js).
+    concat(project.files.html).
+    concat(project.files.tests);
+
 module.exports = function(config) {
   config.set({
 
-    basePath: '../..',
+    basePath: project.cwd,
 
     singleRun: true,
 
@@ -9,23 +17,20 @@ module.exports = function(config) {
 
     reporters: ['story', 'coverage'],
 
-    preprocessors: {
-      // source files, that you wanna generate coverage for
-      // do not include tests or libraries
-      // (these files will be instrumented by Istanbul)
-      'lib/puppet-herald/public/**/*.js': ['coverage'],
-      'lib/puppet-herald/public/**/*.html': ['ng-html2js']
-    },
+    // source files, that you wanna generate coverage for
+    // do not include tests or libraries
+    // (these files will be instrumented by Istanbul)
+    preprocessors: project.preprocessors,
 
     // optionally, configure the reporter
     coverageReporter: {
       dir : 'coverage/javascript',
       reporters: [
         // reporters not supporting the `file` property
-        { type: 'html', subdir: 'report-html' },
+        { type: 'lcov', subdir: 'lcov' },
         // reporters supporting the `file` property, use `subdir` to directly
         // output them in the `dir` directory
-        { type: 'cobertura', subdir: '.', file: 'cobertura.txt' },
+        { type: 'cobertura', subdir: '.', file: 'cobertura.xml' },
         { type: 'text', subdir: '.', file: 'text.txt' },
         { type: 'text-summary', subdir: '.', file: 'text-summary.txt' },
       ]
@@ -33,19 +38,9 @@ module.exports = function(config) {
 
     ngHtml2JsPreprocessor: {
       // strip this from the file path
-      stripPrefix: 'lib/puppet-herald/public/',
+      stripPrefix: project.publicDir + '/',
     },
 
-    files: [
-      'node_modules/angular/angular.js',
-      'node_modules/angular-loader/angular-loader.js',
-      'node_modules/angular-mocks/angular-mocks.js',
-      'node_modules/angular-route/angular-route.js',
-      'node_modules/moment/moment.js',
-      'node_modules/angular-moment/angular-moment.js',
-      'lib/puppet-herald/public/**/*.js',
-      'lib/puppet-herald/public/**/*.html',
-      'test/javascript/src/**/*.js'
-    ]
+    files: files
   });
 };

data/test/javascript/src/app_test.js

@@ -13,78 +13,27 @@ describe('herald module', function() {
     }));
 
     it('should have a `null` as page set by default', function() {
-      expect(controller.page).toEqual(null);
+      expect(scope.page).toEqual(null);
     });
 
-    it('should have a ("Nodes", null) as page set, if Page.title("Nodes") was called before', function() {
+    it('should have ("Nodes", null), after Page.title("Nodes") call', function() {
       Page.title('Nodes');
-      expect(controller.page).toEqual("Nodes");
-      expect(controller.target).toEqual(undefined);
+      expect(scope.page).toEqual("Nodes");
+      expect(scope.target).toEqual(undefined);
     });
 
-    it('should have a ("Report", 1234567) as page set, if Page.title("Report", 1234567) was called before', function() {
+    it('should have ("Report", 1234567), after Page.title("Report", 1234567) call', function() {
       Page.title('Report', 1234567);
-      expect(controller.page).toEqual("Report");
-      expect(controller.target).toEqual(1234567);
+      expect(scope.page).toEqual("Report");
+      expect(scope.target).toEqual(1234567);
     });
 
-    it('should have a ("Node", "master") as page set, if Page.title("Node", "master", " - ") was called before', function() {
+    it('should have ("Node", "master"), after Page.title("Node", "master", " - ") call', function() {
       Page.title('Node', "master", ' - ');
-      expect(controller.page).toEqual("Node");
-      expect(controller.target).toEqual('master');
+      expect(scope.page).toEqual("Node");
+      expect(scope.target).toEqual('master');
     });
 
   });
 
-  describe('routes mapping', function() {
-
-    var $route, $location, $rootScope, navigateTo;
-    beforeEach(module('nodes/nodes.html'));
-    beforeEach(module('node/node.html'));
-    beforeEach(module('report/report.html'));
-    beforeEach(inject(function(_$route_, _$location_, _$rootScope_) {
-      $route = _$route_;
-      $location = _$location_;
-      $rootScope = _$rootScope_;
-      navigateTo = function(address) {
-        expect($route.current).toBeUndefined();
-        $location.path(address);
-        $rootScope.$digest();
-      };
-    }));
-
-    it('should map NodesController for unknown address', function() {
-      expect($route.routes[null].redirectTo).toEqual('/nodes');
-    });
-    it('should map NodesController if given "/nodes"', function() {
-      expect($route.routes['/nodes'].controller).toBe('NodesController');
-    });
-
-    it('should navigate to "/nodes" if given "/" a address', function() {
-      navigateTo('/');
-      expect($route.current.controller).toBe('NodesController');
-      expect($route.current.originalPath).toBe('/nodes');
-    });
-
-    it('should navigate to "/nodes" if given "/non-existing-link-0" a address', function() {
-      navigateTo('/non-existing-link-0');
-      expect($route.current.controller).toBe('NodesController');
-      expect($route.current.originalPath).toBe('/nodes');
-    });
-
-    it('should navigate to "/node/1" if given "/node/1" a address', function() {
-      navigateTo('/node/1');
-      expect($route.current.controller).toBe('NodeController');
-      expect($route.current.originalPath).toBe('/node/:nodeId');
-      expect($route.current.pathParams.nodeId).toBe('1');
-    });
-
-    it('should navigate to "/report/1" if given "/report/1" a address', function() {
-      navigateTo('/report/1');
-      expect($route.current.controller).toBe('ReportController');
-      expect($route.current.originalPath).toBe('/report/:reportId');
-      expect($route.current.pathParams.reportId).toBe('1');
-    });
-
-  });
 });