hive-messages 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ce8888c06ae4d9bb6819bc0c15e524bdfa808b3
-  data.tar.gz: cd28cff00097b2b3490b2053b619d0210f3e970d
+  metadata.gz: 010a5f7de0660e6e3c5c42e50534baf87bb11abf
+  data.tar.gz: 453093c413e973cadd65e79b4eac155edc23e83c
 SHA512:
-  metadata.gz: 9edff75da51b512f71ac0c25dce2440265d93af91a1fca08ec79f30f76f58b7e00fc3b40fea74cf16522718f56745374e785579bb5f95112194f43c5e976655c
-  data.tar.gz: 3d086b2076f35364f61f7a8d53db0278049d985ebc4ef2640c49ccea752637a1bf8a759cda4b0bb035d9605494130697deb472b9bc2225a6b03a635ea8d0af8e
+  metadata.gz: cded9d3a8cebcf5d676b1f823d5cbdd960c4f14cdb70720e1858aad164701694cf47446a629fef2766cd6edadbe80f2e2bc72488f0d5754fc879fd8074e92f70
+  data.tar.gz: cb0973943df1eca8b2b42e56d181fbdccb6121c4f124b6423e48220cb6df3e79586e78d50e090a00dacd1c0f8751c55684cab89f181ed5063f52c2fea65e39eb

data/hive-messages.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "hive-messages"
-  spec.version       = '1.0.2'
+  spec.version       = '1.0.3'
   spec.authors       = ["David Buckhurst", "Paul Carey"]
   spec.email         = ["david.buckhurst@bbc.co.uk"]
   spec.summary       = %q{Hive communication library.}

data/lib/hive/messages/job.rb

@@ -69,24 +69,38 @@ module Hive
         mime =  MimeMagic.by_path(artifact_path)
         mime_type = mime ? mime.type : 'text/plain'
 
-        net_http_args = {:use_ssl => url.instance_of?(URI::HTTPS)}
-
-        if Hive::Messages.configuration.pem_file
-          pem = File.read(Hive::Messages.configuration.pem_file)
-          net_http_args[:cert] = OpenSSL::X509::Certificate.new(pem)
-          net_http_args[:key] = OpenSSL::PKey::RSA.new(pem)
-          net_http_args[:verify_mode] = Hive::Messages.configuration.ssl_verify_mode
-        end
+        net_http_args = http_args(url)
 
         File.open(artifact_path) do |artifact|
-          req = Net::HTTP::Post::Multipart.new url.path, "data" => UploadIO.new(artifact, mime_type, basename)
-          res = Net::HTTP.start(url.host, url.port, net_http_args) do |http|
-            http.request(req)
-          end
+          request = Net::HTTP::Post::Multipart.new url.path, "data" => UploadIO.new(artifact, mime_type, basename)
+          res = http_response(url, request, net_http_args)
           Hive::Messages::Artifact.new.from_json(res.body)
         end
       end
 
+      def fetch(uri_str, limit = 10)
+        raise ArgumentError, 'too many HTTP redirects' if limit == 0
+
+        url = URI.parse(uri_str) 
+        net_http_args = http_args(url)
+    
+        request = Net::HTTP::Get.new(url)
+        response = http_response(url, request, net_http_args)
+    
+        case response
+        when Net::HTTPSuccess then
+          response
+        when Net::HTTPRedirection then
+          location = response['location']
+          warn "redirected to #{location}"
+          fetch(location, limit - 1)
+        when Net::HTTPNotFound then
+          raise "Build not found at location #{uri_str}"
+        else
+          response.value
+        end
+      end
+
       def complete
         self.patch(uri: Hive::Paths::Jobs.complete_url(self.job_id), as: "application/json")
       end
@@ -95,6 +109,26 @@ module Hive
         self.message = message
         self.patch(uri: Hive::Paths::Jobs.error_url(self.job_id), as: "application/json")
       end
+
+      private
+
+      def http_response(url, request, net_http_args)
+        Net::HTTP.start(url.host, url.port, net_http_args) do |http|
+            http.request(request)
+        end
+      end
+
+      def http_args(url)
+        net_http_args = {:use_ssl => url.instance_of?(URI::HTTPS)}
+        if Hive::Messages.configuration.pem_file
+          pem = File.read(Hive::Messages.configuration.pem_file)
+          net_http_args[:cert] = OpenSSL::X509::Certificate.new(pem)
+          net_http_args[:key] = OpenSSL::PKey::RSA.new(pem)
+          net_http_args[:verify_mode] = Hive::Messages.configuration.ssl_verify_mode
+        end
+        net_http_args
+      end
+      
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hive-messages
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - David Buckhurst
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus