upgrade dependencies, fix spec test

jhaals · May 16, 2014 · 48e328b · 48e328b
1 parent 3ae6db7
commit 48e328b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 38 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "cardboard", "~> 1.0"
+gem "cardboard", "~> 2.1"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,48 +3,38 @@ GEM
   specs:
     addressable (2.3.5)
     ansi (1.4.3)
-    boxen (1.5.2)
+    boxen (2.2.0)
       ansi (~> 1.4)
       hiera (~> 1.0)
       highline (~> 1.6)
       json_pure (>= 1.7.7, < 2.0)
-      librarian-puppet (~> 0.9.10)
-      octokit (~> 1.15)
+      librarian-puppet (~> 0.9.9)
+      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.2)
-    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.4)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    hiera (1.3.0)
       json_pure
-    highline (1.6.19)
-    json (1.8.0)
-    json_pure (1.8.0)
+    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.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.2.3)
+    octokit (2.3.1)
+      sawyer (~> 0.5.1)
+    puppet (3.4.1)
       facter (~> 1.6)
       hiera (~> 1.0)
       rgen (~> 0.6.5)
@@ -54,22 +44,25 @@ GEM
       rake
       rspec (>= 2.9.0)
       rspec-puppet (>= 0.1.1)
-    rake (10.1.0)
-    rgen (0.6.5)
+    rake (10.1.1)
+    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.4)
-    rspec-expectations (2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    rspec-puppet (0.1.6)
+    rspec-mocks (2.14.4)
+    rspec-puppet (1.0.1)
       rspec
+    sawyer (0.5.2)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
     thor (0.18.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cardboard (~> 1.0)
+  cardboard (~> 2.1)
diff --git a/manifests/box.pp b/manifests/box.pp
@@ -11,7 +11,6 @@
   $ensure = 'present',
 ) {
   require vagrant
-  include boxen::config
 
   vagrant_box { $name:
     ensure   => $ensure,

diff --git a/manifests/plugin.pp b/manifests/plugin.pp
@@ -12,7 +12,6 @@
   $license = undef,
 ) {
   require vagrant
-  include boxen::config
 
   if $name =~ /^vagrant-/ {
     $plugin_name = $name

diff --git a/spec/fixtures/Puppetfile b/spec/fixtures/Puppetfile
@@ -1 +1 @@
-mod 'boxen', '0.0.26', :github_tarball => 'boxen/puppet-boxen'
+mod 'boxen', '3.6.0', :github_tarball => 'boxen/puppet-boxen'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		mod 'boxen', '0.0.26', :github_tarball => 'boxen/puppet-boxen'
		mod 'boxen', '3.6.0', :github_tarball => 'boxen/puppet-boxen'