cfoundry 0.5.0 → 0.5.1.rc1

data/Rakefile

@@ -36,29 +36,3 @@ namespace :deploy do
     sh "git push origin latest-release"
   end
 end
-
-namespace :release do
-  DEPENDENTS = %w[
-    vmc/vmc.gemspec
-    vmc-plugins/admin/admin-vmc-plugin.gemspec
-    vmc-plugins/console/console-vmc-plugin.gemspec
-    vmc-plugins/manifests/manifests-vmc-plugin.gemspec
-    vmc-plugins/mcf/mcf-vmc-plugin.gemspec
-    vmc-plugins/tunnel/tunnel-vmc-plugin.gemspec
-  ].freeze
-
-  def bump_dependent(file, dep, ver)
-    puts "Bumping #{dep} to #{ver} in #{file}"
-
-    old = File.read(file)
-    new = old.sub(/(\.add.+#{dep}\D+)[^'"]+(.+)/, "\\1#{ver}\\2")
-
-    File.open(file, "w") { |io| io.print new }
-  end
-
-  task :bump_dependents do
-    DEPENDENTS.each do |dep|
-      bump_dependent(File.expand_path("../../#{dep}", __FILE__), "cfoundry", CFoundry::VERSION)
-    end
-  end
-end

data/lib/cfoundry/auth_token.rb

@@ -21,7 +21,8 @@ module CFoundry
       @refresh_token = refresh_token
     end
 
-    attr_reader :auth_header
+    attr_accessor :auth_header
+    attr_reader :refresh_token
 
     def to_hash
       {
@@ -35,6 +36,7 @@ module CFoundry
     # TODO: rename to #data
     def token_data
       return @token_data if @token_data
+      return {} unless @auth_header
 
       json_hashes = Base64.decode64(@auth_header.split(" ", 2).last)
       data_json = json_hashes.sub(JSON_HASH, "")[JSON_HASH]
@@ -44,5 +46,18 @@ module CFoundry
     rescue MultiJson::DecodeError
       {}
     end
+
+    def auth_header=(auth_header)
+      @token_data = nil
+      @auth_header = auth_header
+    end
+
+    def expiration
+      Time.at(token_data[:exp])
+    end
+
+    def expires_soon?
+      (expiration.to_i - Time.now.to_i) < 60
+    end
   end
 end

data/lib/cfoundry/baseclient.rb

@@ -24,14 +24,21 @@ module CFoundry
 
     def uaa
       @uaa ||= begin
-        endpoint = info[:authorization_endpoint]
-        uaa = CFoundry::UAAClient.new(endpoint)
-        uaa.trace = trace
-        uaa.token = token
-        uaa
+        if(endpoint = info[:authorization_endpoint])
+          uaa = CFoundry::UAAClient.new(endpoint)
+          uaa.trace = trace
+          uaa.token = token
+          uaa
+        else
+          nil
+        end
       end
     end
 
+    def password_score(password)
+      uaa ? uaa.password_score(password) : :unknown
+    end
+
     def token=(token)
       if token.is_a?(String)
         token = CFoundry::AuthToken.new(token)
@@ -68,6 +75,11 @@ module CFoundry
     end
 
     def request(method, *args)
+      if needs_token_refresh?
+        token.auth_header = nil
+        refresh_token!
+      end
+
       path, options = normalize_arguments(args)
       request, response = request_raw(method, path, options)
       handle_response(response, options, request)
@@ -77,8 +89,17 @@ module CFoundry
       @rest_client.request(method, path, options)
     end
 
+    def refresh_token!
+      self.token = uaa.try_to_refresh_token!
+    end
+
     private
 
+    def needs_token_refresh?
+      token && token.auth_header && token.refresh_token && \
+        token.expires_soon?
+    end
+
     def status_is_successful?(code)
       (code >= 200) && (code < 400)
     end

data/lib/cfoundry/client.rb

@@ -6,6 +6,7 @@ require "cfoundry/v1/app"
 require "cfoundry/v1/framework"
 require "cfoundry/v1/runtime"
 require "cfoundry/v1/service"
+require "cfoundry/v1/service_plan"
 require "cfoundry/v1/service_instance"
 require "cfoundry/v1/user"
 require "cfoundry/v1/base"
@@ -41,9 +42,5 @@ module CFoundry
         CFoundry::V1::Client.new(*args)
       end
     end
-
-    def info
-      get("info", :accept => :json)
-    end
   end
 end

data/lib/cfoundry/rest_client.rb

@@ -151,6 +151,9 @@ module CFoundry
     end
 
     def construct_url(path)
+      uri = URI.parse(path)
+      return path if uri.scheme
+
       path = "/#{path}" unless path[0] == ?\/
       target + path
     end

data/lib/cfoundry/uaaclient.rb

@@ -2,7 +2,7 @@ require "cfoundry/baseclient"
 require 'uaa'
 
 module CFoundry
-  class UAAClient < BaseClient
+  class UAAClient
     attr_accessor :target, :client_id, :token, :trace
 
     def initialize(target = "https://uaa.cloudfoundry.com", client_id = "vmc")
@@ -20,11 +20,12 @@ module CFoundry
     def authorize(username, password)
       wrap_uaa_errors do
         begin
-          creds = { :username => username, :password => password }
-          token_issuer.implicit_grant_with_creds(creds)
+          token_issuer.owner_password_grant(username, password)
         rescue CF::UAA::BadResponse => e
           status_code = e.message[/\d+/] || 400
           raise CFoundry::Denied.new("Authorization failed", status_code)
+        rescue CF::UAA::TargetError
+          token_issuer.implicit_grant_with_creds(:username => username, :password => password)
         end
       end
     end
@@ -70,18 +71,29 @@ module CFoundry
       end
     end
 
+    def try_to_refresh_token!
+      wrap_uaa_errors do
+        begin
+          token_info = token_issuer.refresh_token_grant(token.refresh_token)
+          self.token = AuthToken.from_uaa_token_info(token_info)
+        rescue CF::UAA::TargetError
+          self.token
+        end
+      end
+    end
+
     private
 
     def token_issuer
       @token_issuer ||= CF::UAA::TokenIssuer.new(target, client_id, nil, :symbolize_keys => true)
-      @token_issuer.logger.level = @trace ? 0 : 1
+      @token_issuer.logger.level = @trace ? Logger::Severity::TRACE : 1
       @token_issuer
     end
 
     def scim
       auth_header = token && token.auth_header
       scim = CF::UAA::Scim.new(target, auth_header)
-      scim.logger.level = @trace ? 0 : 1
+      scim.logger.level = @trace ? Logger::Severity::TRACE : 1
       scim
     end
 
@@ -94,7 +106,7 @@ module CFoundry
     rescue CF::UAA::InvalidToken
       raise CFoundry::Denied
     rescue CF::UAA::TargetError => e
-      raise CFoundry::UAAError.new(e.info["error_description"], e.info["error"])
+      raise CFoundry::UAAError.new(e.info[:error_description], e.info[:error])
     end
   end
 end

data/lib/cfoundry/upload_helpers.rb

@@ -135,9 +135,33 @@ module CFoundry
         resource[:fn].sub!("#{path}/", "")
       end
 
+      prune_empty_directories(path)
+
       resources
     end
 
+    # OK, HERES THE PLAN...
+    #
+    # 1. Get all the directories in the entire file tree.
+    # 2. Sort them by the length of their absolute path.
+    # 3. Go through the list, longest paths first, and remove
+    #    the directories that are empty.
+    #
+    # This ensures that directories containing empty directories
+    # are also pruned.
+    def prune_empty_directories(path)
+      all_files = Dir["#{path}/**/{*,.*}"]
+      all_files.reject! { |fn| fn =~ /\/\.+$/ }
+
+      directories = all_files.select { |x| File.directory?(x) }
+      directories.sort! { |a, b| b.size <=> a.size }
+
+      directories.each do |directory|
+        entries = Dir.entries(directory) - %w{. ..}
+        FileUtils.rmdir(directory) if entries.empty?
+      end
+    end
+
     def make_fingerprints(path)
       fingerprints = []
       total_size = 0

data/lib/cfoundry/v1/base.rb

@@ -49,7 +49,7 @@ module CFoundry::V1
       post("resources", :content => :json, :accept => :json, :payload => fingerprints)
     end
 
-    def upload_app(name, zipfile, resources = [])
+    def upload_app(name, zipfile = nil, resources = [])
       payload = {
         :_method => "put",
         :resources => MultiJson.dump(resources),

data/lib/cfoundry/v1/client.rb

@@ -106,7 +106,8 @@ module CFoundry::V1
 
                 services <<
                   Service.new(vendor.to_s, ver.to_s, meta[:description],
-                              type.to_s, provider.to_s, state && state.first)
+                              type.to_s, provider.to_s, state && state.first,
+                              generate_plans(meta))
               end
             end
           end
@@ -116,6 +117,17 @@ module CFoundry::V1
       services
     end
 
+    def generate_plans(meta)
+      names = meta[:plans]
+      descriptions = meta[:plan_descriptions]
+      default_name = meta[:default_plan]
+      names.map { |name|
+        description = descriptions[name] if descriptions
+        is_default = name == default_name || names.length == 1
+        ServicePlan.new(name, description, is_default)
+      }
+    end
+
     # Retrieve available runtimes.
     def runtimes(options = {})
       runtimes = []

data/lib/cfoundry/v1/service.rb

@@ -1,15 +1,17 @@
 module CFoundry::V1
   class Service
-    attr_accessor :label, :version, :description, :type, :provider, :state
+    attr_accessor :label, :version, :description, :type, :provider, :state, :service_plans
 
     def initialize(label, version = nil, description = nil,
-                   type = nil, provider = "core", state = nil)
+                   type = nil, provider = "core", state = nil,
+                   service_plans = [])
       @label = label
       @description = description
       @version = version
       @type = type
       @provider = provider
       @state = state
+      @service_plans = service_plans
     end
 
     def eql?(other)
@@ -28,5 +30,10 @@ module CFoundry::V1
     def current?
       @state == :current
     end
+
+    def default_service_plan
+      service_plans.find(&:default?)
+    end
+
   end
 end

data/lib/cfoundry/v1/service_plan.rb

@@ -0,0 +1,19 @@
+module CFoundry::V1
+
+  class ServicePlan
+
+    attr_accessor :name, :description
+
+    def initialize(name, description, is_default)
+      @name = name
+      @description = description
+      @is_default = is_default
+    end
+
+    def default?
+      @is_default
+    end
+
+  end
+
+end

data/lib/cfoundry/v2/app.rb

@@ -43,6 +43,10 @@ module CFoundry::V2
         self.cache[:running_instances] = x
       },
 
+      :instances => proc { |x|
+        self.total_instances = x
+      },
+
       # TODO: remove these when cc consistently returns nested hashes
       :framework_guid => proc { |x|
         if f = self.cache[:framework]
@@ -104,13 +108,13 @@ module CFoundry::V2
     end
 
     def env
-      @env ||= CFoundry::ChattyHash.new(
+      CFoundry::ChattyHash.new(
         method(:env=),
-        environment_json)
+        stringify(environment_json))
     end
 
     def env=(x)
-      self.environment_json = x.to_hash
+      self.environment_json = stringify(x.to_hash)
     end
 
     def debug_mode # TODO v2
@@ -296,6 +300,18 @@ module CFoundry::V2
       Instance.new(self, "0", @client).stream_file(*path, &blk)
     end
 
+    private
+
+    def stringify(hash)
+      new = {}
+
+      hash.each do |k, v|
+        new[k.to_s] = v.to_s
+      end
+
+      new
+    end
+
     class Instance
       attr_reader :app, :id
 

data/lib/cfoundry/v2/base.rb

@@ -13,10 +13,12 @@ module CFoundry::V2
       put("v2", "resource_match", :content => :json, :accept => :json, :payload => fingerprints)
     end
 
-    def upload_app(guid, zipfile, resources = [])
-      payload = {
-        :resources => MultiJson.dump(resources),
-        :application =>
+    def upload_app(guid, zipfile = nil, resources = [])
+      payload = {}
+      payload[:resources] = MultiJson.dump(resources)
+
+      if zipfile
+        payload[:application] =
           UploadIO.new(
             if zipfile.is_a? File
               zipfile
@@ -24,7 +26,7 @@ module CFoundry::V2
               File.new(zipfile, "rb")
             end,
             "application/zip")
-      }
+      end
 
       put("v2", "apps", guid, "bits", :payload => payload)
     rescue EOFError

data/lib/cfoundry/v2/client.rb

@@ -82,6 +82,8 @@ module CFoundry::V2
 
     # The currently authenticated user.
     def current_user
+      return unless token
+
       token_data = @base.token.token_data
       if guid = token_data[:user_id]
         user = user(guid)

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.5.0".freeze
+  VERSION = "0.5.1.rc1".freeze
 end

data/spec/cfoundry/auth_token_spec.rb

@@ -46,6 +46,14 @@ describe CFoundry::AuthToken do
         let(:access_token) { Base64.encode64('{"algo": "h1234"}{"user_id", "a6", "email": "a@b.com"}random-bytes') }
         its(:token_data) { should eq({}) }
       end
+
+      context "when the auth header is nil" do
+        before do
+          subject.auth_header = nil
+        end
+
+        its(:token_data) { should eq({}) }
+      end
     end
   end
 
@@ -74,4 +82,44 @@ describe CFoundry::AuthToken do
       its(:token_data) { should eq({ :baz => "buzz" }) }
     end
   end
-end
+
+  describe "#auth_header=" do
+    let(:access_token) { Base64.encode64('{"algo": "h1234"}{"user_id": "a6", "email": "a@b.com"}random-bytes') }
+    let(:other_access_token) { Base64.encode64('{"algo": "h1234"}{"user_id": "b6", "email": "a@b.com"}random-bytes') }
+
+    subject { CFoundry::AuthToken.new("bearer #{access_token}") }
+
+    it "invalidates @token_data" do
+      subject.token_data
+      expect {
+        subject.auth_header = "bearer #{other_access_token}"
+      }.to change { subject.token_data[:user_id] }.from("a6").to("b6")
+    end
+  end
+
+  describe "#expires_soon?" do
+    let(:access_token) { Base64.encode64(%Q|{"algo": "h1234"}{"exp":#{expiration.to_i}}random-bytes|) }
+
+    subject { CFoundry::AuthToken.new("bearer #{access_token}") }
+
+    context "when the token expires in less than 1 minute" do
+      let(:expiration) { Time.now + 59 }
+
+      it "returns true" do
+        Timecop.freeze do
+          expect(subject.expires_soon?).to be_true
+        end
+      end
+    end
+
+    context "when the token expires in greater than or equal to 1 minute" do
+      let(:expiration) { Time.now + 60 }
+
+      it "returns false" do
+        Timecop.freeze do
+          expect(subject.expires_soon?).to be_false
+        end
+      end
+    end
+  end
+end

data/spec/cfoundry/baseclient_spec.rb

@@ -30,46 +30,155 @@ describe CFoundry::BaseClient do
         end
       end
     end
+
+    context "when there is a token with an auth_header" do
+      let(:refresh_token) { nil }
+      let(:token) { CFoundry::AuthToken.new("bearer something", refresh_token) }
+
+      before do
+        stub(subject).request_raw
+        subject.token = token
+        stub(token).expires_soon? { expires_soon? }
+      end
+
+      context "and the token is about to expire" do
+        let(:uaa) { Object.new }
+        let(:expires_soon?) { true }
+
+        context "and there is a refresh token" do
+          let(:refresh_token) { "some-refresh-token" }
+
+          it "sets the token's auth header to nil to prevent recursion" do
+            stub(subject).refresh_token!
+            subject.request("GET", "foo")
+          end
+
+          it "refreshes the access token" do
+            mock(subject).refresh_token!
+            subject.request("GET", "foo")
+          end
+        end
+
+        context "and there is NOT a refresh token" do
+          let(:refresh_token) { nil }
+
+          it "moves along" do
+            mock(subject).request_raw(anything, anything, anything)
+            dont_allow(subject).refresh_token!
+            subject.request("GET", "foo")
+          end
+        end
+      end
+
+      context "and the token is NOT about to expire" do
+        let(:expires_soon?) { nil }
+
+        it "moves along" do
+          mock(subject).request_raw(anything, anything, anything)
+          dont_allow(subject).refresh_token!
+          subject.request("GET", "foo")
+        end
+      end
+    end
+
+    describe "#refresh_token!" do
+      let(:uaa) { stub }
+      let(:access_token) { Base64.encode64(%Q|{"algo": "h1234"}{"a":"b"}random-bytes|) }
+      let(:refresh_token) { "xyz" }
+      let(:new_access_token) { Base64.encode64(%Q|{"algo": "h1234"}{"a":"x"}random-bytes|) }
+      let(:auth_token) { CFoundry::AuthToken.new("bearer #{access_token}", refresh_token) }
+
+      before { stub(subject).uaa { uaa } }
+
+      it "refreshes the token with UAA client and assigns it" do
+        mock(uaa).try_to_refresh_token! {
+          CFoundry::AuthToken.new("bearer #{new_access_token}", auth_token.refresh_token)
+        }
+
+        subject.refresh_token!
+
+        expect(subject.token.auth_header).to eq "bearer #{new_access_token}"
+      end
+    end
+
   end
 
   describe "UAAClient" do
-    before do
-      stub(subject).info { { :authorization_endpoint => "http://uaa.example.com" } }
-    end
+    context "with a valid uaa endpoint" do
+      before do
+        stub(subject).info { { :authorization_endpoint => "http://uaa.example.com" } }
+      end
+
+      describe "#uaa" do
+        it "creates a UAAClient on the first call" do
+          expect(subject.uaa).to be_a CFoundry::UAAClient
+        end
 
-    describe "#uaa" do
-      it "creates a UAAClient on the first call" do
-        expect(subject.uaa).to be_a CFoundry::UAAClient
+        it "returns the same object on later calls" do
+          uaa = subject.uaa
+          expect(subject.uaa).to eq uaa
+        end
+
+        it "has the same AuthToken as BaseClient" do
+          token = CFoundry::AuthToken.new(nil)
+          stub(subject).token { token }
+          expect(subject.uaa.token).to eq token
+        end
       end
 
-      it "returns the same object on later calls" do
-        uaa = subject.uaa
-        expect(subject.uaa).to eq uaa
+      describe "#token=" do
+        it "propagates the change to #uaa" do
+          subject.uaa
+          expect(subject.uaa.token).to eq subject.token
+          subject.token = CFoundry::AuthToken.new(nil)
+          expect(subject.uaa.token).to eq subject.token
+        end
       end
 
-      it "has the same AuthToken as BaseClient" do
-        token = CFoundry::AuthToken.new(nil)
-        stub(subject).token { token }
-        expect(subject.uaa.token).to eq token
+      describe "#trace=" do
+        it "propagates the change to #uaa" do
+          subject.uaa
+          subject.trace = true
+          expect(subject.uaa.trace).to eq true
+          subject.trace = false
+          expect(subject.uaa.trace).to eq false
+        end
       end
     end
 
-    describe "#token=" do
-      it "propagates the change to #uaa" do
-        subject.uaa
-        expect(subject.uaa.token).to eq subject.token
-        subject.token = CFoundry::AuthToken.new(nil)
-        expect(subject.uaa.token).to eq subject.token
+    context "with no uaa endpoint" do
+      before do
+        stub(subject).info { { :something => "else" } }
       end
+
+      describe "#uaa" do
+        it "does not return a UAAClient" do
+          expect(subject.uaa).to be_nil
+        end
+      end
+
     end
+  end
+
+  describe "#password_score" do
+    context "with a uaa" do
+      before do
+        stub(subject).info { { :authorization_endpoint => "http://uaa.example.com" } }
+      end
+
+      it "delegates to the uaa's password strength method" do
+        mock(subject.uaa).password_score('password')
+        subject.password_score('password')
+      end
+    end
+
+    context "without a uaa" do
+      before do
+        stub(subject).info { { :something => "else" } }
+      end
 
-    describe "#trace=" do
-      it "propagates the change to #uaa" do
-        subject.uaa
-        subject.trace = true
-        expect(subject.uaa.trace).to eq true
-        subject.trace = false
-        expect(subject.uaa.trace).to eq false
+      it "returns :unknown" do
+        expect(subject.password_score('password')).to eq(:unknown)
       end
     end
   end

data/spec/cfoundry/client_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe CFoundry::Client do
+  subject { CFoundry::Client.new('http://example.com') }
+
+  it "returns a v1 client when used on a v1 target" do
+    stub_request(:get, "http://example.com/info").to_return(:status => 200, :body => '{"version":1}')
+    subject.should be_a(CFoundry::V1::Client)
+  end
+
+  it "returns a v2 client when used on a v2 target" do
+    stub_request(:get, "http://example.com/info").to_return(:status => 200, :body => '{"version":2}')
+    subject.should be_a(CFoundry::V2::Client)
+  end
+end

data/spec/cfoundry/rest_client_spec.rb

@@ -200,6 +200,24 @@ describe CFoundry::RestClient do
       end
     end
 
+    describe "when the path is a full url" do
+      let(:path) { "http://example.com" }
+
+      it "requests the given url" do
+        stub = stub_request(:get, "http://example.com")
+        subject
+        expect(stub).to have_been_requested
+      end
+    end
+
+    describe "when the path is malformed" do
+      let(:path) { "#%&*$(#%&$%)" }
+
+      it "blows up" do
+        expect { subject }.to raise_error(URI::InvalidURIError)
+      end
+    end
+
     describe 'trace' do
       before do
         rest_client.trace = true

data/spec/cfoundry/uaaclient_spec.rb

@@ -7,6 +7,7 @@ describe CFoundry::UAAClient do
 
   before do
     uaa.token = CFoundry::AuthToken.new(auth_header)
+    CF::UAA::Util.default_logger.level = 1
   end
 
   shared_examples "UAA wrapper" do
@@ -61,33 +62,44 @@ EOF
     let(:state) { 'somestate' }
     let(:redirect_uri) { 'https://uaa.cloudfoundry.com/redirect/vmc' }
     let(:auth) { Object.new }
+    let(:issuer) { Object.new }
 
     subject { uaa.authorize(username, password) }
 
-    before { stub(uaa).token_issuer.stub!.implicit_grant_with_creds { auth } }
+    before do
+      stub(issuer).owner_password_grant { auth }
+      stub(uaa).token_issuer { issuer }
+    end
 
     include_examples "UAA wrapper"
 
     it 'returns the token on successful authentication' do
-      stub(uaa).token_issuer.mock!.implicit_grant_with_creds(creds) { auth }
+      mock(issuer).owner_password_grant(username, password) { auth }
       expect(subject).to eq auth
     end
 
     context 'when authorization fails' do
       context 'in the expected way' do
         it 'raises a CFoundry::Denied error' do
-          stub(uaa).token_issuer.stub!.implicit_grant_with_creds { raise CF::UAA::BadResponse.new("401: FooBar") }
-
+          mock(issuer).owner_password_grant(anything, anything) { raise CF::UAA::BadResponse.new("401: FooBar") }
           expect { subject }.to raise_error(CFoundry::Denied, "401: Authorization failed")
         end
       end
 
       context 'in an unexpected way' do
         it 'raises a CFoundry::Denied error' do
-          stub(uaa).token_issuer.stub!.implicit_grant_with_creds { raise CF::UAA::BadResponse.new("no_status_code") }
+          mock(issuer).owner_password_grant(anything, anything) { raise CF::UAA::BadResponse.new("no_status_code") }
           expect { subject }.to raise_error(CFoundry::Denied, "400: Authorization failed")
         end
       end
+
+      context "with a CF::UAA::TargetError" do
+        it "retries with implicit grant" do
+          stub(issuer).owner_password_grant { raise CF::UAA::TargetError.new("useless info") }
+          mock(issuer).implicit_grant_with_creds(:username => username, :password => password)
+          expect { subject }.to_not raise_error
+        end
+      end
     end
   end
 
@@ -172,7 +184,7 @@ EOF
       it { should == :good }
     end
 
-    context 'when the score is less than the required core' do
+    context 'when the score is less than the required score' do
       let(:response) { MultiJson.encode "score" => 1, "requiredScore" => 5 }
       it { should == :weak }
     end
@@ -259,7 +271,7 @@ EOF
     end
 
     context "when the block raises CF::UAA::TargetError" do
-      let(:error) { CF::UAA::TargetError.new({ "error" => "foo", "error_description" => "bar" }) }
+      let(:error) { CF::UAA::TargetError.new({ :error => "foo", :error_description => "bar" }) }
 
       it "raises CFoundry::UAAError" do
         expect { subject }.to raise_exception(CFoundry::UAAError, "foo: bar")
@@ -270,7 +282,7 @@ EOF
   describe "#token_issuer" do
     it "has logging level 0 if #trace is true" do
       uaa.trace = true
-      expect(uaa.send(:token_issuer).logger.level).to eq 0
+      expect(uaa.send(:token_issuer).logger.level).to eq -1
     end
 
     it "has logging level 1 if #trace is false" do
@@ -282,7 +294,7 @@ EOF
   describe "#scim" do
     it "has logging level 0 if #trace is true" do
       uaa.trace = true
-      expect(uaa.send(:scim).logger.level).to eq 0
+      expect(uaa.send(:scim).logger.level).to eq -1
     end
 
     it "has logging level 1 if #trace is false" do
@@ -290,4 +302,31 @@ EOF
       expect(uaa.send(:scim).logger.level).to eq 1
     end
   end
+
+  describe "#try_to_refresh_token!" do
+    it "uses the refresh token to get a new access token" do
+      mock(uaa.send(:token_issuer)).refresh_token_grant(uaa.token.refresh_token) do
+        CF::UAA::TokenInfo.new(
+          :token_type => "bearer",
+          :access_token => "refreshed-token",
+          :refresh_token => "some-refresh-token")
+      end
+
+      uaa.try_to_refresh_token!
+      expect(uaa.token.auth_header).to eq "bearer refreshed-token"
+      expect(uaa.token.refresh_token).to eq "some-refresh-token"
+    end
+
+    context "when the refresh token has expired" do
+      it "returns the current token" do
+        stub(uaa.send(:token_issuer)).refresh_token_grant do
+          raise CF::UAA::TargetError.new
+        end
+
+        expect {
+          uaa.try_to_refresh_token!
+        }.to_not change { uaa.token }
+      end
+    end
+  end
 end

data/spec/cfoundry/upload_helpers_spec.rb

@@ -28,15 +28,16 @@ describe CFoundry::UploadHelpers do
     end
 
     before do
+      FileUtils.rm_rf tmpdir
+
       stub(Dir).tmpdir do
         FileUtils.mkdir_p tmpdir
         tmpdir
       end
+
       stub(base).upload_app.with_any_args
     end
 
-    after { FileUtils.rm_rf tmpdir }
-
     subject { fake_model.upload(path, check_resources) }
 
     def relative_glob(dir)
@@ -125,5 +126,49 @@ describe CFoundry::UploadHelpers do
         subject
       end
     end
+
+    context 'when all files match existing resources' do
+      context 'and there are directories' do
+        let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_nested_directories" }
+
+        it 'prunes them before zipping' do
+          stub(fake_model).make_fingerprints(anything) do
+            [[], CFoundry::UploadHelpers::RESOURCE_CHECK_LIMIT + 1]
+          end
+
+          stub(base).resource_match(anything) do
+            %w{ xyz foo/bar/baz/fizz }.map do |path|
+              { :fn => "#{tmpdir}/.vmc_#{guid}_files/#{path}" }
+            end
+          end
+
+          mock(base).upload_app(anything, false, anything)
+
+          fake_model.upload(path)
+        end
+      end
+    end
+
+    context "when only dotfiles don't match existing resources" do
+      let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_dotfiles" }
+
+      it 'does not prune them' do
+        stub(fake_model).make_fingerprints(anything) do
+          [[], CFoundry::UploadHelpers::RESOURCE_CHECK_LIMIT + 1]
+        end
+
+        stub(base).resource_match(anything) do
+          %w{ xyz }.map do |path|
+            { :fn => "#{tmpdir}/.vmc_#{guid}_files/#{path}" }
+          end
+        end
+
+        mock(base).upload_app(anything, anything, anything) do |_, zip, _|
+          expect(zip).to be_a(String)
+        end
+
+        fake_model.upload(path)
+      end
+    end
   end
-end
+end

data/spec/cfoundry/v2/app_spec.rb

@@ -0,0 +1,49 @@
+require "spec_helper"
+
+describe CFoundry::V2::App do
+  let(:client) { fake_client }
+
+  describe "environment" do
+    let(:app) { fake :app, :env => { "FOO" => "1" } }
+
+    it "returns a hash-like object" do
+      expect(app.env["FOO"]).to eq "1"
+    end
+
+    describe "converting keys and values to strings" do
+      let(:app) { fake :app, :env => { :FOO => 1 } }
+
+      it "converts keys and values to strings" do
+        expect(app.env.to_hash).to eq("FOO" => "1")
+      end
+    end
+
+    context "when changes are made to the hash-like object" do
+      it "reflects the changes in .env" do
+        expect {
+          app.env["BAR"] = "2"
+        }.to change { app.env.to_hash }.from("FOO" => "1").to("FOO" => "1", "BAR" => "2")
+      end
+    end
+
+    context "when the env is set to something else" do
+      it "reflects the changes in .env" do
+        expect {
+          app.env = { "BAR" => "2" }
+        }.to change { app.env.to_hash }.from("FOO" => "1").to("BAR" => "2")
+      end
+    end
+  end
+
+  describe "#summarize!" do
+    let(:app) { fake :app }
+
+    it "assigns :instances as #total_instances" do
+      stub(app).summary { { :instances => 4 } }
+
+      app.summarize!
+
+      expect(app.total_instances).to eq(4)
+    end
+  end
+end

data/spec/cfoundry/v2/base_spec.rb

@@ -244,6 +244,23 @@ describe CFoundry::V2::Base do
       base.upload_app(guid, fake_zipfile)
       expect(stub).to have_been_requested
     end
+
+    context "when there is no file to upload" do
+      it "does not include 'application' in the request hash" do
+        stub =
+          stub_request(
+            :put,
+            "https://api.cloudfoundry.com/v2/apps/#{guid}/bits"
+          ).with { |request|
+            request.body =~ /name="resources"/ &&
+              request.body !~ /name="application"/
+          }.to_return(
+            :body => "{}"
+          )
+        base.upload_app(guid)
+        expect(stub).to have_been_requested
+      end
+    end
   end
 
   describe "#stream_file" do

data/spec/cfoundry/v2/client_spec.rb

@@ -26,6 +26,11 @@ describe CFoundry::V2::Client do
     subject { client.current_user }
     before { client.token = token }
 
+    context "when there is no token" do
+      let(:token) { nil }
+      it { should eq nil }
+    end
+
     context "when there is no access_token_data" do
       let(:token) { CFoundry::AuthToken.new("bearer some-access-token", "some-refresh-token") }
       it { should eq nil }

data/spec/cfoundry/v2/organization_spec.rb

@@ -1,3 +1,5 @@
+require "spec_helper"
+
 describe CFoundry::V2::Organization do
   let(:client) { fake_client }
 

data/spec/cfoundry/v2/space_spec.rb

@@ -1,3 +1,5 @@
+require "spec_helper"
+
 describe CFoundry::V2::Space do
   let(:client) { fake_client }
 

data/spec/fixtures/apps/with_dotfiles/xyz

@@ -0,0 +1 @@
+bar

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require "rspec"
 require "cfoundry"
 require "webmock/rspec"
 require "ostruct"
+require "timecop"
 
 Dir[File.expand_path('../{support,fakes}/**/*.rb', __FILE__)].each do |file|
   require file
@@ -13,4 +14,4 @@ RSpec.configure do |c|
   c.include Fake::FakeMethods
   c.include V1Fake::FakeMethods
   c.mock_with :rr
-end
+end

data/spec/support/fake_helper.rb

@@ -79,7 +79,7 @@ module CFoundry::V2
     end
 
     def fake_attributes(attributes)
-      fakes = default_fakes.merge(attributes)
+      fakes = default_fakes
 
       # default relationships to other fake objects
       self.class.to_one_relations.each do |name, opts|
@@ -95,6 +95,17 @@ module CFoundry::V2
           end
       end
 
+      # make sure that the attributes provided are set after the defaults
+      #
+      # we have to do this for cases like environment_json vs. env,
+      # where one would clobber the other
+      attributes.each do |k, _|
+        fakes.delete k
+      end
+
+      fakes = fakes.to_a
+      fakes += attributes.to_a
+
       fakes
     end
 

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
+  hash: 3470363275
+  prerelease: 6
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  - rc
+  - 1
+  version: 0.5.1.rc1
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -16,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-06 00:00:00 Z
+date: 2013-02-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -153,6 +155,20 @@ dependencies:
   type: :development
   name: gem-release
   requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  name: timecop
+  requirement: *id010
 description: 
 email: 
 - vcap-dev@googlegroups.com
@@ -185,6 +201,7 @@ files:
 - lib/cfoundry/v1/runtime.rb
 - lib/cfoundry/v1/service.rb
 - lib/cfoundry/v1/service_instance.rb
+- lib/cfoundry/v1/service_plan.rb
 - lib/cfoundry/v1/user.rb
 - lib/cfoundry/v2/app.rb
 - lib/cfoundry/v2/base.rb
@@ -209,6 +226,7 @@ files:
 - lib/cfoundry.rb
 - spec/cfoundry/auth_token_spec.rb
 - spec/cfoundry/baseclient_spec.rb
+- spec/cfoundry/client_spec.rb
 - spec/cfoundry/errors_spec.rb
 - spec/cfoundry/rest_client_spec.rb
 - spec/cfoundry/trace_helpers_spec.rb
@@ -217,6 +235,7 @@ files:
 - spec/cfoundry/v1/base_spec.rb
 - spec/cfoundry/v1/client_spec.rb
 - spec/cfoundry/v1/model_magic_spec.rb
+- spec/cfoundry/v2/app_spec.rb
 - spec/cfoundry/v2/base_spec.rb
 - spec/cfoundry/v2/client_spec.rb
 - spec/cfoundry/v2/model_magic_spec.rb
@@ -233,6 +252,9 @@ files:
 - spec/fakes/service_plan_fake.rb
 - spec/fakes/space_fake.rb
 - spec/fakes/user_fake.rb
+- spec/fixtures/apps/with_dotfiles/xyz
+- spec/fixtures/apps/with_nested_directories/foo/bar/baz/fizz
+- spec/fixtures/apps/with_nested_directories/xyz
 - spec/fixtures/apps/with_vmcignore/ignored_dir/file_in_ignored_dir.txt
 - spec/fixtures/apps/with_vmcignore/ignored_file.txt
 - spec/fixtures/apps/with_vmcignore/non_ignored_dir/file_in_non_ignored_dir.txt
@@ -265,12 +287,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: cfoundry
@@ -281,6 +305,7 @@ summary: High-level library for working with the Cloud Foundry API.
 test_files: 
 - spec/cfoundry/auth_token_spec.rb
 - spec/cfoundry/baseclient_spec.rb
+- spec/cfoundry/client_spec.rb
 - spec/cfoundry/errors_spec.rb
 - spec/cfoundry/rest_client_spec.rb
 - spec/cfoundry/trace_helpers_spec.rb
@@ -289,6 +314,7 @@ test_files:
 - spec/cfoundry/v1/base_spec.rb
 - spec/cfoundry/v1/client_spec.rb
 - spec/cfoundry/v1/model_magic_spec.rb
+- spec/cfoundry/v2/app_spec.rb
 - spec/cfoundry/v2/base_spec.rb
 - spec/cfoundry/v2/client_spec.rb
 - spec/cfoundry/v2/model_magic_spec.rb
@@ -305,6 +331,9 @@ test_files:
 - spec/fakes/service_plan_fake.rb
 - spec/fakes/space_fake.rb
 - spec/fakes/user_fake.rb
+- spec/fixtures/apps/with_dotfiles/xyz
+- spec/fixtures/apps/with_nested_directories/foo/bar/baz/fizz
+- spec/fixtures/apps/with_nested_directories/xyz
 - spec/fixtures/apps/with_vmcignore/ignored_dir/file_in_ignored_dir.txt
 - spec/fixtures/apps/with_vmcignore/ignored_file.txt
 - spec/fixtures/apps/with_vmcignore/non_ignored_dir/file_in_non_ignored_dir.txt