@@ -12,7 +12,7 @@ class Plugin < DataMapper::Base after_create :install after_create :set_create_activity after_update :set_update_activity - after_destroy :remove + #after_destroy :remove class << self @@loaded = [] @@ -22,21 +22,26 @@ class Plugin < DataMapper::Base # This grabs the plugin using its url, unpacks it, and loads the metadata for it def download # Load the manifest yaml - manifest = YAML::load(Net::HTTP.get(URI.parse(url + "/manifest.yml"))) + manifest = YAML::load(Net::HTTP.get(URI.parse(url + ".yml"))) # Grab metadata from manifest - self.name = manifest["plugin"]["name"] - self.author = manifest["plugin"]["author"] - self.version = manifest["plugin"]["version"] - self.homepage = manifest["plugin"]["homepage"] - self.about = manifest["plugin"]["about"] + self.name = manifest["name"] + self.author = manifest["author"] + self.version = manifest["version"] + self.homepage = manifest["homepage"] + self.about = manifest["about"] # Build the path self.path = File.join(File.join(File.join(Merb.root, "app"), "plugins"), URI.parse(url).path.split("/").last.split(".").first) # Remove any existing plugin at the path FileUtils.rm_rf(self.path) - # Download all of the plugin contents - recurse(manifest["plugin"]["contents"]) + Dir.mkdir(self.path) + # Download the package and untgz + require 'zlib' + require 'stringio' + require 'archive/tar/minitar' + package = Net::HTTP.get(URI.parse(url + ".tgz")) + Archive::Tar::Minitar.unpack(Zlib::GzipReader.new(StringIO.new(package)), self.path) # Unpack any gems downloaded - unpack_gems(manifest["plugin"]["contents"]["gems"]["."]) unless manifest["plugin"]["contents"]["gems"].nil? + unpack_gems(manifest["gems"]["."]) unless manifest["gems"].nil? end ## app/models/plugin.rb @@ -46,6 +46,7 @@ use_test :rspec, 'merb_stories' # These are some examples of how you might specify dependencies. # +gem "archive-tar-minitar" dependencies "merb_helpers" dependencies "merb-assets" dependencies "merb-cache" config/init.rb 69f7329cc9035f5dd945f1e6eb47c0537a9a6c15 Alexander Flatter flatter@alexander-flatters-macbook-pro.local http://github.com/mleung/feather/commit/f79ee25efcee0d83b3431912cd943b7799a69833 f79ee25efcee0d83b3431912cd943b7799a69833 2008-05-20T08:47:29-07:00 2008-05-20T08:47:29-07:00 Changed Plugin to support tgz packages 13f8b506c9ab37ddd63ae9ea807febc85e4e1500 Alexander Flatter flatter@alexander-flatters-macbook-pro.local