puppet-herald 0.2.0 → 0.8.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWQxYTc4MjVkZGQ2NzM5MTk4ZTUxNDUzY2I5MzYzMjMwNDA0ZTk0Ng==
-  data.tar.gz: !binary |-
-    ZTdkYTA0MDU0OWM1ZGRhZTZmZTg0NzUzOTkzOWE3MTE4NjA0Y2IyNw==
+SHA1:
+  metadata.gz: 2ee304896b40f495005c9736912edbd4be29c3af
+  data.tar.gz: 98065e6b110c281a4fc48d07481891860e4aba33
 SHA512:
-  metadata.gz: !binary |-
-    NDhjYTZiNDkyN2M0YzFlZWNkMzkwOGU4NTUzYjc1MDA0MDFjNjY5MzI0M2Q2
-    ZjhhYWVhMmMxOTNkM2Q1MzM0OWU5YWYyYzIyMGVkYmNjM2NiNGFiMDFlMTQ2
-    MGMxMjVjODY0N2JjZDU4ZGRlNzliNDk3MmFjNTVkYjg3NWJkYzQ=
-  data.tar.gz: !binary |-
-    MDRjOGZkMGFmZmU2ZWUyMWFiYzJkZGNjMWI1YmNhNGI0ODVmYzgzNDQ3M2Vj
-    YjUxNWM2YWQzYzY1ZjIwMWYxOTBmYWVkOWFhMzcwMWM4Mzk5NDE4MzJmYWMw
-    NjBhZTRiMjliNzE4ODg5NzU2NjhkMWUyMGZiYzExNTQxMDdjMmU=
+  metadata.gz: f8cb0f887979c0ef58ebe1fa92b1d78d9de35cb93a1ee01b05157ea3c2f13653060afc100a6ab414768bd587193800129bb8d25df17f3361bf305288eb31cffd
+  data.tar.gz: 9e6af822fbf2070d6b5075185ded7f6fc4d67c5444eda55dab2a49c9e200dff6fd0605afc900b26668f17f9e9c8e8cdf75386c8f707845e69a36b454fc02e406

data/.gitignore

@@ -22,4 +22,7 @@
 /tmp
 /node_modules
 /npm-*.log
+
 /Gemfile.local
+bower_components
+*.gem

data/.jshintrc

@@ -0,0 +1,19 @@
+{
+  "bitwise": true,
+  "curly": true,
+  "eqeqeq": true,
+  "forin": true,
+  "immed": true,
+  "latedef": true,
+  "newcap": true,
+  "noarg": true,
+  "noempty": true,
+  "nonew": true,
+  "plusplus": true,
+  "regexp": true,
+  "undef": true,
+  "strict": true,
+  "trailing": true,
+  "browser": true,
+  "predef": ["angular"]
+}

data/Gemfile

@@ -3,24 +3,37 @@ 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 'webmock',          '~> 1.20'
-  gem 'coveralls',        '~> 0.7'
-  gem 'simplecov',        '~> 0.9'
-  gem 'sqlite3',          '~> 1.3'
-  gem 'rubocop',          '~> 0.28'
+  gem 'rake',               '~> 10.4.0',  require: false
+  gem 'rspec',              '~> 3.2.0',   require: false
+  gem 'rspec-its',          '~> 1.2.0',   require: false
+  gem 'webmock',            '~> 1.21.0',  require: false
+  gem 'simplecov-lcov',     '~> 0.4.0',   require: false
+  gem 'simplecov',          '~> 0.9.0',   require: false
+  gem 'sqlite3',            '~> 1.3.0',   require: false
+  gem 'rubocop',            '~> 0.30.0',  require: false
+  gem 'rspec-activerecord', '~> 0.0.2',   require: false
+  gem 'ox',                 '~> 2.1.0',   require: false
+  gem 'jshintrb',           '~> 0.3.0',   require: false
+  gem 'inch',               '~> 0.5.0',   require: false
 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'
+  gem 'guard',            '~> 2.12.0', require: false
+  gem 'guard-bundler',    '~> 2.1.0',  require: false
+  gem 'guard-rspec',      '~> 4.5.0',  require: false
+  gem 'guard-rake',       '~> 1.0.0',  require: false
+  gem 'guard-shell',      '~> 0.7.0',  require: false
+  gem 'guard-rubocop',    '~> 1.2.0',  require: false
+  gem 'pry-byebug',       '~> 3.1.0',  require: false   if RUBY_VERSION > '2.0.0'
 end
 
 local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
 eval_gemfile local_gemfile if File.exist?(local_gemfile)
 
