From 2e109792f9d1b162f0be95fd15e59d4393c5c6a5 Mon Sep 17 00:00:00 2001 From: Orien Madgwick <_@orien.io> Date: Fri, 9 Jan 2015 09:53:00 +1100 Subject: [PATCH] specs they pass --- Gemfile | 10 ++-- Gemfile.lock | 79 ++++++++++++-------------- data/Darwin/10.10.yaml | 1 + spec/classes/elixir_spec.rb | 2 +- spec/classes/global_spec.rb | 2 +- spec/defines/elixir_definition_spec.rb | 2 +- spec/defines/elixir_version_spec.rb | 2 +- spec/fixtures/hiera/test.yaml | 2 +- 8 files changed, 48 insertions(+), 52 deletions(-) create mode 100644 data/Darwin/10.10.yaml diff --git a/Gemfile b/Gemfile index ad434a8..3233d69 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" -gem "cardboard" -gem "deep_merge" -gem "puppet" -gem "boxen" -gem "librarian-puppet" +gem "cardboard", "~> 2.1" +gem "deep_merge", "~> 1.0" +gem "puppet", "< 3.4.0" +gem "boxen", "~> 2.4.0" +gem "librarian-puppet", "< 0.9.15" diff --git a/Gemfile.lock b/Gemfile.lock index 4910e16..5b37c19 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,16 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.2.8) addressable (2.3.6) ansi (1.4.3) - boxen (2.7.0) + boxen (2.4.0) ansi (~> 1.4) hiera (~> 1.0) highline (~> 1.6) json_pure (>= 1.7.7, < 2.0) - librarian-puppet (~> 1.0.0) - octokit (~> 2.7, >= 2.7.1) - puppet (~> 3.7) + librarian-puppet (~> 0.9.10) + octokit (~> 2.3.0) + puppet (~> 3.0) cardboard (2.1.0) boxen (~> 2.1) puppet-lint (~> 0.3) @@ -19,11 +18,10 @@ GEM rspec-puppet (~> 1.0) deep_merge (1.0.1) diff-lcs (1.2.5) - facter (2.3.0) - CFPropertyList (~> 2.2.6) + facter (1.7.5) faraday (0.9.0) multipart-post (>= 1.2, < 3) - hiera (1.3.4) + hiera (1.3.2) json_pure highline (1.6.21) json (1.8.1) @@ -31,45 +29,42 @@ GEM librarian (0.1.2) highline thor (~> 0.15) - librarian-puppet (1.0.9) + librarian-puppet (0.9.14) json librarian (>= 0.1.2) + open3_backport metaclass (0.0.4) - mocha (1.1.0) + mocha (1.0.0) metaclass (~> 0.0.1) multipart-post (2.0.0) - octokit (2.7.2) - sawyer (~> 0.5.2) - puppet (3.7.3) - facter (> 1.6, < 3) + octokit (2.3.1) + sawyer (~> 0.5.1) + open3_backport (0.0.3) + open4 (~> 1.3.0) + open4 (1.3.3) + puppet (3.3.2) + facter (~> 1.6) hiera (~> 1.0) - json_pure + rgen (~> 0.6.5) puppet-lint (0.3.2) - puppet-syntax (1.4.0) - rake - puppetlabs_spec_helper (0.8.2) - mocha - puppet-lint - puppet-syntax + puppetlabs_spec_helper (0.4.1) + mocha (>= 0.10.5) rake - rspec - rspec-puppet - rake (10.4.2) - rspec (3.1.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) + rspec (>= 2.9.0) + rspec-puppet (>= 0.1.1) + rake (10.3.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.8) + rspec-expectations (2.14.5) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.14.6) rspec-puppet (1.0.1) rspec - rspec-support (3.1.2) - sawyer (0.5.5) + sawyer (0.5.4) addressable (~> 2.3.5) faraday (~> 0.8, < 0.10) thor (0.19.1) @@ -78,8 +73,8 @@ PLATFORMS ruby DEPENDENCIES - boxen - cardboard - deep_merge - librarian-puppet - puppet + boxen (~> 2.4.0) + cardboard (~> 2.1) + deep_merge (~> 1.0) + librarian-puppet (< 0.9.15) + puppet (< 3.4.0) diff --git a/data/Darwin/10.10.yaml b/data/Darwin/10.10.yaml new file mode 100644 index 0000000..ed97d53 --- /dev/null +++ b/data/Darwin/10.10.yaml @@ -0,0 +1 @@ +--- diff --git a/spec/classes/elixir_spec.rb b/spec/classes/elixir_spec.rb index afed4a5..6639831 100644 --- a/spec/classes/elixir_spec.rb +++ b/spec/classes/elixir_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -RSpec.describe "elixir" do +describe "elixir" do let(:facts) { default_test_facts } let(:default_params) { { :prefix => "/test/boxen" } } diff --git a/spec/classes/global_spec.rb b/spec/classes/global_spec.rb index 517fe43..80a938e 100644 --- a/spec/classes/global_spec.rb +++ b/spec/classes/global_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -RSpec.describe "elixir::global" do +describe "elixir::global" do let(:facts) { default_test_facts } let(:params) { { :version => "1.0.0" } } diff --git a/spec/defines/elixir_definition_spec.rb b/spec/defines/elixir_definition_spec.rb index 3d88c6c..bddd994 100644 --- a/spec/defines/elixir_definition_spec.rb +++ b/spec/defines/elixir_definition_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -RSpec.describe "elixir::definition" do +describe "elixir::definition" do let(:facts) { default_test_facts } let(:title) { "1.0.0" } diff --git a/spec/defines/elixir_version_spec.rb b/spec/defines/elixir_version_spec.rb index 93f22e5..76cb32b 100644 --- a/spec/defines/elixir_version_spec.rb +++ b/spec/defines/elixir_version_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -RSpec.describe "elixir::version" do +describe "elixir::version" do let(:facts) { default_test_facts } let(:title) { "1.0.0" } diff --git a/spec/fixtures/hiera/test.yaml b/spec/fixtures/hiera/test.yaml index 16b41c3..61e6317 100644 --- a/spec/fixtures/hiera/test.yaml +++ b/spec/fixtures/hiera/test.yaml @@ -1,3 +1,3 @@ elixir::version::env: - 1.0.2: + 1.0.0: FROM_HIERA: 'true'