rhc 1.23.7 → 1.24.4

data/autocomplete/rhc_bash

@@ -10,9 +10,9 @@ _rhc()
     if [[ "$cur" == -* ]]; then
       opts="--always-prefix --clean --config --debug --insecure --limit --mock --noprompt --password --raw --rhlogin --server --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --token"
     elif [ -z $cur ]; then
-      opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-configure app-create app-delete app-deploy app-force-stop app-reload app-restart app-scale-down app-scale-up app-show app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage deployment deployment-activate deployment-list deployment-show domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show env env-list env-set env-show env-unset git-clone logout member member-add member-list member-remove member-update port-forward scp server setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail threaddump"
+      opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-configure app-create app-delete app-deploy app-force-stop app-reload app-restart app-scale-down app-scale-up app-show app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage deployment deployment-activate deployment-list deployment-show domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show env env-list env-set env-show env-unset git-clone logout member member-add member-list member-remove member-update port-forward scp server setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail team team-create team-delete team-leave team-list team-show threaddump"
     else
-      opts="account account-logout activate-deployment add-alias add-authorization add-cartridge add-member add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-configure app-create app-delete app-deploy app-env app-force-stop app-reload app-restart app-scale-down app-scale-up app-scp app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges configure-app configure-domain create-app create-domain delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain deploy deploy-app deployment deployment-activate deployment-list deployment-show deployments domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show domains env env-add env-list env-remove env-set env-show env-unset force-stop-app git-clone leave-domain list-alias list-authorization list-cartridge list-deployment list-domain list-env list-member list-sshkey logout member member-add member-list member-remove member-update members port-forward reload-app reload-cartridge remove-alias remove-cartridge remove-member remove-sshkey rename-domain restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge scale-down-app scale-up-app scp server set-env setup show-app show-cartridge show-deployment show-domain show-env show-sshkey snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show start-app start-cartridge status-cartridge stop-app stop-cartridge storage-cartridge tail threaddump tidy-app unset-env update-cert-alias update-member"
+      opts="account account-logout activate-deployment add-alias add-authorization add-cartridge add-member add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-configure app-create app-delete app-deploy app-env app-force-stop app-reload app-restart app-scale-down app-scale-up app-scp app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges configure-app configure-domain create-app create-domain create-team delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain delete-team deploy deploy-app deployment deployment-activate deployment-list deployment-show deployments domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show domains env env-add env-list env-remove env-set env-show env-unset force-stop-app git-clone leave-domain leave-team list-alias list-authorization list-cartridge list-deployment list-domain list-env list-member list-sshkey list-team logout member member-add member-list member-remove member-update members port-forward reload-app reload-cartridge remove-alias remove-cartridge remove-member remove-sshkey rename-domain restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge scale-down-app scale-up-app scp server set-env setup show-app show-cartridge show-deployment show-domain show-env show-sshkey show-team snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show start-app start-cartridge status-cartridge stop-app stop-cartridge storage-cartridge tail team team-create team-delete team-leave team-list team-show teams threaddump tidy-app unset-env update-cert-alias update-member"
     fi
   else
     prev="${COMP_WORDS[@]:0:COMP_CWORD}"
@@ -78,7 +78,7 @@ _rhc()
 
       "rhc add-member")
         if [[ "$cur" == -* ]]; then
-          opts="--global --ids --namespace --role --type"
+          opts="--global --ids --namespace --role --team-id --team-name --type"
         else
           opts=""
         fi
@@ -780,6 +780,14 @@ _rhc()
         fi
         ;;
 
+      "rhc create-team")
+        if [[ "$cur" == -* ]]; then
+          opts="--team-name"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc delete-all-authorization")
         if [[ "$cur" == -* ]]; then
           opts=""
@@ -820,6 +828,14 @@ _rhc()
         fi
         ;;
 
+      "rhc delete-team")
+        if [[ "$cur" == -* ]]; then
+          opts="--team-id --team-name"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc deploy")
         if [[ "$cur" == -* ]]; then
           opts="--app --application-id --force-clean-build --hot-deploy --namespace --no-force-clean-build --no-hot-deploy --ref"
@@ -1156,6 +1172,14 @@ _rhc()
         fi
         ;;
 