+begin
+  npmbin = `npm bin`.strip
+  ENV['PATH'] = "#{npmbin}:#{ENV['PATH']}"
+rescue # rubocop:disable Lint/HandleExceptions
+  # nothing
+end
 # vim:ft=ruby

data/Gemfile.local.example

@@ -3,5 +3,8 @@ gem 'pg'
 gem 'puma'
 # gem 'thin'
 
+# Until released without support for 1.8
+gem 'travis', '<= 1.6.11', require: false
+
 
 # vim:ft=ruby

data/Guardfile

@@ -0,0 +1,57 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+directories %w(lib test spec bin)
+
+## Uncomment to clear the screen before every task
+clearing :on
+
+ignore /coverage/, /bower_components/
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
+    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
+  end
+end
+
+guard :bundler do
+  watch('Gemfile')
+  # Uncomment next line if Gemfile contain `gemspec' command
+  watch(/^.+\.gemspec/)
+end
+
+guard :rake, :task => 'inch', :all_on_start => false do
+  watch(%r{^lib/(.+).rb$})
+end
+
+guard :rake, :task => 'js:test', :all_on_start => false do
+  watch(%r{^lib/puppet-herald/public/(.+).js$})
+  watch(%r{^test/javascript/src/(.+)_test.js$})
+  watch(%r{^test/javascript/karma.conf.js$})
+  watch(%r{^test/javascript/bower.json$})
+  watch(%r{^package.json$})
+end
+
+guard :rubocop do
+  watch(%{^Rakefile$})
+  watch(%r{.+\.rb$})
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+end

data/README.md

@@ -197,7 +197,7 @@ npm install
 And then test Javascript code with:
 
 ```shell
-bundle exec rake js
+bundle exec rake js:test
 ```
 
 Check your code for quality with:

data/Rakefile

@@ -1,9 +1,26 @@
-
+require 'jshintrb/jshinttask'
 require 'sinatra/activerecord/rake'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'rubocop'
 require 'fileutils'
+require 'rainbow'
+require 'inch/rake'
+
+def cobertura_attrs
+  require 'ox'
+  f = File.open 'coverage/javascript/cobertura.xml'
+  Ox.parse(f.read).root.attributes
+end
+
+def verify_js_coverage(line_expected = 0.9, branch_expected = 0.9)
+  attrs = cobertura_attrs
+  fail "Line coverage is #{attrs[:'line-rate'].to_f * 100}%, " \
+    "that don't meet minimum requirements of #{line_expected * 100}%." if attrs[:'line-rate'].to_f < line_expected
+
+  fail "Branch coverage is #{attrs[:'branch-rate'].to_f * 100}%, " \
+    "that don't meet minimum requirements of #{branch_expected * 100}%." if attrs[:'branch-rate'].to_f < branch_expected
+end
 
 namespace :spec do
   desc 'Run all spec tests at once.'
@@ -24,29 +41,65 @@ namespace :spec do
   end
 end
 
-desc 'Run javascript Jasmine/Karma tests on PhantomJS.'
-task :js do
-  FileUtils.rm_rf 'coverage/javascript'
-  sh 'node_modules/karma/bin/karma start --browsers PhantomJS test/javascript/karma.conf.js'
-  path = Pathname.glob('coverage/javascript/PhantomJS*/text.txt').first
-  puts 'Coverage for Javascript:'
-  puts File.read(path)
-end
+namespace :js do
+  desc 'Install NPM dependencies'
+  task :install do
+    sh 'npm install'
+  end
+  task :bower_standalone do
+    Dir.chdir 'lib/puppet-herald/public' do
+      sh 'bower install -p'
+    end
+    Dir.chdir 'test/javascript' do
+      sh 'bower install'
+    end
+  end
+  task :test_standalone do
+    FileUtils.rm_rf 'coverage/javascript'
+    sh 'node_modules/karma/bin/karma start --browsers PhantomJS test/javascript/karma.conf.js'
+    path = Pathname.glob('coverage/javascript/text.txt').first
+    puts Rainbow("\nCoverage for Javascript:\n").blue
+    puts File.read(path)
+    begin
+      verify_js_coverage
+    rescue StandardError => ex
+      $stderr.puts Rainbow("\n#{ex.message} Write more tests!\n").red.bright
+      exit 2
+    end
+  end
+  Jshintrb::JshintTask.new :hint do |t|
+    t.pattern = 'lib/puppet-herald/public/**/*.js'
+    t.exclude_pattern = 'lib/puppet-herald/public/bower_components/**/*'
+    t.options = :jshintrc
+  end
 
