cfoundry 4.3.6 → 4.3.7

data/LICENSE

@@ -1,7 +1,8 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+               Apache License
+           Version 2.0, January 2004
+        http://www.apache.org/licenses/
 
+		
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
    1. Definitions.
@@ -200,125 +201,89 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-=======================================================================
+=======================================================================   
 
-VMC-Lib 1.0 GA:
 
-VMC-Lib 1.0 includes a number of subcomponents with
-separate copyright notices and license terms.  The product that
-includes this file does not necessarily use all the open source
-subcomponents referred to below. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
+cf-cfoundry:
 
+cf-cfoundry: includes a number of subcomponents with separate copyright 
+notices and license terms.  The product that includes this file
+does not necessarily use all the open source subcomponents referred 
+to below. Your use of the source code for the these subcomponents 
+is subject to the terms and conditions of the following licenses.
 
-SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR
+SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES
 
-  >>> cf-0.1.4
-   >>> cfoundry-0.1.1
-   >>> diff-lcs-1.1.3
-   >>> interact-0.4.2
-   >>> manifests-vmc-plugin-0.1.0
-   >>> rest-client-1.6.7
-   >>> rspec-2.10.0
-   >>> rspec-core-2.10.0
-   >>> rspec-expectations-2.10.0
-   >>> rspec-mocks-2.10.1
-   >>> thor-0.14.6
+   >>> builder-3.0.4
+   >>> diff-lcs-1.2.4
+   >>> factory_girl-4.2.0
+   >>> gem-release-0.6.0
+   >>> git-1.2.5
+   >>> hashie-2.0.5
+   >>> i18n-0.6.4
+   >>> metaclass-0.0.1
+   >>> multipart-post-1.2.0
+   >>> rake-10.1.0
+   >>> shoulda-matchers-1.5.6
+   >>> thor-0.18.1
 
 
 
-SECTION 2: Ruby Clause-6
+SECTION 2: Apache License, V2.0
 
-   >>> json_pure-1.6.7
-   >>> mime-types-1.18
-   >>> rubyzip-0.9.8
+   >>> addressable-2.3.5
+   >>> cf-uaa-lib-1.3.10
 
 
 
-APPENDIX. Standard License Files
-
-   >>> Ruby Clause-6
-
-
-
---------------- SECTION 1:  BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES ----------
-
-BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES are applicable to the following component(s).
+SECTION 3: Ruby Clause-6
 
+   >>> highline-1.5.2
+   >>> json-1.4.6
+   >>> json_pure-1.8.0
+   >>> rubyzip-0.9.9
 
->>> cf-0.1.4
 
-Copyright (c)2012, Alex Suraci
 
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
+APPENDIX. Standard License Files
 
-    * Neither the name of Alex Suraci nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
+   >>> Ruby Clause-6
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
->>> cfoundry-0.1.1
 
-Copyright (c)2012, Alex Suraci
+--------------- SECTION 1:  BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES ----------
 
-All rights reserved.
+BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES are applicable to the following component(s).
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
+>>> builder-3.0.4
 
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
+Copyright (c) 2003-2012 Jim Weirich (jim.weirich@gmail.com)
 
-    * Neither the name of Alex Suraci nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
+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:
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+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.
 
->>> diff-lcs-1.1.3
 
-[PLEASE NOTE:  VMWARE, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE MIT LICENSE.  PLEASE SEE BELOW FOR THE FULL TEXT OF THE MIT LICENSE.  THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.]
+>>> diff-lcs-1.2.4
 
+[PLEASE NOTE:  GOPIVOTAL, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE MIT LICENSE.  PLEASE SEE BELOW FOR THE FULL TEXT OF THE MIT LICENSE. THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.]
 
 == License
 
