cfoundry_helper 0.2.1 → 0.2.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmNmZDdhZDg0NmU3YTYzZDA3YWRhOGFhMmUzMTk4ODk5OGJkZjlmYw==
+  data.tar.gz: !binary |-
+    NWQ4OWNkM2JmNmNhMjM1MDE0OWIwZmRmMGQxZGI3MmMyZmJjMGQzNQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MDY5MzQ4Nzc1YTA2MmQ4MjJlM2M4Nzk5Y2MwN2NiNTQ1ZDI2Nzc4YTYwZjQw
+    OWEwZDFmNTE5ODJiNjU1MzdiMDIzZWZjYTgxMTRiZTNmMWI5ZmJjNzMxOGU2
+    ZmQ5YTVmYzMzZGI4NzY3M2I5ZGYwNzA3MTY4M2JlM2JlZWMyZmY=
+  data.tar.gz: !binary |-
+    MWE4ZDc0Yzc3YmIxMTYyN2I3YmNmZTYwZmVkMDFjZDRjYWExMzJmYmUxNjY0
+    ODI2MjJkNTJiODYyZjUwMWZlNWJmYTU5MmUyZTEzNjg0MTgwMDY2ZThlMTJl
+    NTVlZTc0NGY2MGJmZjY0NTE2MmVjNTFlNzZjZWVkYTY0MDE4ZjA=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cfoundry_helper (0.2.1)
+    cfoundry_helper (0.2.2)
       activesupport
       cfoundry
 
@@ -21,7 +21,7 @@ GEM
     builder (3.1.4)
     cf-uaa-lib (2.0.0)
       multi_json
-    cfoundry (4.3.6)
+    cfoundry (4.3.8)
       activemodel (>= 3.2.13, < 5.0.0)
       cf-uaa-lib (~> 2.0.0)
       multi_json (~> 1.7)

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/cfoundry_helper.rb

@@ -7,6 +7,9 @@ Bundler.require
 module CFoundryHelper
   autoload :Helpers, File.expand_path('../cfoundry_helper/helpers', __FILE__)
   autoload :Models, File.expand_path('../cfoundry_helper/models', __FILE__)
+  
+  @@config = nil
+  @@config_file_path = nil
 
   def self.env
     unless ENV['RAILS_ENV']
@@ -15,4 +18,46 @@ module CFoundryHelper
       ENV['RAILS_ENV'].to_sym
     end
   end
+  
+  def self.config
+    self.read_config_file
+  end
+  
+  def self.set_config_file_path(path)
+    @@config_file_path = path
+  end
+
+  def self.config_file_path
+    return @@config_file_path
+  end
+  
+  
+  protected
+
+  # reads the uaa and cc configuration from a config file
+  def self.read_config_file
+    # try to set the config file path from the env if not set already
+    self.set_config_file_path_from_env if @@config_file_path.nil?
+
+    if @@config.nil?
+      self.check_config_file_path
+      @@config = YAML.load_file(@@config_file_path)[CFoundryHelper.env.to_s]
+    end
+    @@config
+  end
+
+  def self.check_config_file_path
+    raise "No configuration file path has been set! Please call ClientHelper.set_config_file_path first or set a valid CFOUNDRY_HELPER_CONFIG env variable!" if @@config_file_path.nil?
+    raise "There's no configuration file on #{@@config_file_path}!" if !File.exists? @@config_file_path
+  end
+
+  # sets the configuration file path from reading the CFOUNDRY_HELPER_CONFIG env variable
+  def self.set_config_file_path_from_env
+    config_file_path = ENV["CFOUNDRY_HELPER_CONFIG"]
+    unless config_file_path.nil?
+      self.set_config_file_path config_file_path
+    end
+  end
 end
+
+CFoundryHelper.config

data/lib/cfoundry_helper/helpers/client_helper.rb

@@ -2,19 +2,10 @@ require 'yaml'
 
 module CFoundryHelper::Helpers
   module ClientHelper
