puppet-herald 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,7 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWNhZTUzMzk1M2ExNzcwNGFiZDVkNTNmNDBkZGYxNmQxNzUyYjg2MQ==
-  data.tar.gz: !binary |-
-    ZjBjNjQyMjYzMjc2ZGU0Y2Y4MTA3NWQyMTI1NzIxNGIxMDMwNGQzOA==
-SHA512:
-  metadata.gz: !binary |-
-    ZjVhZjY1ZGYwOGE1ODc1YjcxYzNjMDhjYzFlNTIwY2E1M2VkYjgzNWZkYWQ0
-    NTY4N2M2ZmUxNmVlZDMzN2U0MTZjMDg2MDMzZWI4MjNmY2FhYzNmOTZhMTJl
-    YjZmMTA4MjVlZDk1OTFmNzM2YzM0Yjk0ZWZhMzEyOWIyZjAyMzU=
-  data.tar.gz: !binary |-
-    NzhhZGI2ZDhmYzFiY2I4MzYzMmY3YzMwMDM1ZTRlM2YwYzU4NWEzNDFhNWE3
-    ZDEzOWU1YmFiNjZhNjE3NDQyNzY0ZmIwYTY0OGExNTc4OTUzZWNlZmE1ZTI0
-    YzFlNDI4NDk4YjExODViYjUzYjZkMDJjZjg0YWMxMTUwODM1YWM=
+--- 
+SHA512: 
+  metadata.gz: 78f9a25bcd05308702a4aaab34357dcd95359e1c418d7795fbf46ebea7b2c327a752107952292f121d0ba627feb9c5828a29ca64d22b480097705a1b5b99275c
+  data.tar.gz: e3a4545a971d3c56f7062b98594351899e907828f1ce983386489e340e705a4ed73ae6a8af82b78918926cca3dfc29c78b6407545e545f32cdcf705f31d8594c
+SHA1: 
+  metadata.gz: 0cf69983b2dca3d4c86d2bcb33178563c0d2f1db
+  data.tar.gz: e1a41cbe6c56cce31b299b7002880da7559ddf9d

data/.gitignore

@@ -20,3 +20,6 @@
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
+/node_modules
+/npm-*.log
+/Gemfile.local

data/.travis.yml

@@ -0,0 +1,17 @@
+---
+language: ruby
+bundler_args: --without development
+script:
+  - bundle exec rake test
+  # - ./node_modules/karma/bin/karma start --single-run --browsers PhantomJS test/javascript/karma.conf.js
+before_install: rm -f Gemfile.lock
+before_script:
+  - npm install
+matrix:
+  fast_finish: true
+  include:
+  - rvm: 1.9.3
+  - rvm: 2.0.0
+  - rvm: 2.1.0
+notifications:
+  email: false

data/Gemfile

@@ -2,4 +2,29 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 gemspec
 
+group :test do
+
+  gem 'rake',             '~> 10.4'
+  gem 'rspec',            '~> 3.1'
+  gem 'rspec-its',        '~> 1.1'
+  gem 'coveralls',        '~> 0.7'
+  gem 'simplecov',        '~> 0.9'
+  gem 'sqlite3',          '~> 1.3'
+
+end
+
+group :development do
+
+  gem 'inch',             '~> 0.5'
+  gem 'travis',           '~> 1.6'
+  gem 'pry-byebug',       '~> 2.0'   if RUBY_VERSION >= '2.0.0'
+  gem 'pry-debugger',     '~> 0.2'   if RUBY_VERSION < '2.0.0'
+
+end
+
+local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
+if File.exists?(local_gemfile)
+  eval_gemfile local_gemfile
+end
+
 # vim:ft=ruby

data/Gemfile.local.example

@@ -0,0 +1,7 @@
+
+gem 'pg'
+gem 'puma'
+# gem 'thin'
+
+
+# vim:ft=ruby

data/README.md

@@ -1,11 +1,24 @@
 puppet-herald gem
 ========
 
