cfoundry 0.2.2 → 0.3.0

data/lib/cfoundry/{app.rb → v1/app.rb}

@@ -5,16 +5,19 @@ require "tmpdir"
 
 require "cfoundry/zip"
 
-module CFoundry
+require "cfoundry/v1/framework"
+require "cfoundry/v1/runtime"
+
+module CFoundry::V1
   # Class for representing a user's application on a given target (via
   # Client).
   #
-  # Goes not guarantee that the app exists; used for both app creation and
+  # Does not guarantee that the app exists; used for both app creation and
   # retrieval, as the attributes are all lazily retrieved. Setting attributes
   # does not perform any requests; use #update! to commit your changes.
   class App
     # Application name.
-    attr_reader :name
+    attr_accessor :name
 
     # Application instance count.
     attr_accessor :total_instances
@@ -69,12 +72,12 @@ module CFoundry
     #
     # Keeps the metadata, but clears target-specific state from it.
     def delete!
-      @client.rest.delete_app(@name)
+      @client.base.delete_app(@name)
 
       if @manifest
-        @manifest.delete "meta"
-        @manifest.delete "version"
-        @manifest.delete "state"
+        @manifest.delete :meta
+        @manifest.delete :version
+        @manifest.delete :state
       end
     end
 
@@ -82,13 +85,13 @@ module CFoundry
     #
     # Call this after setting the various attributes.
     def create!
-      @client.rest.create_app(@manifest.merge("name" => @name))
+      @client.base.create_app(@manifest.merge(:name => @name))
       @manifest = nil
     end
 
     # Check if the application exists on the target.
     def exists?
-      @client.rest.app(@name)
+      @client.base.app(@name)
       true
     rescue CFoundry::NotFound
       false
@@ -96,34 +99,35 @@ module CFoundry
 
     # Retrieve all of the instances of the app, as Instance objects.
     def instances
-      @client.rest.instances(@name).collect do |m|
-        Instance.new(@name, m["index"], @client, m)
+      @client.base.instances(@name).collect do |m|
+        Instance.new(@name, m[:index], @client, m)
       end
     end
 
     # Retrieve application statistics, e.g. CPU load and memory usage.
     def stats
-      @client.rest.stats(@name)
+      @client.base.stats(@name)
     end
 
     # Update application attributes. Does not restart the application.
     def update!(what = {})
-      # TODO: hacky; can we not just set in meta field?
-      # we write to manifest["debug"] but read from manifest["meta"]["debug"]
+      # bleh. have to set these here (normally in :meta) or they'll get lost.
       what[:debug] = debug_mode
+      what[:staging] = (what[:staging] || {}).merge(manifest[:staging])
+      what[:staging][:command] = command if command
 
-      @client.rest.update_app(@name, manifest.merge(what))
+      @client.base.update_app(@name, manifest.merge(what))
       @manifest = nil
     end
 
     # Stop the application.
     def stop!
-      update! "state" => "STOPPED"
+      update! :state => "STOPPED"
     end
 
     # Start the application.
     def start!
-      update! "state" => "STARTED"
+      update! :state => "STARTED"
     end
 
     # Restart the application.
@@ -141,8 +145,8 @@ module CFoundry
     def health
       s = state
       if s == "STARTED"
-        healthy_count = manifest["runningInstances"]
-        expected = manifest["instances"]
+        healthy_count = manifest[:runningInstances]
+        expected = manifest[:instances]
         if healthy_count && expected > 0
           ratio = healthy_count / expected.to_f
           if ratio == 1.0
@@ -179,13 +183,13 @@ module CFoundry
       state == "STARTED"
     end
 
