puppet-herald 0.1.1 → 0.2.0

data/package.json

@@ -9,15 +9,20 @@
   "dependencies": {
     "angular": "1.3.x",
     "angular-route": "1.3.x",
-    "angular-loader": "1.3.x",
-    "angular-mocks": "1.3.x"
+    "moment": "~2.8",
+    "angular-moment": "~0.8"
   },
   "devDependencies": {
+    "angular-loader": "1.3.x",
+    "angular-mocks": "1.3.x",
     "jasmine-core": "~2.1.0",
     "karma-jasmine": "~0.3.0",
     "karma": "~0.12.0",
     "phantomjs": "~1.9.0",
-    "karma-phantomjs-launcher": "~0.1"
+    "karma-story-reporter": "~0.2",
+    "karma-coverage": "~0.1",
+    "karma-phantomjs-launcher": "~0.1",
+    "karma-ng-html2js-preprocessor": "~0.1"
   },
   "scripts": {
     "test": "test/javascript/karma.conf.js"

data/puppet-herald.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |gem|
   gem.summary       = PuppetHerald::SUMMARY
   gem.description   = PuppetHerald::DESCRIPTION
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
   # Dependencies
   gem.required_ruby_version = '>= 1.9.2'
@@ -26,9 +26,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'sinatra-activerecord', '~> 2.0'
   gem.add_runtime_dependency 'micro-optparse',       '~> 1.2'
   gem.add_runtime_dependency 'uglifier',             '~> 2.6'
-
-  # Development and test dependencies specified in Gemfile
-  
 end
 
-# vim:ft=ruby
+# vim:ft=ruby

data/spec/integration/application_spec.rb

@@ -0,0 +1,175 @@
+ENV['RACK_ENV'] = 'test'
+
+require 'support/reconnectdb'
+require 'spec_helper'
+require 'rspec'
+require 'rack/test'
+
+shared_examples 'a redirect to app.html' do
+  it { expect(subject).not_to be_successful }
+  it { expect(subject).to be_redirection }
+  it { expect(subject.status).to eq(301) }
+  it { expect(subject.header['Location']).to eq('http://example.org/app.html') }
+end
+
+shared_examples 'a proper 2xx - success' do
+  it { expect(subject).to be_successful }
+  it { expect(subject.status).to be >= 200 }
+  it { expect(subject.status).to be < 300 }
+  it { expect(subject.body).not_to be_empty }
+end
+
+shared_examples '500 - error' do
+  it { expect(subject).not_to be_successful }
+  it { expect(subject).to be_server_error }
+  it { expect(subject.status).to eq 500 }
+  it { expect(subject.body).not_to be_empty }
+end
+
+shared_examples '404 - not found' do
+  it { expect(subject).not_to be_successful }
+  it { expect(subject).to be_client_error }
+  it { expect(subject.status).to eq 404 }
+  it { expect(subject.body).not_to be_empty }
+end
+
+shared_examples "working API - success" do
+  it { expect(subject.content_type).to eq 'application/json' }
+  it_behaves_like 'a proper 2xx - success'
+end
+
+shared_examples "working API - not found" do
+  it { expect(subject.content_type).to eq 'application/json' }
+  it_behaves_like '404 - not found'
+end
+
+shared_examples "working API - error" do
+  it { expect(subject.content_type).to eq 'application/json' }
+  it_behaves_like '500 - error'
+end
+
+describe 'The Herald App' do
+  include Rack::Test::Methods
+
+  before(:all) { reconnectdb }
+
+  def app
+    require 'puppet-herald/application'
+    PuppetHerald::Application
+  end
+
+  describe "on '/' redirects to '/app.html'" do
+    it_behaves_like 'a redirect to app.html' do
+      subject { get '/' }
+    end
+  end
+
+  describe "on '/index.html' redirects to '/app.html'" do
+    it_behaves_like 'a redirect to app.html' do
+      subject { get '/index.html' }
+    end
+  end
+
+  describe "on main page '/app.html'" do
+    subject { get '/app.html' }
+    context 'in production' do
+      before { expect(PuppetHerald).to receive(:in_prod?).at_least(:once).and_return true }
+      it { expect(subject.body).to include 'app.min.js' }
+    end
+    context 'in dev' do
+      before { expect(PuppetHerald).to receive(:in_prod?).at_least(:once).and_return false }
+      it { expect(subject.body).not_to include 'app.min.js' }
+      it { expect(subject.body).to include 'report.js' }
+      it { expect(subject.body).to include 'nodes.js' }
+      it { expect(subject.body).to include 'node.js' }
+      it { expect(subject.body).to include 'artifact.js' }
+    end
+    it_behaves_like 'a proper 2xx - success'
+  end
+
+  describe "on '/version.json'" do
+    subject { get '/version.json' }
+    it_behaves_like 'a proper 2xx - success'
+    it { expect(subject.content_type).to eq 'application/json' }
+    it { expect(subject.body).to include PuppetHerald::VERSION }
+  end
+
+  describe "on '/app.min.js'" do
+    subject { get '/app.min.js' }
+    it_behaves_like 'a proper 2xx - success'
+    it { expect(subject.content_type).to eq 'application/javascript;charset=utf-8' }
+  end
+
+  describe "on '/app.min.js.map'" do
+    subject { get '/app.min.js.map' }
+    it_behaves_like 'a proper 2xx - success'
+    it { expect(subject.content_type).to eq 'application/javascript;charset=utf-8' }
+  end
+
+  describe "that is received a fatal error" do
+    after :each do
+      Dir.glob(Dir.tmpdir + '/puppet-herald-bug*.log') { |file| Pathname.new(file).unlink }
+      PuppetHerald.environment = :test
+    end
+    context 'while inside json API' do
+      before :each do
+        expect_any_instance_of(PuppetHerald::App::ApiImplV1).to receive(:version_json).and_raise :expected
+      end
+      subject { get '/version.json' }
+      context 'in production environment' do
+        before :each do
+          PuppetHerald.environment = :production
+        end
+        it_behaves_like 'working API - error'
+      end
+      context 'in dev environment' do
+        before :each do
+          PuppetHerald.environment = :development
+        end
+        it_behaves_like 'working API - error'
+      end
+    end
+    context 'while in standard WWW' do
+      before :each do
+        expect_any_instance_of(PuppetHerald::App::LogicImpl).to receive(:app_html).and_raise :expected
+      end
+      subject { get '/app.html' }
+      context 'in production environment' do
+        before { PuppetHerald.environment = :production }
+        it_behaves_like '500 - error'
+        it { expect(subject.content_type).to include 'text/html' }
+      end
+
+      context 'in dev environment' do
+        before { PuppetHerald.environment = :development }
+        it_behaves_like '500 - error'
+        it { expect(subject.content_type).to include 'text/html' }
+      end
+    end
+  end
+
+  context 'API call' do
+
+    before :each do
+      reconnectdb
+    end
+    describe "post '/api/v1/reports'" do
+      let(:yaml) { File.read(File.expand_path("../fixtures/changed-notify.yaml", __FILE__)) }
+      subject { post '/api/v1/reports', yaml }
+      it_behaves_like 'working API - success'
+    end
+    describe "get '/api/v1/nodes'" do
+      subject { get '/api/v1/nodes' }
+      it_behaves_like 'working API - success'
+    end
+    describe "get '/api/v1/nodes/1'" do
+      subject { get '/api/v1/nodes/1' }
+      it_behaves_like 'working API - not found'
+    end
+    describe "get '/api/v1/reports/1'" do
+      subject { get '/api/v1/reports/1' }
+      it_behaves_like 'working API - not found'
+    end
+  end
+  
+end

data/spec/integration/models/node_spec.rb

@@ -3,18 +3,18 @@ require 'puppet-herald/models/report'
 require 'puppet-herald/models/log-entry'
 require 'puppet-herald/models/node'
 
-describe Node, '.get_with_reports', :rollback => true do
+describe PuppetHerald::Models::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 }
+  let(:id)   { PuppetHerald::Models::Report.create_from_yaml(yaml).node_id }
 
   context 'fetching an existing node' do