-    @@config = nil
     @@scim_client = nil
     @@cloud_controller_client = nil
-    @@config_file_path = nil
     @@auth_token = nil
 
-    def self.set_config_file_path(path)
-      @@config_file_path = path
-    end
-
-    def self.config_file_path
-      return @@config_file_path
-    end
 
     def self.get_cc_target_url
       return self.cloud_controller_client.target
@@ -36,15 +27,14 @@ module CFoundryHelper::Helpers
       # just return the already initialized client if present
       return @@scim_client unless @@scim_client.nil?
 
-      self.read_config_file
       token_issuer = CF::UAA::TokenIssuer.new(
-          @@config['uaa']['site'],
-          @@config['uaa']['client_id'],
-          @@config['uaa']['client_secret'])
+          CFoundryHelper.config['uaa']['site'],
+          CFoundryHelper.config['uaa']['client_id'],
+          CFoundryHelper.config['uaa']['client_secret'])
 
       token_info = token_issuer.client_credentials_grant
       access_token = token_info.info["access_token"]
-      @@scim_client = CF::UAA::Scim.new(@@config['uaa']['site'], "bEareR #{access_token}")
+      @@scim_client = CF::UAA::Scim.new(CFoundryHelper.config['uaa']['site'], "bEareR #{access_token}")
     end
 
     ##
@@ -57,13 +47,12 @@ module CFoundryHelper::Helpers
       # TODO: Refresh the token with the uaa refresh method.
       return @@cloud_controller_client if @@cloud_controller_client
 
-      self.read_config_file
-      token_issuer = CF::UAA::TokenIssuer.new(@@config['uaa']['site'], "cf")
-      token_info = token_issuer.implicit_grant_with_creds(@@config['cloud_controller'])
+      token_issuer = CF::UAA::TokenIssuer.new(CFoundryHelper.config['uaa']['site'], "cf")
+      token_info = token_issuer.implicit_grant_with_creds(CFoundryHelper.config['cloud_controller'])
       access_token = token_info.info["access_token"]
       token = CFoundry::AuthToken.from_hash({:token => "bearer #{access_token}"})
       @@auth_token = token
-      CFoundry::V2::Client.new(@@config['cloud_controller']['site'], token)
+      CFoundry::V2::Client.new(CFoundryHelper.config['cloud_controller']['site'], token)
     end
 
 
@@ -75,32 +64,7 @@ module CFoundryHelper::Helpers
       @@cloud_controller_client = client
     end
 
-    protected
 
-    # reads the uaa and cc configuration from a config file
-    def self.read_config_file
-      # try to set the config file path from the env if not set already
-      self.set_config_file_path_from_env if @@config_file_path.nil?
-
-      if @@config.nil?
-        self.check_config_file_path
-        @@config = YAML.load_file(@@config_file_path)[CFoundryHelper.env.to_s]
-      end
-      @@config
-    end
-
-    def self.check_config_file_path
-      raise "No configuration file path has been set! Please call ClientHelper.set_config_file_path first or set a valid CFOUNDRY_HELPER_CONFIG env variable!" if @@config_file_path.nil?
-      raise "There's no configuration file on #{@@config_file_path}!" if !File.exists? @@config_file_path
-    end
-
-    # sets the configuration file path from reading the CFOUNDRY_HELPER_CONFIG env variable
-    def self.set_config_file_path_from_env
-      config_file_path = ENV["CFOUNDRY_HELPER_CONFIG"]
-      unless config_file_path.nil?
-        self.set_config_file_path config_file_path
-      end
-    end
 
   end
 end

data/lib/cfoundry_helper/version.rb

@@ -1,3 +1,3 @@
 module CFoundryHelper
-  VERSION = "0.2.1"
-end
+  VERSION = "0.2.2"
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry_helper
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - Julian Weber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nats
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -242,30 +217,26 @@ files:
 homepage: http://www.anynines.com
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3457547663060522280
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This gem provides additional helper classes and scripts for the cfoundry
   gem.
 test_files: