Merge pull request #31 from boxen/rewrite

Rewrite to use Hiera

Author: MikeMcQuaid

Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "cardboard", "~> 1.0"
+gem "cardboard", "~> 2.1"

Gemfile.lock

@@ -1,75 +1,68 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.4)
+    addressable (2.3.5)
     ansi (1.4.3)
-    boxen (1.4.2)
+    boxen (2.1.0)
       ansi (~> 1.4)
       hiera (~> 1.0)
       highline (~> 1.6)
       json_pure (>= 1.7.7, < 2.0)
       librarian-puppet (~> 0.9.9)
-      octokit (~> 1.15)
+      octokit (~> 2.3.0)
       puppet (~> 3.0)
-    cardboard (1.0.4)
-      boxen (~> 1.0)
+    cardboard (2.1.0)
+      boxen (~> 2.1)
       puppet-lint (~> 0.3)
       puppetlabs_spec_helper (~> 0.4)
-      rspec-puppet (~> 0.1)
-    diff-lcs (1.2.4)
-    facter (1.7.1)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
-    hashie (2.0.5)
-    hiera (1.2.1)
+      rspec-puppet (~> 1.0)
+    diff-lcs (1.2.5)
+    facter (1.7.3)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    hiera (1.3.4)
       json_pure
-    highline (1.6.19)
-    json (1.8.0)
-    json_pure (1.8.0)
-    librarian-puppet (0.9.9)
+    highline (1.6.20)
+    json (1.8.1)
+    json_pure (1.8.1)
+    librarian-puppet (0.9.10)
       json
       thor (~> 0.15)
     metaclass (0.0.1)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.7)
     multipart-post (1.2.0)
-    netrc (0.7.7)
-    octokit (1.24.0)
-      addressable (~> 2.2)
-      faraday (~> 0.8)
-      faraday_middleware (~> 0.9)
-      hashie (~> 2.0)
-      multi_json (~> 1.3)
-      netrc (~> 0.7.7)
-    puppet (3.2.2)
+    octokit (2.3.1)
+      sawyer (~> 0.5.1)
+    puppet (3.3.2)
       facter (~> 1.6)
       hiera (~> 1.0)
-      rgen (~> 0.6)
+      rgen (~> 0.6.5)
     puppet-lint (0.3.2)
     puppetlabs_spec_helper (0.4.1)
       mocha (>= 0.10.5)
       rake
       rspec (>= 2.9.0)
       rspec-puppet (>= 0.1.1)
     rake (10.1.0)
-    rgen (0.6.5)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rgen (0.6.6)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rspec-puppet (0.1.6)
+    rspec-mocks (2.14.4)
+    rspec-puppet (1.0.1)
       rspec
+    sawyer (0.5.1)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
     thor (0.18.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cardboard (~> 1.0)
+  cardboard (~> 2.1)

data/Darwin.yaml

@@ -0,0 +1,17 @@
+---
+mysql::configdir:          "%{::boxen::config::configdir}/mysql"
+mysql::globalconfigprefix: "%{::boxen::config::homebrewdir}"
+mysql::datadir:            "%{::boxen::config::datadir}/mysql"
+mysql::bindir:             "%{::boxen::config::homebrewdir}/bin"
+mysql::executable:         "%{::boxen::config::homebrewdir}/bin/mysqld_safe"
+mysql::client:             "%{::boxen::config::homebrewdir}/bin/mysql"
+mysql::logdir:             "%{::boxen::config::logdir}/mysql"
+mysql::servicename:        "dev.mysql"
+
+mysql::user: "%{::boxen_user}"
+mysql::host: "127.0.0.1"
+mysql::port: "13306"
+mysql::socket: "%{mysql::datadir}/socket"
+
+mysql::package: boxen/brews/mysql
+mysql::version: 5.5.20-boxen2

data/Debian.yaml

@@ -0,0 +1,14 @@
+---
+mysql::configdir:          "/etc/mysql"
+mysql::globalconfigprefix: ""
+mysql::datadir:            "/data/mysql"
+mysql::logdir:             "/var/log/mysql"
+mysql::servicename:        "mysql"
+
+mysql::user: "mysql"
+mysql::host: "0.0.0.0"
+mysql::port: "3306"
+mysql::socket: "/tmp/mysql.sock"
+
+mysql::package: mysql-server
+mysql::version: installed

data/common.yaml

@@ -0,0 +1,4 @@
+---
+mysql::ensure: present
+mysql::enable: true
+

data/hiera.yaml

@@ -0,0 +1,6 @@
+---
+:hierarchy:
+  - "%{::osfamily}"
+  - common
+
+:merge_behavior: deeper