rhc-rest 0.0.7 → 0.0.14

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require 'rake'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+end
+

data/bin/sample-usage.rb

@@ -1,25 +1,17 @@
 #!/usr/bin/env ruby
 # Copyright 2011 Red Hat, Inc.
 #
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 require '../lib/rhc-rest'
 
@@ -29,18 +21,24 @@ if __FILE__ == $0
 end_point = ARGV[0]
 username = ARGV[1]
 password = ARGV[2]
-namespace = ARGV[3]
+domain_id = ARGV[3]
 
-if end_point.nil? or username.nil? or password.nil? or namespace.nil?
-  puts "Usage: https://<hostname>/broker/rest <username> <password> <namespace>"
+if end_point.nil? or username.nil? or password.nil? or domain_id.nil?
+  puts "Usage: https://<hostname>/broker/rest <username> <password> <domain_id>"
   exit 1
 end
-
+@mydebug =true
 client = Rhc::Rest::Client.new(end_point, username, password)
 
+client.domains.each do |domain|
+  domain.applications.each do |app|
+    app.delete
+  end
+  domain.delete
+end
 puts "Creating a domain"
-domain = client.add_domain(namespace)
-puts "Domain created: #{domain.namespace}"
+domain = client.add_domain(domain_id)
+puts "Domain created: #{domain.id}"
 
 puts "Getting all cartridges..."
 client.cartridges.each do |cart|
@@ -49,7 +47,7 @@ end
 
 puts "Creating application appone"
 carts = client.find_cartridge("php-5.3")
-domain.add_application("appone", carts.first.name)
+domain.add_application("appone", {:cartridge => carts.first.name})
 
 puts "Try deleting domain with an application"
 begin
@@ -60,7 +58,7 @@ end
 
 puts "Getting all domains and applications..."
 client.domains.each do |domain|
-  puts "  Domain: #{domain.namespace}"
+  puts "  Domain: #{domain.id}"
   domain.applications.each do |app|
     puts "    Application: #{app.name}"
     app.cartridges.each do |cart|
@@ -79,7 +77,7 @@ if not apps.nil? and not apps.first.nil?
 end
 
 puts "Create new application named appthree..."
-app = client.domains.first.add_application("appthree", "php-5.3")
+app = client.domains.first.add_application("appthree", {:cartridge =>"php-5.3"})
 puts "Adding MySQL cartridge to appthree"
 cartridge = app.add_cartridge("mysql-5.1")
 puts "Check to see if it was added"

data/doc/Rhc/Rest/Client.html

@@ -246,7 +246,7 @@
         
         <div class="method-heading">
           <span class="method-name">add_domain</span><span
-            class="method-args">(namespace)</span>
+            class="method-args">(id)</span>
           <span class="method-click-advice">click to toggle source</span>
         </div>
         
@@ -259,11 +259,11 @@
           
           <div class="method-source-code" id="add_domain-source">
             <pre><span class="ruby-comment"># File lib/rhc-rest/client.rb, line 45</span>
-<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_domain</span>(<span class="ruby-identifier">namespace</span>)
-  <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">debug</span> <span class="ruby-node">&quot;Adding domain #{namespace}&quot;</span>
+<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_domain</span>(<span class="ruby-identifier">id</span>)
+  <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">debug</span> <span class="ruby-node">&quot;Adding domain #{id}&quot;</span>
   <span class="ruby-identifier">url</span> = <span class="ruby-identifier">@@end_point</span> <span class="ruby-operator">+</span> <span class="ruby-ivar">@links</span>[<span class="ruby-string">'ADD_DOMAIN'</span>][<span class="ruby-string">'href'</span>]
   <span class="ruby-identifier">method</span> =  <span class="ruby-ivar">@links</span>[<span class="ruby-string">'ADD_DOMAIN'</span>][<span class="ruby-string">'method'</span>]
