Issue #108 Don't fail on malformed Modulefile from a git dependency

Changelog.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### 0.9.14
+
+ * Issue #108 Don't fail on malformed Modulefile from a git dependency
+
 ### 0.9.13
 
  * Issue #176 Upgrade to librarian 0.1.2

lib/librarian/puppet/extension.rb

@@ -218,4 +218,11 @@ def to_s
     end
   end
 
+  class Logger
+    def warn(string = nil, &block)
+      return unless ui
+
+      ui.warn(string || yield)
+    end
+  end
 end

lib/librarian/puppet/source/git.rb

@@ -81,11 +81,7 @@ def fetch_dependencies(name, version, extra)
           dependencies = Set.new
 
           if modulefile?
-            metadata = ::Puppet::ModuleTool::Metadata.new
-
-            ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
-
-            metadata.dependencies.each do |dependency|
+            evaluate_modulefile(modulefile).dependencies.each do |dependency|
               dependency_name = dependency.instance_variable_get(:@full_module_name)
               version = dependency.instance_variable_get(:@version_requirement)
               gem_requirement = Requirement.new(version).gem_requirement
@@ -110,11 +106,18 @@ def forge_source
         # Naming this method 'version' causes an exception to be raised.
         def module_version
           return '0.0.1' unless modulefile?
+          evaluate_modulefile(modulefile).version
+        end
 
-          metadata  = ::Puppet::ModuleTool::Metadata.new
-          ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
-
-          metadata.version
+        def evaluate_modulefile(modulefile)
+          metadata = ::Puppet::ModuleTool::Metadata.new
+          begin
+            ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
+          rescue ArgumentError, SyntaxError => error
+            warn { "Unable to parse #{modulefile}, ignoring: #{error}" }
+            metadata.version = '0.0.1'
+          end
+          metadata
         end
 
         def modulefile

lib/librarian/puppet/util.rb

@@ -9,6 +9,9 @@ def debug(*args, &block)
       def info(*args, &block)
         environment.logger.info(*args, &block)
       end
+      def warn(*args, &block)
+        environment.logger.warn(*args, &block)
+      end
 
       # workaround Issue #173 FileUtils.cp_r will fail if there is a symlink that points to a missing file
       # or when the symlink is copied before the target file when preserve is true