+##### Status Info
+[![GitHub Issues](https://img.shields.io/github/issues/wavesoftware/gem-puppet-herald.svg)](https://github.com/wavesoftware/gem-puppet-herald/issues) [![Gem](http://img.shields.io/gem/v/puppet-herald.svg)](https://rubygems.org/gems/puppet-herald) [![GitHub Release](https://img.shields.io/github/release/wavesoftware/gem-puppet-herald.svg)](https://github.com/wavesoftware/gem-puppet-herald/releases) [![Apache 2.0 License](http://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://raw.githubusercontent.com/wavesoftware/gem-puppet-herald/develop/LICENSE)
+
+##### Master (stable) branch
+[![Build Status](https://img.shields.io/travis/wavesoftware/gem-puppet-herald/master.svg)](https://travis-ci.org/wavesoftware/gem-puppet-herald) [![Dependency Status](https://gemnasium.com/wavesoftware/gem-puppet-herald.svg)](https://gemnasium.com/wavesoftware/gem-puppet-herald) [![Coverage Status](https://img.shields.io/coveralls/wavesoftware/gem-puppet-herald/master.svg)](https://coveralls.io/r/wavesoftware/gem-puppet-herald?branch=master) [![Code Climate](https://codeclimate.com/github/wavesoftware/gem-puppet-herald/badges/gpa.svg?branch=master)](https://codeclimate.com/github/wavesoftware/gem-puppet-herald) [![Inline docs](http://inch-ci.org/github/wavesoftware/gem-puppet-herald.svg?branch=master)](http://inch-ci.org/github/wavesoftware/gem-puppet-herald)
+
+##### Development branch
+[![Build Status](https://img.shields.io/travis/wavesoftware/gem-puppet-herald/develop.svg)](https://travis-ci.org/wavesoftware/gem-puppet-herald) [![Dependency Status](https://gemnasium.com/wavesoftware/gem-puppet-herald.svg)](https://gemnasium.com/wavesoftware/gem-puppet-herald) [![Coverage Status](https://img.shields.io/coveralls/wavesoftware/gem-puppet-herald/develop.svg)](https://coveralls.io/r/wavesoftware/gem-puppet-herald?branch=develop) [![Code Climate](https://codeclimate.com/github/wavesoftware/gem-puppet-herald/badges/gpa.svg?branch=develop)](https://codeclimate.com/github/wavesoftware/gem-puppet-herald) [![Inline docs](http://inch-ci.org/github/wavesoftware/gem-puppet-herald.svg?branch=develop)](http://inch-ci.org/github/wavesoftware/gem-puppet-herald) 
+
 Overview
 --------
 
 Herald is a puppet report processor. He provides a gateway for consuming puppet reports, a REST API and a simple Web app to display reports.
 
+![A reports list](https://raw.githubusercontent.com/wavesoftware/gem-puppet-herald/gh-pages/images/reports.png)
+
+![A logs of single report](https://raw.githubusercontent.com/wavesoftware/gem-puppet-herald/gh-pages/images/logs.png)
+
 Puppet module
 -----
 

data/Rakefile

@@ -1,6 +1,13 @@
-require 'puppet-herald/app'
+
 require 'sinatra/activerecord/rake'
 require 'rspec/core/rake_task'
 
+desc "Run spec tests."
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+
+desc "Run lint, and spec tests."
+task :test => [
+  :spec
+]
+
+task :default => :test

data/bin/puppet-herald

@@ -10,4 +10,4 @@ rescue LoadError
 end
 
 # Process command line options and run Puppet Herald
-PuppetHerald::CLI.parse_options
+PuppetHerald::CLI.run!

data/lib/puppet-herald.rb

@@ -9,11 +9,7 @@ module PuppetHerald
   @@root = File.dirname(File.dirname(File.realpath(__FILE__)))
 
   def self.relative_dir dir
-    File.join @@root, dir
-  end
-
-  def self.port
-    @@port
+    File.realpath(File.join @@root, dir)
   end
 
   def self.environment
@@ -31,7 +27,23 @@ module PuppetHerald
   def self.is_in_prod?
     return !is_in_dev?
   end
+
+  def self.bug ex
+    file = Tempfile.new(['puppet-herald-bug', '.log'])
+    filepath = file.path
+    file.close
+    file.unlink
+    message = "v#{PuppetHerald::VERSION}-#{ex.class.to_s}: #{ex.message}"
+    contents = message + "\n\n" + ex.backtrace.join("\n") + "\n"
+    File.write(filepath, contents)
+    bugo = {
+      :message  => message,
+      :homepage => PuppetHerald::HOMEPAGE,
+      :bugfile  => filepath,
+      :help     => "Please report this bug to #{PuppetHerald::HOMEPAGE} by passing contents of bug file: #{filepath}"
+    }
+    return bugo
+  end
 end
 
 require 'puppet-herald/database'
-require 'puppet-herald/app'

data/lib/puppet-herald/app.rb

@@ -1,5 +1,5 @@
 require 'sinatra/base'
-require "sinatra/namespace"
+require 'sinatra/namespace'
 require 'sinatra/activerecord'
 require 'puppet-herald'
 require 'puppet-herald/javascript'
@@ -10,36 +10,27 @@ module PuppetHerald
   class App < Sinatra::Base
     register Sinatra::Namespace
     register Sinatra::ActiveRecordExtension
-    configure [:production, :development] do
-      enable :logging
-      PuppetHerald::Database.setup self
-    end
+
+    set :database, PuppetHerald::Database.spec unless PuppetHerald::Database.spec.nil?
     if PuppetHerald::is_in_dev?
       set :environment, :development
     else
       set :environment, :production
     end
 
-    def self.bug ex
-      file = Tempfile.new(['puppet-herald-bug', '.log'])
-      filepath = file.path
-      file.close
-      file.unlink
-      message = "v#{PuppetHerald::VERSION}-#{ex.class.to_s}: #{ex.message}"
-      contents = message + "\n\n" + ex.backtrace.join("\n") + "\n"
-      File.write(filepath, contents)
-      bugo = {
-        :message  => message,
-        :homepage => PuppetHerald::HOMEPAGE,
-        :bugfile  => filepath,
-        :help     => "Please report this bug to #{PuppetHerald::HOMEPAGE} by passing contents of bug file: #{filepath}"
-      }
-      return bugo
+    def self.run! options = {}, &block
+      ActiveRecord::Base.establish_connection(PuppetHerald::Database.spec)
+      ActiveRecord::Migrator.up "db/migrate"
+      super options, *block
     end
 
     error do
-      @bug = PuppetHerald::App.bug(env['sinatra.error'])
-      erb :err500
+      @bug = PuppetHerald::bug(env['sinatra.error'])
+      if response.content_type == 'application/json'
+        @bug.to_json
+      else
+        erb :err500
+      end
     end
 
     get %r{/app\.min\.(js\.map|js)} do |ext|

data/lib/puppet-herald/cli.rb

@@ -1,4 +1,5 @@
 require 'micro-optparse'
+require 'logger'
 require 'puppet-herald'
 require 'puppet-herald/version'
 require 'puppet-herald/database'
@@ -6,7 +7,37 @@ require 'puppet-herald/database'
 module PuppetHerald
   class CLI
 
-    def self.parse_options
+    @@logger = Logger.new STDOUT
+    @@errlogger = Logger.new STDERR
+    @@retcode = 0
+
+    def self.retcode= val
+      @@retcode = val if @@retcode == 0
+    end
+
+    def self.logger
+      @@logger
+    end
+
+    def self.errlogger
+      @@errlogger
+    end
+
+    def self.run! argv=ARGV
+      @@retcode = 0
+      begin
+        options = parse_options argv
+        require 'puppet-herald/app'
+        PuppetHerald::App.run! options
+      rescue Exception => ex
+        bug = PuppetHerald.bug(ex)
+        errlogger.fatal "Unexpected error occured, mayby a bug?\n\n#{bug[:message]}\n\n#{bug[:help]}"
+        self.retcode = 1
+      end
+      Kernel::exit @@retcode
+    end
+
+    def self.parse_options argv
       usage = ""
       banner = <<-eos
 #{PuppetHerald::NAME} v#{PuppetHerald::VERSION} - #{PuppetHerald::SUMMARY}
@@ -30,24 +61,20 @@ CAUTION! For security reasons, don't pass password in connection string, use --p
         p.option :dbconn, "Connection string to database, see info above", :default => defaultdb
         p.option :passfile, "If using postgresql, this file will be read for password to database", :default => defaultdbpass
       end
-      options = parser.process!
+      options = parser.process!(argv)
 
-      puts "Starting #{PuppetHerald::NAME} v#{PuppetHerald::VERSION}..."
+      logger.info "Starting #{PuppetHerald::NAME} v#{PuppetHerald::VERSION} in #{PuppetHerald::environment}..."
       PuppetHerald::Database.dbconn   = options[:dbconn]
       PuppetHerald::Database.passfile = options[:passfile]
       begin
-        PuppetHerald::Database.validate! :echo => true
+        PuppetHerald::Database.spec :echo => true
       rescue Exception => ex
-        STDERR.puts "FATAL ERROR - Database configuration is invalid!\n\n#{ex.message}"
-        exit 2
-      end
-      begin
-        PuppetHerald::App.run! options
-      rescue Exception => ex
-        bug = PuppetHerald::App.bug(ex)
-        STDERR.puts "FATAL ERROR - Unexpected error occured, mayby a bug?\n\n#{bug[:message]}\n\n#{bug[:help]}"
-        exit 1
+        errlogger.fatal "Database configuration is invalid!\n\n#{ex.message}"
+        self.retcode = 2
+        raise ex
       end
+
+      return options
     end
   end
 end

data/lib/puppet-herald/database.rb

@@ -1,10 +1,16 @@
 require 'fileutils'
+require 'logger'
 
 module PuppetHerald
   class Database
 
     @@dbconn   = nil
     @@passfile = nil
+    @@logger = Logger.new STDOUT
+
+    def self.logger
+      @@logger
+    end
 
     def self.dbconn= dbconn
       @@dbconn = dbconn
@@ -14,18 +20,23 @@ module PuppetHerald
       @@passfile = passfile
     end
 
-    def self.validate! echo=false
-      db = URI.parse(@@dbconn)
+    def self.spec echo=false
+      return nil if @@dbconn.nil?
       connection = {}
-      if db.scheme.to_s.empty?
-        raise "Database scheme couldn't be empty! Connection string given: #{@@dbconn}"
+      match = @@dbconn.match(/^(sqlite3?|postgres(?:ql)?):\/\/(.+)$/)
+      unless match
+        raise "Invalid database connection string given: #{@@dbconn}"
       end
-      if ['sqlite', 'sqlite3'].include? db.scheme
-        file = File.expand_path("#{db.host}#{db.path}")
-        FileUtils.touch file
+      if ['sqlite', 'sqlite3'].include? match[1]
+        dbname = match[2]
+        unless dbname.match /^(?:file:)?:mem/
+          dbname = File.expand_path(dbname)
+          FileUtils.touch dbname
+        end
         connection[:adapter]  = 'sqlite3'
-        connection[:database] = file
+        connection[:database] = dbname
       else
+        db = URI.parse @@dbconn
         dbname = db.path[1..-1]
         connection[:adapter]  = db.scheme == 'postgres' ? 'postgresql' : db.scheme
         connection[:host]     = db.host
@@ -38,13 +49,9 @@ module PuppetHerald
       if echo
         copy = connection.dup
         copy[:password] = '***' unless copy[:password].nil?
-        puts "Using #{copy.inspect} for database."
+        logger.info "Using #{copy.inspect} for database."
       end
       return connection
     end
-
-    def self.setup app
-      ActiveRecord::Base.establish_connection(validate!)
-    end
   end
 end

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

@@ -2,14 +2,13 @@
   "name": "puppet-herald",
   "description": "Report processor for Puppet",
   "version": "0.1.0",
-  "homepage": "https://github.com/wavesoftware/puppet-herald",
+  "homepage": "https://github.com/wavesoftware/gem-puppet-herald",
   "license": "Apache 2.0",
   "private": false,
   "dependencies": {
     "angular": "1.3.x",
     "angular-route": "1.3.x",
     "angular-loader": "1.3.x",
-    "angular-mocks": "~1.3.x",
-    "html5-boilerplate": "~4.3.0"
+    "angular-mocks": "1.3.x"
   }
 }

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

@@ -1,7 +1,7 @@
 'use strict';
 
 describe('herald.artifact module', function() {
-  beforeEach(module('myApp.artifact'));
+  beforeEach(module('herald.artifact'));
 
   describe('app-version directive', function() {
     it('should print current version', function() {

data/lib/puppet-herald/version.rb

@@ -4,12 +4,12 @@ module PuppetHerald
     version = desired
     if desired.match(/[^0-9\.]+/)
       git = `git describe --tags --dirty --always`
-      version += "-" + git[1..-1]
+      version += "." + git.gsub('-', '.')
     end
     return version.strip
   end
 
-  VERSION     = version_prep '0.1.0'
+  VERSION     = version_prep '0.1.1'
   LICENSE     = 'Apache 2.0'
   NAME        = 'Puppet Herald'
   PACKAGE     = 'puppet-herald'

data/package.json

@@ -0,0 +1,40 @@
+{
+  "name": "puppet-herald",
+  "version": "0.1.1",
+  "description": "Provides a gateway for consuming puppet reports, a REST API and a simple Web app to display reports.",
+  "main": "lib/puppet-herald/public/app.js",
+  "directories": {
+    "test": "test"
+  },
+  "dependencies": {
+    "angular": "1.3.x",
+    "angular-route": "1.3.x",
+    "angular-loader": "1.3.x",
+    "angular-mocks": "1.3.x"
+  },
+  "devDependencies": {
+    "jasmine-core": "~2.1.0",
+    "karma-jasmine": "~0.3.0",
+    "karma": "~0.12.0",
+    "phantomjs": "~1.9.0",
+    "karma-phantomjs-launcher": "~0.1"
+  },
+  "scripts": {
+    "test": "test/javascript/karma.conf.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/wavesoftware/gem-puppet-herald.git"
+  },
+  "keywords": [
+    "puppet",
+    "reports",
+    "herald"
+  ],
+  "author": "Krzysztof Suszynski",
+  "license": "Apache 2.0",
+  "bugs": {
+    "url": "https://github.com/wavesoftware/gem-puppet-herald/issues"
+  },
+  "homepage": "https://github.com/wavesoftware/gem-puppet-herald"
+}

data/puppet-herald.gemspec

@@ -20,42 +20,14 @@ Gem::Specification.new do |gem|
   # Dependencies
   gem.required_ruby_version = '>= 1.9.2'
 
-  prydebugger = if RUBY_VERSION >= "2.0.0" then 'pry-byebug' else 'pry-debugger' end
-  dependencies = {
-    :runtime     => [
-      'rake',
-      'sinatra',
-      'sinatra-contrib',
-      'sinatra-activerecord',
-      'micro-optparse',
-      'uglifier',
-      'sqlite3',
-      'pg',
-      'puma'
-    ],
-    :test        => [
-      'rspec',
-      'rspec-its',
-      'coveralls',
-      'simplecov'
-    ],
-    :developmant => [
-      'inch',
-      'travis',
-      'travis-lint',
-      prydebugger
-    ]
-  }
+  # Runtime
+  gem.add_runtime_dependency 'sinatra',              '~> 1.4'
+  gem.add_runtime_dependency 'sinatra-contrib',      '~> 1.4'
+  gem.add_runtime_dependency 'sinatra-activerecord', '~> 2.0'
+  gem.add_runtime_dependency 'micro-optparse',       '~> 1.2'
+  gem.add_runtime_dependency 'uglifier',             '~> 2.6'
 
-  dependencies[:runtime].each do |spec|
-    gem.add_runtime_dependency spec
-  end
-  dependencies[:test].each do |spec|
-    gem.add_development_dependency spec
-  end
-  dependencies[:developmant].each do |spec|
-    gem.add_development_dependency spec
-  end
+  # Development and test dependencies specified in Gemfile
   
 end
 

data/spec/integration/app_spec.rb

@@ -0,0 +1,21 @@
+ENV['RACK_ENV'] = 'test'
+
+require 'model_helper'
+require 'rspec'
+require 'rack/test'
+
+xdescribe 'The Herald App', :rollback => true do
+  include Rack::Test::Methods
+
+  def app
+    require 'puppet-herald/app'
+    PuppetHerald::App
+  end
+
+  it "on '/' redirects to '/app.html'" do
+    get '/'
+    expect(last_response).not_to be_ok
+    expect(last_response.status).to eq(301)
+    expect(last_response.header['Location']).to eq('http://example.org/app.html')
+  end
+end

data/spec/integration/models/node_spec.rb

@@ -0,0 +1,26 @@
+require 'model_helper'
+require 'puppet-herald/models/report'
+require 'puppet-herald/models/log-entry'
+require 'puppet-herald/models/node'
+
+describe Node, '.get_with_reports', :rollback => true do
+  let(:yaml) { File.read(File.expand_path("../../fixtures/changed-notify.yaml", __FILE__)) }
+  let(:id)   { Report.create_from_yaml(yaml).node_id }
+
+  context 'fetching an existing node' do
+    subject { Node.get_with_reports id }
+    
+    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(Node)
+    end
+    it "should return persisted node" do
+      subject.persisted?.should be_truthy
+    end
+    it "should have status 'changed'" do
+      subject.status.should eq('changed')
+    end
+  end
+end

data/spec/{unit → integration}/models/report_spec.rb

@@ -2,7 +2,7 @@ require 'model_helper'
 require 'puppet-herald/models/report'
 require 'puppet-herald/models/log-entry'
 
-describe Report, ".create_from_yaml" do
+describe Report, ".create_from_yaml", :rollback => true do
   context 'for valid YAML' do
     let(:yaml) { File.read(File.expand_path("../../fixtures/changed-notify.yaml", __FILE__)) }
     it 'that is really not empty' do
@@ -35,4 +35,37 @@ describe Report, ".create_from_yaml" do
       end
     end
   end
+end
+
+describe Report, '.get_with_log_entries', :rollback => true do
+  let(:yaml) { File.read(File.expand_path("../../fixtures/changed-notify.yaml", __FILE__)) }
+  let(:id)   { Report.create_from_yaml(yaml).id }
+
+  context 'fetching an existing report' do
+    subject { Report.get_with_log_entries id }
+    
+    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(Report)
+    end
+    it "should return persisted report" do
+      subject.persisted?.should be_truthy
+    end
+    it "should have status 'changed'" do
+      subject.status.should eq('changed')
+    end
+    it "should have 3 log entries, also persisted" do
+      subject.log_entries.size.should eq(3)
+      subject.log_entries.each do |log|
+        log.persisted?.should be_truthy
+      end
+    end
+    it "should have parent node, that is persistedand 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

data/spec/model_helper.rb

@@ -1,2 +1,2 @@
+require 'spec_helper'
 require 'support/active_record'
-require 'spec_helper'

data/spec/spec_helper.rb

@@ -4,10 +4,13 @@ begin
   gem 'simplecov'
   require 'simplecov'
   SimpleCov.start do
+    add_filter "/test/"
     add_filter "/spec/"
     add_filter "/.vendor/"
     add_filter "/vendor/"
     add_filter "/gems/"
+    add_filter "/node_modules/"
+    add_filter "/coverage/"
   end
 rescue Gem::LoadError
   # do nothing

data/spec/support/active_record.rb

@@ -1,14 +1,16 @@
+require 'puppet-herald/database'
 require 'active_record'
 require 'stringio'        # silence the output
 $stdout = StringIO.new    # from migrator
 
-ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+PuppetHerald::Database.dbconn = 'sqlite3://:memory:'
+ActiveRecord::Base.establish_connection(PuppetHerald::Database.spec)
 ActiveRecord::Migrator.up "db/migrate"
 
 $stdout = STDOUT
 
 RSpec.configure do |config|
-  config.around do |example|
+  config.around(:example, {:rollback => true}) do |example|
     ActiveRecord::Base.transaction do
       example.run
       raise ActiveRecord::Rollback

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

@@ -0,0 +1,54 @@
+require 'spec_helper'
+require 'puppet-herald'
+require 'puppet-herald/cli'
+
+context 'With silenced loggers' do
+
+  before :each do
+    PuppetHerald::CLI::logger.level = 100
+    PuppetHerald::CLI::errlogger.level = 100
+    PuppetHerald::Database::logger.level = 100
+    PuppetHerald::Database::dbconn = nil
+  end
+
+  describe PuppetHerald::CLI, '.parse_options' do
+    subject { PuppetHerald::CLI::parse_options argv }
+
+    context 'on defaults' do
+      let(:argv) { [] }
+      its(:class) { should be Hash }
+      it { subject[:port].should eq 11303 }
+    end
+
+    context 'on with invalid DB' do
+      let(:argv) { ['--dbconn', '/non-exist/db.sqlite'] }
+      
+      it { expect { subject }.to raise_error(RuntimeError, /Invalid database connection string given/) }
+    end
+  end
+
+  describe PuppetHerald::CLI, '.run!' do
+    subject { PuppetHerald::CLI::run! argv }
+
+    context 'on defaults' do
+      let(:argv) { [] }
+      before :each do
+        require 'puppet-herald/app'
+        expect(Kernel).to receive(:exit).with(0)
+        expect(PuppetHerald::App).to receive(:run!).and_return :none
+      end
+
+      it { expect(subject).to be_nil }
+    end
+
+    context 'on with invalid DB' do
+      let(:argv) { ['--dbconn', '/non-exist/db.sqlite'] }
+      before :each do
+        expect(Kernel).to receive(:exit).with(2)
+      end
+      
+      it { expect(subject).to be_nil }
+    end
+  end
+
+end

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

@@ -0,0 +1,57 @@
+require 'spec_helper'
+require 'puppet-herald'
+require 'puppet-herald/database'
+
+describe PuppetHerald::Database, '.spec' do
+  let(:tempdir) { Dir.tmpdir }
+  let(:echo) { false }
+  subject { PuppetHerald::Database::spec echo }
+  context 'with invalid dbconn' do
+    before :each do
+      PuppetHerald::Database::dbconn = "#{tempdir}/non-existing.db"
+    end
+    it { expect { subject }.to raise_error(RuntimeError, /Invalid database connection string given/) }
+  end
+  context 'using sqlite' do
+    context 'with non existing database' do
+      before :each do
+        PuppetHerald::Database::dbconn = 'sqlite:///non-existing/non-existing.db'
+      end
+      it { expect { subject }.to raise_error(Errno::ENOENT, /No such file or directory/) }
+    end
+    context 'with creatable database file' do
+      before :each do
+        PuppetHerald::Database::dbconn = "sqlite://#{tempdir}/non-existing.db"
+      end
+      its(:class) { should be Hash }
+      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
+    end
+  end
+  context 'using postgres' do
+    before :each do
+      PuppetHerald::Database::dbconn = "postgres://abc@localhost:6543/adb"
+    end
+    context 'with non existing passfile' do
+      before :each do
+        PuppetHerald::Database::passfile = "/non-existing/passfile"
+      end
+      it { expect { subject }.to raise_error(Errno::ENOENT, /No such file or directory/) }
+    end
+    context 'with existing passfile' do
+      before :each do
+        PuppetHerald::Database::passfile = __FILE__
+      end
+      its(:class) { should be Hash }
+      its(:size) { should eq 7 }
+    end
+  end
+
+end

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

@@ -0,0 +1,44 @@
+require 'spec_helper'
+require 'puppet-herald'
+require 'puppet-herald/javascript'
+
+describe PuppetHerald::Javascript, '.files' do
+  context 'running in dev environment' do
+    before :each do
+      expect(PuppetHerald).to receive(:is_in_dev?).twice.and_return true
+      expect(Dir).to receive(:glob).twice.and_return(['aaa.js', 'a/bbb.js', 'ccc_test.js'])
+      PuppetHerald::Javascript::files
+    end
+    after :each do
+      PuppetHerald::Javascript::class_variable_set '@@files', nil
+    end
+    let(:files) { PuppetHerald::Javascript::files }
+    it { files.size.should eq 2 }
+    it { files.should include 'aaa.js' }
+    it { files.should_not include 'ccc_test.js' }
+  end
+
+  context 'running in prod environment' do
+    before :each do
+      expect(PuppetHerald).to receive(:is_in_dev?).twice.and_return false
+      expect(Dir).to receive(:glob).once.and_return(['aaa.js', 'a/bbb.js', 'ccc_test.js'])
+      PuppetHerald::Javascript::files
+    end
+    after :each do
+      PuppetHerald::Javascript::class_variable_set '@@files', nil
+    end
+    let(:files) { PuppetHerald::Javascript::files }
+    it { files.size.should eq 2 }
+    it { files.should include 'aaa.js' }
+    it { files.should_not include 'ccc_test.js' }
+  end
+end
+
+describe PuppetHerald::Javascript, '.uglify' do
+  subject { PuppetHerald::Javascript::uglify 'myapp.js.map' }
+
+  it { subject.size.should eq 2 }
+  it { subject['js'].should_not be_empty }
+  it { subject['js.map'].should_not be_empty }
+  it { subject['js'].should include('myapp.js.map') }
+end

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

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'puppet-herald'
+require 'puppet-herald/version'
+
+describe PuppetHerald, '.version_prep' do
+  context 'on stable version v1.2.3' do
+    subject { PuppetHerald::version_prep '1.2.3' }
+    it { subject.should eq '1.2.3' }
+  end
+  context 'on unstable version v1.2.3.pre' do
+    subject { PuppetHerald::version_prep '1.2.3.pre' }
+    it { subject.should match /^1\.2\.3\.pre\.v\d+\.\d+\.\d+(?:\.\d+\.g[0-9a-f]{7}(?:\.dirty)?)?$/ }
+  end
+end

data/spec/unit/puppet-herald_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+require 'puppet-herald'
+
+describe PuppetHerald, '.relative_dir' do
+  let(:thisfile) { File.realpath(__FILE__) }
+  context 'on directory "."' do
+    subject { PuppetHerald.relative_dir '.' }
+
+    it do
+      subject.should_not be_nil
+    end
+
+    it 'should give a common path' do
+      thisfile.should include(subject)
+    end
+
+    it do
+      thisfile.gsub(subject, '').should eq('/spec/unit/puppet-herald_spec.rb')
+    end
+  end
+
+  context 'on directory "lib/puppet-herald/public"' do
+    subject { PuppetHerald.relative_dir 'lib/puppet-herald/public' }
+
+    it { Pathname.new(File.join(subject, 'app.js')).should be_file }
+  end
+end
+
+describe PuppetHerald do
+  after :each do
+    ENV.delete 'PUPPET_HERALD_ENV'
+  end
+  context 'on unset environment variable' do
+    before :each do
+      ENV.delete 'PUPPET_HERALD_ENV'
+    end
+    describe '.environment' do
+      it { subject::environment.should eq(:production) }
+    end
+    describe '.is_in_prod?' do
+      it { subject.should be_is_in_prod }
+    end
+  end
+
+  context 'on environment variable set to dev' do
+    before :each do
+      ENV['PUPPET_HERALD_ENV'] = 'dev'
+    end
+    describe '.environment' do
+      it { subject::environment.should eq(:dev) }
+    end
+    describe '.is_in_prod?' do
+      it { subject.should be_is_in_dev }
+    end
+  end
+end

data/test/javascript/karma.conf.js

@@ -0,0 +1,13 @@
+module.exports = function(config) {
+  config.set({
+    frameworks: ['jasmine'],
+
+    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',
+      '../../lib/puppet-herald/public/**/*_test.js'
+    ]
+  });
+};

metadata

@@ -1,264 +1,80 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: puppet-herald
-version: !ruby/object:Gem::Version
-  version: 0.1.0
+version: !ruby/object:Gem::Version 
+  version: 0.1.1
 platform: ruby
-authors:
+authors: 
 - Krzysztof Suszynski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+
+date: 2014-12-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra-contrib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra-activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: micro-optparse
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.4"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: sinatra-contrib
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: uglifier
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.4"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sinatra-activerecord
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: micro-optparse
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.2"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: uglifier
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.6"
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: inch
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: travis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: travis-lint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-debugger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Provides a gateway for consuming puppet reports, a REST API and a simple
-  Web app to display reports.
+  version_requirements: *id005
+description: Provides a gateway for consuming puppet reports, a REST API and a simple Web app to display reports.
 email: krzysztof.suszynski@wavesoftware.pl
-executables:
+executables: 
 - puppet-herald
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
+- Gemfile.local.example
 - README.md
 - Rakefile
 - bin/puppet-herald
@@ -298,34 +114,47 @@ files:
 - lib/puppet-herald/version.rb
 - lib/puppet-herald/views/app.erb
 - lib/puppet-herald/views/err500.erb
+- package.json
 - puppet-herald.gemspec
+- spec/integration/app_spec.rb
+- spec/integration/fixtures/changed-notify.yaml
+- spec/integration/models/node_spec.rb
+- spec/integration/models/report_spec.rb
 - spec/model_helper.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
-- spec/unit/fixtures/changed-notify.yaml
-- spec/unit/models/report_spec.rb
+- spec/unit/puppet-herald/cli_spec.rb
+- spec/unit/puppet-herald/database_spec.rb
+- spec/unit/puppet-herald/javascript_spec.rb
+- spec/unit/puppet-herald/version_spec.rb
+- spec/unit/puppet-herald_spec.rb
+- test/javascript/karma.conf.js
 homepage: https://github.com/wavesoftware/gem-puppet-herald
-licenses:
+licenses: 
 - Apache 2.0
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: a Puppet report processor
 test_files: []
+