Integration of OG Grant Roles with Rules

I would expect the rule to pass the role as-well.

Maybe it's a separate issue...
Is it possible to add new actions which grant and revoke user role?
Something like this:

/**
 * Implements hook_rules_action_info().
 */
function og_rules_rules_action_info() {
  $actions = array();

  $actions['og_rules_rules_grant_role'] = array(
    'label' => t('Grant a group role to a user'),
    'group' => t('Organic groups'),
    'parameter' => array(
      'group' => array(
        'type' => array_keys(og_get_all_group_entity()),
        'label' => t('Group'),
        'description' => t('Group'),
        'wrapped' => TRUE,
      ),
      'account' => array(
        'type' => 'user',
        'label' => t('The user which will be a granted a role.'),
      ),
      'og_role' => array(
        'type' => 'integer',
        'label' => t('The role ID.'),
      ),
    ),
  );

  $actions['og_rules_rules_revoke_user_role'] = array(
    'label' => t('Revoke a group role from a user'),
    'group' => t('Organic groups'),
    'parameter' => array(
      'group' => array(
        'type' => array_keys(og_get_all_group_entity()),
        'label' => t('Group'),
        'description' => t('Group'),
        'wrapped' => TRUE,
      ),
      'account' => array(
        'type' => 'user',
        'label' => t('The user which will lose a role.'),
      ),
      'og_role' => array(
        'type' => 'integer',
        'label' => t('The role ID.'),
      ),
    ),
  );

  return $actions;
}

function og_rules_rules_grant_role(EntityDrupalWrapper $group, $account, $rid) {
  if (FALSE == og_role_load($rid)) {
    throw new RulesEvaluationException('Unable to load group role with rid "@rid"', array('@rid' => $rid));
  }
  og_role_grant($group->type(), $group->getIdentifier(), $account->uid, $rid);
}

function og_rules_rules_revoke_user_role(EntityDrupalWrapper $group, $account, $rid) {
  if (FALSE == og_role_load($rid)) {
    throw new RulesEvaluationException('Unable to load group role with rid "@rid"', array('@rid' => $rid));
  }
  og_role_revoke($group->type(), $group->getIdentifier(), $account->uid, $rid);
}

I need this, so I've created a new patch against 7.x-2.x. It passes in the role id.

#6: og-add_og_role_events-1816800.patch queued for re-testing.

Rerolled without whitespace errors.

+++ b/og.module
@@ -2856,6 +2856,10 @@ function og_role_grant($group_type, $gid, $uid, $rid) {
+      rules_invoke_event('og_role_grant', og_get_membership('node', $gid, 'user', $uid), entity_metadata_wrapper('user', user_load($uid)), $rid);

Why hardcode to node?

You know, that's a very good question. Again...

(Also fixed a small typo.)

entity_metadata_wrapper() can get the $uid, no need to user_load() it.

Again...

Committed, thanks.