rhc 1.22.5 → 1.23.7

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 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 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 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"
+      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"
     fi
   else
     prev="${COMP_WORDS[@]:0:COMP_CWORD}"
@@ -78,7 +78,7 @@ _rhc()
 
       "rhc add-member")
         if [[ "$cur" == -* ]]; then
-          opts="--ids --namespace --role"
+          opts="--global --ids --namespace --role --type"
         else
           opts=""
         fi
@@ -192,7 +192,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="create delete start stop scale-up scale-down force-stop restart reload tidy show deploy configure env snapshot"
+          opts="env snapshot create delete start stop scale-up scale-down force-stop restart reload tidy show deploy configure"
         fi
         ;;
 
@@ -1206,7 +1206,7 @@ _rhc()
 
       "rhc list-member")
         if [[ "$cur" == -* ]]; then
-          opts="--app --ids --namespace --target"
+          opts="--all --app --ids --namespace --target"
         else
           opts=""
         fi
@@ -1232,13 +1232,13 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="list add remove"
+          opts="list add update remove"
         fi
         ;;
 
       "rhc member add")
         if [[ "$cur" == -* ]]; then
-          opts="--ids --namespace --role"
+          opts="--global --ids --namespace --role --type"
         else
           opts=""
         fi
@@ -1246,7 +1246,7 @@ _rhc()
 
       "rhc member list")
         if [[ "$cur" == -* ]]; then
-          opts="--app --ids --namespace --target"
+          opts="--all --app --ids --namespace --target"
         else
           opts=""
         fi
@@ -1254,7 +1254,15 @@ _rhc()
 
       "rhc member remove")
         if [[ "$cur" == -* ]]; then
-          opts="--all --ids --namespace"
+          opts="--all --ids --namespace --type"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc member update")
+        if [[ "$cur" == -* ]]; then
+          opts="--ids --namespace --role --type"
         else
           opts=""
         fi
@@ -1262,7 +1270,7 @@ _rhc()
 
       "rhc member-add")
         if [[ "$cur" == -* ]]; then
-          opts="--ids --namespace --role"
+          opts="--global --ids --namespace --role --type"
         else
           opts=""
         fi
@@ -1270,7 +1278,7 @@ _rhc()
 
       "rhc member-list")
         if [[ "$cur" == -* ]]; then
-          opts="--app --ids --namespace --target"
+          opts="--all --app --ids --namespace --target"
         else
           opts=""
         fi
@@ -1278,7 +1286,15 @@ _rhc()
 
       "rhc member-remove")
         if [[ "$cur" == -* ]]; then
-          opts="--all --ids --namespace"
+          opts="--all --ids --namespace --type"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc member-update")
+        if [[ "$cur" == -* ]]; then
+          opts="--ids --namespace --role --type"
         else
           opts=""
         fi
@@ -1286,7 +1302,7 @@ _rhc()
 
       "rhc members")
         if [[ "$cur" == -* ]]; then
-          opts="--app --ids --namespace --target"
+          opts="--all --app --ids --namespace --target"
         else
           opts=""
         fi
@@ -1334,7 +1350,7 @@ _rhc()
 
       "rhc remove-member")
         if [[ "$cur" == -* ]]; then
-          opts="--all --ids --namespace"
+          opts="--all --ids --namespace --type"
         else
           opts=""
         fi
@@ -1700,6 +1716,14 @@ _rhc()
         fi
         ;;
 
+      "rhc update-member")
+        if [[ "$cur" == -* ]]; then
+          opts="--ids --namespace --role --type"
+        else
+          opts=""
+        fi
+        ;;
+
     esac
     IFS=$SAVE_IFS
   fi

data/features/core_feature.rb

@@ -50,6 +50,7 @@ describe "rhc core scenarios" do
   context "when creating an app" do
     when_running 'create-app', 'test1', a_web_cartridge
     before{ no_applications }
+    after { no_applications }
     it "returns the proper info and is in the rest api" do
       status.should == 0
       output.should match "Your application 'test1' is now available"
@@ -69,6 +70,7 @@ describe "rhc core scenarios" do
       standard_config
       @app = has_an_application
     end
+    after(:all){ @app.destroy }
 
     let(:app){ @app }
 

data/lib/rhc/commands/domain.rb

@@ -149,8 +149,9 @@ module RHC::Commands
       domain = rest_client.find_domain(namespace)
 
       say "Leaving domain ... "
-      domain.leave
+      result = domain.leave
       success "done"
+      result.messages.each{ |s| paragraph{ say s } }
 
       0
     end

data/lib/rhc/commands/member.rb

@@ -5,7 +5,7 @@ module RHC::Commands
     summary "Manage membership on domains"
     syntax "<action>"
     description <<-DESC
-      Teams of developers can collaborate on applications by adding people to
+      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.
@@ -32,7 +32,7 @@ module RHC::Commands
     default_action :help
 
     summary "List members of a domain or application"
