cfoundry_helper 0.3.2 → 0.3.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDQ0NGVkYWQzNWEyMzc4ZWI1MWZhOTRmZTMyOTBiYmI0MWQ5ZWE0Ng==
-  data.tar.gz: !binary |-
-    NWY3NjhhNzA3Njg5YmJmZjY3M2E0M2Y4OTdmZmNiY2Q0MWQzM2ViOQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YTgzZTViY2FhMmM0ZjY5YjFhYTMwMjUyNTQ5MTE4YWNlYzRkMzZhOTJkYWNh
-    NzI4MTgwNTYzMDNkZDFiNGJmYmQ4NzI3ODY2NjU4ZjA0YTI2MzEyOGM0NTY4
-    NzhlOWQyYzU1ZTZhZTc1ZDY3OGFlOTk1NzBjYWRkMmVjOTUzYTI=
-  data.tar.gz: !binary |-
-    ZjNlNmYyMjk2M2FkZDUzOGM3ODUxYjIyNGNhZGM1ZjI3ZjgzZTZmOGE4ZTFi
-    ZDdmNDdhMWYyZjg2MDgwODZhOWE1OGEwZDZlMzgyOGMxMzAxNmM0NmI4ZDBi
-    ODM5OTAzZDk5OGIwNmIxOTI5MGE1MjVmMWYxMWE2MGQ0Mjk5MWY=
+SHA1:
+  metadata.gz: 19904dfa34730a958d5094029a7b231b24b01968
+  data.tar.gz: e4d21a700c8c1f3ae817ae086b7b46e042c5da53
+SHA512:
+  metadata.gz: 5e0bd11fcc89ae298939e6cd181055a4f06fcd01cbcea5b65e94994c864c54d16d175b5cdd90cb0d5bf9e4dbd19c53c4c1557374976c6e261c47b8f2abd9f2ab
+  data.tar.gz: a7b99e2619e04bf586419dba24129f0b3b6156ee6979fb7f3d1475ea0e708f400b8d28141dcc79a4774748360ecdadaf1febbd2c193db63ac094e5d3a6c75c29

data/.gitignore

