dsl.rb in librarian-puppet-1.1.0

- old
+ new

@@ -15,18 +15,10 @@
 
       # copied from Librarian::Dsl to use our own Receiver
       def run(specfile = nil, sources = [])
         specfile, sources = nil, specfile if specfile.kind_of?(Array) && sources.empty?
 
-        if specfile.kind_of?(Pathname) and !File.exists?(specfile)
-          debug { "Specfile not found, using defaults: #{specfile}" }
-          specfile = Proc.new do
-            forge "http://forge.puppetlabs.com"
-            metadata
-          end
-        end
-
         Target.new(self).tap do |target|
           target.precache_sources(sources)
           debug_named_source_cache("Pre-Cached Sources", target)
 
           specfile ||= Proc.new if block_given?
@@ -36,51 +28,23 @@
           debug_named_source_cache("Post-Cached Sources", target)
         end.to_spec
       end
 
       class Receiver < Librarian::Dsl::Receiver
-        attr_reader :specfile, :working_path
+        attr_reader :specfile
 
         # save the specfile and call librarian
         def run(specfile = nil)
-          @working_path = specfile.kind_of?(Pathname) ? specfile.parent : Pathname.new(Dir.pwd)
           @specfile = specfile
           super
         end
 
         # implement the 'modulefile' syntax for Puppetfile
         def modulefile
-          f = modulefile_path
-          raise Error, "Modulefile file does not exist: #{f}" unless File.exists?(f)
-          File.read(f).lines.each do |line|
+          File.read(Pathname.new(specfile).parent.join('Modulefile')).lines.each do |line|
             regexp = /\s*dependency\s+('|")([^'"]+)\1\s*(?:,\s*('|")([^'"]+)\3)?/
             regexp =~ line && mod($2, $4)
           end
-        end
-
-        # implement the 'metadata' syntax for Puppetfile
-        def metadata
-          f = working_path.join('metadata.json')
-          unless File.exists?(f)
-            msg = "Metadata file does not exist: #{f}"
-            # try modulefile, in case we don't have a Puppetfile and we are using the default template
-            if File.exists?(modulefile_path)
-              modulefile
-              return
-            else
-              raise Error, msg
-            end
-          end
-          dependencyList = JSON.parse(File.read(f))['dependencies']
-          dependencyList.each do |d|
-            mod(d['name'], d['version_requirement'])
-          end
-        end
-
-        private
-
-        def modulefile_path
-          working_path.join('Modulefile')
         end
       end
     end
   end
 end