+      "rhc leave-team")
+        if [[ "$cur" == -* ]]; then
+          opts="--team-id --team-name"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc list-alias")
         if [[ "$cur" == -* ]]; then
           opts="--app --application-id --namespace"
@@ -1206,7 +1230,7 @@ _rhc()
 
       "rhc list-member")
         if [[ "$cur" == -* ]]; then
-          opts="--all --app --ids --namespace --target"
+          opts="--all --app --ids --namespace --target --team-id --team-name"
         else
           opts=""
         fi
@@ -1220,6 +1244,14 @@ _rhc()
         fi
         ;;
 
+      "rhc list-team")
+        if [[ "$cur" == -* ]]; then
+          opts="--mine"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc logout")
         if [[ "$cur" == -* ]]; then
           opts="--all"
@@ -1238,7 +1270,7 @@ _rhc()
 
       "rhc member add")
         if [[ "$cur" == -* ]]; then
-          opts="--global --ids --namespace --role --type"
+          opts="--global --ids --namespace --role --team-id --team-name --type"
         else
           opts=""
         fi
@@ -1246,7 +1278,7 @@ _rhc()
 
       "rhc member list")
         if [[ "$cur" == -* ]]; then
-          opts="--all --app --ids --namespace --target"
+          opts="--all --app --ids --namespace --target --team-id --team-name"
         else
           opts=""
         fi
@@ -1254,7 +1286,7 @@ _rhc()
 
       "rhc member remove")
         if [[ "$cur" == -* ]]; then
-          opts="--all --ids --namespace --type"
+          opts="--all --ids --namespace --team-id --team-name --type"
         else
           opts=""
         fi
@@ -1270,7 +1302,7 @@ _rhc()
 
       "rhc member-add")
         if [[ "$cur" == -* ]]; then
-          opts="--global --ids --namespace --role --type"
+          opts="--global --ids --namespace --role --team-id --team-name --type"
         else
           opts=""
         fi
@@ -1278,7 +1310,7 @@ _rhc()
 
       "rhc member-list")
         if [[ "$cur" == -* ]]; then
-          opts="--all --app --ids --namespace --target"
+          opts="--all --app --ids --namespace --target --team-id --team-name"
         else
           opts=""
         fi
@@ -1286,7 +1318,7 @@ _rhc()
 
       "rhc member-remove")
         if [[ "$cur" == -* ]]; then
-          opts="--all --ids --namespace --type"
+          opts="--all --ids --namespace --team-id --team-name --type"
         else
           opts=""
         fi
@@ -1302,7 +1334,7 @@ _rhc()
 
       "rhc members")
         if [[ "$cur" == -* ]]; then
-          opts="--all --app --ids --namespace --target"
+          opts="--all --app --ids --namespace --target --team-id --team-name"
         else
           opts=""
         fi
@@ -1350,7 +1382,7 @@ _rhc()
 
       "rhc remove-member")
         if [[ "$cur" == -* ]]; then
-          opts="--all --ids --namespace --type"
+          opts="--all --ids --namespace --team-id --team-name --type"
         else
           opts=""
         fi
@@ -1508,6 +1540,14 @@ _rhc()
         fi
         ;;
 
+      "rhc show-team")
+        if [[ "$cur" == -* ]]; then
+          opts="--team-id --team-name"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc snapshot")
         if [[ "$cur" == -* ]]; then
           opts=""
@@ -1684,6 +1724,102 @@ _rhc()
         fi
         ;;
 
+      "rhc team")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts="create show list delete leave"
+        fi
+        ;;
+
+      "rhc team create")
+        if [[ "$cur" == -* ]]; then
+          opts="--team-name"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc team delete")
+        if [[ "$cur" == -* ]]; then
+          opts="--team-id --team-name"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc team leave")
+        if [[ "$cur" == -* ]]; then
+          opts="--team-id --team-name"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc team list")
+        if [[ "$cur" == -* ]]; then
+          opts="--mine"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc team show")
+        if [[ "$cur" == -* ]]; then
+          opts="--team-id --team-name"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc team-create")
+        if [[ "$cur" == -* ]]; then
+          opts="--team-name"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc team-delete")
+        if [[ "$cur" == -* ]]; then
+          opts="--team-id --team-name"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc team-leave")
+        if [[ "$cur" == -* ]]; then
+          opts="--team-id --team-name"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc team-list")
+        if [[ "$cur" == -* ]]; then
+          opts="--mine"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc team-show")
+        if [[ "$cur" == -* ]]; then
+          opts="--team-id --team-name"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc teams")
+        if [[ "$cur" == -* ]]; then
+          opts="--mine"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc threaddump")
         if [[ "$cur" == -* ]]; then
           opts="--app --application-id --namespace"