-    syntax "<domain_or_app_name> [-n DOMAIN_NAME] [-a APP_NAME]"
+    syntax "<domain_or_app_name> [-n DOMAIN_NAME] [-a APP_NAME] [--all]"
     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
@@ -44,33 +44,67 @@ module RHC::Commands
       '--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
     alias_action :members, :root_command => true
     def list(path)
       target = find_app_or_domain(path)
-      members = target.members.sort_by{ |m| [m.owner? ? 0 : 1, m.role_weight, m.name] }
-      show_name = members.any?{ |m| m.name && m.name != m.login }
-      members.map! do |m|
-        [
-          ((m.name || "") if show_name),
-          m.login || "",
-          m.owner? ? "#{m.role} (owner)" : m.role,
-          (m.id if options.ids)
-        ].compact
+
+      members = target.members
+      if options.all
+        show_members = members.sort
+      else
+        show_members = members.select do |m| 
+          if m.owner?
+            true
+          elsif m.explicit_role?
+            true
+          elsif m.from.any? {|f| f["type"] != "team" }
+            true
+          else
+            false
+          end
+        end.sort
+      end
+      show_name = show_members.any?{ |m| m.name.presence && m.name != m.login }
+      show_login = show_members.any?{ |m| m.login.presence }
+      
+      if show_members.present?
+        say table(show_members.map do |member|
+          [
+            ((member.name || "") if show_name),
+            ((member.login || "") if show_login),
+            role_description(member, member.teams(members)),
+            (member.id if options.ids),
+            member.type
+          ].compact
+        end, :header => [
+          ('Name' if show_name),
+          ('Login' if show_login),
+          'Role',
+          ("ID" if options.ids),
+          "Type"
+        ].compact)
+      else
+        info "The #{target.class.model_name.downcase} #{target.name} does not have any members."
+      end
+
+      if show_members.count < members.count
+        paragraph do
+          info "Pass --all to display all members, including members of teams."
+        end
       end
-      say table(members, :header => [('Name' if show_name), 'Login', 'Role', ("ID" if options.ids)].compact)
 
       0
     end
 
-    summary "Add or update a member on a domain"
-    syntax "<login> [<login>...] [-n DOMAIN_NAME] [--role view|edit|admin] [--ids]"
+    summary "Add a member on a domain"
+    syntax "(<login>... | <team name>... | <id>...) [-n DOMAIN_NAME] [--role view|edit|admin] [--ids] [--type user|team] [--global]"
     description <<-DESC
-      Adds or updates members on a domain by passing one or more login
-      or ids for other people on OpenShift.  The login and ID values for each
-      account are displayed in 'rhc account'. 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.
+      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.
 
       Roles
         view  - able to see information about the domain and its apps,
@@ -89,26 +123,89 @@ module RHC::Commands
         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 team1 --type team --role admin -n mydomain
+          Gives your team named 'team1' admin access 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 'edit')", :type => Role, :optional => true
-    argument :members, "A list of members logins to add.  Pass --ids to treat this as a list of IDs.", [], :type => :list
+    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
+    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 = options.role || 'edit'
-      raise ArgumentError, 'You must pass one or more logins or ids to this command' unless members.present?
+      role = get_role_option(options)
+      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, "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} ... "
-      target.update_members(changes_for(members, role))
+      
+      members = search_teams(members, global).map{|member| member.id} if team?(type) && !options.ids
+      target.update_members(changes_for(members, role, type))
+
+      success "done"
+
+      0
+    end
+
+    summary "Update a member on a domain"
+    syntax "(<login>... | <team name>... | <id>...) --role view|edit|admin [-n DOMAIN_NAME] [--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 
+      members of your domain. You cannot change the role of the owner.
+
+      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 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 team1 --type team --role admin -n mydomain
+          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
+          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
+    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)
+      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?
+      
+      say "Updating #{pluralize(members.length, role_name(role))} to #{target.class.model_name.downcase} ... "
+      
+      members = search_team_members(target.members, members).map{|member| member.id} if team?(type) && !options.ids
+      target.update_members(changes_for(members, role, type))
+
       success "done"
 
       0
     end
 
     summary "Remove a member from a domain"
-    syntax "<login> [<login>...] [-n DOMAIN_NAME] [--ids]"
+    syntax "(<login>... | <team name>... | <id>...) [-n DOMAIN_NAME] [--ids] [--type user|team]"
     description <<-DESC
-      Remove members on a domain by passing one or more login or ids for each
+      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>'.
 
@@ -117,9 +214,11 @@ module RHC::Commands
     takes_domain
     option ['--ids'], "Treat the arguments as a list of IDs"
     option ['--all'], "Remove all members from this domain."
-    argument :members, "Member logins to remove from the domain.  Pass --ids to treat this as a list of IDs.", [], :type => :list
+    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
     def remove(members)
       target = find_domain