-tests = [
-  :'spec:all',
-  :js,
-  :rubocop
-]
+  desc 'Install bower JS dependencies.'
+  task bower: [:'js:install', :'js:bower_standalone']
+  desc 'Run javascript Jasmine/Karma tests on PhantomJS.'
+  task test: [:'js:install', :'js:bower', :'js:hint', :'js:test_standalone']
+end
 
-begin
-  require 'inch/rake'
-  Inch::Rake::Suggest.new :inch, '--pedantic'
-  tests << :inch
-rescue LoadError # rubocop:disable all
-  # nothing here
+namespace :console do
+  desc 'Start a console with loaded ActiveRecord models on dev database'
+  task :db do
+    require 'pry'
+    require 'puppet-herald'
+    PuppetHerald.environment = :dev
+    home = File.expand_path('~')
+    defaultdb     = "sqlite://#{home}/pherald.db"
+    defaultdbpass = "#{home}/.pherald.pass"
+    PuppetHerald.database.dbconn   = defaultdb
+    PuppetHerald.database.passfile = defaultdbpass
+    PuppetHerald.database.spec
+    require 'puppet-herald/app/configuration'
+    PuppetHerald::App::Configuration.configure_app(cron: false)
+    require 'puppet-herald/models/node'
+    pry
+  end
 end
 
+Inch::Rake::Suggest.new :inch, '--pedantic'
+
 RuboCop::RakeTask.new(:rubocop) do |task|
   # don't abort rake on failure
   task.fail_on_error = true
@@ -68,7 +121,34 @@ namespace :rubocop do
   end
 end
 
+desc 'Combine and POST covarage result to coveralls.io'
+task :coveralls do
+  root = File.dirname(File.expand_path(__FILE__))
+  rlcov = File.read('./coverage/ruby/lcov/gem-puppet-herald.lcov').gsub("#{root}/", './')
+  File.write('./coverage/ruby/lcov/lcov.info', rlcov)
+  sh "./node_modules/.bin/lcov-result-merger 'coverage/*/lcov/lcov.info' | ./node_modules/coveralls/bin/coveralls.js"
+end
+
+tests = [
+  :'js:test',
+  :'spec:all',
+  :rubocop,
+  :inch
+]
+tests << :coveralls if ENV['TRAVIS']
+
 desc 'Run lint, and all spec tests.'
 task test: tests
 
+desc 'Installs all dependencies.'
+task install: [:'js:install', :'js:bower']
+
+desc 'Build a gem package.'
+task :gem do
+  sh 'gem build puppet-herald.gemspec'
+end
+
+desc 'Builds, and test package'
+task build: [:install, :test, :gem]
+
 task default: :test

data/db/migrate/20141218200108_remove_no_of_reports_from_nodes.rb

@@ -0,0 +1,7 @@
+# Migration
+class RemoveNoOfReportsFromNodes < ActiveRecord::Migration
+  # Migration
+  def change
+    remove_column :nodes, :no_of_reports, :integer
+  end
+end

data/lib/puppet-herald.rb

@@ -5,83 +5,113 @@ rescue LoadError # rubocop:disable Lint/HandleExceptions
 end
 
 require 'puppet-herald/database'
+require 'logger'
 
 # A module for Herald
 module PuppetHerald
   @root = File.dirname(File.dirname(File.realpath(__FILE__)))
   @database = PuppetHerald::Database.new
+  @logger = Logger.new STDOUT
+  @errlogger = Logger.new STDERR
 
-  # A database object
-  # @return [PuppetHerald::Database] a database object
-  def self.database  # rubocop:disable Style/TrivialAccessors
-    @database
-  end
+  class << self
+    # Logger for CLI interface (error)
+    # @return [Logger] logger for CLI
+    attr_reader :errlogger
 