data/features/members_feature.rb

@@ -104,7 +104,7 @@ describe "rhc member scenarios" do
         members.any?{ |m| m.id == other_users[user1].id && m.editor? }.should be_true
         members.any?{ |m| m.id == other_users[user2].id && m.editor? }.should be_true
 
-        r = rhc 'remove-member', domain.name, '--all'
+        r = rhc 'remove-member', '-n', domain.name, '--all'
         r.status.should == 0
         r.stdout.should match "Removing all members from domain.*done"
         members = client.find_domain(domain.name).members

data/lib/rhc/commands/app.rb

@@ -116,8 +116,8 @@ module RHC::Commands
             :url => (cartridge.url if cartridge.custom?),
             :gear_size => options.gear_size || cartridge.gear_profile,
             :additional_gear_storage => (cartridge.additional_gear_storage if cartridge.additional_gear_storage > 0),
-            :scales_from => (cartridge.scales_from if cartridge.scalable?),
-            :scales_to => (cartridge.scales_to if cartridge.scalable?)
+            :scales_from => (cartridge.scales_from if scaling && cartridge.scalable?),
+            :scales_to => (cartridge.scales_to if scaling && cartridge.scalable?)
           }.reject{|k,v| v.nil? }
         end
       end

data/lib/rhc/commands/cartridge.rb

@@ -130,6 +130,7 @@ module RHC::Commands
     def remove(cartridge)
       rest_app = find_app(:include => :cartridges)
       rest_cartridge = check_cartridges(cartridge, :from => rest_app.cartridges).first
+      external_zero_gears = external_zero_gears_cartridge?(rest_cartridge)
 
       confirm_action "Removing a cartridge is a destructive operation that may result in loss of data associated with the cartridge.\n\nAre you sure you wish to remove #{rest_cartridge.name} from '#{rest_app.name}'?"
 
@@ -139,6 +140,8 @@ module RHC::Commands
 
       paragraph{ rest_cartridge.messages.each { |msg| success msg } }
 
+      paragraph{ warn 'There may be external resources or accounts associated with this external cartridge that need to be removed manually.' } if external_zero_gears
+
       0
     end
 
@@ -325,5 +328,9 @@ module RHC::Commands
         end
         resp
       end
+
+      def external_zero_gears_cartridge?(rest_cartridge)
+        rest_cartridge.external? && rest_cartridge.current_scale == 0
+      end
   end
 end

data/lib/rhc/commands/member.rb

@@ -2,53 +2,82 @@ require 'rhc/commands/base'
 
 module RHC::Commands
   class Member < Base
-    summary "Manage membership on domains"
+    summary "Manage membership on domains and teams"
     syntax "<action>"
     description <<-DESC
-      Developers can collaborate on applications by adding people or teams to
-      domains as members: each member has a role (admin, editor, or viewer),
-      and those roles determine what the user can do with the domain and the
-      applications contained within.
+      Domain Membership
+        Developers can collaborate on applications by adding people or teams to
+        domains as members. Each member has a role (admin, edit, or view),
+        and those roles determine what the user can do with the domain and the
+        applications contained within.
 
-      Roles:
+        Domain Member Roles
 
-        view  - able to see information about the domain and its apps, but not make any changes
-        edit  - create, update, and delete applications, and has Git and SSH access
-        admin - can update membership of a domain
+          view  - able to see the domain and its apps, but not make any changes
+          edit  - create, update, and delete applications, and has Git and SSH access
+          admin - can update membership of a domain
+
+        The default role granted to domain members is 'edit' - use the '--role' 
+        argument to specify a different role. When adding and removing members, you 
+        can use their 'login' value (typically their email or a short unique name for
+        them), or their 'id'.  Both login and ID are visible via the 'rhc account' 
+        command.
+
+        To see existing members of a domain or application, use:
+
+          rhc members -n DOMAIN_NAME [-a APP_NAME]
+
+        To change the role for a domain member, simply call the update-member command 
+        with the new role. You cannot change the role of the owner.
+
+      Team Membership
+        People who typically share the same role can be added to a team. The team can
+        then be added as a member of a domain, and all of the people in the team will
+        inherit the team's role on the domain.
+
+        If a person is a member of multiple teams which are members of a domain, or
+        is also added as a domain member individually, their effective role is the 
+        higher of their individual role or their teams' roles on the domain.
 