@@ -6,3 +6,4 @@ pkg/
 pkg/*
 .DS_Store
 bin/.DS_Store
+.bundle

data/CHANGELOG.textile

@@ -1,3 +1,7 @@
+h2. v0.3.3
+* update jwt gem version to 1.0.0
+* fixes jwt usage in ClientHelper
+
 h2. v0.3.2
 * requests a new token from the uaa if the token is expired
 

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    cfoundry_helper (0.3.2)
+    cfoundry_helper (0.3.3)
       activesupport
       cfoundry
-      jwt
+      jwt (>= 1.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -22,7 +22,7 @@ GEM
     builder (3.1.4)
     cf-uaa-lib (2.0.0)
       multi_json
-    cfoundry (4.6.1)
+    cfoundry (4.7.1)
       activemodel (>= 3.2.13, < 5.0.0)
       cf-uaa-lib (~> 2.0.0)
       multi_json (~> 1.7)
@@ -42,11 +42,10 @@ GEM
     httpclient (2.3.4.1)
     i18n (0.6.5)
     json_pure (1.8.0)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
+    jwt (1.0.0)
     method_source (0.8.2)
     minitest (4.7.5)
-    multi_json (1.8.2)
+    multi_json (1.10.1)
     multipart-post (1.2.0)
     nats (0.4.28)
       daemons (>= 1.1.5)

data/README.textile

@@ -10,14 +10,14 @@ a) You can configure multiple targets within a configuration file. Please execut
 
 b) You can also configure the targets by passing in a configuration hash:
 	CfoundryHelper.load_config_from_hash config_hash
-	
+
 !!! It is important to load a configuration using one of the methods above before executing any helper functions.
-     
+
 
 h2. Target Selection
 
-Since cfoundry_helper now supports multiple CF targets you have to set your desired target by using the 
-CFoundryHelper::Helpers::ClientHelper.current_target_url= method for selecting a target from your service configuration file. 
+Since cfoundry_helper now supports multiple CF targets you have to set your desired target by using the
+CFoundryHelper::Helpers::ClientHelper.current_target_url= method for selecting a target from your service configuration file.
 You can list all configured targets using the CFoundryHelper.available_targets method.
 
 !!! It is important to select a target before executing any helper functions, e.g:
@@ -36,7 +36,7 @@ h2. User management
 The CFoundryHelper::Helpers::UserHelper module provides methods for managing users within the system:
 
 * get user by email
-* create a user 
+* create a user
 * delete a user
 * change a user's password
 
@@ -46,7 +46,7 @@ The CFoundryHelper::Helpers::OrganizationHelper modules' methods provide helper
 * create a space within an organization
 * add/remove Users from spaces
 * administer User roles within a space
-* empty a space (remove all apps, service_bindings, service_instances, routes and domains from the space) 
+* empty a space (remove all apps, service_bindings, service_instances, routes and domains from the space)
 * delete a space
 
 h2. Client Helper
@@ -61,8 +61,12 @@ h2. Scripts
 * bin/create_space_for_org : creates a space to an organization and assigns all organization members to it
     ** usage : bundle exec bin/create_space_for_org <org name> <space name> <services_config_file_location>
 
+h2. Documentation
+
+* You can find additional documentation in the doc directory.
+* You can find usage examples in the doc/examples and bin directories.
 
 h2. Console Usage
 
-Use the following command to start the console: 
+Use the following command to start the console:
     bundle exec rake c

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/cfoundry_helper.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "cfoundry"
   spec.add_dependency "activesupport"
-  spec.add_dependency "jwt"
+  spec.add_dependency "jwt", ">= 1.0.0"
 end

data/doc/examples/delete_user_recursive.rb

@@ -0,0 +1,31 @@
+# preparation) start the console using: bundle exec rake c
+
+# connect to cc & uaa
+CFoundryHelper.load_config_from_file "config/services.yml"
+CFoundryHelper::Helpers::ClientHelper.current_target_url = CFoundryHelper.available_targets.first
+
+# get the infos
+email = "testemail@example.com"
+user = CFoundryHelper::Helpers::UserHelper.get_user_by_email email
+orgs = user.organizations
+
+# puts orgs and spaces
+orgs.each do |org|
+     puts org.name
+     puts "Spaces:"
+     puts ""
+     org.spaces.each do |sp|
+          puts sp.name
+     end
+     puts ""
+end
+
+# delete all orgs recursively
+orgs.each do |org|
+     puts "Deleting: #{org.name}"
+     CFoundryHelper::Helpers::OrganizationHelper.delete_organization_recursive(org)
+end
+
+# delete the user
+puts "Deleting the user with email: #{email}"
+user.delete!

data/lib/cfoundry_helper/helpers/client_helper.rb

@@ -11,7 +11,7 @@ module CFoundryHelper::Helpers
     def self.current_target_url=(url)
       @@current_target_url = url
     end
-    
+
     def self.current_target_url
       return @@current_target_url
     end
@@ -35,17 +35,17 @@ module CFoundryHelper::Helpers
     def self.scim_client
       # just return the already initialized client if present
       raise CFoundryHelper::Errors::ConfigurationError, "The ClientHelper's current target url is not defined in the configuration yaml file!" if CFoundryHelper.config[@@current_target_url].nil?
-      
+
       return @@scim_client unless @@scim_client.nil?
 
-      token_issuer = CF::UAA::TokenIssuer.new(
+      token_issuer = ::CF::UAA::TokenIssuer.new(
           CFoundryHelper.config[@@current_target_url]['uaa']['site'],
           CFoundryHelper.config[@@current_target_url]['uaa']['client_id'],
           CFoundryHelper.config[@@current_target_url]['uaa']['client_secret'])
 
       token_info = token_issuer.client_credentials_grant
       access_token = token_info.info["access_token"]
-      @@scim_client = CF::UAA::Scim.new(CFoundryHelper.config[@@current_target_url]['uaa']['site'], "bEareR #{access_token}")
+      @@scim_client = ::CF::UAA::Scim.new(CFoundryHelper.config[@@current_target_url]['uaa']['site'], "bEareR #{access_token}")
     end
 
     ##
@@ -54,11 +54,11 @@ module CFoundryHelper::Helpers
     def self.cloud_controller_client
       # just return the already initialized client if present
       raise CFoundryHelper::Errors::ConfigurationError, "The ClientHelper's current target url is not defined in the configuration!" if CFoundryHelper.config[@@current_target_url].nil?
-      
+
       # just return the already initialized client if the auth token is not expired.
       return @@cloud_controller_client unless is_auth_token_expired?
 
-      token_issuer = CF::UAA::TokenIssuer.new(CFoundryHelper.config[@@current_target_url]['uaa']['site'], "cf")
+      token_issuer = ::CF::UAA::TokenIssuer.new(CFoundryHelper.config[@@current_target_url]['uaa']['site'], "cf")
       token_info = token_issuer.implicit_grant_with_creds(CFoundryHelper.config[@@current_target_url]['cloud_controller'])
       access_token = token_info.info["access_token"]
       token = CFoundry::AuthToken.from_hash({:token => "bearer #{access_token}"})
@@ -74,18 +74,20 @@ module CFoundryHelper::Helpers
     def self.set_cc_client(client)
       @@cloud_controller_client = client
     end
-    
+
     private
-    
+
     # Check that the Cloud Foundry auth token isn't expierd.
     # Returns true if the auth_token is expired or uninitialized.
     def self.is_auth_token_expired?
       return true if @@auth_token.nil?
-      
+
       decoded_token = ::JWT.decode(@@auth_token.auth_header.split(' ')[1], nil, false)
 
+      # this is returned as an array from jwt since version 1.0.0
+      decoded_token = decoded_token.first if decoded_token.class == Array
       return true if Time.at(decoded_token['exp']) < Time.now
       return false
     end
   end
-end
+end

data/lib/cfoundry_helper/version.rb

@@ -1,3 +1,3 @@
 module CFoundryHelper
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry_helper
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Julian Weber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,170 +28,170 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nats
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cfoundry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 description: This gem provides additional helper classes and scripts for the cfoundry
   gem.
 email:
@@ -216,6 +216,7 @@ files:
 - bin/delete_orgs_and_users
 - cfoundry_helper.gemspec
 - config/services.yml.example
+- doc/examples/delete_user_recursive.rb
 - lib/cfoundry_helper.rb
 - lib/cfoundry_helper/errors.rb
 - lib/cfoundry_helper/helpers.rb
@@ -239,17 +240,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: This gem provides additional helper classes and scripts for the cfoundry