tutum 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a78bd77cac2157ce3d289b2b5e9ec2091675d4f
-  data.tar.gz: fff8f4a56856405397b9a48ea35705443a370a45
+  metadata.gz: eb4f306b8b85406bc8c2357375a12287cfbfbfc1
+  data.tar.gz: f7c627785f0290b77e1610dca0b071c00679d6e1
 SHA512:
-  metadata.gz: 88f4959d2bd96abe0c72a4a3caf9eb1bd66a12abfb4e632c147abb5190dccf14718aa2b01648cea9c458ea7d394e1165065a5e602793aace28b1409840cc1474
-  data.tar.gz: 58041d025c910af93b030f96e0e53a55481809c1f74477731e78f74424bf3258a149a58e6f60189b048c1e5ee3316a2d1e23fd8afdccbc6c7e434bf1ef04c4c5
+  metadata.gz: c904fbc72d92c9f44d925bd63da23188fac0ce1c43bdbe590e185236eadb544287d101eac9b2f927fd5761bf5947b7bbaa17299a104e8d0649f77b742af22405
+  data.tar.gz: e88057f3342dc052c647b052da33a28046fe75f4945e4197b3644248e36dad2d4a173716dfacfc91824a150fd6ecc53d8ae491f7f519dc923ef3f0d2a4237f1c

data/lib/tutum.rb

@@ -1,20 +1,17 @@
 require_relative './tutum_api'
 
-
 require_relative './tutum_actions'
 require_relative './tutum_containers'
 require_relative './tutum_node_clusters'
-require_relative './tutum_images'
-require_relative './tutum_node_clusters'
 require_relative './tutum_node_types'
 require_relative './tutum_nodes'
 require_relative './tutum_providers'
 require_relative './tutum_regions'
 require_relative './tutum_services'
-require_relative './tutum_error'
 
 class Tutum
   attr_reader :username, :api_key
+
   def initialize(username, api_key)
     @username = username
     @api_key = api_key
@@ -22,9 +19,9 @@ class Tutum
 
   def headers
     {
-      "Authorization" => "ApiKey #{@username}:#{@api_key}",
-      "Accept" => "application/json",
-      "Content-Type" => "application/json"
+      'Authorization' => "ApiKey #{@username}:#{@api_key}",
+      'Accept' => 'application/json',
+      'Content-Type' => 'application/json'
     }
   end
 
@@ -59,5 +56,4 @@ class Tutum
   def services
     @services ||= TutumServices.new(headers)
   end
-
 end

data/lib/tutum_api.rb

@@ -1,49 +1,39 @@
-require 'httparty'
+require 'rest-client'
+
 class TutumApi
   attr_reader :headers
-  BASE_API_PATH = "https://dashboard.tutum.co/api"
-  API_VERSION = "v1"
+
+  BASE_API_PATH = 'https://dashboard.tutum.co/api'
+  API_VERSION = 'v1'
+
   def initialize(headers)
     @headers = headers
   end
-  def http_headers
-    { headers: headers }
-  end
-  def api_path(path)
-    BASE_API_PATH+"/"+API_VERSION + path
-  end
 
-
-  def expect_20x(path, &block)
-    response = block.call
-    if(response.code/10 != 20)
-      msg = response.inspect
-      if(response.parsed_response)
-        msg = response.parsed_response.inspect
-      end
-      raise TutumError.new("#{response.code} received for API call to #{path}: #{msg}")
-    end
-    response
+  def url(path)
+    BASE_API_PATH + '/' + API_VERSION + path
   end
 
-  def http_get(path, args={})
-    expect_20x(path) do 
-      HTTParty.get(api_path(path), http_headers.merge({ :query => args }))
-    end
+  def http_get(path, params={})
+    query =  "?" + params.map { |k,v| "#{k}=#{v}"}.join("&")
+    full_path = path
+    full_path += query unless params.empty?
+    response = RestClient.get(url(path), headers)
+    JSON.parse(response)
   end