-      The default role granted to members when added is 'edit' - use the '--role'
-      argument to use another.  When adding and removing members, you can use their
-      'login' value (typically their email or a short unique name for them) or their
-      'id'.  Both login and ID are visible via the 'rhc account' command.
+        Team Member Roles
+          view  - able to see information about the team and its members, and
+                  has access to all domains the team is a member of
 
-      To see existing members of a domain or application, use:
+        To see existing members of a team, use:
 
-        rhc members -n <domain_name> [-a <app_name>]
+          rhc members -t TEAM_NAME
 
-      To change the role for a user, simply call the add-member command with the new role. You
-      cannot change the role of the owner.
       DESC
     syntax "<action>"
     default_action :help
 
-    summary "List members of a domain or application"
-    syntax "<domain_or_app_name> [-n DOMAIN_NAME] [-a APP_NAME] [--all]"
+    summary "List members of a domain, application, or team"
+    syntax [
+      "<domain_name>[/<app_name>] [--all]",
+      "-n DOMAIN_NAME [--all]",
+      "-n DOMAIN_NAME -a APP_NAME [--all]",
+      nil,
+      "-t TEAM_NAME"
+    ]
     description <<-DESC
-      Show the existing members of a domain or application - you can pass the name
-      of your domain with '-n', the name of your application with '-a', or combine
-      them in the first argument to the command like:
+      Show the existing members of a domain, application, or team.
 
-        rhc members <domain_name>/[<app_name>]
+      To show the members of a domain or application, you can pass the name of your 
+      domain with '-n', the name of your application with '-a', or combine them in
+      the first argument to the command like:
+        rhc members <domain_name>[/<app_name>]
 
-      The owner is always listed first.  To see the unique ID of members, pass
-      '--ids'.
+      To show the members of a team, you can pass the name of the team with '-t':
+        rhc members -t TEAM_NAME
+
+      The owner is always listed first.  To see the unique ID of members, pass '--ids'.
       DESC
     option ['--ids'], "Display the IDs of each member", :optional => true
     option ['--all'], "Display all members, including members of teams", :optional => true
-    takes_application_or_domain :argument => true
+    takes_membership_container :argument => true
     alias_action :members, :root_command => true
-    def list(path)
-      target = find_app_or_domain(path)
+    def list(_)
+      target = find_membership_container
 
       members = target.members
       if options.all
@@ -98,48 +127,66 @@ module RHC::Commands
       0
     end
 
-    summary "Add a member on a domain"
-    syntax "(<login>... | <team name>... | <id>...) [-n DOMAIN_NAME] [--role view|edit|admin] [--ids] [--type user|team] [--global]"
+    summary "Add a member to a domain or team"
+    syntax [
+      "-n DOMAIN_NAME [--role view|edit|admin] <login>...",
+      "-n DOMAIN_NAME [--role view|edit|admin] <team_name>... --type team [--global]",
+      "-n DOMAIN_NAME [--role view|edit|admin] <id>... --ids [--type user|team]",
+      nil,
+      "-t TEAM_NAME <login>...",
+      "-t TEAM_NAME <id>... --ids",
+    ]
     description <<-DESC
-      Adds members on a domain by passing a user login, team name, or ID for each 
-      member. The login and ID for each account are displayed in 'rhc account'.
-      To change the role for an existing domain member, use the 'rhc member update'
-      command.
+      Domain Membership
+        Add members to a domain by passing a user login, team name, or ID for each 
+        member. The login and ID for each account are displayed in 'rhc account'.
+        To change the role for an existing domain member, use the 'rhc member update'
+        command.
 
-      Roles
-        view  - able to see information about the domain and its apps,
-                but not make any changes
-        edit  - create, update, and delete applications, and has Git
-                and SSH access
-        admin - can update membership of a domain
+        Domain Member Roles
+          view  - able to see information about the domain and its apps,
+                  but not make any changes
+          edit  - create, update, and delete applications, and has Git
+                  and SSH access
+          admin - can update membership of a domain
+
+          The default role granted to domain members is 'edit'.
+          Use the '--role' argument for 'view' or 'admin'.
 
