Merge branch 'master' into maestrodev, resetting to their master

Conflicts:
	Changelog.md
	README.md
	Rakefile
	features/install.feature
	features/support/env.rb
	lib/librarian/puppet/extension.rb
	lib/librarian/puppet/source/forge.rb
	lib/librarian/puppet/source/git.rb
	spec/requirement_spec.rb

Changelog.md

@@ -1,5 +1,19 @@
 ## Changelog
 
+### 0.9.11
+ * Better sort of githib tarball versions when there are mixed tags starting with and without 'v'
+ * Add modulefile dsl to reuse Modulefile dependencies
+ * Fix error if a git module has a dependency without version
+ * Fix git dependency with :path attribute
+ * Cleaner output when no Puppetfile found
+ * Reduce the number of API calls to the Forge
+ * Don't sort versions as strings. Rely on the forge returning them ordered
+ * Pass --module_repository to `puppet module install` to install from other forges
+ * Cache forge responses and print an error if returns an invalid response
+ * Add a User-Agent header to all requests to the GitHub API
+ * Convert puppet version requirements to rubygems, pessimistic and ranges
+ * Use librarian gem
+
 ### 0.9.10.1
 
  * Catch GitHub API rate limit exceeded

README.md

@@ -1,13 +1,14 @@
 # Librarian-puppet
 