-  def http_post(path, args={})
-    expect_20x(path) do 
-      HTTParty.post(api_path(path), http_headers.merge({ :body => args.to_json }))
-    end
+
+  def http_post(path, content={})
+    response = RestClient.post(url(path), content.to_json, headers)
+    JSON.parse(response)
   end
-  def http_patch(path, args={})
-    expect_20x(path) do 
-      HTTParty.patch(api_path(path), http_headers.merge({ :body => args.to_json }))
-    end
+
+  def http_patch(path, content={})
+    response = RestClient.patch(url(path), content.to_json, headers)
+    JSON.parse(response)
   end
-  def http_delete(path, args={})
-    expect_20x(path) do 
-      HTTParty.delete(api_path(path), http_headers.merge({ :query => args }))
-    end
+
+  def http_delete(path)
+    response = RestClient.delete(url(path), headers)
+    JSON.parse(response)
   end
 end

data/lib/tutum_containers.rb

@@ -3,7 +3,7 @@ class TutumContainers < TutumApi
     "/container/"
   end
 
-  def list(params)
+  def list(params={})
     http_get(list_url, params)
   end
 

data/lib/tutum_node_clusters.rb

@@ -3,7 +3,7 @@ class TutumNodeClusters < TutumApi
     "/nodecluster/"
   end
 
-  def list(params)
+  def list(params={})
     http_get(list_url, params)
   end
 
@@ -26,7 +26,7 @@ class TutumNodeClusters < TutumApi
   def update_url(uuid)
     "/nodecluster/#{uuid}/"
   end
-  
+
   def update(uuid, params)
     http_patch(update_url(uuid), params)
   end
@@ -34,7 +34,7 @@ class TutumNodeClusters < TutumApi
   def deploy_url(uuid)
     "/nodecluster/#{uuid}/deploy/"
   end
-  
+
   def deploy(uuid)
     http_post(deploy_url(uuid))
   end
@@ -46,5 +46,5 @@ class TutumNodeClusters < TutumApi
   def terminate(uuid)
     http_delete(terminate_url(uuid))
   end
-
 end
+

data/lib/tutum_node_types.rb

@@ -3,8 +3,8 @@ class TutumNodeTypes < TutumApi
     "/nodetype/"
   end
 
-  def list
-    http_get(list_url)
+  def list(params={})
+    http_get(list_url, params)
   end
 
   def get_url(uuid)
@@ -14,5 +14,4 @@ class TutumNodeTypes < TutumApi
   def get(uuid)
     http_get(get_url(uuid))
   end
-
 end

data/lib/tutum_nodes.rb

@@ -3,7 +3,7 @@ class TutumNodes < TutumApi
     "/node/"
   end
 
-  def list(params)
+  def list(params={})
     http_get(list_url, params)
   end
 
@@ -18,9 +18,9 @@ class TutumNodes < TutumApi
   def deploy_url(uuid)
     "/node/#{uuid}/deploy/"
   end
-  
-  def deploy(uuid, params)
-    http_post(deploy_url(uuid), params)
+
+  def deploy(uuid)
+    http_post(deploy_url(uuid))
   end
 
   def terminate_url(uuid)
@@ -30,5 +30,4 @@ class TutumNodes < TutumApi
   def terminate(uuid)
     http_delete(terminate_url(uuid))
   end
-
 end

data/lib/tutum_providers.rb

@@ -3,7 +3,7 @@ class TutumProviders < TutumApi
     "/provider/"
   end
 
-  def list(params)
+  def list(params={})
     http_get(list_url, params)
   end
 
@@ -14,5 +14,4 @@ class TutumProviders < TutumApi
   def get(uuid)
     http_get(get_url(uuid))
   end
-
 end

data/lib/tutum_regions.rb

@@ -3,7 +3,7 @@ class TutumRegions < TutumApi
     "/region/"
   end
 