-      The default role granted to members when added is 'edit' - use the '--role'
-      argument for 'view' or 'admin'.
+      Team Membership
+        Add users to a team by passing a user login, or ID for each member.
+
+        Team Member Roles
+          view  - able to see information about the team and its members, and
+                  has access to all domains the team is a member of
 
       Examples
         rhc add-member sally joe -n mydomain
           Gives the accounts with logins 'sally' and 'joe' edit access on mydomain
 
-        rhc add-member bob@example.com --role admin -n mydomain
-          Gives the account with login 'bob@example.com' admin access on mydomain
+        rhc add-member bob --role admin -n mydomain
+          Gives the account with login 'bob' admin access on mydomain
 
         rhc add-member team1 --type team --role admin -n mydomain
           Gives your team named 'team1' admin access on mydomain
 
+        rhc add-member steve -t team1
+          Adds the account with login 'steve' as a member of your team named 'team1'
       DESC
-    takes_domain
-    option ['--ids'], "Treat the arguments as a list of IDs", :optional => true
-    option ['-r', '--role ROLE'], "The role to give to each member - view, edit, or admin (default is 'edit')", :type => Role, :optional => true
-    option ['--type TYPE'], "Type of argument(s) being passed. Accepted values are either 'team' or 'user' (default is 'user').", :optional => true
-    option ['--global'], "Use global-scoped teams. Must be used with '--type team'.", :optional => true
+    takes_membership_container :writable => true
+    option ['--ids'], "Add member(s) by ID", :optional => true
+    option ['-r', '--role ROLE'], "The role to give to each member - view, edit, or admin (default is 'edit' for domains, 'view' for teams)", :type => Role, :optional => true
+    option ['--type TYPE'], "Type of member(s) being added - user or team (default is 'user').", :optional => true
+    option ['--global'], "Add global-scoped teams as members. Must be used with '--type team'.", :optional => true
     argument :members, "A list of members (user logins, team names, or IDs) to add. Pass --ids to treat this as a list of IDs.", [], :type => :list
     def add(members)
-      target = find_domain
-      role = get_role_option(options)
+      target = find_membership_container :writable => true
+
+      role = get_role_option(options, target)
       type = get_type_option(options)
       global = !!options.global
 
-      raise ArgumentError, 'You must pass at least one user login, team name, or ID to this command.' unless members.present?
+      raise ArgumentError, 'You must pass at least one member to this command.' unless members.present?
       raise ArgumentError, "The --global option can only be used with '--type team'." if global && !team?(type)
       
       say "Adding #{pluralize(members.length, role_name(role))} to #{target.class.model_name.downcase} ... "
@@ -153,7 +200,11 @@ module RHC::Commands
     end
 
     summary "Update a member on a domain"
-    syntax "(<login>... | <team name>... | <id>...) --role view|edit|admin [-n DOMAIN_NAME] [--ids] [--type user|team]"
+    syntax [
+      "-n DOMAIN_NAME --role view|edit|admin <login>...",
+      "-n DOMAIN_NAME --role view|edit|admin <team_name>... --type team",
+      "-n DOMAIN_NAME --role view|edit|admin <id>... --ids [--type user|team]",
+    ]
     description <<-DESC
       Updates members on a domain by passing a user login, team name, or ID for 
       each member. You can use the 'rhc members' command to list the existing 
@@ -166,31 +217,28 @@ module RHC::Commands
                 and SSH access
         admin - can update membership of a domain
 
-      The default role granted to members when added is 'edit' - use the '--role'
-      argument for 'view' or 'admin'.
-
       Examples
-        rhc update-member bob@example.com --role view -n mydomain
-          Adds or updates the member with login 'bob@example.com' to 'admin' role on mydomain
+        rhc update-member -n mydomain --role view bob
+          Adds or updates the user with login 'bob' to 'admin' role on mydomain
 
-        rhc update-member team1 --type team --role admin -n mydomain
+        rhc update-member -n mydomain --role admin team1 --type team
           Updates the team member with name 'team1' to the 'admin' role on mydomain
 
-        rhc update-member team1_id --type team --role admin -n mydomain --ids
+        rhc update-member -n mydomain --role admin team1_id --ids --type team
           Adds or updates the team with ID 'team1_id' to the 'admin' role on mydomain
 
       DESC
     takes_domain
