lib/ronin/cache/overlay.rb in ronin-0.1.0 vs lib/ronin/cache/overlay.rb in ronin-0.1.1

- old
+ new

@@ -144,11 +144,13 @@ # # _options_ may contain the following key: # <tt>:media</tt>:: The media of the Overlay. # def Overlay.install(options={},&block) - Repertoire.checkout(:media => options[:media], :uri => options[:uri], :into => Config::REPOSITORY_DIR) do |path,media,uri| + options = options.merge(:into => Config::REPOSITORY_DIR) + + Repertoire.checkout(options) do |path,media,uri| return Overlay.add(path,media,uri,&block) end end # @@ -392,11 +394,9 @@ def load_metadata(&block) metadata_path = File.join(@path,METADATA_FILE) if File.file?(metadata_path) metadata = REXML::Document.new(open(metadata_path)) - - #@authors = Author.from_xml(metadata,'/ronin-overlay/contributors/author') metadata.elements.each('/ronin-overlay') do |repo| @name = repo.elements['name'].get_text.to_s.strip @license = repo.elements['license'].get_text.to_s.strip @description = repo.elements['description'].get_text.to_s.strip