@@ -326,12 +291,13 @@ This software is available under three licenses: the GNU GPL version 2 (or at
 your option, a later version), the Perl Artistic license, or the MIT license.
 Note that my preference for licensing is the MIT license, but Algorithm::Diff
 was dually originally licensed with the Perl Artistic and the GNU GPL ("the
-same terms as Perl itself") and that the Ruby implementation hews pretty
-closely to the Perl version, so I must maintain the additional licensing terms.
+same terms as Perl itself") and given that the Ruby implementation originally
+hewed pretty closely to the Perl version, I must maintain the additional
+licensing terms.
 
-* Copyright 20042011 Austin Ziegler.
-* Adapted from Algorithm::Diff (Perl) by Ned Konz and a Smalltalk versionby
-  Mario I. Wolczko <mario@wolczko.com>
+* Copyright 20042013 Austin Ziegler.
+* Adapted from Algorithm::Diff (Perl) by Ned Konz and a Smalltalk version by
+  Mario I. Wolczko.
 
 === MIT License
 
@@ -360,62 +326,80 @@ See the file docs/artistic.txt in the main distribution.
 See the file docs/COPYING.txt in the main distribution.
 
 
->>> interact-0.4.2
+>>> factory_girl-4.2.0
 
-Copyright (c)2011, Alex Suraci
+Copyright (c) 2008-2013 Joe Ferris and thoughtbot, inc.
 
-All rights reserved.
+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:
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
+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.
 
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
 
-    * Neither the name of Alex Suraci nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
+>>> gem-release-0.6.0
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+MIT LICENSE
 
+Copyright (c) <% year %> <%= author %> <<%= email %>>
 
->>> manifests-vmc-plugin-0.1.0
+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:
 
-Copyright (c) 2012, Alex Suraci
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-All rights reserved.
+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.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+>>> git-1.2.5
 
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Copyright (c) 2008 Scott Chacon
 
-Neither the name of Alex Suraci nor the names of other contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+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:
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+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.
 
->>> rest-client-1.6.7
 
-Released under the MIT License: http://www.opensource.org/licenses/mit-license.php
+>>> hashie-2.0.5
 
-Copyright (c) 2003, 2004 Jim Weirich
+Copyright (c) 2009 Intridea, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -437,13 +421,9 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
->>> rspec-2.10.0
-
-(The MIT License)
+>>> i18n-0.6.4
 
-Copyright (c) 2009 Chad Humphries, David Chelimsky
-Copyright (c) 2006 David Chelimsky, The RSpec Development Team
-Copyright (c) 2005 Steven Baker
+Copyright (c) 2008 The Ruby I18n team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -458,40 +438,110 @@ 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.
+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.
 
 
->>> rspec-core-2.10.0
+ADDITIONAL LICENSE INFORMATION:
 
-The MIT License
+> Ruby License
 
-Copyright (c) 2009 Chad Humphries, David Chelimsky
+i18n-0.6.1.gem.tar\data.tar.gz\data.tar\lib\i18n\gettext\po_parser.rb
 
-Copyright (c) 2006 David Chelimsky, The RSpec Development Team
+Copyright (C) 2003-2009 Masao Mutoh <mutoh at highway.ne.jp>
 
-Copyright (c) 2005 Steven Baker
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
 
-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:
+1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
 
-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.
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
 
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
 
->>> rspec-expectations-2.10.0
 
-(The MIT License)
+>>> metaclass-0.0.1
 
-Copyright (c) 2006 David Chelimsky, The RSpec Development Team
-Copyright (c) 2005 Steven Baker
+== Licence (MIT)
+
+Copyright (c) 2011 James Mead
+
+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.
+
+
+>>> multipart-post-1.2.0
+
+Copyright (c) 2007-2012 Nick Sieger nick@nicksieger.com
 
 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
+'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
@@ -500,7 +550,7 @@ 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,
+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
@@ -509,12 +559,9 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
->>> rspec-mocks-2.10.1
+>>> rake-10.1.0
 
-(The MIT License)
-
-Copyright (c) 2006 David Chelimsky, The RSpec Development Team
-Copyright (c) 2005 Steven Baker
+Copyright (c) 2003, 2004 Jim Weirich
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -529,16 +576,42 @@ 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.
+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.
+
+
+>>> shoulda-matchers-1.5.6
+
+Copyright (c) 2006-2013, Tammer Saleh, thoughtbot, 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:
 
->>> thor-0.14.6
+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.
 
-Copyright (c) 2008 Yehuda Katz
+
+>>> thor-0.18.1
+
+Copyright (c) 2008 Yehuda Katz, Eric Hodel, et al.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -560,20 +633,135 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
---------------- SECTION 2: Ruby Clause-6 ----------
+--------------- SECTION 2: Apache License, V2.0 ----------
+
+Apache License, V2.0 is applicable to the following component(s).
+
+
+>>> addressable-2.3.5
+
+coding: utf-8
+Copyright (C) 2006-2013 Bob Aman
+
+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.
+
+
+>>> cf-uaa-lib-1.3.10
+
+Cloud Foundry 2012.02.03 Beta
+Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+
+This product is licensed to you under the Apache License, Version 2.0 (the "License").
+You may not use this product except in compliance with the License.
+
+This product includes a number of subcomponents with
+separate copyright notices and license terms. Your use of these
+subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the LICENSE file.
+
+
+--------------- SECTION 3: Ruby Clause-6 ----------
+
+Ruby Clause-6 is applicable to the following component(s).
+
+
+>>> highline-1.5.2
+
+[PLEASE NOTE:  GOPIVOTAL, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE RUBY LICENSE. PLEASE SEE BELOW FOR THE FULL TEXT OF THE RUBY LICENSE.  THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.] 
+
+
+Created by James Edward Gray II on 2005-04-26.
+Copyright 2005 Gray Productions. All rights reserved.
+
+License Terms
+
+Distributed under the user's choice of the {GPL Version 2}[http://www.gnu.org/licenses/old-licenses/gpl-2.0.html] (see COPYING for details) or the
+{Ruby software license}[http://www.ruby-lang.org/en/LICENSE.txt] by
+James Edward Gray II and Greg Brown.
 
-Ruby Clause-6 are applicable to the following component(s).
+Please email James[mailto:james@grayproductions.net] with any questions.
 
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
+You can redistribute it and/or modify it under either the terms of the GPL
+(see COPYING.txt file), or the conditions below:
+
+1. You may make and give away verbatim copies of the source form of the
+software without restriction, provided that you duplicate all of the
+original copyright notices and associated disclaimers.
+
+2. You may modify your copy of the software in any way, provided that
+you do at least ONE of the following:
+
+a) place your modifications in the Public Domain or otherwise
+make them Freely Available, such as by posting said
+modifications to Usenet or an equivalent medium, or by allowing
+the author to include your modifications in the software.
+
+b) use the modified software only within your corporation or
+organization.
+
+c) rename any non-standard executables so the names do not conflict
+with standard executables, which must also be provided.
+
+d) make other distribution arrangements with the author.
+
+3. You may distribute the software in object code or executable
+form, provided that you do at least ONE of the following:
+
+a) distribute the executables and library files of the software,
+together with instructions (in the manual page or equivalent)
+on where to get the original distribution.
+
+b) accompany the distribution with the machine-readable source of
+the software.
+
+c) give non-standard executables non-standard names, with
+instructions on where to get the original software distribution.
+
+d) make other distribution arrangements with the author.
+
+4. You may modify and include the part of the software into any other
+software (possibly commercial).  But some files in the distribution
+are not written by the author, so that they are not under this terms.
+
+They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+files under the ./missing directory.  See each file for the copying
+condition.
+
+5. The scripts and library files supplied as input to or produced as
+output from the software do not automatically fall under the
+copyright of the software, but belong to whomever generated them,
+and may be sold commercially, and may be aggregated with this
+software.
 