-    { :total_instances => "instances",
-      :state => "state",
-      :status => "state",
-      :services => "services",
-      :uris => "uris",
-      :urls => "uris",
-      :env => "env"
+    { :total_instances => :instances,
+      :state => :state,
+      :status => :state,
+      :services => :services,
+      :uris => :uris,
+      :urls => :uris,
+      :env => :env
     }.each do |meth, attr|
       define_method(meth) do
         manifest[attr]
@@ -212,35 +216,41 @@ module CFoundry
 
     # Application framework.
     def framework
-      manifest["staging"]["framework"] ||
-        manifest["staging"]["model"]
+      Framework.new(
+        manifest[:staging][:framework] ||
+          manifest[:staging][:model])
     end
 
     def framework=(v) # :nodoc:
+      v = v.name if v.is_a?(Framework)
+
       @manifest ||= {}
-      @manifest["staging"] ||= {}
+      @manifest[:staging] ||= {}
 
-      if @manifest["staging"].key? "model"
-        @manifest["staging"]["model"] = v
+      if @manifest[:staging].key? :model
+        @manifest[:staging][:model] = v
       else
-        @manifest["staging"]["framework"] = v
+        @manifest[:staging][:framework] = v
       end
     end
 
     # Application runtime.
     def runtime
-      manifest["staging"]["runtime"] ||
-        manifest["staging"]["stack"]
+      Framework.new(
+        manifest[:staging][:runtime] ||
+          manifest[:staging][:stack])
     end
 
     def runtime=(v) # :nodoc:
+      v = v.name if v.is_a?(Runtime)
+
       @manifest ||= {}
-      @manifest["staging"] ||= {}
+      @manifest[:staging] ||= {}
 
-      if @manifest["staging"].key? "stack"
-        @manifest["staging"]["stack"] = v
+      if @manifest[:staging].key? :stack
+        @manifest[:staging][:stack] = v
       else
-        @manifest["staging"]["runtime"] = v
+        @manifest[:staging][:runtime] = v
       end
     end
 
@@ -249,49 +259,50 @@ module CFoundry
     #
     # Used for standalone apps.
     def command
-      manifest["staging"]["command"]
+      manifest[:staging][:command] ||
+        manifest[:meta][:command]
     end
 
     def command=(v) # :nodoc:
       @manifest ||= {}
-      @manifest["staging"] ||= {}
-      @manifest["staging"]["command"] = v
+      @manifest[:staging] ||= {}
+      @manifest[:staging][:command] = v
     end
 
 
     # Application memory.
     def memory
-      manifest["resources"]["memory"]
+      manifest[:resources][:memory]
     end
 
     def memory=(v) # :nodoc:
       @manifest ||= {}
-      @manifest["resources"] ||= {}
-      @manifest["resources"]["memory"] = v
+      @manifest[:resources] ||= {}
+      @manifest[:resources][:memory] = v
     end
 
 
     # Application debug mode.
     def debug_mode
-      manifest.fetch("debug") do
-        manifest["meta"] && manifest["meta"]["debug"]
+      manifest.fetch(:debug) do
+        manifest[:meta] && manifest[:meta][:debug]
       end
     end
 
     def debug_mode=(v) # :nodoc:
       @manifest ||= {}
-      @manifest["debug"] = v
+      @manifest[:debug] = v
     end
 
 
     # Bind services to application.
     def bind(*service_names)
-      update!("services" => services + service_names)
+      update!(:services => services + service_names)
     end
 
     # Unbind services from application.
     def unbind(*service_names)
-      update!("services" =>
+      update!(:services =>
                 services.reject { |s|
                   service_names.include?(s)
                 })
@@ -352,7 +363,7 @@ module CFoundry
 
       packed = CFoundry::Zip.pack(tmpdir, zipfile)
 
-      @client.rest.upload_app(@name, packed && zipfile, resources || [])
+      @client.base.upload_app(@name, packed && zipfile, resources || [])
     ensure
       FileUtils.rm_f(zipfile) if zipfile
       FileUtils.rm_rf(tmpdir) if tmpdir
@@ -361,7 +372,7 @@ module CFoundry
     private
 
     def manifest
-      @manifest ||= @client.rest.app(@name)
+      @manifest ||= @client.base.app(@name)
     end
 
     def prepare_package(path, to)
@@ -430,11 +441,11 @@ module CFoundry
 
       return if total_size <= RESOURCE_CHECK_LIMIT
 
-      resources = @client.rest.check_resources(fingerprints)
+      resources = @client.base.check_resources(fingerprints)
 
       resources.each do |resource|
-        FileUtils.rm_f resource["fn"]
-        resource["fn"].sub!("#{path}/", '')
+        FileUtils.rm_f resource[:fn]
+        resource[:fn].sub!("#{path}/", "")
       end
 
       resources
@@ -491,32 +502,32 @@ module CFoundry
 
       # Instance state.
       def state
-        @manifest["state"]
+        @manifest[:state]
       end
       alias_method :status, :state
 
       # Instance start time.
       def since
-        Time.at(@manifest["since"])
+        Time.at(@manifest[:since])
       end
 
       # Instance debugger data. If instance is in debug mode, returns a hash
       # containing :ip and :port keys.
       def debugger
-        return unless @manifest["debug_ip"] and @manifest["debug_port"]
+        return unless @manifest[:debug_ip] and @manifest[:debug_port]
 
-        { :ip => @manifest["debug_ip"],
-          :port => @manifest["debug_port"]
+        { :ip => @manifest[:debug_ip],
+          :port => @manifest[:debug_port]
         }
       end
 
       # Instance console data. If instance has a console, returns a hash
       # containing :ip and :port keys.
       def console
-        return unless @manifest["console_ip"] and @manifest["console_port"]
+        return unless @manifest[:console_ip] and @manifest[:console_port]
 
-        { :ip => @manifest["console_ip"],
-          :port => @manifest["console_port"]
+        { :ip => @manifest[:console_ip],
+          :port => @manifest[:console_port]
         }
       end
 
@@ -538,7 +549,7 @@ module CFoundry
       #
       #   For example, <code>files("foo", "bar")</code> for +foo/bar+.
       def files(*path)
-        @client.rest.files(@app, @index, *path).split("\n").collect do |entry|
+        @client.base.files(@app, @index, *path).split("\n").collect do |entry|
           path + [entry.split(/\s+/, 2)[0]]
         end
       end
@@ -550,7 +561,7 @@ module CFoundry
       #
       #   For example, <code>files("foo", "bar")</code> for +foo/bar+.
       def file(*path)
-        @client.rest.files(@app, @index, *path)
+        @client.base.files(@app, @index, *path)
       end
     end
   end

data/lib/cfoundry/v1/base.rb

@@ -0,0 +1,206 @@
+require "json"
+
+require "cfoundry/baseclient"
+require "cfoundry/uaaclient"
+
+require "cfoundry/errors"
+
+module CFoundry::V1
+  class Base < CFoundry::BaseClient
+    attr_accessor :target, :token, :proxy, :trace
+
+    def initialize(
+        target = "https://api.cloudfoundry.com",
+        token = nil)
+      @target = target
+      @token = token
+    end
+
+
+    # invalidate token data when changing token
+    def token=(t)
+      @token = t
+    end
+
+
+    # The UAA used for this client.
+    #
+    # `false` if no UAA (legacy)
+    def uaa
+      return @uaa unless @uaa.nil?
+
+      endpoint = info[:authorization_endpoint]
+      return @uaa = false unless endpoint
+
+      @uaa = CFoundry::UAAClient.new(endpoint)
+      @uaa.trace = @trace
+      @uaa.token = @token
+      @uaa
+    end
+
+
+    # Cloud metadata
+    def info
+      get("info", nil => :json)
+    end
+
+    def system_services
+      get("info", "services", nil => :json)
+    end
+
+    def system_runtimes
+      get("info", "runtimes", nil => :json)
+    end
+
+    # Users
+    def users
+      get("users", nil => :json)
+    end
+
+    def create_user(payload)
+      post(payload, "users")
+    end
+
+    def user(email)
+      get("users", email, nil => :json)
+    end
+
+    def delete_user(email)
+      delete("users", email, nil => :json)
+      true
+    end
+
+    def update_user(email, payload)
+      put(payload, "users", email, :json => nil)
+    end
+
+    def create_token(payload, email)
+      post(payload, "users", email, "tokens", :json => :json)
+    end
+
+    # Applications
+    def apps
+      get("apps", nil => :json)
+    end
+
+    def create_app(payload)
+      post(payload, "apps", :json => :json)
+    end
+
+    def app(name)
+      get("apps", name, nil => :json)
+    end
+
+    def instances(name)
+      get("apps", name, "instances", nil => :json)[:instances]
+    end
+
+    def files(name, instance, *path)
+      get("apps", name, "instances", instance, "files", *path)
+    end
+    alias :file :files
+
+    def update_app(name, payload)
+      put(payload, "apps", name, :json => nil)
+    end
+
+    def delete_app(name)
+      # TODO: no JSON response?
+      delete("apps", name)
+      true
+    end
+
+    def stats(name)
+      get("apps", name, "stats", nil => :json)
+    end
+
+    def check_resources(fingerprints)
+      post(fingerprints, "resources", :json => :json)
+    end
+
+    def upload_app(name, zipfile, resources = [])
+      payload = {
+        :_method => "put",
+        :resources => resources.to_json,
+        :multipart => true,
+        :application =>
+          if zipfile.is_a? File
+            zipfile
+          elsif zipfile.is_a? String
+            File.new(zipfile, "rb")
+          end
+      }
+
+      post(payload, "apps", name, "application")
+    rescue RestClient::ServerBrokeConnection
+      retry
+    end
+
+    # Services
+    def services
+      get("services", nil => :json)
+    end
+
+    def create_service(manifest)
+      post(manifest, "services", :json => :json)
+    end
+
+    def service(name)
+      get("services", name, nil => :json)
+    end
+
+    def delete_service(name)
+      delete("services", name, nil => :json)
+      true
+    end
+
+    private
+
+    def handle_response(response, accept)
+      json = accept == :json
+
+      case response.code
+      when 200, 204, 302
+        if accept == :headers
+          return response.headers
+        end
+
+        if json
+          if response.code == 204
+            raise "Expected JSON response, got 204 No Content"
+          end
+
+          parse_json(response)
+        else
+          response
+        end
+
+      when 400, 403
+        info = parse_json(response)
+        raise CFoundry::Denied.new(403, info[:description])
+
+      when 404
+        raise CFoundry::NotFound
+
+      when 411, 500, 504
+        begin
+          raise_error(parse_json(response))
+        rescue JSON::ParserError
+          raise CFoundry::BadResponse.new(response.code, response)
+        end
+
+      else
+        raise CFoundry::BadResponse.new(response.code, response)
+      end
+    end
+
+    def raise_error(info)
+      case info[:code]
+      when 402
+        raise CFoundry::UploadFailed.new(info[:description])
+      else
+        raise CFoundry::APIError.new(info[:code], info[:description])
+      end
+    end
+  end
+end