librarian-puppet-maestrodev 0.9.9.6 → 0.9.9.7

data/lib/librarian/puppet/source/forge.rb

@@ -1,6 +1,5 @@
-require 'uri'
-require 'net/http'
 require 'json'
+require 'open-uri'
 
 module Librarian
   module Puppet
@@ -8,35 +7,26 @@ module Librarian
       class Forge
         class Repo
 
-          attr_accessor :source, :name
-          private :source=, :name=
+          attr_accessor :source, :name, :versions, :api_data
+          private :source=, :name=, :versions=, :api_data, :api_data=
 
           def initialize(source, name)
             self.source = source
             self.name = name
-            @dependencies = {}
-          end
 
-          def versions
-            return @versions if @versions
-            data = api_call("#{name}.json")
-            if data.nil?
+            # call API and cache data
+            self.api_data = api_call(name)
+            if api_data.nil?
               raise Error, "Unable to find module '#{name}' on #{source}"
             end
-
-            versions = data['releases'].map { |r| r['version'] }
+            versions = api_data[name].map { |r| r['version'] }.reverse
             debug { "  Module #{name} found versions: #{versions.join(", ")}" }
             versions.select { |v| ! Gem::Version.correct? v }.each { |v| debug { "Ignoring invalid version '#{v}' for module #{name}" } }
-            @versions = versions.select { |v| Gem::Version.correct? v }
+            self.versions = versions.select { |v| Gem::Version.correct? v }
           end
 
           def dependencies(version)
-            return @dependencies[version] if @dependencies[version]
-            data = api_call("api/v1/releases.json?module=#{name}&version=#{version}")
-            if data.nil?
-              raise Error, "Unable to find version #{version} for module '#{name}' on #{source}"
-            end
-            @dependencies[version] = data[name].first['dependencies']
+            api_data[name].detect{|x| x['version'] == version.to_s}['dependencies']
           end
 
           def manifests
@@ -133,46 +123,34 @@ module Librarian
           end
 
           def vendor_cache(name, version)
+            info = api_data[name].detect {|h| h['version'] == version.to_s }
             File.open(vendored_path(name, version).to_s, 'w') do |f|
-              download(name, version) do |data|
-                f << data
+              open("#{source}#{info['file']}") do |input|
+                while (buffer = input.read)
+                  f.write(buffer)
+                end
               end
             end
           end
 
-          def download(name, version, &block)
-            data = api_call("api/v1/releases.json?module=#{name}&version=#{version}")
-
-            info = data[name].detect {|h| h['version'] == version.to_s }
-
-            stream(info['file'], &block)
-          end
-
-          def stream(file, &block)
-            Net::HTTP.get_response(URI.parse("#{source}#{file}")) do |res|
-              res.code
-
-              res.read_body(&block)
-            end
-          end
-
           def debug(*args, &block)
             environment.logger.debug(*args, &block)
           end
 
         private
 
-          def api_call(path)
+          def api_call(module_name)
             base_url = source.uri
-            resp = Net::HTTP.get_response(URI.parse("#{base_url}/#{path}"))
-            case resp.code.to_i
-            when 404,410
-              nil
-            when 200
-              data = resp.body
+            begin
+              data = open("#{base_url}/api/v1/releases.json?module=#{module_name}") {|f| f.read}
               JSON.parse(data)
-            else
-              raise Error, "Error requesting #{base_url}/#{path}: [#{resp.code}] #{resp.body}"
+            rescue OpenURI::HTTPError => e
+              case e.io.status[0].to_i
+              when 404,410
+                nil
+              else
+                raise e, "Error requesting #{base_url}/#{path}: #{e.to_s}"
+              end
             end
           end
         end

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "0.9.9.6"
+    VERSION = "0.9.9.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet-maestrodev
 version: !ruby/object:Gem::Version
-  version: 0.9.9.6
+  version: 0.9.9.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
@@ -149,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -204921353019984320
+      hash: -3641701570484774639
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -204921353019984320
+      hash: -3641701570484774639
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25