ovfparse 0.7.26 → 0.8.5

data/lib/ovfparse/http_vmrepository.rb

@@ -18,9 +18,24 @@ class HttpVmRepository < VmRepository
 
 
   def get 
-    #TODO slap a '/' char on the end of self.uri if it doesn't have one, otherwise many servers return 403 
-    url = URI.parse(URI.escape(self.uri))
-    req = Net::HTTP::Get.new(url.path)
+    begin
+      url = URI.parse(URI.escape(self.uri))
+      req = Net::HTTP::Get.new(url.path)
+    rescue
+      if(uri.match(/\/$/) == nil)
+        begin
+          url = URI.parse(URI.escape(self.uri + '/'))
+          req = Net::HTTP::Get.new(url.path)
+          @url = @url + '/'
+        rescue Exception => e
+          raise "We tried it with and without a trailing / but it still doesn't work, this thing is broken: " + e.message
+          # TODO: log the fact that this repo sucks at life
+        end
+      else
+        raise "This has a trailing slash and it doesn't work so it's a busted URL"
+      end
+    end
+
     res = Net::HTTP.start(url.host, url.port) {|http|
       http.request(req)
     }

data/lib/ovfparse/marketplace_repository.rb

@@ -25,7 +25,22 @@ class MarketplaceRepository < VmRepository
 
   def fetch
     #retrieve data from http server
-    raw_html = open(uri)
+    begin
+      raw_html = open(uri)
+    rescue
+      if(uri.match(/\/$/) != nil)
+        begin
+          raw_html = open(uri[0..-2])
+          @url = @url[0..-2]
+        rescue Exception => e
+          #something useful
+          raise "Tried getting rid of the trailing slash but still no dice: " + e.message
+        end
+      else
+        #something useful
+        raise "No trailing slash so this is probably a dead URL"
+      end
+    end
     if (raw_html)  
 
       #parse out package list from index html

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ovfparse
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
-  - 7
-  - 26
-  version: 0.7.26
+  - 8
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - Jim Barkley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 -04:00
+date: 2011-08-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency