Merge pull request #90 from n0ts/my-dev

Bump up git 2.14.2 and more

Gemfile

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

Gemfile.lock

@@ -2,83 +2,83 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.2.8)
-    addressable (2.3.6)
-    ansi (1.4.3)
-    boxen (1.5.2)
+    addressable (2.3.8)
+    ansi (1.5.0)
+    boxen (2.9.0)
       ansi (~> 1.4)
       hiera (~> 1.0)
-      highline (~> 1.6)
+      highline (~> 1.6.0)
       json_pure (>= 1.7.7, < 2.0)
-      librarian-puppet (~> 0.9.9)
-      octokit (~> 1.15)
-      puppet (~> 3.0)
-    cardboard (1.0.4)
-      boxen (~> 1.0)
+      librarian-puppet (~> 1.0.0)
+      octokit (~> 2.7, >= 2.7.1)
+      puppet (~> 3.7)
+    cardboard (2.1.0)
+      boxen (~> 2.1)
       puppet-lint (~> 0.3)
       puppetlabs_spec_helper (~> 0.4)
-      rspec-puppet (~> 0.1)
+      rspec-puppet (~> 1.0)
     diff-lcs (1.2.5)
-    facter (2.0.1)
+    facter (2.4.6)
       CFPropertyList (~> 2.2.6)
-    faraday (0.9.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.1)
-      faraday (>= 0.7.4, < 0.10)
-    hashie (2.1.1)
-    hiera (1.3.3)
+    hiera (1.3.4)
       json_pure
     highline (1.6.21)
-    json (1.8.1)
-    json_pure (1.8.1)
+    json (2.0.2)
+    json_pure (1.8.3)
     librarian (0.1.2)
       highline
       thor (~> 0.15)
-    librarian-puppet (0.9.17)
+    librarian-puppet (1.0.9)
       json
       librarian (>= 0.1.2)
-    multi_json (1.10.1)
+    metaclass (0.0.4)
+    mocha (1.2.1)
+      metaclass (~> 0.0.1)
     multipart-post (2.0.0)
-    netrc (0.7.7)
-    octokit (1.25.0)
-      addressable (~> 2.2)
-      faraday (~> 0.8)
-      faraday_middleware (~> 0.9)
-      hashie (~> 2.0)
-      multi_json (~> 1.3)
-      netrc (~> 0.7.7)
-    puppet (3.6.1)
+    octokit (2.7.2)
+      sawyer (~> 0.5.2)
+    puppet (3.8.7)
       facter (> 1.6, < 3)
       hiera (~> 1.0)
       json_pure
-      rgen (~> 0.6.5)
     puppet-lint (0.3.2)
-    puppetlabs_spec_helper (0.5.0)
-      puppet
+    puppet-syntax (2.1.1)
+      rake
+    puppetlabs_spec_helper (0.10.3)
+      mocha
       puppet-lint
+      puppet-syntax
       rake
-      rspec
       rspec-puppet
-    rake (10.3.2)
-    rgen (0.6.6)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.0)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.0)
+    rake (11.3.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.0)
-      rspec-support (~> 3.0.0)
-    rspec-puppet (0.1.6)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-puppet (1.0.1)
       rspec