->>> json_pure-1.6.7
+6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.
 
-[PLEASE NOTE:  VMWARE, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE RUBY LICENSE STATED BELOW.  THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.]
 
+>>> json-1.4.6
 
-JSON-JRuby is copyrighted free software by Daniel Luz <mernen at gmail dot com>,
-and is a derivative work of Florian Frank's json library <flori at ping dot de>.
+[PLEASE NOTE:  GOPIVOTAL, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE RUBY CLAUSE-6 LICENSE.  PLEASE SEE THE APPENDIX TO REVIEW THE FULL TEXT OF THE RUBY CLAUSE-6 LICENSE.  THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.]
+
+License
+
+This is software is distributed under the same license as Ruby itself. See http://www.ruby-lang.org/en/LICENSE.txt.
+
+
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
 You can redistribute it and/or modify it under either the terms of the GPL
-version 2 (see the file GPL), or the conditions below:
+(see COPYING.txt file), or the conditions below:
 
   1. You may make and give away verbatim copies of the source form of the
      software without restriction, provided that you duplicate all of the
@@ -590,36 +778,37 @@ version 2 (see the file GPL), or the conditions below:
        b) use the modified software only within your corporation or
           organization.
 
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
+       c) rename any non-standard executables so the names do not conflict
+	  with standard executables, which must also be provided.
 
        d) make other distribution arrangements with the author.
 