+      type = get_type_option(options)
 
       if options.all
         say "Removing all members from #{target.class.model_name.downcase} ... "
@@ -127,9 +226,13 @@ module RHC::Commands
         success "done"
 
       else
-        raise ArgumentError, 'You must pass one or more logins or ids to this command' unless members.present?
+        raise ArgumentError, 'You must pass at least one user login, team name, or ID to this command.' unless members.present?
+
         say "Removing #{pluralize(members.length, 'member')} from #{target.class.model_name.downcase} ... "
-        target.update_members(changes_for(members, 'none'))
+
+        members = search_team_members(target.members, members).map{|member| member.id} if team?(type) && !options.ids
+        target.update_members(changes_for(members, 'none', type))
+
         success "done"
       end
 
@@ -137,12 +240,131 @@ module RHC::Commands
     end
 
     protected
-      def changes_for(members, role)
+      def get_role_option(options, default_value='edit')
+        options.role || default_value
+      end
+
+      def get_type_option(options, default_value='user')
+        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
+      end
+
+      def changes_for(members, role, type)
         members.map do |m|
-          h = {:role => role}
-          h[options.ids ? :id : :login] = m
+          h = {:role => role, :type => type}
+          h[options.ids ||  team?(type) ? :id : :login] = m
           h
         end
       end
+
+      def team?(type)
+        type == 'team'
+      end
+
+      def search_teams(team_names, global=false)
+        r = []
+        team_names.each do |team_name|
+          teams_for_name = 
+            global ? 
+              rest_client.search_teams(team_name, global) : 
+              rest_client.search_owned_teams(team_name)
+
+          team_for_name = nil
+          suggestions = nil
+
+          if (exact_matches = teams_for_name.select {|t| t.name == team_name }).present?
+            if exact_matches.length == 1
+              team_for_name = exact_matches.first
+            else
+              raise RHC::TeamNotFoundException.new("There is more than one team named '#{team_name}'. " +
+                "Please use the --ids flag and specify the exact id of the team you want to manage.")
+            end
+
+          elsif (case_insensitive_matches = teams_for_name.select {|t| t.name =~ /^#{Regexp.escape(team_name)}$/i }).present?
+            if case_insensitive_matches.length == 1
+              team_for_name = case_insensitive_matches.first
+            else
+              suggestions = case_insensitive_matches
+            end
+
+          else
+            suggestions = teams_for_name
+          end
+
+
+          if team_for_name
+            r << team_for_name
+          elsif suggestions.present?
+            msg = global ? "No global team found with the name '#{team_name}'." : "You do not have a team named '#{team_name}'."
+            raise RHC::TeamNotFoundException.new(msg + " Did you mean one of the following?\n#{suggestions[0..50].map(&:name).join(", ")}")
+          else
+            msg = global ? "No global team found with the name '#{team_name}'." : "You do not have a team named '#{team_name}'."
+            raise RHC::TeamNotFoundException.new(msg)
+          end
+
+        end
+        r.flatten
+      end
+
+      def search_team_members(members, names)
+        r = []
+        team_members = members.select(&:team?)
+        names.each do |name|
+
+          team_for_name = nil
+          suggestions = nil
+
+          if (exact_matches = team_members.select{|team| team.name == name }).present?
+            if exact_matches.length == 1
+              team_for_name = exact_matches.first
+            else
+              raise RHC::MemberNotFoundException.new("There is more than one member team named '#{name}'. " +
+                "Please use the --ids flag and specify the exact id of the team you want to manage.")
+            end
+
+          elsif (case_insensitive_matches = team_members.select{|team| team.name =~ /^#{Regexp.escape(name)}$/i}).present?
+            if case_insensitive_matches.length == 1
+              team_for_name = case_insensitive_matches.first
+            else
+              suggestions = case_insensitive_matches
+            end
+
+          else
+            suggestions = team_members.select{|t| t.name =~ /#{Regexp.escape(name)}/i}
+          end
+
+          if team_for_name
+            r << team_for_name
+          elsif suggestions.present?
+            raise RHC::MemberNotFoundException.new("No member team found with the name '#{name}'. " +
+              "Did you mean one of the following?\n#{suggestions[0..50].map(&:name).join(", ")}")
+          else
+            raise RHC::MemberNotFoundException.new("No member team found with the name '#{name}'.")
+          end
+
+        end
+        r.flatten
+      end
+
+      def role_description(member, teams=[])
+        if member.owner?
+          "#{member.role} (owner)"
+        elsif member.explicit_role != member.role && member.from.all? {|f| f['type'] == 'domain'}
+          "#{member.role} (via domain)"
+        elsif member.explicit_role != member.role && teams.present? && (teams_with_role = teams.select{|t| t.role == member.role }).present?
+          "#{member.role} (via #{teams_with_role.map(&:name).sort.join(', ')})"
+        else
+          member.role
+        end
+      end
   end
-end
+end