[DRE-commits] [librarian-puppet] 103/153: Update librarianp and fix git tests that now work

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository librarian-puppet.

commit ebfc0e4b7e05b87587d6ad25840d96c0c6196894
Author: Carlos Sanchez <carlos at apache.org>
Date:   Fri Mar 6 16:55:27 2015 +0000

    Update librarianp and fix git tests that now work
---
 Gemfile                      | 1 +
 features/install/git.feature | 6 ++++--
 librarian-puppet.gemspec     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 851fabc..f84b19c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
 gemspec
+gem 'librarianp', :path => '/Users/csanchez/dev/librarian'
\ No newline at end of file
diff --git a/features/install/git.feature b/features/install/git.feature
index ed60c68..8c36e8f 100644
--- a/features/install/git.feature
+++ b/features/install/git.feature
@@ -164,6 +164,7 @@ Feature: cli/install/git
     And the file "modules/test/Modulefile" should match /version *'0\.0\.1'/
     And a file named "modules/stdlib/metadata.json" should exist
 
+  @test
   Scenario: Install a module with mismatching Puppetfile and Modulefile
     Given a file named "Puppetfile" with:
     """
@@ -175,6 +176,7 @@ Feature: cli/install/git
     And the file "modules/concat/metadata.json" should match /"name": *"puppetlabs-concat"/
     And a file named "modules/stdlib/metadata.json" should exist
 
+  @test
   Scenario: Install from Puppetfile with duplicated entries
     Given a file named "Puppetfile" with:
     """
@@ -185,5 +187,5 @@ Feature: cli/install/git
       :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
     """
     When I run `librarian-puppet install`
-    Then the exit status should be 1
-    And the output should contain "Duplicated dependencies"
+    Then the exit status should be 0
+    And the output should contain "Dependency 'puppetlabs-stdlib' duplicated for module, merging"
diff --git a/librarian-puppet.gemspec b/librarian-puppet.gemspec
index c5ff455..09ed87a 100644
--- a/librarian-puppet.gemspec
+++ b/librarian-puppet.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.executables = ['librarian-puppet']
 
-  s.add_dependency "librarianp", ">=0.6.0"
+  s.add_dependency "librarianp", ">=0.6.2"
   s.add_dependency "rsync"
   s.add_dependency "puppet_forge"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/librarian-puppet.git