-    rspec-support (3.0.0)
+    rspec-support (3.5.0)
+    sawyer (0.5.5)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
     thor (0.19.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cardboard (~> 1.0)
+  cardboard (~> 2.1)
   rake
+
+BUNDLED WITH
+   1.10.6

data/Darwin.yaml

@@ -2,7 +2,7 @@
 git::configdir: "%{::boxen::config::configdir}/git"
 
 git::package: 'boxen/brews/git'
-git::version: '2.14.1-boxen1'
+git::version: '2.14.2-boxen1'
 
 git::credentialhelper: "%{::boxen::config::repodir}/script/boxen-git-credential"
 git::global_credentialhelper: "%{boxen::config::home}/bin/boxen-git-credential"

data/common.yaml

@@ -2,7 +2,7 @@
 git::configdir: "/etc/git"
 
 git::package: 'git'
-git::version: '1.8.4'
+git::version: '2.10.1-boxen2'
 
 git::global_excludesfile: "%{hiera('git::configdir')}/gitignore"
 git::manage_gitignore: true

files/brews/git.rb

@@ -1,15 +1,15 @@
 class Git < Formula
   desc "Distributed revision control system"
   homepage "https://git-scm.com"
-  url "https://www.kernel.org/pub/software/scm/git/git-2.14.1.tar.xz"
-  sha256 "6f724c6d0e9e13114ab35db6f67e1b2c1934b641e89366e6a0e37618231f2cc6"
+  url "https://www.kernel.org/pub/software/scm/git/git-2.14.2.tar.xz"
+  sha256 "50e9723996114ad1eec4dda89960d9fe34461749ae42031008a261fedd03c7a1"
   head "https://github.com/git/git.git", :shallow => false
-  version "2.14.1-boxen1"
+  version "2.14.2-boxen1"
 
   bottle do
-    sha256 "33de4e36d4d60f7d7281b3ed9d6f1e2e9e4e495da9dd1547c92e70ae330edbeb" => :sierra
-    sha256 "2ee548b022f7e1bb210fa8388328bcca806cc2b0c9c263835957dd3a92fad5d2" => :el_capitan
-    sha256 "96054f0692deece5e4cd78adcf97a04886de3e3681558358647af9f6cf80373d" => :yosemite
+    sha256 "aeee88fe952395662443823da8defc89740f7f63199dfd52cb0ae570b85ebdf4" => :high_sierra
+    sha256 "cde6194d8988226cf213a5903821004d0844960fee3695d9553b009b473ab41a" => :sierra
+    sha256 "f7388986a241ac6f82b02254e965e0f854985e1f4d55ca108cbbd84f04735268" => :el_capitan
   end
 
   option "with-blk-sha1", "Compile with the block-optimized SHA1 implementation"
@@ -39,13 +39,13 @@ class Git < Formula
   end
 
   resource "html" do
-    url "https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.14.1.tar.xz"
-    sha256 "9c1970c7f87f37c8b3044e01e0500d84d8bc4eb4dfa5ca881c32c351f20769fb"
+    url "https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.14.2.tar.xz"
+    sha256 "a36661e81e5b21e788cd84e11860bcd0cafa402eff06e6371415a5a0e0b80dfb"
   end
 
   resource "man" do
-    url "https://www.kernel.org/pub/software/scm/git/git-manpages-2.14.1.tar.xz"
-    sha256 "7ebce1e0e862af1367e24f14765c7b67f08b63fb01b80949f55479c562d414f2"
+    url "https://www.kernel.org/pub/software/scm/git/git-manpages-2.14.2.tar.xz"
+    sha256 "6dd350d1e9d00159a549f0fad08a9f954b1d12576fc8d5865fbed9dee15105fc"
   end
 
   def install

spec/classes/git_spec.rb

@@ -15,7 +15,7 @@
     {
       :configdir               => configdir,
       :package                 => 'boxen/brews/git',
-      :version                 => '2.3.0',
+      :version                 => '2.10.1-boxen2',
       :global_credentialhelper => "#{boxenhome}/bin/boxen-git-credential",
       :credentialhelper        => "#{repodir}/script/boxen-git-credential",
       :global_excludesfile     => '/opt/boxen/config/git/gitignore',
@@ -26,12 +26,12 @@
   let(:params) { default_params }
 
   it do
-    should include_class('homebrew')
+    should contain_class('homebrew')
 
     should contain_homebrew__formula('git')
 
     should contain_package('boxen/brews/git').with({
-      :ensure => '2.3.0',
+      :ensure => '2.10.1-boxen2',
       :provider => 'homebrew',
     })
 
@@ -66,7 +66,7 @@
 
     it do
       should contain_package('boxen/brews/git').with({
-        :ensure => '2.3.0',
+        :ensure => '2.10.1-boxen2',
         :provider => nil,
       })
     end