Merge tag '1.2.0' into stable

1.2.0

.gitignore

@@ -0,0 +1,5 @@
+*.swo
+.bundle
+*.swp
+test/fixtures/var/db/jerakia/*
+/Gemfile.lock

.pkgr.yml

@@ -1,11 +1,26 @@
 targets:
   ubuntu-16.04:
-  ubuntu-14.04:
+    build_dependencies:
+      - ruby-dev
+      - libsqlite3-dev
+
   debian-8:
-  debian-7:
-  centos-6:
+    build_dependencies:
+      - ruby-dev
+      - libsqlite3-dev
+
   centos-7:
+    build_dependencies:
+      - ruby-devel
+
+before:
+  - mv ext/pkgr/Gemfile.lock .
 
 cli: jerakia
 user: root
 group: root
+after_install: ext/pkgr/postinstall.sh
+
+env:
+  - PACKAGING=1
+

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Jerakia Release Notes
 
+## 1.2.0
+
+* New feature, Jerakia Server
+* New feature, PuppetDB scope handler
+* This release has many additions, please see the [full release notes](http://jerakia.io/releasenotes/1_2) for complete documentation
+
 ### 1.1.2
 
 * Various bugfixes around resource cloning between lookups, and from the CLI (https://github.com/crayfishx/jerakia/pull/61).

Gemfile

@@ -1,11 +1,35 @@
 source 'https://rubygems.org'
-gem 'rake'
+
+if ENV['PACKAGING'].to_s == "1"
+ruby '2.3.0'
+end
+
 gem 'faster_require'
 gem 'psych'
-gem 'rspec-core'
-gem 'rspec'
-gem 'mocha'
 gem 'lookup_http'
 gem 'thor'
 gem "deep_merge"
-gem 'json'
+gem "thin"
+gem "sinatra"
+gem "dm-sqlite-adapter"
+gem "rake"
+gem "rack", "~> 1.6.5"
+
+group(:development, :test) do
+  gem 'rspec-core'
+  gem 'rspec'
+  gem 'mocha'
+  gem "puppet", ENV['PUPPET_GEM_VERSION'] || '~> 4.8.0'
+end
+
+# JSON must be 1.x on Ruby 1.9
+if RUBY_VERSION < '2.0'
+  gem 'json', '~> 1.8'
+  #gem 'json_pure', '~> 1.8'
+  gem 'data_mapper', '~> 1.2'
+  gem 'public_suffix', '1.4.6'
+else
+  gem 'json'
+  gem 'data_mapper'
+  gem 'public_suffix'
+end

ext/jerakia/jerakia.skel.yaml

@@ -0,0 +1,20 @@
+---
+
+# policydir is where Jerakia policies are stored, by default there are
+# us a default.rb which contains the default policy.
+#
+policydir: /etc/jerakia/policy.d
+
+# Plugins are loaded from the plugin directory specified here
+#
+plugindir: /var/lib/jerakia/plugins
+
+# Logging settings
+#
+loglevel: info
+logfile: /var/log/jerakia/jerakia.log
+
+# Jerakia Server needs to keep some small sqlite databases
+# this location determines where they are stored, if you not
+#
+databasedir: /var/db/jerakia

ext/jerakia/policy.skel.rb

@@ -0,0 +1,22 @@
+# Jerakia policy file.
+#
+# The default policy is called :default, you can add further policies by adding
+# them into the policy.d folder as name.rb
+#
+policy :default do
+
+  # Lookups are initiated in order, each lookup must define at least a datasource
+  # to tell Jerakia where to source the data from 
+  #
+  lookup :main do
+    datasource :file, {
+      :docroot => '/var/lib/jerakia/data',
+      :searchpath => [
+        "hostname/#{scope[:certname]}",
+        "environment/#{scope[:environment]}",
+        "common",
+      ],
+      :format => :yaml
+    }
+  end
+end