-  3. You may distribute the software in object code or binary form,
-     provided that you do at least ONE of the following:
+  3. You may distribute the software in object code or executable
+     form, provided that you do at least ONE of the following:
 
-       a) distribute the binaries and library files of the software,
+       a) distribute the executables and library files of the software,
 	  together with instructions (in the manual page or equivalent)
 	  on where to get the original distribution.
 
        b) accompany the distribution with the machine-readable source of
 	  the software.
 
-       c) give non-standard binaries non-standard names, with
+       c) give non-standard executables non-standard names, with
           instructions on where to get the original software distribution.
 
        d) make other distribution arrangements with the author.
 
   4. You may modify and include the part of the software into any other
      software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under these terms.
+     are not written by the author, so that they are not under this terms.
 
-     For the list of those files and their copying conditions, see the
-     file LEGAL.
+     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+     files under the ./missing directory.  See each file for the copying
+     condition.
 
-  5. The scripts and library files supplied as input to or produced as
+  5. The scripts and library files supplied as input to or produced as 
      output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them,
+     copyright of the software, but belong to whomever generated them, 
      and may be sold commercially, and may be aggregated with this
      software.
 
@@ -629,32 +818,84 @@ version 2 (see the file GPL), or the conditions below:
      PURPOSE.
 
 
->>> mime-types-1.18
+>>> json_pure-1.8.0
+
+[PLEASE NOTE:  GOPIVOTAL, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE RUBYCLAUSE-6 LICENSE.  PLEASE SEE THE APPENDIX TO REVIEW THE FULL TEXT OF THE RUBYCLAUSE-6 LICENSE. THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE] 
+
+This code is copyrighted work by Daniel Luz <dev at mernen dot com>.
+
+Distributed under the Ruby and GPLv2 licenses; see COPYING and GPL files
+for details.
+
+
+>>> rubyzip-0.9.9
+
+License
+
+rubyzip is distributed under the same license as ruby. See
+http://www.ruby-lang.org/en/LICENSE.txt
+
+[PLEASE NOTE:  GOPIVOTAL, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE Ruby Clause-6.  PLEASE SEE THE APPENDIX TO REVIEW THE FULL TEXT OF THE Ruby Clause-6.  THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.]
+
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
 
-[PLEASE NOTE:  VMWARE, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE RUBY LICENSE.  PLEASE SEE THE APPENDIX TO REVIEW THE FULL TEXT OF RUBY LICENSE. THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.]
+       d) make other distribution arrangements with the author.
 
-== Licence
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
 
-This software is available under a triple disjunctive licence:
-{Ruby's licence}[http://www.ruby-lang.org/en/LICENSE.txt],
-the
-{Perl Artistic licence}[http://www.perl.com/pub/a/language/misc/Artistic.html],
-or the {GNU GPL version 2}[http://www.gnu.org/licenses/old-licenses/gpl-2.0.html]
-(or at your option, any later verison).
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
 
-If you do not accept one of these licences, you may not use this software.
+       b) accompany the distribution with the machine-readable source of
+	  the software.
 
-* Copyright 20032012 Austin Ziegler.
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
 
+       d) make other distribution arrangements with the author.
 
->>> rubyzip-0.9.8
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
 
-Copyright (C) 2002, 2003 Thomas Sondergaard
- rubyzip is free software; you can redistribute it and/or
- modify it under the terms of the ruby license.
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
 
 
-=============== APPENDIX. Standard License Files ==============
+=============== APPENDIX. Standard License Files ============== 
 
 
 
@@ -668,7 +909,7 @@ You can redistribute it and/or modify it under either the terms of the GPL
      software without restriction, provided that you duplicate all of the
      original copyright notices and associated disclaimers.
 
-
+ 
   2. You may modify your copy of the software in any way, provided that
      you do at least ONE of the following:
 
@@ -685,7 +926,7 @@ You can redistribute it and/or modify it under either the terms of the GPL
 
        d) make other distribution arrangements with the author.
 
-
+ 
   3. You may distribute the software in object code or executable
      form, provided that you do at least ONE of the following:
 
@@ -701,7 +942,7 @@ You can redistribute it and/or modify it under either the terms of the GPL
 
        d) make other distribution arrangements with the author.
 