-  def list(params)
+  def list(params={})
     http_get(list_url, params)
   end
 
@@ -14,5 +14,4 @@ class TutumRegions < TutumApi
   def get(uuid)
     http_get(get_url(uuid))
   end
-
 end

data/lib/tutum_services.rb

@@ -3,7 +3,7 @@ class TutumServices < TutumApi
     "/service/"
   end
 
-  def list(params)
+  def list(params={})
     http_get(list_url, params)
   end
 
@@ -34,7 +34,7 @@ class TutumServices < TutumApi
   def update_url(uuid)
     "/service/#{uuid}/"
   end
-  
+
   def update(uuid, params)
     http_patch(update_url(uuid), params)
   end
@@ -42,7 +42,7 @@ class TutumServices < TutumApi
   def start_url(uuid)
     "/service/#{uuid}/start/"
   end
-  
+
   def start(uuid)
     http_post(start_url(uuid))
   end
@@ -50,18 +50,17 @@ class TutumServices < TutumApi
   def stop_url(uuid)
     "/service/#{uuid}/stop/"
   end
-  
+
   def stop(uuid)
     http_post(stop_url(uuid))
   end
 
- 
   def redeploy_url(uuid)
     "/service/#{uuid}/redeploy/"
   end
-  
-  def redeploy(uuid, params)
-    http_post(redeploy_url(uuid), params)
+
+  def redeploy(uuid)
+    http_post(redeploy_url(uuid))
   end
 
   def terminate_url(uuid)
@@ -71,5 +70,4 @@ class TutumServices < TutumApi
   def terminate(uuid)
     http_delete(terminate_url(uuid))
   end
-
 end

metadata

@@ -1,32 +1,120 @@
 --- !ruby/object:Gem::Specification
 name: tutum
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
+- Josie Wright
 - Martyn Garcia
 - Mikkel Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 1.7.2
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.3.2
+- !ruby/object:Gem::Dependency
+  name: wrong
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 description: Provides HTTP functionality wrapped in a nice ruby interface.
-email: martyn@255bits.com
+email:
+- jozwright@gmail.com
+- martyn@255bits.com
+- mikkel@255bits.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -35,15 +123,13 @@ files:
 - lib/tutum_actions.rb
 - lib/tutum_api.rb
 - lib/tutum_containers.rb
-- lib/tutum_error.rb
-- lib/tutum_images.rb
 - lib/tutum_node_clusters.rb
 - lib/tutum_node_types.rb
 - lib/tutum_nodes.rb
 - lib/tutum_providers.rb
 - lib/tutum_regions.rb
 - lib/tutum_services.rb
-homepage: https://github.com/255BITS/ruby-tutum
+homepage: https://github.com/tutumcloud/ruby-tutum
 licenses:
 - MIT
 metadata: {}
@@ -66,6 +152,6 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Ruby interface for the tutum PaaS API.
+summary: A Ruby wrapper for the Tutum API
 test_files: []
 has_rdoc: 

data/lib/tutum_error.rb

@@ -1,2 +0,0 @@
-class TutumError < StandardError
-end

data/lib/tutum_images.rb

@@ -1,43 +0,0 @@
-class TutumImages < TutumApi
-  def list_url
-    "/image/"
-  end
-
-  def list(params)
-    http_get(list_url, params)
-  end
-
-  def add_url
-    "/image/"
-  end
-
-  def add(name, params)
-    http_post(add_url, params.merge({:name => name}))
-  end
-
-  def get_url(name)
-    "/image/#{name}/"
-  end
-
-  def get(name)
-    http_get(get_url(name))
-  end
-
-  def update_url(name)
-    "/image/#{name}/"
-  end
-  
-  def update(name, params)
-    http_patch(update_url(name), params)
-  end
-
-  def delete_url(name)
-    "/image/#{name}/"
-  end
-
-  def delete(name)
-    http_delete(delete_url(name))
-  end
-
-
-end