-  # Calculates a replative directory inside the project
-  #
-  # @param dir [String] a sub directory
-  # @return [String] a full path to replative dir
-  def self.relative_dir(dir)
-    File.realpath(File.join @root, dir)
-  end
+    # Logger for CLI interface
+    # @return [Logger] logger for CLI
+    attr_reader :logger
 
-  def self.environment=(environment)
-    rackenv = :production
-    envsymbol = environment.to_s.to_sym
-    case envsymbol
-    when :dev, :development
-      rackenv = :development
-    when :test, :ci
-      rackenv = :test
-    else
-      rackenv = :production
-      envsymbol = :production
+    # A database object
+    # @return [PuppetHerald::Database] a database object
+    def database  # rubocop:disable Style/TrivialAccessors
+      @database
     end
-    ENV['PUPPET_HERALD_ENV'] = envsymbol.to_s
-    ENV['RACK_ENV'] = rackenv.to_s
-  end
 
-  # Gets the environment set for Herald
-  # @return [Symbol] an environment
-  def self.environment
-    env = :production
-    env = ENV['PUPPET_HERALD_ENV'].to_sym unless ENV['PUPPET_HERALD_ENV'].nil?
-    ENV['RACK_ENV'] = env.to_s
-    env
-  end
+    # Calculates a replative directory inside the project
+    #
+    # @param dir [String] a sub directory
+    # @return [String] a full path to replative dir
+    def relative_dir(dir)
+      File.realpath(File.join @root, dir)
+    end
 
-  # Checks is running in DEVELOPMENT kind of environment (dev, ci, test)
-  #
-  # @return [Boolean] true if runs in development
-  def self.in_dev?
-    [:development, :dev, :test, :ci].include? environment
-  end
+    def environment=(newenv)
+      envsymbol = newenv.to_s.to_sym
+      ENV['PUPPET_HERALD_ENV'] = envsymbol.to_s
+      rackenv
+      setup_logger
+    end
 
-  # Checks is running in production environment
-  #
-  # @return [Boolean] true if runs in production
-  def self.in_prod?
-    !in_dev?
-  end
+    # Setups logger's level
+    #
+    # @return [nil]
+    def setup_logger
+      logger.level = self.in_dev? ? Logger::DEBUG : Logger::INFO
+      errlogger.level = logger.level
+      nil
+    end
 
-  # Reports a bug in desired format
-  #
-  # @param ex [Exception] an exception that was thrown
-  # @return [Hash] a hash with info about bug to be displayed to user
-  def self.bug(ex)
-    file = Tempfile.new(['puppet-herald-bug', '.log'])
-    filepath = file.path
-    file.close
-    file.unlink
-    message = "v#{PuppetHerald::VERSION}-#{ex.class}: #{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}"
-    }
-    bugo
+    # Gets the environment set for Herald
+    #
+    # @return [Symbol] an environment
+    def environment
+      ENV['PUPPET_HERALD_ENV'] = :production.to_s if ENV['PUPPET_HERALD_ENV'].nil?
+      ENV['PUPPET_HERALD_ENV'].to_sym
+    end
+
+    # Rack environment
+    #
+    # @return [Symbol] Rack environment
+    def rackenv
+      case environment
+      when :dev, :development
+        rackenv = :development
+      when :test, :ci
+        rackenv = :test
+      else
+        rackenv = :production
+      end
+      ENV['RACK_ENV'] = rackenv.to_s
+      rackenv
+    end
+
+    # Checks is running in DEVELOPMENT kind of environment (dev, ci, test)
+    #
+    # @return [Boolean] true if runs in development
+    def in_dev?
+      [:development, :dev, :test, :ci].include? environment
+    end
+
+    # Checks is running in production environment
+    #
+    # @return [Boolean] true if runs in production
+    def in_prod?
+      !in_dev?
+    end
+
+    # Reports a bug in desired format
+    #
+    # @param ex [Exception] an exception that was thrown
+    # @return [Hash] a hash with info about bug to be displayed to user
+    def bug(ex)
+      file = Tempfile.new(['puppet-herald-bug', '.log'])
+      filepath = file.path
+      file.close
+      file.unlink
+      message = "v#{PuppetHerald::VERSION}-#{ex.class}: #{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}"
+      }
+      bugo
+    end
   end
+  PuppetHerald.rackenv
+  PuppetHerald.setup_logger
 end