cider_client 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7badeb8e7fe4e1f1e5f92fd2d3c77c68dc43298
-  data.tar.gz: cbad76cedde3f4e55a34bc990a058036e1864feb
+  metadata.gz: a68079e2b028d9656a70a5cb100094f0b934254b
+  data.tar.gz: 8195a2a3659451056149902d1928ed5db02deb05
 SHA512:
-  metadata.gz: 3992118565cb51083efcc34725ccbaf25caef0c53421d15d16818aee452b66e2738aca2516dfba83fb80b93f88a9a9d29b2e062502b3dca2281edf129c243774
-  data.tar.gz: 7dc8046005962131739117bb2217fe0788e954c1613291920061e24bfb625c5a91f14b367f6e00f85841b175acd6c37fa4cd936c5a1cba8402f188cc002a7878
+  metadata.gz: c6954a91d028fb093a3fca3b84562b3d9cb04218362fdbafb735fc8800d6f6d9bf4a927dbb92ec74ede204e460b306826103936650cd2d057b22648021aa41d9
+  data.tar.gz: 1a21d6c5fb3490f7632b81b4fc02cebc81fe35ef79172eab598fc231de4b8876c5aba4c9fa56ab398498c6351b775e1f348b138e68153f93c66256f302a62955

data/lib/cider_client.rb

@@ -7,29 +7,25 @@ require 'fileutils'
 class CiderClient
   attr_accessor :execution_id, :host
   attr_writer :username, :password
+  attr_reader :base_url
 
   def initialize(options = {})
     @host = options.fetch(:host)
     @username = options.fetch(:username)
     @password = options.fetch(:password)
-    fail "The server at #{@host} does not provide the\
-      correct API version. v2 is required." unless api_compatible?
-  end
 
-  # Returns the base URL including usernames and passwords. Always uses usernames
-  # and passwords, because you can't do anything on Cider without basic auth anyhow.
-  # Is used in all further url_* methods.
-  def base_url
-    "http://#{@username}:#{@password}@#{@host}"
-  end
+    @base_url = if @host =~ /^https?:\/\//
+                  @host
+                else
+                  "http://" + @host
+                end
 
-  # URL starting from the base URL root, with the passed path appended
-  def url(path)
-    "#{base_url}#{path}"
+    fail "The server at #{@host} does not provide the\
+      correct API version. v2 is required." unless api_compatible?
   end
 
   def api_url(path = '')
-    url("/cider-ci/api/v2/#{path}")
+    "/cider-ci/api/v2/#{path}"
   end
 
   # URL starting from the execution, with the passed path appended
@@ -42,7 +38,7 @@ class CiderClient
     begin
       # Try to get the API root URL. If it 404s out, this server probably
       # doesn't offer that API version.
-      RestClient.get(api_url)
+      get(api_url)
       api_version_matches = true
     rescue RestClient::ResourceNotFound
       api_version_matches = false
@@ -56,7 +52,7 @@ class CiderClient
     end
     if data['_links']['next']
       puts "Retrieved #{tasks.count} tasks total so far."
-      data = JSON.parse(RestClient.get(url(data['_links']['next']['href'])))
+      data = JSON.parse(get(data['_links']['next']['href']))
       tasks = recurse_tasks(tasks, data)
     end
     tasks
@@ -65,7 +61,7 @@ class CiderClient
   def tasks
     tasks = []
     recurse_tasks(tasks,
-                  JSON.parse(RestClient.get(execution_url('tasks'))))
+                  JSON.parse(get(execution_url('tasks'))))
   end
 
   # I've got a long thing, what can I say...
@@ -73,11 +69,11 @@ class CiderClient
   def trials
     trials = []
     tasks.each do |task|
-      task_url = url(task['href'])
-      details = JSON.parse(RestClient.get(task_url))
-      trials_url = url(details['_links']['cici:trials']['href'])
+      task_url = task['href']
+      details = JSON.parse(get(task_url))
+      trials_url = details['_links']['cici:trials']['href']
       puts "Need to retrieve all trials for #{details['_links']['cici:trials']['href']}"
-      single_trial = JSON.parse(RestClient.get(trials_url))
+      single_trial = JSON.parse(get(trials_url))
       single_trial['_links']['cici:trial'].each do |st|
         trials << st
       end
@@ -96,9 +92,9 @@ class CiderClient
     puts 'Retrieving trial details to find all attachments, this may take a long time.'
     trial_attachment_groups = []
     trials.each do |trial|
-      trial_url = url(trial['href'])
+      trial_url = trial['href']
       puts "Retrieving trial details for #{trial_url}."
-      single_trial = JSON.parse(RestClient.get(trial_url))
+      single_trial = JSON.parse(get(trial_url))
       trial_attachment_groups << \
         single_trial['_links']['cici:trial-attachments']
     end
@@ -110,8 +106,8 @@ class CiderClient
   def trial_attachment_hrefs(pattern = /.*/)
     matching_tas = []
     trial_attachment_groups.each do |tag|
-      trial_attachment_url = url(tag['href'])
-      trial_attachment_details = JSON.parse(RestClient.get(trial_attachment_url))
+      trial_attachment_url = tag['href']
+      trial_attachment_details = JSON.parse(get(trial_attachment_url))
       matching_tas << trial_attachment_details['_links']['cici:trial-attachment'].select do |ta|
         ta if ta['href'].match(pattern)
       end
@@ -120,12 +116,25 @@ class CiderClient
   end
 
   def attachment_data(href)
-    attachment_details = JSON.parse(RestClient.get(url(href)))
+    attachment_details = JSON.parse(get(href))
     stream_url = attachment_details['_links']['data-stream']['href']
+    get(stream_url)
+  end
+
 
-    # Stupid fix because the CI hosts seem to return their own IP instead of hostname
-    # in these responses
-    stream_url.gsub!('https://195.176.254.43', base_url)
-    RestClient.get(stream_url)
+  def get(url)
+    full_url = if url =~ /^https?:\/\//
+                 url
+               else
+                 @base_url + url
+               end
+
+    RestClient::Request.new(
+      method: :get,
+      url: full_url,
+      user: @username,
+      password:  @password
+    ).execute
   end
+
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cider_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ramón Cahenzli
+- Thomas Schank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json