-    subject { Node.get_with_reports id }
+    subject { PuppetHerald::Models::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)
+      subject.class.should eq(PuppetHerald::Models::Node)
     end
     it "should return persisted node" do
       subject.persisted?.should be_truthy

data/spec/integration/models/report_spec.rb

@@ -2,19 +2,19 @@ require 'model_helper'
 require 'puppet-herald/models/report'
 require 'puppet-herald/models/log-entry'
 
-describe Report, ".create_from_yaml", :rollback => true do
+describe PuppetHerald::Models::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
       yaml.should_not be_empty
     end
     context 'running on real sqlite3 db' do
-      subject { Report.create_from_yaml yaml }
+      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(Report)
+        subject.class.should eq(PuppetHerald::Models::Report)
       end
       it "should return persisted report" do
         subject.persisted?.should be_truthy
@@ -37,18 +37,18 @@ describe Report, ".create_from_yaml", :rollback => true do
   end
 end
 
-describe Report, '.get_with_log_entries', :rollback => true do
+describe PuppetHerald::Models::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 }
+  let(:id)   { PuppetHerald::Models::Report.create_from_yaml(yaml).id }
 
   context 'fetching an existing report' do
-    subject { Report.get_with_log_entries id }
+    subject { PuppetHerald::Models::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)
+      subject.class.should eq(PuppetHerald::Models::Report)
     end
     it "should return persisted report" do
       subject.persisted?.should be_truthy

