rs_user_policy 0.1.4 → 0.1.5

data/bin/rs_user_policy

@@ -89,7 +89,7 @@ end
 # Populate the user_assignments with extra bits..
 user_collection.users.each do |user|
   user_hash = user.to_hash
-  user_hash.delete(:permissions)
+  user_hash.delete("permissions")
   user_assignments[user.email].merge!(user_hash)
 end
 
@@ -124,7 +124,7 @@ net_new_users.each do |net_new_user_email|
       net_new_user_href = api_user.href
       net_new_user = UserResourceDetailMock.new(net_new_user_email, net_new_user_href)
       user_assignments[net_new_user_email].delete("create")
-    rescue RightApi::Exceptions::ApiException => e
+    rescue RightApi::ApiError => e
       log.error("Failed to create a user with the following properties.\n  Properties: #{JSON.pretty_generate(user_create_params)}\n  Error: #{e}")
       next
     end
@@ -166,7 +166,7 @@ begin
       end
     end
   end
-rescue RightApi::Exceptions::ApiException => e
+rescue RightApi::ApiError => e
   log.fatal("A RightScale API exception occurred - #{e}")
 end
 

data/lib/rs_user_policy/right_api/multi_client.rb

@@ -62,7 +62,7 @@ module RsUserPolicy
                 :parent => account_id
               }
             end
-          rescue ::RightApi::Exceptions::ApiException => e
+          rescue ::RightApi::ApiError => e
             raise e unless e.message =~ /Permission denied/
           end
           @accounts[account_id] = this_account

data/lib/rs_user_policy/right_api/permission_utilities.rb

@@ -44,7 +44,7 @@ module RsUserPolicy
 
       # Destroys all passed in permissions with the specified client.
       # This method handles deleting permissions in the appropriate order to avoid the dreaded;
-      # RightApi::Exceptions::ApiException: Error: HTTP Code: 422, Response body: A user must have the observer role.
+      # RightApi::ApiError: Error: HTTP Code: 422, Response body: A user must have the observer role.
       # TODO: Handle a 422 resulting from calling delete too quickly and attempting to remove "observer" when other deletes have not been committed
       #
       # @param [Array<RightApi::ResourceDetail>] permissions
@@ -53,7 +53,7 @@ module RsUserPolicy
       # @param [RightApi::Client] client
       #   An active RightApi::Client instance for the account referenced in account_href
       #
-      # @raise [RightApi::Exceptions::ApiException] If an unrecoverable API error has occurred.
+      # @raise [RightApi::ApiError] If an unrecoverable API error has occurred.
       #
       # @return [Hash] A hash where the keys are the permission hrefs destroyed, and the values are the role_title of those permissions
       def self.destroy_permissions(permissions, client)
@@ -67,7 +67,7 @@ module RsUserPolicy
 
       # Creates all the passed in permissions using the supplied client.
       # This method handles creating permissions with "observer" first in order to avoide the dreaded;
-      # RightApi::Exceptions::ApiException: Error: HTTP Code: 422, Response body: A user must have the observer role.
+      # RightApi::ApiError: Error: HTTP Code: 422, Response body: A user must have the observer role.
       #
       # @param [Hash] permissions
       #   A hash where the key is a RightScale API User href, and the value is a hash where the key is the permission role_title that the user should be granted, and the value is nil.
@@ -75,7 +75,7 @@ module RsUserPolicy
       # @param [RightApi::Client] client
       #   An active RightApi::Client instance for the account referenced in account_href
       #
-      # @raise [RightApi::Exceptions::ApiException] If an unrecoverable API error has occurred.
+      # @raise [RightApi::ApiError] If an unrecoverable API error has occurred.
       #
       # @return [Hash] The permissions input hash, where the nil values have been replaced with the href of the permission which was created.
       #

data/lib/rs_user_policy/user.rb

@@ -36,10 +36,10 @@ module RsUserPolicy
     # Converts this object to a hash which can be serialized
     def to_hash()
       rethash = {
-        :permissions => @permissions
+        "permissions" => @permissions
       }
       (@user.attributes - [:links]).each do |attr_sym|
-        rethash[attr_sym.to_sym] = @user.send(attr_sym.to_s)
+        rethash[attr_sym.to_s] = @user.send(attr_sym.to_s)
       end
       rethash
     end
@@ -69,7 +69,7 @@ module RsUserPolicy
     # @param [Hash] options Optional parameters
     # @option options [Bool] :dry_run If true, no API calls will be made, but the return value will contain the actions which would have been taken
     #
-    # @raise [RightApi::Exceptions::ApiException] If an unrecoverable API error has occurred.
+    # @raise [RightApi::ApiError] If an unrecoverable API error has occurred.
     #
     # @return [Hash] A hash where the keys are the permission hrefs destroyed, and the keys are the role_title of those permissions
     def clear_permissions(account_href, client, options={})
@@ -96,7 +96,7 @@ module RsUserPolicy
     # @param [Hash] options Optional parameters
     # @option options [Bool] :dry_run If true, no API calls will be made, but the return value will contain the actions which would have been taken
     #
-    # @raise [RightApi::Exceptions::ApiException] If an unrecoverable API error has occurred.
+    # @raise [RightApi::ApiError] If an unrecoverable API error has occurred.
     #
     # @return [Hash,Hash] A tuple where two hashes are returned.  The keys of the hashes are the href of the permission, and the values are the role_title of the permission.  The first hash is the permissions removed, and the second hash is the permissions added
     def set_api_permissions(permissions, account_href, client, options={})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rs_user_policy
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -16,17 +16,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.5.10
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2355040945407508027
+      hash: 710974494852960112
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2355040945407508027
+      hash: 710974494852960112
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24