-  <span class="ruby-identifier">payload</span> = {<span class="ruby-value">:namespace</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">namespace</span>}
+  <span class="ruby-identifier">payload</span> = {<span class="ruby-value">:id</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">id</span>}
   <span class="ruby-identifier">request</span> = <span class="ruby-constant">RestClient</span><span class="ruby-operator">::</span><span class="ruby-constant">Request</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value">:url</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">url</span>, <span class="ruby-value">:method</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">method</span>, <span class="ruby-value">:headers</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">@@headers</span>, <span class="ruby-value">:payload</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">payload</span>)
   <span class="ruby-keyword">return</span> <span class="ruby-identifier">send</span>(<span class="ruby-identifier">request</span>)
 <span class="ruby-keyword">end</span></pre>
@@ -454,7 +454,7 @@
         
         <div class="method-heading">
           <span class="method-name">find_domain</span><span
-            class="method-args">(namespace)</span>
+            class="method-args">(id)</span>
           <span class="method-click-advice">click to toggle source</span>
         </div>
         
@@ -467,12 +467,12 @@
           
           <div class="method-source-code" id="find_domain-source">
             <pre><span class="ruby-comment"># File lib/rhc-rest/client.rb, line 64</span>
-<span class="ruby-keyword">def</span> <span class="ruby-identifier">find_domain</span>(<span class="ruby-identifier">namespace</span>)
-  <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">debug</span> <span class="ruby-node">&quot;Finding domain #{namespace}&quot;</span>
+<span class="ruby-keyword">def</span> <span class="ruby-identifier">find_domain</span>(<span class="ruby-identifier">id</span>)
+  <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">debug</span> <span class="ruby-node">&quot;Finding domain #{id}&quot;</span>
   <span class="ruby-identifier">filtered</span> = <span class="ruby-constant">Array</span>.<span class="ruby-identifier">new</span>
   <span class="ruby-identifier">domains</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">domain</span><span class="ruby-operator">|</span>
   <span class="ruby-comment">#TODO do a regex caomparison</span>
-    <span class="ruby-keyword">if</span> <span class="ruby-identifier">domain</span>.<span class="ruby-identifier">namespace</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">namespace</span>
+    <span class="ruby-keyword">if</span> <span class="ruby-identifier">domain</span>.<span class="ruby-identifier">id</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">id</span>
     <span class="ruby-identifier">filtered</span>.<span class="ruby-identifier">push</span>(<span class="ruby-identifier">domain</span>)
     <span class="ruby-keyword">end</span>
   <span class="ruby-keyword">end</span>

data/ext/mkrf_conf.rb

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'rubygems/command.rb'
+require 'rubygems/dependency_installer.rb' 
+begin
+  Gem::Command.build_args = ARGV
+rescue NoMethodError
+end 
+inst = Gem::DependencyInstaller.new
+begin
+  if ENV['JSON_PURE'] or (RUBY_VERSION == "1.8.6" or RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /darwin/)
+    inst.install('json_pure')
+  else
+    inst.install('json')
+  end
+rescue
+  exit(1)
+end 
+
+f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")   # create dummy rakefile to indicate success
+f.write("task :default\n")
+f.close

data/lib/rhc-rest.rb

@@ -79,6 +79,8 @@ module Rhc
         end
         #puts "#{response}"
         return parse_response(response) unless response.nil? or response.code == 204
+      rescue RestClient::RequestTimeout, RestClient::ServerBrokeConnection, RestClient::SSLCertificateNotVerified => e
+        raise ResourceAccessException.new("Failed to access resource: #{e.message}")
       rescue RestClient::ExceptionWithResponse => e
       #puts "#{e.response}"
         process_error_response(e.response)
@@ -93,7 +95,7 @@ module Rhc
         result = JSON.parse(response)
         messages = result['messages']
       rescue Exception => e
-        logger.debug "Response did not include a message from server"
+        logger.debug "Response did not include a message from server" if @mydebug
         #puts response
       end
       case response.code
@@ -148,6 +150,8 @@ module Rhc
             raise ServiceUnavailableException.new(message['text'])
           end
         end
+      else
+        raise ResourceAccessException.new("Server returned error code with no output: #{response.code}")
       end
 
     end

data/lib/rhc-rest/application.rb

@@ -3,8 +3,9 @@ module Rhc
   module Rest
     class Application
       include Rest
-      attr_reader :domain_id, :name, :creation_time, :uuid, :aliases, :server_identity
+      attr_reader :domain_id, :name, :creation_time, :uuid, :aliases, :git_url, :app_url, :node_profile, :framework, :scalable, :health_check_path, :embedded
       def initialize(args)
+        #logger.debug args
         @domain_id = args[:domain_id] || args["domain_id"]
         @name = args[:name] || args["name"]
         @creation_time = args[:creation_time] || args["creation_time"]
@@ -16,8 +17,8 @@ module Rhc
 
       #Add Cartridge
       def add_cartridge(name)
-        logger.debug "Adding cartridge #{name}"
-        url = @@end_point + @links['ADD_CARTRIDGE']['href']
+        logger.debug "Adding cartridge #{name}" if @mydebug
+        url = @links['ADD_CARTRIDGE']['href']
         method =  @links['ADD_CARTRIDGE']['method']
         payload = {:name => name}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
@@ -26,8 +27,8 @@ module Rhc
 
       #Get all Cartridge for this applications
       def cartridges
-        logger.debug "Getting all cartridges for application #{self.name}"
-        url = @@end_point + @links['LIST_CARTRIDGES']['href']
+        logger.debug "Getting all cartridges for application #{self.name}" if @mydebug
+        url = @links['LIST_CARTRIDGES']['href']
         method =  @links['LIST_CARTRIDGES']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
         return send(request)
@@ -35,8 +36,8 @@ module Rhc
 
       #Start Application
       def start
-        logger.debug "Starting application #{self.name}"
-        url = @@end_point + @links['START']['href']
+        logger.debug "Starting application #{self.name}" if @mydebug
+        url = @links['START']['href']
         method =  @links['START']['method']
         payload = {:event=> "start"}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
@@ -45,8 +46,8 @@ module Rhc
 
       #Stop  Application
       def stop(force=false)
-        logger.debug "Stopping application #{self.name} force-#{force}"
-        url = @@end_point + @links['STOP']['href']
+        logger.debug "Stopping application #{self.name} force-#{force}" if @mydebug
+        url = @links['STOP']['href']
         method =  @links['STOP']['method']
         if force
           payload = {:event=> "force-stop"}
@@ -59,8 +60,8 @@ module Rhc
 
       #Restart Application
       def restart
-        logger.debug "Restarting application #{self.name}"
-        url = @@end_point + @links['RESTART']['href']
+        logger.debug "Restarting application #{self.name}" if @mydebug
+        url = @links['RESTART']['href']
         method =  @links['RESTART']['method']
         payload = {:event=> "restart"}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
@@ -69,8 +70,8 @@ module Rhc
 
       #Delete Application
       def destroy
-        logger.debug "Deleting application #{self.name}"
-        url = @@end_point + @links['DELETE']['href']
+        logger.debug "Deleting application #{self.name}" if @mydebug
+        url = @links['DELETE']['href']
         method =  @links['DELETE']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
         return send(request)

data/lib/rhc-rest/cartridge.rb

@@ -11,8 +11,8 @@ module Rhc
 
       #Start Cartridge
       def start
-        logger.debug "Starting cartridge #{self.name}"
-        url = @@end_point + @links['START']['href']
+        logger.debug "Starting cartridge #{self.name}" if @mydebug
+        url = @links['START']['href']
         method =  @links['START']['method']
         payload = {:event=> "start"}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
@@ -21,8 +21,8 @@ module Rhc
 
       #Stop Cartridge
       def stop()
-        logger.debug "Stopping cartridge #{self.name}"
-        url = @@end_point + @links['STOP']['href']
+        logger.debug "Stopping cartridge #{self.name}" if @mydebug
+        url = @links['STOP']['href']
         method =  @links['STOP']['method']
         payload = {:event=> "stop"}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
@@ -31,8 +31,8 @@ module Rhc
 
       #Restart Cartridge
       def restart
-        logger.debug "Restarting cartridge #{self.name}"
-        url = @@end_point + @links['RESTART']['href']
+        logger.debug "Restarting cartridge #{self.name}" if @mydebug
+        url = @links['RESTART']['href']
         method =  @links['RESTART']['method']
         payload = {:event=> "restart"}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
@@ -41,8 +41,8 @@ module Rhc
 
       #Reload Cartridge
       def reload
-        logger.debug "Reloading cartridge #{self.name}"
-        url = @@end_point + @links['RESTART']['href']
+        logger.debug "Reloading cartridge #{self.name}" if @mydebug
+        url = @links['RESTART']['href']
         method =  @links['RESTART']['method']
         payload = {:event=> "reload"}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
@@ -51,8 +51,8 @@ module Rhc
 
       #Delete Cartridge
       def destroy
-        logger.debug "Deleting cartridge #{self.name}"
-        url = @@end_point + @links['DELETE']['href']
+        logger.debug "Deleting cartridge #{self.name}" if @mydebug
+        url = @links['DELETE']['href']
         method =  @links['DELETE']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
         return send(request)

data/lib/rhc-rest/client.rb

@@ -5,11 +5,12 @@ module Rhc
     class Client
       include Rest
       def initialize(end_point, username, password)
-        @@end_point = end_point
+        logger.debug "Connecting to #{end_point}" if @mydebug
         credentials = Base64.encode64("#{username}:#{password}")
         @@headers["Authorization"] = "Basic #{credentials}"
         #first get the API
-        request = RestClient::Request.new(:url => @@end_point + "/api", :method => :get, :headers => @@headers)
+        RestClient.proxy = ENV['http_proxy']
+        request = RestClient::Request.new(:url => end_point, :method => :get, :headers => @@headers)
         begin
           response = request.execute
           result = JSON.parse(response)
@@ -22,31 +23,31 @@ module Rhc
       end
 
       #Add Domain
-      def add_domain(namespace)
-        logger.debug "Adding domain #{namespace}"
-        url = @@end_point + @links['ADD_DOMAIN']['href']
+      def add_domain(id)
+        logger.debug "Adding domain #{id}" if @mydebug
+        url = @links['ADD_DOMAIN']['href']
         method =  @links['ADD_DOMAIN']['method']
-        payload = {:namespace => namespace}
+        payload = {:id => id}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
         return send(request)
       end
 
       #Get all Domain
       def domains
-        logger.debug "Getting all domains"
-        url = @@end_point + @links['LIST_DOMAINS']['href']
+        logger.debug "Getting all domains" if @mydebug
+        url = @links['LIST_DOMAINS']['href']
         method =  @links['LIST_DOMAINS']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
         return send(request)
       end
 
       #Find Domain by namesapce
-      def find_domain(namespace)
-        logger.debug "Finding domain #{namespace}"
+      def find_domain(id)
+        logger.debug "Finding domain #{id}" if @mydebug
         filtered = Array.new
         domains.each do |domain|
         #TODO do a regex caomparison
-          if domain.namespace == namespace
+          if domain.id == id
           filtered.push(domain)
           end
         end
@@ -55,7 +56,7 @@ module Rhc
 
       #Find Application by name
       def find_application(name)
-        logger.debug "Finding application #{name}"
+        logger.debug "Finding application #{name}" if @mydebug
         filtered = Array.new
         domains.each do |domain|
         #TODO do a regex caomparison
@@ -70,8 +71,8 @@ module Rhc
 
       #Get all Cartridge
       def cartridges
-        logger.debug "Getting all cartridges"
-        url = @@end_point + @links['LIST_CARTRIDGES']['href']
+        logger.debug "Getting all cartridges" if @mydebug
+        url = @links['LIST_CARTRIDGES']['href']
         method =  @links['LIST_CARTRIDGES']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
         return send(request)
@@ -79,7 +80,7 @@ module Rhc
 
       #Find Cartridge by name
       def find_cartridge(name)
-        logger.debug "Finding cartridge #{name}"
+        logger.debug "Finding cartridge #{name}" if @mydebug
         filtered = Array.new
         cartridges.each do |cart|
         #TODO do a regex caomparison
@@ -92,7 +93,7 @@ module Rhc
 
       #Get User info
       def user
-        url = @@end_point + @links['GET_USER']['href']
+        url = @links['GET_USER']['href']
         method =  @links['GET_USER']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
         return send(request)
@@ -100,7 +101,7 @@ module Rhc
 
       #find Key by name
       def find_key(name)
-        logger.debug "Finding key #{name}"
+        logger.debug "Finding key #{name}" if @mydebug
         filtered = Array.new
         user.keys.each do |key|
         #TODO do a regex caomparison
@@ -113,7 +114,7 @@ module Rhc
 
       def logout
         #TODO logout
-        logger.debug "Logout/Close client"
+        logger.debug "Logout/Close client" if @mydebug
       end
       alias :close :logout
     end

data/lib/rhc-rest/domain.rb

@@ -2,40 +2,49 @@ module Rhc
   module Rest
     class Domain
       include Rest
-      attr_reader :namespace
+      attr_reader :id
       def initialize(args)
-        @namespace = args[:namespace] || args["namespace"]
+        @id = args[:id] || args["id"]
         @links = args[:links] || args["links"]
       end
 
       #Add Application to this domain
-      def add_application(name, cartridge, scale=false)
-        logger.debug "Adding application #{name} to domain #{self.namespace}"
-        url = @@end_point + @links['ADD_APPLICATION']['href']
+      # options
+      # cartrdige
+      # template
+      # scale
+      # node_profile
+      def add_application(name, options)
+        logger.debug "Adding application #{name} to domain #{self.id}" if @mydebug
+        url = @links['ADD_APPLICATION']['href']
         method =  @links['ADD_APPLICATION']['method']
-        payload = {:name => name, :cartridge => cartridge}
-        if scale
-          payload[:scale] = true
+        payload = {:name => name}
+        options.each do |key, value|
+          payload[key] = value
         end
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
+        timeout = nil
+        if options[:scale]
+          timeout = 180 # 3 minute timeout for scalable app
+        end
+        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload, :timeout => timeout)
         return send(request)
       end
 
       #Get all Application for this domain
       def applications
-        logger.debug "Getting all applications for domain #{self.namespace}"
-        url = @@end_point + @links['LIST_APPLICATIONS']['href']
+        logger.debug "Getting all applications for domain #{self.id}" if @mydebug
+        url = @links['LIST_APPLICATIONS']['href']
         method =  @links['LIST_APPLICATIONS']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
         return send(request)
       end
 
       #Update Domain
-      def update(new_namespace)
-        logger.debug "Updating domain #{self.namespace} to #{new_namespace}"
-        url = @@end_point + @links['UPDATE']['href']
+      def update(new_id)
+        logger.debug "Updating domain #{self.id} to #{new_id}" if @mydebug
+        url = @links['UPDATE']['href']
         method =  @links['UPDATE']['method']
-        payload = {:namespace => new_namespace}
+        payload = {:domain_id => new_id}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
         return send(request)
       end
@@ -43,8 +52,8 @@ module Rhc
 
       #Delete Domain
       def destroy(force=false)
-        logger.debug "Deleting domain #{self.namespace}"
-        url = @@end_point + @links['DELETE']['href']
+        logger.debug "Deleting domain #{self.id}" if @mydebug
+        url = @links['DELETE']['href']
         method =  @links['DELETE']['method']
         payload = {:force => force}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)

data/lib/rhc-rest/key.rb

@@ -12,8 +12,8 @@ module Rhc
 
       # Update Key
       def update(type, content)
-        logger.debug "Updating key #{self.name}"
-        url = @@end_point + @links['UPDATE']['href']
+        logger.debug "Updating key #{self.name}" if @mydebug
+        url = @links['UPDATE']['href']
         method =  @links['UPDATE']['method']
         payload = {:type => type, :content => content}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
@@ -22,8 +22,8 @@ module Rhc
 
       #Delete Key
       def destroy
-        logger.debug "Deleting key #{self.name}"
-        url = @@end_point + @links['DELETE']['href']
+        logger.debug "Deleting key #{self.name}" if @mydebug
+        url = @links['DELETE']['href']
         method =  @links['DELETE']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
         return send(request)

data/lib/rhc-rest/user.rb

@@ -10,7 +10,7 @@ module Rhc
 
       #Add Key for this user
       def add_key(name, content, type)
-        url = @@end_point + @links['ADD_KEY']['href']
+        url = @links['ADD_KEY']['href']
         method =  @links['ADD_KEY']['method']
         payload = {:name => name, :type => type, :content => content}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
@@ -19,7 +19,7 @@ module Rhc
 
       #Get all Key for this user
       def keys
-        url = @@end_point + @links['LIST_KEYS']['href']
+        url = @links['LIST_KEYS']['href']
         method =  @links['LIST_KEYS']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
         return send(request)

data/rhc-rest.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_dependency("json")
+  s.extensions << 'ext/mkrf_conf.rb'
   s.add_dependency("rest-client")
 end

data/rhc-rest.spec

@@ -6,7 +6,8 @@
 
 Summary:       Ruby bindings/client for OpenShift REST API
 Name:          rhc-rest
-Version:       0.0.7
+# Make sure to update express/client.spec and express/Rakefile when increasing version number
+Version:       0.0.14
 Release:       1%{?dist}
 Group:         Network/Daemons
 License:       ASL 2.0
@@ -56,6 +57,48 @@ rm -rf %{buildroot}
 %doc COPYRIGHT
 
 %changelog
+* Thu Apr 12 2012 Mike McGrath <mmcgrath@redhat.com> 0.0.14-1
+- Merge branch 'master' of github.com:openshift/os-client-tools
+  (mmcgrath@redhat.com)
+- BZ810790: Fixed app scaling payload creation (fotios@redhat.com)
+
+* Thu Apr 12 2012 Mike McGrath <mmcgrath@redhat.com> 0.0.13-1
+- 
+
+* Thu Apr 12 2012 Mike McGrath <mmcgrath@redhat.com> 0.0.12-1
+- Update to ASL 2.0 License (jhonce@redhat.com)
+- Bug 810714 - Command Line Tools: Unable to create scalable application via
+  proxy (lnader@redhat.com)
+- Also noted to change Rakefile when bumping version (fotios@redhat.com)
+- BZ810439: Fixed dependency for client tools to require latest version of rhc-
+  rest (fotios@redhat.com)
+- changed permissions to 755 (lnader@redhat.com)
+- removed doc/created.rid (lnader@redhat.com)
+- remove +x (lnader@redhat.com)
+
+* Mon Apr 09 2012 Lili Nader <lnader@redhat.com> 0.0.11-1
+- bug fixes (lnader@redhat.com)
+
+* Mon Apr 09 2012 Lili Nader <lnader@redhat.com> 0.0.10-1
+- 
+
+* Mon Apr 09 2012 Lili Nader <lnader@redhat.com> 0.0.9-1
+- absolute URLs (lnader@redhat.com)
+- Made sure debugging output was only printed when @mydebug was specified
+  (fotios@redhat.com)
+- Ruby REST api changes:  - Make 'domain namespace' consistent across
+  domain/app objects. It will be referred as 'id' in domain objects and
+  'domain_id' in app objects. (rpenta@redhat.com)
+- update sample script for ruby REST api (rpenta@redhat.com)
+
+* Fri Mar 30 2012 Lili Nader <lnader@redhat.com> 0.0.8-1
+- Catch all to prevent trying to parse a null response on an http code we did
+  not expect. (rmillner@redhat.com)
+- Increase the timeout to 3 minutes on creating a scalable application.
+  (rmillner@redhat.com)
+- Creating scalable apps was causing a timeout.  Needed to setup an exception
+  to propagate that back to the end-user. (rmillner@redhat.com)
+
 * Wed Mar 21 2012 Lili Nader <lnader@redhat.com> 0.0.7-1
 - Get rhc-rest a building ... (ramr@redhat.com)
 - Fix to get rhc-rest building. (ramr@redhat.com)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc-rest
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Red Hat
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-04 00:00:00 Z
+date: 2012-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -31,27 +31,13 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 description: Ruby bindings for OpenShift REST API
 email: 
 - openshift@redhat.com
 executables: []
 
-extensions: []
-
+extensions: 
+- ext/mkrf_conf.rb
 extra_rdoc_files: []
 
 files: 
@@ -117,7 +103,6 @@ files:
 - doc/js/search_index.js
 - doc/js/search.js
 - doc/js/jquery.js
-- doc/doc/created.rid
 - doc/Gemfile.html
 - Rakefile
 - rhc-rest.gemspec
@@ -125,6 +110,7 @@ files:
 - rhc-rest.spec
 - COPYRIGHT
 - LICENSE
+- ext/mkrf_conf.rb
 homepage: http://www.openshift.com
 licenses: []