data/spec/spec_helper.rb

@@ -4,13 +4,18 @@ 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/"
+    add_filter '/test/'
+    add_filter '/spec/'
+    add_filter '/.vendor/'
+    add_filter '/vendor/'
+    add_filter '/gems/'
+    add_filter '/node_modules/'
+    add_filter '/coverage/'
+    add_group 'Models', 'lib/puppet-herald/models'
+    add_group 'App', 'lib/puppet-herald/app'
+    minimum_coverage 95
+    maximum_coverage_drop 3
+    coverage_dir 'coverage/ruby'
   end
 rescue Gem::LoadError
   # do nothing

data/spec/support/active_record.rb

@@ -1,19 +1,15 @@
-require 'puppet-herald/database'
-require 'active_record'
-require 'stringio'        # silence the output
-$stdout = StringIO.new    # from migrator
+require 'support/reconnectdb'
 
-PuppetHerald::Database.dbconn = 'sqlite3://:memory:'
-ActiveRecord::Base.establish_connection(PuppetHerald::Database.spec)
-ActiveRecord::Migrator.up "db/migrate"
-
-$stdout = STDOUT
+reconnectdb
 
 RSpec.configure do |config|
   config.around(:example, {:rollback => true}) do |example|
+    ActiveRecord::Base.logger.level = 2 unless ActiveRecord::Base.logger.nil?
     ActiveRecord::Base.transaction do
       example.run
-      raise ActiveRecord::Rollback
+      if ActiveRecord::Base.connection.open_transactions > 0
+        raise ActiveRecord::Rollback
+      end
     end
   end
 end

data/spec/support/reconnectdb.rb

@@ -0,0 +1,13 @@
+def reconnectdb
+  require 'puppet-herald'
+  require 'active_record'
+  require 'stringio'        # silence the output
+  $stdout = StringIO.new    # from migrator
+
+  PuppetHerald::database.dbconn = 'sqlite3://:memory:'
+  ActiveRecord::Base.establish_connection(PuppetHerald::database.spec)
+  ActiveRecord::Base.logger.level = 2 unless ActiveRecord::Base.logger.nil?
+  ActiveRecord::Migrator.up "db/migrate"
+
+  $stdout = STDOUT
+end

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