-
+ 
   4. You may modify and include the part of the software into any other
      software (possibly commercial).  But some files in the distribution
      are not written by the author, so that they are not under this terms.
@@ -710,7 +951,7 @@ You can redistribute it and/or modify it under either the terms of the GPL
      files under the ./missing directory.  See each file for the copying
      condition.
 
-
+ 
   5. The scripts and library files supplied as input to or produced as
      output from the software do not automatically fall under the
      copyright of the software, but belong to whomever generated them,
@@ -733,14 +974,14 @@ available (as would be noted above), you may obtain a copy of
 the source code corresponding to the binaries for such open
 source components and modifications thereto, if any, (the
 "Source Files"), by downloading the Source Files from VMware's website at
-http://www.vmware.com/download/open_source.html, or by sending a request, with
-your name and address to: VMware, Inc., 3401 Hillview Avenue,
-Palo Alto, CA 94304,United States of America. All such
-requests should clearly specify: OPEN SOURCE FILES REQUEST,
-Attention General Counsel. VMware shall mail a copy of the
+http://www.vmware.com/download/open_source.html, or by sending a request, 
+with your name and address to: GoPivotal, Inc., 1900 S. Norfolk Street #125, 
+San Mateo, CA 94403, Attention: General Counsel. 
+All such requests should clearly specify: OPEN SOURCE FILES REQUEST,
+Attention General Counsel. GoPivotal shall mail a copy of the
 Source Files to you on a CD or equivalent physical medium. This
 offer to obtain a copy of the Source Files is valid for three
-years from the date you acquired this Software product. Alternatively,
-the Source Files may accompany the VMware product.
+years from the date you acquired this Software product. Alternatively, 
+the Source Files may accompany the GoPivotal product.
 
-[MAPLE-VMC10GAKV051412]
+[CFCFOUNDRY8152013AV081913]

data/lib/cfoundry/v2/base.rb

@@ -28,11 +28,28 @@ module CFoundry::V2
             "application/zip")
       end
 
-      put("v2", "apps", guid, "bits", :payload => payload)
+      response = put("v2", "apps", guid, "bits",
+        :payload => payload,
+        :params => {"async" => "true"},
+        :accept => :json)
+
+      poll_upload_until_finished(response[:metadata][:guid])
     rescue EOFError
       retry
     end
 
+    def poll_upload_until_finished(guid)
+      while true
+        response = get("v2", "jobs", guid, :accept => :json)
+        break if response[:entity][:status] == "finished"
+
+        if response[:entity][:status] == "failed"
+          raise CFoundry::BadResponse
+        end
+        sleep 0.2
+      end
+    end
+
     def files(guid, instance, *path)
       get("v2", "apps", guid, "instances", instance, "files", *path)
     end

data/lib/cfoundry/v2/service.rb

@@ -4,6 +4,7 @@ module CFoundry::V2
   class Service < Model
     attribute :label, String
     attribute :provider, String
+    attribute :unique_id, String
     attribute :url, :url
     attribute :description, String
     attribute :version, String
@@ -13,6 +14,7 @@ module CFoundry::V2
     attribute :timeout, Integer, :default => nil
     attribute :active, :boolean, :default => false
     attribute :extra, String
+    attribute :tags, [String]
     to_many   :service_plans
 
     queryable_by :service_plan_guid

data/lib/cfoundry/v2/service_plan.rb

@@ -4,6 +4,8 @@ module CFoundry::V2
   class ServicePlan < Model
     attribute :name, :string
     attribute :description, :string
+    attribute :unique_id, String
+    attribute :free, :boolean, :default => false
     attribute :extra, :string
     to_one    :service
     to_many   :service_instances

data/lib/cfoundry/v2/space.rb

@@ -10,6 +10,7 @@ module CFoundry::V2
     to_many   :apps
     to_many   :domains
     to_many   :service_instances
+    to_many   :services
 
     scoped_to_organization
 

data/lib/cfoundry/version.rb

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

data/spec/cfoundry/v2/base_spec.rb

@@ -245,10 +245,19 @@ describe CFoundry::V2::Base do
   describe "#upload_app" do
     let(:guid) { "some-guid" }
     let(:bits) { "some-bits" }