+[![Build Status](https://travis-ci.org/rodjek/librarian-puppet.png?branch=master)](https://travis-ci.org/rodjek/librarian-puppet)
+
 ## Note
 
 This is a fork of [rodjek librarian-puppet](https://github.com/rodjek/librarian-puppet) with
 a bunch of fixes submitted as pull requests there.
 It is published to rubygems as [librarian-puppet-maestrodev](https://rubygems.org/gems/librarian-puppet-maestrodev)
 so you can easily try it.
 
-
 ## Introduction
 
 Librarian-puppet is a bundler for your puppet infrastructure.  You can use
@@ -30,6 +31,15 @@ Every Puppet repository that uses Librarian-puppet will have a file named
 `Puppetfile` in the root directory of that repository.  The full specification
 for which modules your puppet infrastructure repository  depends goes in here.
 
+### Simple Puppetfile
+
+This Puppetfile will download all the dependencies listed in your Modulefile from the Puppet Forge
+
+    forge "http://forge.puppetlabs.com"
+
+    modulefile
+
+
 ### Example Puppetfile
 
     forge "http://forge.puppetlabs.com"

Rakefile

@@ -1,14 +1,20 @@
-require 'rake/clean'
+require 'bundler/setup'
 require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+require 'rake/clean'
 
 CLEAN.include('pkg/', 'tmp/')
 CLOBBER.include('Gemfile.lock')
 
 RSpec::Core::RakeTask.new
 Cucumber::Rake::Task.new(:features)
 
-task :default => [:spec, :features]
+Rake::TestTask.new do |test|
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end
 
 # Use our custom tag name
 module Bundler
@@ -19,4 +25,4 @@ module Bundler
   end
 end
 
-require 'bundler/gem_tasks'
+task :default => [:test, :spec, :features]

features/examples/dependency_without_version/Modulefile

@@ -0,0 +1,7 @@
+name 'librarian-test'
+version '0.0.1'
+
+author 'librarian'
+license 'Apache License, Version 2.0'
+
+dependency 'puppetlabs/stdlib'

features/examples/dependency_without_version/manifests/init.pp

@@ -0,0 +1 @@
+class test {}

features/examples/test/Modulefile

@@ -0,0 +1,7 @@
+name 'librarian-test'
+version '0.0.1'
+
+author 'librarian'
+license 'Apache License, Version 2.0'
+
+dependency 'puppetlabs/stdlib', '>=0'

features/examples/test/manifests/init.pp

@@ -0,0 +1 @@
+class test {}

features/install.feature

@@ -2,7 +2,13 @@ Feature: cli/install
   In order to be worth anything
   Puppet librarian needs to install modules properly
 
-  @slow
+  Scenario: Running install with no Puppetfile
+    Given there is no Puppetfile
+    When I run `librarian-puppet install`
+    Then the output should contain "Could not find Puppetfile"
+    And the exit status should be 1
+
+  @veryslow
   Scenario: Installing a module and its dependencies
     Given a file named "Puppetfile" with:
     """
@@ -15,7 +21,7 @@ Feature: cli/install
     And the file "modules/apt/Modulefile" should match /name *'puppetlabs-apt'/
     And the file "modules/stdlib/Modulefile" should match /name *'puppetlabs-stdlib'/
 
-  @slow
+  @veryveryslow
   Scenario: Installing an exact version of a module
     Given a file named "Puppetfile" with:
     """
@@ -167,8 +173,9 @@ Feature: cli/install
     Then the exit status should be 1
     And the output should contain "Unable to find module 'puppetlabs/xxxxx' on http://forge.puppetlabs.com"
 
+  @pending
   Scenario: Install a module with dependencies specified in a Puppetfile
-    Given a file named "Puppetfile" with:
+    Given PENDING a file named "Puppetfile" with:
     """
     mod 'super', :git => 'git://github.com/mpalmer/puppet-super'
     
@@ -189,3 +196,58 @@ Feature: cli/install
     When I run `librarian-puppet install`
     Then the exit status should be 1
     And the output should contain "Could not resolve the dependencies"
+
+  @veryslow
+  Scenario: Install a module from git and using path
+    Given a file named "Puppetfile" with:
+    """
+    forge "http://forge.puppetlabs.com"
+
+    mod 'test', :git => 'https://github.com/rodjek/librarian-puppet.git', :path => 'features/examples/test'
+    """
+    When I run `librarian-puppet install`
+    Then the exit status should be 0
+    And the file "modules/test/Modulefile" should match /version *'0\.0\.1'/
+    And a file named "modules/stdlib/Modulefile" should exist
+
+  @slow
+  Scenario: Install a module from the Forge with dependencies without version
+    Given a file named "Puppetfile" with:
+    """
+    forge "http://forge.puppetlabs.com"
+
+    mod 'sbadia/gitlab', '0.1.0'
+    """
+    When I run `librarian-puppet install`
+    Then the exit status should be 0
+    And the file "modules/gitlab/Modulefile" should match /version *'0\.1\.0'/
+
+  @veryslow
+  Scenario: Install a module from git without version
+    Given a file named "Puppetfile" with:
+    """
+    forge "http://forge.puppetlabs.com"
+
+    mod 'test', :git => 'https://github.com/rodjek/librarian-puppet.git', :path => 'features/examples/dependency_without_version'
+    """
+    When I run `librarian-puppet install`
+    Then the exit status should be 0
+    And the file "modules/test/Modulefile" should match /version *'0\.0\.1'/
+    And a file named "modules/stdlib/Modulefile" should exist
+
+  @veryslow
+  Scenario: Source dependencies from Modulefile
+    Given a file named "Puppetfile" with:
+    """
+    forge "http://forge.puppetlabs.com"
+
+    modulefile
+    """
+    And a file named "Modulefile" with:
+    """
+    name "random name"
+    dependency "puppetlabs/postgresql", "2.4.1"
+    """
+    When I run `librarian-puppet install`
+    Then the exit status should be 0
+    And the file "modules/postgresql/Modulefile" should match /name *'puppetlabs-postgresql'/

features/support/env.rb

@@ -5,9 +5,21 @@
 end
 
 Before('@slow') do
-  @aruba_timeout_seconds = 25
+  @aruba_timeout_seconds = 30
 end
 
 Before('@veryslow') do
-  @aruba_timeout_seconds = 50
+  @aruba_timeout_seconds = 60
+end
+
+Before('@veryveryslow') do
+  @aruba_timeout_seconds = 90
+end
+
+Given /^PENDING/ do |x|
+  pending
+end
+
+Given(/^there is no Puppetfile$/) do
+  fail if (File.exist?('Puppetfile'))
 end

lib/librarian/puppet/cli.rb

@@ -45,6 +45,12 @@ def init
       option "destructive", :type => :boolean, :default => false
       option "local", :type => :boolean, :default => false
       def install
+
+        unless File.exist?('Puppetfile')
+          say "Could not find Puppetfile in #{Dir.pwd}", :red
+          exit 1
+        end
+
         ensure!
         clean! if options["clean"]
         unless options["destructive"].nil?

lib/librarian/puppet/dsl.rb

@@ -14,3 +14,16 @@ class Dsl < Librarian::Dsl
     end
   end
 end
+
+module Librarian
+  class Dsl
+    class Receiver
+      def modulefile
+        File.read('Modulefile').lines.each do |line|
+          regexp = /\s*dependency\s+('|")([^'"]+)\1\s*(?:,\s*('|")([^'"]+)\3)?/
+          regexp =~ line && mod($2, $4)
+        end
+      end
+    end
+  end
+end