@@ -1,18 +1,28 @@
 require 'spec_helper'
 require 'puppet-herald'
 require 'puppet-herald/cli'
+require 'sinatra/base'
+
+class TestCLI < PuppetHerald::CLI
+  def test_parse(argv)
+    self.parse(argv)
+  end
+end
 
 context 'With silenced loggers' do
 
+  let(:cli) { TestCLI.new }
+
   before :each do
-    PuppetHerald::CLI::logger.level = 100
-    PuppetHerald::CLI::errlogger.level = 100
-    PuppetHerald::Database::logger.level = 100
-    PuppetHerald::Database::dbconn = nil
+    cli.logger.level = 100
+    cli.errlogger.level = 100
+    PuppetHerald::database::logger.level = 100
+    PuppetHerald::database::dbconn = nil
+    allow(FileUtils).to receive(:touch)
   end
 
-  describe PuppetHerald::CLI, '.parse_options' do
-    subject { PuppetHerald::CLI::parse_options argv }
+  describe PuppetHerald::CLI, '.parse' do
+    subject { cli.test_parse argv }
 
     context 'on defaults' do
       let(:argv) { [] }
@@ -20,7 +30,7 @@ context 'With silenced loggers' do
       it { subject[:port].should eq 11303 }
     end
 
-    context 'on with invalid DB' do
+    context 'with invalid DB configuration given' do
       let(:argv) { ['--dbconn', '/non-exist/db.sqlite'] }
       
       it { expect { subject }.to raise_error(RuntimeError, /Invalid database connection string given/) }
@@ -28,26 +38,48 @@ context 'With silenced loggers' do
   end
 
   describe PuppetHerald::CLI, '.run!' do
-    subject { PuppetHerald::CLI::run! argv }
+    subject { cli.run! argv }
 
     context 'on defaults' do
       let(:argv) { [] }
       before :each do
-        require 'puppet-herald/app'
+        expect(PuppetHerald).to receive(:in_dev?).at_least(:once).and_return(false)
         expect(Kernel).to receive(:exit).with(0)
-        expect(PuppetHerald::App).to receive(:run!).and_return :none
+        expect(Sinatra::Application).to receive(:run!).and_return :none
+        dbconn = { :adapter => 'sqlite3', :database => ':memory:' }
+        expect(PuppetHerald::database).to receive(:spec).at_least(:once).and_return dbconn
+        require 'stringio'        # silence the output
+        $stdout = StringIO.new    # from migrator
+      end
+      after :each do
+        $stdout = STDOUT
       end
 
       it { expect(subject).to be_nil }
     end
 
-    context 'on with invalid DB' do
+    context 'with exception from within starting application' do
+      let(:argv) { [] }
+      before :each do
+        expect(Kernel).to receive(:exit).with(1).and_raise :excpected1
+        expect(ActiveRecord::Base).to receive(:establish_connection).and_raise :expected2
+        dbconn = { :adapter => 'sqlite3', :database => ':memory:' }
+        expect(PuppetHerald::database).to receive(:spec).at_least(:once).and_return dbconn
+      end
+      after :each do
+        Dir.glob(Dir.tmpdir + '/puppet-herald-bug*.log') { |file| Pathname.new(file).unlink }
+      end
+      
+      it { expect { subject }.to raise_error }
+    end
+
+    context 'with invalid DB configuration given' do
       let(:argv) { ['--dbconn', '/non-exist/db.sqlite'] }
       before :each do
-        expect(Kernel).to receive(:exit).with(2)
+        expect(Kernel).to receive(:exit).with(2).and_raise :excpected
       end
       
-      it { expect(subject).to be_nil }
+      it { expect { subject }.to raise_error }
     end
   end