<%= link_to "Back", node_classes_path, :class => 'btn btn-sm btn-default' %>
<%= link_to "Edit", edit_node_class_path(@node_class), :class => 'btn btn-sm btn-primary' %>
- <%= link_to "Delete", @node_class, :method => :delete, :confirm => "Are you sure?", :class => 'btn btn-sm btn-danger pull-right' %>
+ <%= link_to "Delete", @node_class, :method => :delete, :data => { :confirm => "Are you sure?" }, :class => 'btn btn-sm btn-danger pull-right' %>
<%= link_to "Back", node_groups_path, :class => 'btn btn-sm btn-default' %>
<%= link_to "Edit", edit_node_group_path(@node_group), :class => 'btn btn-sm btn-primary' %>
- <%= link_to "Delete", @node_group, :method => :delete, :confirm => "Are you sure?", :class => 'btn btn-sm btn-danger pull-right' %>
+ <%= link_to "Delete", @node_group, :method => :delete, :data => { :confirm => "Are you sure?" }, :class => 'btn btn-sm btn-danger pull-right' %>
<%= link_to "Back", @report.node ? node_path(@report.node) : reports_path, :class => 'btn btn-sm btn-default' %>
- <%= link_to "Delete", @report, :method => :delete, :confirm => "Are you sure?", :class => 'btn btn-sm btn-danger pull-right' %>
+ <%= link_to "Delete", @report, :method => :delete, :data => { :confirm => "Are you sure?" }, :class => 'btn btn-sm btn-danger pull-right' %>
diff --git a/config/application.rb b/config/application.rb
index 38fdd57..39773ae 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -4,9 +4,7 @@
if defined?(Bundler)
# If you precompile assets before deploying to production, use this line
- Bundler.require(*Rails.groups(:assets => %w(development test)))
- # If you want your assets lazily compiled in production, use this line
- # Bundler.require(:default, :assets, Rails.env)
+ Bundler.require(:default, Rails.env)
end
module Enc
@@ -42,21 +40,9 @@ class Application < Rails::Application
# Enable escaping HTML in JSON.
config.active_support.escape_html_entities_in_json = true
- # Use SQL instead of Active Record's schema dumper when creating the database.
- # This is necessary if your schema can't be completely dumped by the schema dumper,
- # like if you have constraints or database-specific column types
- # config.active_record.schema_format = :sql
-
- # Enforce whitelist mode for mass assignment.
- # This will create an empty whitelist of attributes available for mass-assignment for all models
- # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
- # parameters by using an attr_accessible or attr_protected declaration.
- config.active_record.whitelist_attributes = true
-
- # Enable the asset pipeline
- config.assets.enabled = true
-
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
+
+ config.active_record.raise_in_transactional_callbacks = true
end
end
diff --git a/config/database.yml b/config/database.yml
index ff7fe08..dd5c7fd 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -18,15 +18,27 @@ postgresql: &pg
defaults: &defaults
pool: 16
timeout: 5000
- host: localhost
- <<: *<%= ENV['DB'] || "pg" %>
+ <<: *<%= ENV['DB'] || "mysql2" %>
development:
- <<: *defaults
+ adapter: mysql2
+ encoding: utf8
+ host: enc-dashboard.c1phlpd5jvwq.us-west-2.rds.amazonaws.com
+ port: 3306
+ database: dashboard_development
+ username: dashboard
+ password: d4aca968
test:
<<: *defaults
+ host: localhost
production:
- <<: *defaults
+ # <<: *defaults
# presumably, we'd erb-echo the production password from /etc/something here.
+ adapter: mysql2
+ encoding: utf8
+ host: enc-dashboard
+ database: dashboard_production
+ username: dashboard
+ password: d4aca968
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 0335c29..d602256 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -6,32 +6,28 @@
# since you don't have to restart the web server when you make code changes.
config.cache_classes = false
- # Log error messages when you accidentally call methods on nil.
- config.whiny_nils = true
+ config.eager_load = false
# Show full error reports and disable caching
config.consider_all_requests_local = true
config.action_controller.perform_caching = false
+ # Compress JavaScripts and CSS
+ config.assets.js_compressor = :uglifier
+
# Don't care if the mailer can't send
config.action_mailer.raise_delivery_errors = false
# Print deprecation notices to the Rails logger
config.active_support.deprecation = :log
- # Only use best-standards-support built into browsers
- config.action_dispatch.best_standards_support = :builtin
-
- # Raise exception on mass assignment protection for Active Record models
- config.active_record.mass_assignment_sanitizer = :strict
-
- # Log the query plan for queries taking more than this (works
- # with SQLite, MySQL, and PostgreSQL)
- config.active_record.auto_explain_threshold_in_seconds = 0.5
-
- # Do not compress assets
- config.assets.compress = false
+ # Raise an error on page load if there are pending migrations
+ config.active_record.migration_error = :page_load
# Expands the lines which load the assets
config.assets.debug = true
+
+ config.logger = Logger.new(STDOUT)
+ config.logger.level = :debug
+ config.log_level = :debug
end
diff --git a/config/environments/prod.rb b/config/environments/prod.rb
new file mode 100644
index 0000000..59cfca2
--- /dev/null
+++ b/config/environments/prod.rb
@@ -0,0 +1,73 @@
+Enc::Application.configure do
+ # Settings specified here will take precedence over those in config/application.rb
+
+ # Code is not reloaded between requests
+ config.cache_classes = true
+
+ config.eager_load = true
+
+ # Full error reports are disabled and caching is turned on
+ config.consider_all_requests_local = false
+ config.action_controller.perform_caching = true
+
+ # Disable Rails's static asset server (Apache or nginx will already do this)
+ config.serve_static_files = true
+
+ # Compress JavaScripts and CSS
+ config.assets.js_compressor = :uglifier
+
+ # Don't fallback to assets pipeline if a precompiled asset is missed
+ config.assets.compile = false
+
+ # Generate digests for assets URLs
+ config.assets.digest = true
+
+ # Defaults to nil and saved in location specified by config.assets.prefix
+ # config.assets.manifest = YOUR_PATH
+
+ # Specifies the header that your server uses for sending files
+ # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+ # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+ # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+ # config.force_ssl = true
+
+ # See everything in the log (default is :info)
+ # config.log_level = :debug
+
+ # Prepend all log lines with the following tags
+ # config.log_tags = [ :subdomain, :uuid ]
+
+ # Use a different logger for distributed setups
+ # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+ # Use a different cache store in production
+ # config.cache_store = :mem_cache_store
+
+ # Enable serving of images, stylesheets, and JavaScripts from an asset server
+ # config.action_controller.asset_host = "http://assets.example.com"
+
+ # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+ # config.assets.precompile += %w( search.js )
+
+ # Disable delivery errors, bad email addresses will be ignored
+ # config.action_mailer.raise_delivery_errors = false
+
+ # Enable threaded mode
+ # config.threadsafe!
+
+ # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+ # the I18n.default_locale when a translation can not be found)
+ config.i18n.fallbacks = true
+
+ # Send deprecation notices to registered listeners
+ config.active_support.deprecation = :notify
+
+ config.serve_static_files = true
+ config.paths['config/database'] = '/etc/enc_dashboard/database.yml' if File.exists? '/etc/enc_dashboard/database.yml'
+
+ # Setup custom logger to stdout and log level to debug
+ config.logger = Logger.new(STDOUT)
+ config.logger.level = :debug
+ config.log_level = :debug
+end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4c19acd..8ff1ada 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -4,15 +4,17 @@
# Code is not reloaded between requests
config.cache_classes = true
+ config.eager_load = true
+
# Full error reports are disabled and caching is turned on
config.consider_all_requests_local = false
config.action_controller.perform_caching = true
# Disable Rails's static asset server (Apache or nginx will already do this)
- config.serve_static_assets = false
+ config.serve_static_files = true
# Compress JavaScripts and CSS
- config.assets.compress = true
+ config.assets.js_compressor = :uglifier
# Don't fallback to assets pipeline if a precompiled asset is missed
config.assets.compile = false
@@ -61,7 +63,8 @@
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
- # Log the query plan for queries taking more than this (works
- # with SQLite, MySQL, and PostgreSQL)
- # config.active_record.auto_explain_threshold_in_seconds = 0.5
+ # Setup custom logger to stdout and log level to debug
+ config.logger = Logger.new(STDOUT)
+ config.logger.level = :debug
+ config.log_level = :debug
end
diff --git a/config/environments/stage.rb b/config/environments/stage.rb
new file mode 100644
index 0000000..984f13f
--- /dev/null
+++ b/config/environments/stage.rb
@@ -0,0 +1,29 @@
+Enc::Application.configure do
+ # Settings specified here will take precedence over those in config/application.rb
+
+ # In the development environment your application's code is reloaded on
+ # every request. This slows down response time but is perfect for development
+ # since you don't have to restart the web server when you make code changes.
+ config.cache_classes = false
+
+ config.eager_load = false
+
+ # Show full error reports and disable caching
+ config.consider_all_requests_local = true
+ config.action_controller.perform_caching = false
+
+ # Don't care if the mailer can't send
+ config.action_mailer.raise_delivery_errors = false
+
+ # Print deprecation notices to the Rails logger
+ config.active_support.deprecation = :log
+
+ config.assets.js_compressor = :uglifier
+
+ # Expands the lines which load the assets
+ config.assets.debug = true
+
+ config.serve_static_files = true
+ config.assets.compile = false
+ config.paths['config/database'] = '/etc/enc_dashboard/database.yml' if File.exists? '/etc/enc_dashboard/database.yml'
+end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index b365299..11a3562 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -8,11 +8,10 @@
config.cache_classes = true
# Configure static asset server for tests with Cache-Control for performance
- config.serve_static_assets = true
+ config.serve_static_files = true
config.static_cache_control = "public, max-age=3600"
- # Log error messages when you accidentally call methods on nil
- config.whiny_nils = true
+ config.eager_load = false
# Show full error reports and disable caching
config.consider_all_requests_local = true
@@ -29,9 +28,6 @@
# ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test
- # Raise exception on mass assignment protection for Active Record models
- config.active_record.mass_assignment_sanitizer = :strict
-
# Print deprecation notices to the stderr
config.active_support.deprecation = :stderr
end
diff --git a/config/initializers/00_enc_settings.rb b/config/initializers/00_enc_settings.rb
index 9f2629c..db4811f 100644
--- a/config/initializers/00_enc_settings.rb
+++ b/config/initializers/00_enc_settings.rb
@@ -1,5 +1,9 @@
if File.exists? "config/settings.yml"
- ENC_CONFIG = YAML.load_file("#{Rails.root}/config/settings.yml")[Rails.env].with_indifferent_access
+ ENC_CONFIG = HashWithIndifferentAccess.new(YAML.load(File.read("#{Rails.root}/config/settings.yml"))[Rails.env])
+ puts "=> Config file(settings.yml) loaded. \n ENC_CONFIG: #{ENC_CONFIG}"
+elsif File.exists? "/etc/enc_dashboard/settings.yml"
+ ENC_CONFIG = HashWithIndifferentAccess.new(YAML.load(File.read("/etc/enc_dashboard/settings.yml"))[Rails.env])
+ puts "=> Config file(settings.yml) loaded. \n ENC_CONFIG: #{ENC_CONFIG}"
else
puts "WARNING: No config/settings.yml file found"
ENC_CONFIG = {}
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index be058f1..6cb96ce 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -2,6 +2,9 @@
# Your secret key for verifying the integrity of signed cookies.
# If you change this key, all old signed cookies will become invalid!
+
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
-Enc::Application.config.secret_token = '920e97b1d36c9c3f92c6fb9ba9c2ff72e3dccea603965445d2e8e1ce0e003e55ac084008a9841940bb3173ed6269e412ffecb23b20598c730e2fe85f8ac5ce60'
+# You can use `rake secret` to generate a secure secret key.
+
+Enc::Application.config.secret_key_base = '5c82fd92241d77979577a72754fbe29de81e14a7343814aa9b9486147920bbdf2f71e7dc271e33c1a7037e8d1c1b487b7209ff4ba7820278069d6e02992ee38e'
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index 999df20..c2f744d 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -7,8 +7,3 @@
ActiveSupport.on_load(:action_controller) do
wrap_parameters format: [:json]
end
-
-# Disable root element in JSON by default.
-ActiveSupport.on_load(:active_record) do
- self.include_root_in_json = false
-end
diff --git a/config/routes.rb b/config/routes.rb
index 6d4f834..db6793e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,4 +32,8 @@
end
resources :parameters, only: [:index, :new, :create]
root :to => 'nodes#index'
+
+ # Rails 4.0 requires that routes using match must specify the request method
+ # match 'moov_check' => "home#moov_check"
+ get 'moov_check' => 'home#moov_check'
end
diff --git a/config/settings.yml.sample b/config/settings.yml.sample
deleted file mode 100644
index 355a6ed..0000000
--- a/config/settings.yml.sample
+++ /dev/null
@@ -1,10 +0,0 @@
-development:
-# spool_path: /tmp/enc_spool
- puppetdb:
- host: hostname
- port: port
-production:
-# spool_path: /tmp/enc_spool
- puppetdb:
- host: hostname
- port: port
diff --git a/db/migrate/20160503213802_add_index_to_node_group_memberships.rb b/db/migrate/20160503213802_add_index_to_node_group_memberships.rb
new file mode 100644
index 0000000..e01ebea
--- /dev/null
+++ b/db/migrate/20160503213802_add_index_to_node_group_memberships.rb
@@ -0,0 +1,5 @@
+class AddIndexToNodeGroupMemberships < ActiveRecord::Migration
+ def change
+ add_index :node_group_memberships, :node_group_id
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8ccfa99..ab58670 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,108 +9,110 @@
# from scratch. The latter is a flawed and unsustainable approach (the more migrations
# you'll amass, the slower it'll run and the greater likelihood for issues).
#
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20140509184854) do
+ActiveRecord::Schema.define(version: 20160503213802) do
- create_table "metrics", :force => true do |t|
- t.integer "report_id", :null => false
- t.string "category"
- t.string "name"
- t.decimal "value", :precision => 12, :scale => 6
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ create_table "metrics", force: :cascade do |t|
+ t.integer "report_id", limit: 4, null: false
+ t.string "category", limit: 255
+ t.string "name", limit: 255
+ t.decimal "value", precision: 12, scale: 6
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- add_index "metrics", ["report_id"], :name => "index_metrics_on_report_id"
+ add_index "metrics", ["report_id"], name: "index_metrics_on_report_id", using: :btree
- create_table "node_class_memberships", :force => true do |t|
- t.integer "node_id"
- t.integer "node_class_id"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ create_table "node_class_memberships", force: :cascade do |t|
+ t.integer "node_id", limit: 4
+ t.integer "node_class_id", limit: 4
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- create_table "node_classes", :force => true do |t|
- t.string "name", :null => false
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ create_table "node_classes", force: :cascade do |t|
+ t.string "name", limit: 255, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- add_index "node_classes", ["name"], :name => "index_node_classes_on_name", :unique => true
+ add_index "node_classes", ["name"], name: "index_node_classes_on_name", unique: true, using: :btree
- create_table "node_group_memberships", :force => true do |t|
- t.integer "node_id"
- t.integer "node_group_id"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ create_table "node_group_memberships", force: :cascade do |t|
+ t.integer "node_id", limit: 4
+ t.integer "node_group_id", limit: 4
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- create_table "node_groups", :force => true do |t|
- t.string "name", :null => false
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ add_index "node_group_memberships", ["node_group_id"], name: "index_node_group_memberships_on_node_group_id", using: :btree
+
+ create_table "node_groups", force: :cascade do |t|
+ t.string "name", limit: 255, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- add_index "node_groups", ["name"], :name => "index_node_groups_on_name", :unique => true
+ add_index "node_groups", ["name"], name: "index_node_groups_on_name", unique: true, using: :btree
- create_table "nodes", :force => true do |t|
- t.string "name", :null => false
- t.text "description"
+ create_table "nodes", force: :cascade do |t|
+ t.string "name", limit: 255, null: false
+ t.text "description", limit: 65535
t.datetime "reported_at"
- t.integer "last_apply_report_id"
- t.string "status"
- t.boolean "hidden", :default => false
- t.integer "last_inspect_report_id"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
- t.string "environment"
+ t.integer "last_apply_report_id", limit: 4
+ t.string "status", limit: 255
+ t.boolean "hidden", default: false
+ t.integer "last_inspect_report_id", limit: 4
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.string "environment", limit: 255
end
- add_index "nodes", ["name"], :name => "index_nodes_on_name", :unique => true
+ add_index "nodes", ["name"], name: "index_nodes_on_name", unique: true, using: :btree
- create_table "parameters", :force => true do |t|
- t.string "key"
- t.text "value"
- t.integer "parameterable_id"
- t.string "parameterable_type"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ create_table "parameters", force: :cascade do |t|
+ t.string "key", limit: 255
+ t.text "value", limit: 65535
+ t.integer "parameterable_id", limit: 4
+ t.string "parameterable_type", limit: 255
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- create_table "report_logs", :force => true do |t|
- t.integer "report_id"
- t.string "level"
- t.text "message"
+ create_table "report_logs", force: :cascade do |t|
+ t.integer "report_id", limit: 4
+ t.string "level", limit: 255
+ t.text "message", limit: 65535
t.datetime "time"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
- t.string "source"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.string "source", limit: 255
end
- add_index "report_logs", ["report_id"], :name => "index_report_logs_on_report_id"
+ add_index "report_logs", ["report_id"], name: "index_report_logs_on_report_id", using: :btree
- create_table "reports", :force => true do |t|
- t.integer "node_id"
- t.string "status"
- t.string "environment"
+ create_table "reports", force: :cascade do |t|
+ t.integer "node_id", limit: 4
+ t.string "status", limit: 255
+ t.string "environment", limit: 255
t.datetime "time"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- add_index "reports", ["node_id"], :name => "index_reports_on_node_id"
+ add_index "reports", ["node_id"], name: "index_reports_on_node_id", using: :btree
- create_table "resource_statuses", :force => true do |t|
- t.integer "report_id"
+ create_table "resource_statuses", force: :cascade do |t|
+ t.integer "report_id", limit: 4
t.boolean "failed"
t.boolean "skipped"
t.boolean "is_changed"
- t.text "title"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.text "title", limit: 65535
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- add_index "resource_statuses", ["report_id"], :name => "index_resource_statuses_on_report_id"
+ add_index "resource_statuses", ["report_id"], name: "index_resource_statuses_on_report_id", using: :btree
end
diff --git a/db/seeds.rb b/db/seeds.rb
index 6c82759..fb5384d 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,12 +5,12 @@
#
# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
# Mayor.create(name: 'Emanuel', city: cities.first)
-node1 = Node.find_or_create_by_name("node1")
+node1 = Node.find_or_create_by(name: "node1")
node1.status = "unchanged"
node1.save
-node2 = Node.find_or_create_by_name("node2")
+node2 = Node.find_or_create_by(name: "node2")
node2.status = "changed"
node2.save
-group1 = NodeGroup.find_or_create_by_name("group1")
-group2 = NodeGroup.find_or_create_by_name("group2")
-group3 = NodeGroup.find_or_create_by_name("group3")
+group1 = NodeGroup.find_or_create_by(name: "group1")
+group2 = NodeGroup.find_or_create_by(name: "group2")
+group3 = NodeGroup.find_or_create_by(name: "group3")
diff --git a/enc_dashboard.gemspec b/enc_dashboard.gemspec
new file mode 100644
index 0000000..0ea8095
--- /dev/null
+++ b/enc_dashboard.gemspec
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'enc_dashboard/version'
+
+Gem::Specification.new do |gem|
+ gem.name = "enc_dashboard"
+ gem.version = EncDashboard::VERSION
+ gem.authors = ["Joshua B. Bussdieker"]
+ gem.email = ["josh.bussdieker@moovweb.com"]
+ gem.description = %q{Puppet dashboard replacement}
+ gem.summary = %q{Puppet dashboard replacement}
+ gem.homepage = ""
+
+ gem.files = `git ls-files`.split($/)
+ gem.files << Dir[".bundle/**/*"]
+ gem.files << Dir["vendor/**/*"]
+ gem.files << Dir["public/**/*"]
+ gem.files << "JENKINS"
+ gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+ gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
+ gem.require_paths = ["lib"]
+end
diff --git a/lib/enc_dashboard/version.rb b/lib/enc_dashboard/version.rb
new file mode 100644
index 0000000..870a31e
--- /dev/null
+++ b/lib/enc_dashboard/version.rb
@@ -0,0 +1,10 @@
+module EncDashboard
+ VERSION = lambda {
+ version = File.read("VERSION").strip
+ if File.exists?("JENKINS")
+ version += "."
+ version += File.read("JENKINS").strip
+ end
+ version
+ }.yield
+end
diff --git a/public/moov_check.txt b/public/moov_check.txt
new file mode 100644
index 0000000..d86bac9
--- /dev/null
+++ b/public/moov_check.txt
@@ -0,0 +1 @@
+OK
diff --git a/spec/factories/node.rb b/spec/factories/node.rb
index 39405cb..b56326a 100644
--- a/spec/factories/node.rb
+++ b/spec/factories/node.rb
@@ -37,7 +37,7 @@
end
factory :node_with_reports, parent: :node do
- ignore do
+ ransient do
report_count 5
end
diff --git a/spec/factories/report.rb b/spec/factories/report.rb
index 8f31bf2..0fde8a9 100644
--- a/spec/factories/report.rb
+++ b/spec/factories/report.rb
@@ -9,7 +9,7 @@
end
factory :report_with_dependents, parent: :full_report do
- ignore do
+ ransient do
metric_count 5
report_log_count 5
resource_status_count 5
diff --git a/spec/lib/puppetdb_spec.rb b/spec/lib/puppetdb_spec.rb
index 69c97c2..9392624 100644
--- a/spec/lib/puppetdb_spec.rb
+++ b/spec/lib/puppetdb_spec.rb
@@ -1,5 +1,5 @@
require 'spec_helper'
describe PuppetDB do
- its(:options) { should be_kind_of Hash }
+ it(:options) { should be_kind_of Hash }
end
diff --git a/vendor/assets/javascripts/.gitkeep b/vendor/assets/javascripts/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/vendor/assets/stylesheets/.gitkeep b/vendor/assets/stylesheets/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/vendor/plugins/.gitkeep b/vendor/plugins/.gitkeep
deleted file mode 100644
index e69de29..0000000