-    option ['--ids'], "Treat the arguments as a list of IDs", :optional => true
-    option ['-r', '--role ROLE'], "The role to give to each member - view, edit, or admin (default is 'edit')", :type => Role, :optional => true
-    option ['--type TYPE'], "Type of argument(s) being passed. Accepted values are either 'team' or 'user' (default is 'user').", :optional => true
+    option ['--ids'], "Update member(s) by ID", :optional => true
+    option ['-r', '--role ROLE'], "The role to give to each member - view, edit, or admin", :type => Role, :optional => false
+    option ['--type TYPE'], "Type of member(s) being updated - user or team (default is 'user').", :optional => true
     argument :members, "A list of members (user logins, team names, or IDs) to update.  Pass --ids to treat this as a list of IDs.", [], :type => :list
     def update(members)
       target = find_domain
-      role = get_role_option(options)
+      role = get_role_option(options, target)
       type = get_type_option(options)
 
-      raise ArgumentError, 'You must pass at least one user login, team name, or ID to this command.' unless members.present?
+      raise ArgumentError, 'You must pass at least one member to this command.' unless members.present?
       
       say "Updating #{pluralize(members.length, role_name(role))} to #{target.class.model_name.downcase} ... "
       
@@ -202,22 +250,33 @@ module RHC::Commands
       0
     end
 
-    summary "Remove a member from a domain"
-    syntax "(<login>... | <team name>... | <id>...) [-n DOMAIN_NAME] [--ids] [--type user|team]"
+    summary "Remove a member from a domain or team"
+    syntax [
+      "-n DOMAIN_NAME <login>...",
+      "-n DOMAIN_NAME <team_name>... --type team",
+      "-n DOMAIN_NAME <id>... --ids [--type user|team]",
+      nil,
+      "-t TEAM_NAME <login>...",
+      "-t TEAM_NAME <id>... --ids",
+    ]
     description <<-DESC
       Remove members from a domain by passing a user login, team name, or ID for each
       member you wish to remove.  View the list of existing members with
-      'rhc members <domain_name>'.
+        rhc members -n DOMAIN_NAME
 
-      Pass '--all' to remove all but the owner from the domain.
+      Remove members from a team by passing a user login, or ID for each
+      member you wish to remove.  View the list of existing members with
+        rhc members -t TEAM_NAME
+
+      Pass '--all' to remove all members but the owner.
       DESC
-    takes_domain
-    option ['--ids'], "Treat the arguments as a list of IDs"
-    option ['--all'], "Remove all members from this domain."
-    option ['--type TYPE'], "Type of argument(s) being passed. Accepted values are either 'team' or 'user' (default is 'user').", :optional => true
-    argument :members, "A list of members (user logins, team names, or IDs) to remove from the domain.  Pass --ids to treat this as a list of IDs.", [], :type => :list
+    takes_membership_container :writable => true
+    option ['--ids'], "Remove member(s) by ID."
+    option ['--all'], "Remove all members"
+    option ['--type TYPE'], "Type of member(s) being removed - user or team (default is 'user').", :optional => true
+    argument :members, "A list of members (user logins, team names, or IDs) to remove.  Pass --ids to treat this as a list of IDs.", [], :type => :list
     def remove(members)
-      target = find_domain
+      target = find_membership_container :writable => true
       type = get_type_option(options)
 
       if options.all
@@ -226,7 +285,7 @@ module RHC::Commands
         success "done"
 
       else
-        raise ArgumentError, 'You must pass at least one user login, team name, or ID to this command.' unless members.present?
+        raise ArgumentError, 'You must pass at least one member to this command.' unless members.present?
 
         say "Removing #{pluralize(members.length, 'member')} from #{target.class.model_name.downcase} ... "
 
@@ -240,22 +299,13 @@ module RHC::Commands
     end
 
     protected
-      def get_role_option(options, default_value='edit')
-        options.role || default_value
+      def get_role_option(options, target)
+        options.role || target.default_member_role
       end
 
-      def get_type_option(options, default_value='user')
+      def get_type_option(options)
         type = options.__hash__[:type]
-        case type
-        when 'team'
-          type
-        when 'user'
-          type
-        when nil
-          default_value
-        else
-          raise ArgumentError, "The type '#{type}' is not valid. Type must be 'user' or 'team'."
-        end
+        type || 'user'
       end
 
       def changes_for(members, role, type)