+    let(:job_guid) { "123abc" }
     let(:fake_zipfile) { File.new("#{SPEC_ROOT}/fixtures/empty_file") }
+    let(:upload_response) { %Q({"metadata":{"guid":"#{job_guid}"}}) }
+
+    before do
+      base.should_receive(:poll_upload_until_finished).with(job_guid)
+    end
 
     it "makes a PUT request to the app bits endpoint with the correct payload" do
-      stub = stub_request(:put, "https://api.example.com/v2/apps/#{guid}/bits").to_return(:body => "{}")
+      stub = stub_request(:put, "https://api.example.com/v2/apps/#{guid}/bits?async=true"
+      ).to_return(
+        :body => upload_response
+      )
       base.upload_app(guid, fake_zipfile)
       expect(stub).to have_been_requested
     end
@@ -258,12 +267,12 @@ describe CFoundry::V2::Base do
         stub =
           stub_request(
             :put,
-            "https://api.example.com/v2/apps/#{guid}/bits"
+            "https://api.example.com/v2/apps/#{guid}/bits?async=true"
           ).with { |request|
             request.body =~ /name="resources"/ &&
               request.body !~ /name="application"/
           }.to_return(
-            :body => "{}"
+            :body => upload_response
           )
         base.upload_app(guid)
         expect(stub).to have_been_requested
@@ -271,6 +280,34 @@ describe CFoundry::V2::Base do
     end
   end
 
+  describe "#poll_upload_until_finished" do
+    let(:job_guid) { "123abc" }
+
+    it "makes a GET request" do
+      stub = WebMock::API.stub_request(:get, "https://api.example.com/v2/jobs/#{job_guid}"
+      ).to_return(
+        :body => %q({"metadata":{"guid":"123abc"},"entity":{"status":"running"}})
+      ).times(2).then.to_return(
+        :body => %q({"metadata":{"guid":"123abc"},"entity":{"status":"finished"}})
+      )
+      base.poll_upload_until_finished(job_guid)
+      expect(stub).to have_been_requested.times(3)
+    end
+
+    it "raises CFoundry::BadResponse if upload fails" do
+      stub = WebMock::API.stub_request(:get, "https://api.example.com/v2/jobs/#{job_guid}"
+      ).to_return(
+        :body => %q({"metadata":{"guid":"123abc"},"entity":{"status":"running"}})
+      ).times(2).then.to_return(
+        :body => %q({"metadata":{"guid":"123abc"},"entity":{"status":"failed"}})
+      )
+      expect {
+        base.poll_upload_until_finished(job_guid)
+      }.to raise_error(CFoundry::BadResponse)
+      expect(stub).to have_been_requested.times(3)
+    end
+  end
+
   describe "#stream_file" do
     let(:app_guid) { "1234" }
     let(:instance_guid) { "3456" }

data/spec/cfoundry/v2/service_plan_spec.rb

@@ -0,0 +1,48 @@
+require "spec_helper"
+
+module CFoundry
+  module V2
+    describe ServicePlan do
+      let(:client) { build(:client) }
+
+      subject do
+        build(:service_plan)
+      end
+
+      before :each do
+stub_request(:get, /\/service_plans\/service-plan-guid-\d{1,2}/).to_return :status => 200,
+          :headers => {'Content-Type' => 'application/json'},
+          :body => <<EOF
+  {
+    "metadata": {
+      "guid": "d1251ac1-fe42-4b4a-84d4-e31e95b547d8",
+      "url": "/v2/service_plans/d1251ac1-fe42-4b4a-84d4-e31e95b547d8",
+      "created_at": "2013-08-28T12:28:35+04:00",
+      "updated_at": "2013-08-28T12:33:27+04:00"
+    },
+    "entity": {
+      "name": "free",
+      "free": true,
+      "description": "free as in beer",
+      "unique_id": "0aa2f82c-6918-41df-b676-c275b5954ed7",
+      "extra": ""
+    }
+  }
+EOF
+      end
+
+      let(:uuid) { "4692e0ca-25ed-495e-9ae1-fcb0bcf26a96" }
+
+      it "has unique_id that can be mutated" do
+        subject.unique_id.should == "0aa2f82c-6918-41df-b676-c275b5954ed7"
+
+        subject.unique_id = uuid
+        subject.unique_id.should eq(uuid)
+      end
+
+      it "has free/paid indicator attribute" do
+        subject.free.should be_true
+      end
+    end
+  end
+end

data/spec/cfoundry/v2/service_spec.rb

@@ -0,0 +1,58 @@
+require "spec_helper"
+
+module CFoundry
+  module V2
+    describe Service do
+      let(:client) { build(:client) }
+
+      subject do
+        build(:service)
+      end
+
+      before :each do
+stub_request(:get, /\/services\/service-guid-\d{1,2}/).to_return :status => 200,
+          :headers => {'Content-Type' => 'application/json'},
+          :body => <<EOF
+  {
+    "metadata": {
+      "guid": "d1251ac1-fe42-4b4a-84d4-e31e95b547d8",
+      "url": "/v2/services/d1251ac1-fe42-4b4a-84d4-e31e95b547d8",
+      "created_at": "2013-08-28T12:28:35+04:00",
+      "updated_at": "2013-08-28T12:33:27+04:00"
+    },
+    "entity": {
+      "label": "rabbitmq",
+      "provider": "rabbitherd",
+      "url": "http://rabbitmq.com",
+      "description": "RabbitMQ service",
+      "version": "1.0",
+      "info_url": null,
+      "active": true,
+      "bindable": true,
+      "unique_id": "0aa2f82c-6918-41df-b676-c275b5954ed7",
+      "extra": "",
+      "tags": [
+
+      ],
+      "documentation_url": null,
+      "service_plans_url": "/v2/services/d1251ac1-fe42-4b4a-84d4-e31e95b547d8/service_plans"
+    }
+  }
+EOF
+      end
+
+      let(:uuid) { "4692e0ca-25ed-495e-9ae1-fcb0bcf26a96" }
+
+      it "has unique_id that can be mutated" do
+        subject.unique_id.should == "0aa2f82c-6918-41df-b676-c275b5954ed7"
+
+        subject.unique_id = uuid
+        subject.unique_id.should eq(uuid)
+      end
+
+      it "has tags" do
+        subject.tags.should == []
+      end
+    end
+  end
+end

data/spec/factories/services_factory.rb

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  factory :service, :class => CFoundry::V2::Service do
+    sequence(:guid) { |n| "service-guid-#{n}" }
+    ignore do
+      client { FactoryGirl.build(:client) }
+    end
+
+    initialize_with { new(guid, client) }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 4.3.6
+  version: 4.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -364,6 +364,8 @@ files:
 - spec/cfoundry/v2/organization_spec.rb
 - spec/cfoundry/v2/quota_definition_spec.rb
 - spec/cfoundry/v2/route_spec.rb
+- spec/cfoundry/v2/service_plan_spec.rb
+- spec/cfoundry/v2/service_spec.rb
 - spec/cfoundry/v2/space_spec.rb
 - spec/cfoundry/v2/user_provided_service_instance_spec.rb
 - spec/cfoundry/v2/user_spec.rb
@@ -377,6 +379,7 @@ files:
 - spec/factories/routes_factory.rb
 - spec/factories/service_instances_factory.rb
 - spec/factories/service_plans_factory.rb
+- spec/factories/services_factory.rb
 - spec/factories/spaces_factory.rb
 - spec/factories/user_provided_service_instances_factory.rb
 - spec/factories/users_factory.rb
@@ -449,21 +452,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3733304376660938363
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3733304376660938363
 requirements: []
 rubyforge_project: cfoundry
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: High-level library for working with the Cloud Foundry API.
@@ -503,6 +500,8 @@ test_files:
 - spec/cfoundry/v2/organization_spec.rb
 - spec/cfoundry/v2/quota_definition_spec.rb
 - spec/cfoundry/v2/route_spec.rb
+- spec/cfoundry/v2/service_plan_spec.rb
+- spec/cfoundry/v2/service_spec.rb
 - spec/cfoundry/v2/space_spec.rb
 - spec/cfoundry/v2/user_provided_service_instance_spec.rb
 - spec/cfoundry/v2/user_spec.rb
@@ -516,6 +515,7 @@ test_files:
 - spec/factories/routes_factory.rb
 - spec/factories/service_instances_factory.rb
 - spec/factories/service_plans_factory.rb
+- spec/factories/services_factory.rb
 - spec/factories/spaces_factory.rb
 - spec/factories/user_provided_service_instances_factory.rb
 - spec/factories/users_factory.rb