rhc 1.22.5 → 1.23.7

data/lib/rhc/commands/scp.rb

@@ -13,7 +13,7 @@ module RHC::Commands
       cartridge) by default.
 
       Examples:
-        Uploading a file from your workding directory to your app-root/data directory
+        Uploading a file from your working directory to your app-root/data directory
           rhc scp myapp upload somefile.txt app-root/data
 
         Downloading a file from your app-root/data directory to your working directory

data/lib/rhc/exceptions.rb

@@ -67,6 +67,24 @@ module RHC
     end
   end
 
+  class TeamsNotSupportedException < Exception
+    def initialize(message="Server does not support teams")
+      super message, 161
+    end
+  end
+
+  class TeamNotFoundException < Exception
+    def initialize(message="Team not found")
+      super message, 162
+    end
+  end
+
+  class MemberNotFoundException < Exception
+    def initialize(message="Member not found")
+      super message, 163
+    end
+  end
+
   class GitPermissionDenied < GitException; end
   class GitDirectoryExists < GitException; end
 

data/lib/rhc/helpers.rb

@@ -437,7 +437,7 @@ module RHC
     def run_with_tee(cmd)
       status, stdout, stderr = nil
 
-      if windows?
+      if windows? || jruby?
         #:nocov: TODO: Test block
         system(cmd)
         status = $?.exitstatus

data/lib/rhc/rest.rb

@@ -18,6 +18,7 @@ module RHC
     autoload :GearGroup,            'rhc/rest/gear_group'
     autoload :Key,                  'rhc/rest/key'
     autoload :Membership,           'rhc/rest/membership'
+    autoload :Team,                 'rhc/rest/team'
     autoload :User,                 'rhc/rest/user'
 
     class Exception < RuntimeError

data/lib/rhc/rest/client.rb

@@ -64,6 +64,38 @@ module RHC
         @user ||= api.rest_method "GET_USER"
       end
 
+      def teams
+        debug "Getting all teams"
+        if link = api.link_href(:LIST_TEAMS)
+          @teams ||= api.rest_method "LIST_TEAMS"
+        else
+          raise RHC::TeamsNotSupportedException
+        end
+      end
+
+      def owned_teams
+        debug "Getting owned teams"
+        if link = api.link_href(:LIST_TEAMS_BY_OWNER)
+          @owned_teams ||= api.rest_method "LIST_TEAMS_BY_OWNER", :owner => '@self'
+        else
+          raise RHC::TeamsNotSupportedException
+        end
+      end
+
+      def search_teams(search, global=false)
+        debug "Searching teams"
+        if link = api.link_href(:SEARCH_TEAMS)
+          api.rest_method "SEARCH_TEAMS", :search => search, :global => global
+        else
+          raise RHC::TeamsNotSupportedException
+        end
+      end
+
+      def search_owned_teams(search)
+        debug "Searching owned teams"
+        owned_teams.select{|team| team.name.downcase =~ /#{Regexp.escape(search)}/i}
+      end
+
       #Find Domain by namespace
       def find_domain(id)
         debug "Finding domain #{id}"
@@ -550,6 +582,12 @@ module RHC
             data.map{ |json| EnvironmentVariable.new(json, self) }
           when 'deployments'
             data.map{ |json| Deployment.new(json, self) }
+          when 'teams'
+            data.map{ |json| Team.new(json, self) }
+          when 'member'
+            RHC::Rest::Membership::Member.new(data, self)
+          when 'members'
+            data.map{ |json| RHC::Rest::Membership::Member.new(json, self) }
           else
             data
           end

data/lib/rhc/rest/membership.rb

@@ -1,22 +1,54 @@
 module RHC::Rest
   module Membership
     class Member < Base
+
       define_attr :name, :login, :id, :type, :from, :role, :owner, :explicit_role
+
       def owner?
         !!owner
       end
+
       def admin?
         role == 'admin'
       end
+
       def editor?
         role == 'edit'
       end
+
       def viewer?
         role == 'view'
       end
+
+      def team?
+        type == 'team'
+      end
+
       def name
         attributes['name'] || login
       end
+
+      def type
+        attributes['type'] || 'user'
+      end
+
+      def explicit_role?
+        explicit_role.present?
+      end
+
+      def from
+        Array(attributes['from'])
+      end
+
+      def grant_from?(type, id)
+        from.detect {|f| f['type'] == type && f['id'] == id}
+      end
+
+       def teams(members)
+        team_ids = from.inject([]) {|ids, f| ids << f['id'] if f['type'] == 'team'; ids }
+        members.select {|m| m.team? && team_ids.include?(m.id) }
+      end
+
       def to_s
         if name == login
           "#{login} (#{role})"
@@ -26,12 +58,21 @@ module RHC::Rest
           "#{name} (#{role})"
         end
       end
+
+      def <=>(other)
+        [role_weight, type, name, id] <=> [other.role_weight, other.type, other.name, other.id]
+      end
+
       def role_weight
-        case role
-        when 'admin' then 0
-        when 'edit' then 1
-        when 'view' then 2
-        else 3
+        if owner?
+          0
+        else
+          case role
+          when 'admin' then 1
+          when 'edit' then 2
+          when 'view' then 3
+          else 4
+          end
         end
       end
     end

data/lib/rhc/rest/mock.rb

@@ -428,11 +428,18 @@ module RHC::Rest::Mock
     end
 
     def mock_real_client_links
-      [['GET_USER',        "broker/rest/user",       'GET'],
-       ['LIST_DOMAINS',    "broker/rest/domains",    'GET'],
-       ['ADD_DOMAIN',      "broker/rest/domains",    'POST', ({'optional_params' => [{'name' => 'allowed_gear_sizes'}]} if example_allows_gear_sizes?)].compact,
-       ['LIST_CARTRIDGES', "broker/rest/cartridges", 'GET'],
-      ]
+      mock_teams_links.concat([
+       ['GET_USER',               "broker/rest/user",       'GET'],
+       ['LIST_DOMAINS',           "broker/rest/domains",    'GET'],
+       ['ADD_DOMAIN',             "broker/rest/domains",    'POST', ({'optional_params' => [{'name' => 'allowed_gear_sizes'}]} if example_allows_gear_sizes?)].compact,
+       ['LIST_CARTRIDGES',        "broker/rest/cartridges", 'GET'],
+      ])
+    end
+
+    def mock_teams_links
+      [['SEARCH_TEAMS',           "broker/rest/teams",      'GET'],
+       ['LIST_TEAMS',             "broker/rest/teams",      'GET'],
+       ['LIST_TEAMS_BY_OWNER',    "broker/rest/teams",      'GET']]
     end
 
     def mock_api_with_authorizations
@@ -696,6 +703,12 @@ module RHC::Rest::Mock
       @applications
     end
 
+    def init_members
+      @members ||= []
+      attributes['members'] ||= []
+      self
+    end
+
     def add_member(member)
       (@members ||= []) << member
       (attributes['members'] ||= []) << member.attributes
@@ -902,6 +915,12 @@ module RHC::Rest::Mock
       end
     end
 
+    def init_members
+      @members ||= []
+      attributes['members'] ||= []
+      self
+    end
+
     def add_member(member)
       (@members ||= []) << member
       (attributes['members'] ||= []) << member.attributes

data/lib/rhc/rest/team.rb

@@ -0,0 +1,20 @@
+module RHC
+  module Rest
+    class Team < Base
+
+      define_attr :id, :name, :global
+
+      def global?
+        global
+      end
+
+      def <=>(team)
+        return self.name <=> team.name
+      end
+
+      def to_s
+        self.name
+      end
+    end
+  end
+end

data/spec/rhc/commands/domain_spec.rb

@@ -334,7 +334,7 @@ describe RHC::Commands::Domain do
     let(:arguments) { ['domain', 'leave', '-n', 'deleteme'] }
 
     it "should leave the domain" do
-      rest_client.domains.first.should_receive(:leave)
+      rest_client.domains.first.should_receive(:leave).and_return(RHC::Rest::Membership::Member.new)
       expect { run }.to exit_with_code(0)
     end
   end

data/spec/rhc/commands/member_spec.rb

@@ -13,7 +13,7 @@ describe RHC::Commands::Member do
       expect { run }.to exit_with_code(0)
     end
     it('should output usage') { run_output.should match "Usage: rhc member" }
-    it('should output info about roles') { run_output.should match "Teams of developers can collaborate" }
+    it('should output info about roles') { run_output.should match "Developers can collaborate" }
   end
 
   let(:username){ 'test_user' }
@@ -35,13 +35,23 @@ describe RHC::Commands::Member do
     end
   end
 
-  let(:owner){ RHC::Rest::Membership::Member.new(:id => '1', :role => 'admin', :owner => true, :login => 'alice') }
-  let(:other_admin){ RHC::Rest::Membership::Member.new(:id => '2', :role => 'admin', :login => 'Bob') }
-  let(:other_editor){ RHC::Rest::Membership::Member.new(:id => '3', :role => 'edit', :name => 'Carol', :login => 'carol') }
-  let(:other_viewer){ RHC::Rest::Membership::Member.new(:id => '4', :role => 'view', :name => 'Doug', :login => 'doug@doug.com') }
-  let(:other_viewer2){ RHC::Rest::Membership::Member.new(:id => '5', :role => 'view', :name => 'ViewerC', :login => 'viewerc@viewer.com') }
-  let(:other_viewer3){ RHC::Rest::Membership::Member.new(:id => '6', :role => 'view', :name => 'ViewerB', :login => 'viewerb@viewer.com') }
-  let(:other_viewer4){ RHC::Rest::Membership::Member.new(:id => '7', :role => 'view', :name => 'ViewerA', :login => 'viewera@viewer.com') }
+  let(:owner){ RHC::Rest::Membership::Member.new(:id => '1', :role => 'admin', :explicit_role => 'admin', :owner => true, :login => 'alice', :type => 'user') }
+  let(:other_admin){ RHC::Rest::Membership::Member.new(:id => '2', :role => 'admin', :explicit_role => 'admin', :login => 'Bob', :type => 'user') }
+  let(:other_editor){ RHC::Rest::Membership::Member.new(:id => '3', :role => 'edit', :explicit_role => 'edit', :name => 'Carol', :login => 'carol', :type => 'user') }
+  let(:other_viewer){ RHC::Rest::Membership::Member.new(:id => '4', :role => 'view', :explicit_role => 'view', :name => 'Doug', :login => 'doug@doug.com', :type => 'user') }
+  let(:other_viewer2){ RHC::Rest::Membership::Member.new(:id => '5', :role => 'view', :explicit_role => 'view', :name => 'ViewerC', :login => 'viewerc@viewer.com', :type => 'user') }
+  let(:other_viewer3){ RHC::Rest::Membership::Member.new(:id => '6', :role => 'view', :explicit_role => 'view', :name => 'ViewerB', :login => 'viewerb@viewer.com', :type => 'user') }
+  let(:other_viewer4){ RHC::Rest::Membership::Member.new(:id => '7', :role => 'view', :explicit_role => 'view', :name => 'ViewerA', :login => 'viewera@viewer.com', :type => 'user') }
+  let(:team_admin){ RHC::Rest::Membership::Member.new(:id => '11', :role => 'admin', :explicit_role => 'admin', :name => 'team1', :type => 'team') }
+  let(:team_editor){ RHC::Rest::Membership::Member.new(:id => '12', :role => 'edit', :explicit_role => 'edit', :name => 'team2', :type => 'team') }
+  let(:team_viewer){ RHC::Rest::Membership::Member.new(:id => '13', :role => 'view', :explicit_role => 'view', :name => 'team3', :type => 'team') }
+  let(:team_admin_member){ RHC::Rest::Membership::Member.new(:id => '21', :role => 'admin', :login => 'memberadmin', :type => 'user', :from => [{'id' => '11', 'type' => 'team'}]) }
+  let(:team_editor_member){ RHC::Rest::Membership::Member.new(:id => '22', :role => 'edit', :login => 'membereditor', :type => 'user', :from => [{'id' => '12', 'type' => 'team'}]) }
+  let(:team_viewer_member){ RHC::Rest::Membership::Member.new(:id => '23', :role => 'view', :login => 'memberviewer', :type => 'user', :from => [{'id' => '13', 'type' => 'team'}]) }
+  let(:team_viewer_member2){ RHC::Rest::Membership::Member.new(:id => '24', :role => 'view', :login => 'memberviewer2', :type => 'user', :from => [{'id' => '13', 'type' => 'team'}]) }
+  let(:team_viewer_member3){ RHC::Rest::Membership::Member.new(:id => '25', :role => 'view', :login => 'memberviewer3', :type => 'user', :from => [{'id' => '13', 'type' => 'team'}]) }
+  let(:team_viewer_and_explicit_member){ RHC::Rest::Membership::Member.new(:id => '26', :role => 'view', :explicit_role => 'view', :login => 'memberviewerexplicitedit', :type => 'user', :from => [{'id' => '13', 'type' => 'team'}]) }
+  let(:app_member_via_domain) { RHC::Rest::Membership::Member.new(:id => '27', :role => 'view', :login => 'app_member_via_domain', :type => 'user', :from => [{'type' => 'domain'}]) }
 
   describe 'show-domain' do
     context 'with members' do
@@ -57,16 +67,52 @@ describe RHC::Commands::Member do
       it("should order the members by role then by name") { run_output.should =~ /Bob.*admin.*Admins.*Carol.*Editors.*ViewerA.*ViewerB.*ViewerC.*Viewers/m }
       it("should include the login value") { run_output.should =~ /alice.*Bob.*carol.*doug@doug\.com/m }
     end
+
   end
 
   describe 'list-member' do
+    context 'on a domain with no members' do
+      let(:arguments) { ['members', '-n', 'mock-domain-0'] }
+      let(:supports_members){ true }
+      before{ with_mock_domain.init_members }
+      it { expect { run }.to exit_with_code(0) }
+      it { run_output.should =~ /does not have any members/ }
+    end
+
     context 'on a domain' do
       let(:arguments) { ['members', '-n', 'mock-domain-0'] }
       let(:supports_members){ true }
       before{ with_mock_domain.add_member(owner) }
       it { expect { run }.to exit_with_code(0) }
       it { run_output.should =~ /alice\s+admin \(owner\)/ }
-      it("should not show the name column") { run_output.should =~ /^Login\s+Role$/ }
+      it("should not show the name column") { run_output.should =~ /^Login\s+Role\s+Type$/ }
+    end
+
+    context 'on a domain with teams not showing all members' do
+      let(:arguments) { ['members', '-n', 'mock-domain-0'] }
+      let(:supports_members){ true }
+      before{ with_mock_domain.add_member(owner).add_member(team_admin).add_member(team_editor).add_member(team_admin_member).add_member(team_editor_member).add_member(team_viewer).add_member(team_viewer_and_explicit_member) }
+      it { expect { run }.to exit_with_code(0) }
+      it { run_output.should =~ /alice\s+alice\s+admin \(owner\)\s+user/ }
+      it { run_output.should =~ /team1\s+admin\s+team/ }
+      it { run_output.should_not =~ /memberadmin\s+memberadmin\s+admin \(via team1\)\s+user/ }
+      it { run_output.should =~ /team2\s+edit\s+team/ }
+      it { run_output.should_not =~ /membereditor\s+membereditor\s+edit \(via team2\)\s+user/ }
+      it("should show the name column") { run_output.should =~ /^Name\s+Login\s+Role\s+Type$/ }
+      it("should prompt to use the --all parameter") { run_output.should =~ /--all to display all members/ }
+    end
+
+    context 'on a domain with teams showing all members' do
+      let(:arguments) { ['members', '-n', 'mock-domain-0', '--all'] }
+      let(:supports_members){ true }
+      before{ with_mock_domain.add_member(owner).add_member(team_admin).add_member(team_editor).add_member(team_admin_member).add_member(team_editor_member).add_member(team_viewer).add_member(team_viewer_and_explicit_member) }
+      it { expect { run }.to exit_with_code(0) }
+      it { run_output.should =~ /alice\s+alice\s+admin \(owner\)\s+user/ }
+      it { run_output.should =~ /team1\s+admin\s+team/ }
+      it { run_output.should =~ /memberadmin\s+memberadmin\s+admin \(via team1\)\s+user/ }
+      it { run_output.should =~ /team2\s+edit\s+team/ }
+      it { run_output.should =~ /membereditor\s+membereditor\s+edit \(via team2\)\s+user/ }
+      it("should show the name column") { run_output.should =~ /^Name\s+Login\s+Role\s+Type$/ }
     end
 
     context 'on an application' do
@@ -77,18 +123,27 @@ describe RHC::Commands::Member do
       it { expect { run }.to exit_with_code(1) }
       it { run_output.should =~ /The server does not support adding or removing members/ }
 
+      context "with only implicit members via domain" do
+        let(:supports_members){ true }
+        before{ with_mock_app.add_member(app_member_via_domain) }
+        it { expect { run }.to exit_with_code(0) }
+        it { run_output.should =~ /app_member_via_domain\s+view \(via domain\)/ }
+        it("should not show the name column") { run_output.should =~ /^Login\s+Role\s+Type$/ }
+        it("should not show the --all message") { run_output.should_not =~ /--all/ }
+      end
+
       context "with only owner" do
         let(:supports_members){ true }
         before{ with_mock_app.add_member(owner) }
         it { expect { run }.to exit_with_code(0) }
         it { run_output.should =~ /alice\s+admin \(owner\)/ }
-        it("should not show the name column") { run_output.should =~ /^Login\s+Role$/ }
+        it("should not show the name column") { run_output.should =~ /^Login\s+Role\s+Type$/ }
 
         context "with ids" do
           let(:arguments) { ['members', 'mock-domain-0/mock-app-0', '--ids'] }
           it { expect { run }.to exit_with_code(0) }
           it { run_output.should =~ /alice\s+admin \(owner\) 1/ }
-          it("should not show the name column") { run_output.should =~ /^Login\s+Role\s+ID$/ }
+          it("should not show the name column") { run_output.should =~ /^Login\s+Role\s+ID\s+Type$/ }
         end
       end
 
@@ -102,7 +157,7 @@ describe RHC::Commands::Member do
         it { run_output.should =~ /doug\.com\s+view/ }
         it("should order the members by role") { run_output.should =~ /admin.*owner.*admin.*edit.*view/m }
         it("should include the login value") { run_output.should =~ /alice.*Bob.*carol.*doug@doug\.com/m }
-        it("should show the name column") { run_output.should =~ /^Name\s+Login\s+Role$/ }
+        it("should show the name column") { run_output.should =~ /^Name\s+Login\s+Role\s+Type$/ }
       end
     end
   end
@@ -119,6 +174,13 @@ describe RHC::Commands::Member do
       it { run_output.should =~ /Adding 1 editor to domain .*The server does not support adding or removing members/ }
     end
 
+    context "when the client doesn't support teams" do
+      let(:mock_teams_links){ [] }
+      let(:arguments) { ['add-member', 'testteam', '-n', 'test', '--type', 'team'] }
+      it { expect { run }.to exit_with_code(161) }
+      it { run_output.should =~ /Adding 1 editor to domain .*Server does not support teams/ }
+    end
+
     context "with supported membership" do
       let(:supports_members?){ true }
 
@@ -126,13 +188,154 @@ describe RHC::Commands::Member do
         let(:arguments) { ['add-member', 'testuser', '-n', 'test'] }
         before do
           stub_api_request(:patch, "broker/rest/domains/test/members").
-            with(:body => {:members => [{'login' => 'testuser', 'role' => 'edit'}]}).
+            with(:body => {:members => [{'login' => 'testuser', 'role' => 'edit', 'type' => 'user'}]}).
             to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => 'login', :index => 0, :severity => 'info', :text => 'Added 1 member'},]}.to_json, :status => 200})
         end
         it { expect { run }.to exit_with_code(0) }
         it { run_output.should =~ /Adding 1 editor to domain .*done/ }
       end
 
+      context 'with a valid team' do
+        let(:arguments) { ['add-member', 'testteam', '-n', 'test', '--type', 'team'] }
+        before do
+          challenge do
+            stub_api_request(:get, "broker/rest/teams?owner=@self").
+              to_return({:body => {:type => 'teams', :data => [{:id => 111, :global => false, :name => 'testteam'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing teams'},]}.to_json, :status => 200})
+          end
+          stub_api_request(:patch, "broker/rest/domains/test/members").
+            with(:body => {:members => [{:role => 'edit', :type => 'team', :id => 111, }]}).
+            to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => 'id', :index => 0, :severity => 'info', :text => 'Added 1 member'},]}.to_json, :status => 200})
+        end
+        it { expect { run }.to exit_with_code(0) }
+        it { run_output.should =~ /Adding 1 editor to domain .*done/ }
+      end
+
+      context 'with an invalid type' do
+        let(:arguments) { ['add-member', 'invalidteam', '-n', 'test', '--type', 'foo'] }
+        it { expect { run }.to exit_with_code(1) }
+        it { run_output.should =~ /Type must be/ }
+      end
+
+      context 'with an invalid team' do
+        let(:arguments) { ['add-member', 'invalidteam', '-n', 'test', '--type', 'team'] }
+        before do
+          challenge do
+            stub_api_request(:get, "broker/rest/teams?owner=@self").
+              to_return({:body => {:type => 'teams', :data => [{:id => 111, :global => false, :name => 'testteam'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing teams'},]}.to_json, :status => 200})
+          end
+        end
+        it { expect { run }.to exit_with_code(162) }
+        it { run_output.should =~ /Adding 1 editor to domain .*You do not have a team named 'invalidteam'/ }
+      end
+
+      context 'with multiple partial team matches but one exact match' do
+        let(:arguments) { ['add-member', 'testteam', '-n', 'test', '--type', 'team'] }
+        before do
+          challenge do
+            stub_api_request(:get, "broker/rest/teams?owner=@self").
+              to_return({:body => {:type => 'teams', :data => [{:id => 111, :global => false, :name => 'testteam'}, {:id => 222, :global => false, :name => 'testteam1'}, {:id => 333, :global => false, :name => 'testteam11'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing teams'},]}.to_json, :status => 200})
+          end
+          stub_api_request(:patch, "broker/rest/domains/test/members").
+            with(:body => {:members => [{:role => 'edit', :type => 'team', :id => 111, }]}).
+            to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => 'id', :index => 0, :severity => 'info', :text => 'Added 1 member'},]}.to_json, :status => 200})
+        end
+        it { expect { run }.to exit_with_code(0) }
+        it { run_output.should =~ /Adding 1 editor to domain .*done/ }
+      end
+
+      context 'without an exact team match' do
+        let(:arguments) { ['add-member', 'team', '-n', 'test', '--type', 'team'] }
+        before do
+          challenge do
+            stub_api_request(:get, "broker/rest/teams?owner=@self").
+              to_return({:body => {:type => 'teams', :data => [{:id => 111, :global => false, :name => 'team1'}, {:id => 111, :global => false, :name => 'team2'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing teams'},]}.to_json, :status => 200})
+          end
+        end
+        it { expect { run }.to exit_with_code(162) }
+        it { run_output.should =~ /Adding 1 editor to domain .*You do not have a team named 'team'. Did you mean one of the following\?\nteam1, team2/ }
+      end
+
+      context 'with a single exact case insensitive match' do
+        let(:arguments) { ['add-member', 'testteam', '-n', 'test', '--type', 'team'] }
+        before do
+          challenge do
+            stub_api_request(:get, "broker/rest/teams?owner=@self").
+              to_return({:body => {:type => 'teams', :data => [{:id => 111, :global => false, :name => 'TESTTEAM'}, {:id => 222, :global => false, :name => 'TESTTEAM1'}, {:id => 333, :global => false, :name => 'TESTTEAM2'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing teams'},]}.to_json, :status => 200})
+          end
+          stub_api_request(:patch, "broker/rest/domains/test/members").
+            with(:body => {:members => [{:role => 'edit', :type => 'team', :id => 111, }]}).
+            to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => 'id', :index => 0, :severity => 'info', :text => 'Added 1 member'},]}.to_json, :status => 200})
+        end
+        it { expect { run }.to exit_with_code(0) }
+        it { run_output.should =~ /Adding 1 editor to domain .*done/ }
+      end
+
+      context 'with an exact case sensitive match and some exact case insensitive matches' do
+        let(:arguments) { ['add-member', 'testteam', '-n', 'test', '--type', 'team'] }
+        before do
+          challenge do
+            stub_api_request(:get, "broker/rest/teams?owner=@self").
+              to_return({:body => {:type => 'teams', :data => [{:id => 111, :global => false, :name => 'testteam'}, {:id => 222, :global => false, :name => 'TESTTEAM'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing teams'},]}.to_json, :status => 200})
+          end
+          stub_api_request(:patch, "broker/rest/domains/test/members").
+            with(:body => {:members => [{:role => 'edit', :type => 'team', :id => 111, }]}).
+            to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => 'id', :index => 0, :severity => 'info', :text => 'Added 1 member'},]}.to_json, :status => 200})
+        end
+        it { expect { run }.to exit_with_code(0) }
+        it { run_output.should =~ /Adding 1 editor to domain .*done/ }
+      end
+
+      context 'with a team name containing special characters' do
+        let(:arguments) { ['add-member', '*1()', '-n', 'test', '--type', 'team'] }
+        before do
+          challenge do
+            stub_api_request(:get, "broker/rest/teams?owner=@self").
+              to_return({:body => {:type => 'teams', :data => [{:id => 111, :global => false, :name => '*1()'}, {:id => 222, :global => false, :name => 'another team'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing teams'},]}.to_json, :status => 200})
+          end
+          stub_api_request(:patch, "broker/rest/domains/test/members").
+            with(:body => {:members => [{:role => 'edit', :type => 'team', :id => 111, }]}).
+            to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => 'id', :index => 0, :severity => 'info', :text => 'Added 1 member'},]}.to_json, :status => 200})
+        end
+        it { expect { run }.to exit_with_code(0) }
+        it { run_output.should =~ /Adding 1 editor to domain .*done/ }
+      end
+
+      context 'with multiple exact team matches' do
+        let(:arguments) { ['add-member', 'someteam', '-n', 'test', '--type', 'team'] }
+        before do
+          challenge do
+            stub_api_request(:get, "broker/rest/teams?owner=@self").
+              to_return({:body => {:type => 'teams', :data => [{:id => 111, :global => false, :name => 'someteam'}, {:id => 222, :global => false, :name => 'someteam'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing teams'},]}.to_json, :status => 200})
+          end
+        end
+        it { expect { run }.to exit_with_code(162) }
+        it { run_output.should =~ /Adding 1 editor to domain .*There is more than one team named 'someteam'\. Please use the --ids flag and specify the exact id of the team you want to manage\./ }
+      end
+
+      context 'with multiple case-insensitive team matches' do
+        let(:arguments) { ['add-member', 'someteam', '-n', 'test', '--type', 'team'] }
+        before do
+          challenge do
+            stub_api_request(:get, "broker/rest/teams?owner=@self").
+              to_return({:body => {:type => 'teams', :data => [{:id => 111, :global => false, :name => 'SOMETEAM'}, {:id => 222, :global => false, :name => 'SomeTeam'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing teams'},]}.to_json, :status => 200})
+          end
+        end
+        it { expect { run }.to exit_with_code(162) }
+        it { run_output.should =~ /Adding 1 editor to domain .*You do not have a team named 'someteam'. Did you mean one of the following\?\nSOMETEAM, SomeTeam/ }
+      end
+
+      context 'without a global team' do
+        let(:arguments) { ['add-member', 'testteam', '-n', 'test', '--type', 'team', '--global'] }
+        before do
+          challenge do
+            stub_api_request(:get, "broker/rest/teams?global&search=testteam").
+              to_return({:body => {:type => 'teams', :data => [], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing teams'},]}.to_json, :status => 200})
+          end
+        end
+        it { expect { run }.to exit_with_code(162) }
+        it { run_output.should =~ /Adding 1 editor to domain .*No global team found with the name 'testteam'\./ }
+      end
+
       context 'with an invalid role' do
         let(:arguments) { ['add-member', 'testuser', '-n', 'test', '--role', 'missing'] }
         it { expect { run }.to exit_with_code(1) }
@@ -140,10 +343,10 @@ describe RHC::Commands::Member do
       end
 
       context 'with a missing user' do
-        let(:arguments) { ['add-member', 'testuser', '-n', 'test'] }
+        let(:arguments) { ['add-member', 'testuser', '-n', 'test', '--type', 'user'] }
         before do
           stub_api_request(:patch, "broker/rest/domains/test/members").
-            with(:body => {:members => [{'login' => 'testuser', 'role' => 'edit'}]}).
+            with(:body => {:members => [{'login' => 'testuser', 'role' => 'edit', 'type' => 'user'}]}).
             to_return({:body => {:messages => [{:exit_code => 132, :field => 'login', :index => 0, :severity => 'error', :text => 'There is no user with a login testuser'},]}.to_json, :status => 422})
         end
         it { expect { run }.to exit_with_code(1) }
@@ -154,7 +357,7 @@ describe RHC::Commands::Member do
         let(:arguments) { ['add-member', '123', '-n', 'test', '--ids', '--role', 'admin'] }
         before do
           stub_api_request(:patch, "broker/rest/domains/test/members").
-            with(:body => {:members => [{'id' => '123', 'role' => 'admin'}]}).
+            with(:body => {:members => [{'id' => '123', 'role' => 'admin', 'type' => 'user'}]}).
             to_return({:body => {:messages => [{:exit_code => 132, :field => 'id', :index => 0, :severity => 'error', :text => 'There is no user with the id 123'},]}.to_json, :status => 422})
         end
         it { expect { run }.to exit_with_code(1) }
@@ -163,6 +366,166 @@ describe RHC::Commands::Member do
     end
   end
 
+  describe 'update-member' do
+    context "when the resource doesn't support membership changes" do
+      before{ stub_api }
+
+      context "when updating a domain" do
+        let(:arguments) { ['update-member', 'testuser', '-n', 'test'] }
+        before{ challenge{ stub_one_domain('test', nil, mock_user_auth) } }
+        it { expect { run }.to exit_with_code(1) }
+        it { run_output.should =~ /Updating 1 editor to domain .*The server does not support adding or removing members/ }
+      end
+    end
+
+    context "with supported membership" do
+      let(:supports_members?){ true }
+      before do
+        stub_api
+        challenge{ stub_one_domain('test', nil, mock_user_auth) }
+      end
+
+      context 'with a valid user' do
+        let(:arguments) { ['update-member', 'testuser', '-n', 'test', '-r', 'view'] }
+        before do
+          stub_api_request(:patch, "broker/rest/domains/test/members").
+            with(:body => {:members => [{'login' => 'testuser', 'role' => 'view', 'type' => 'user'}]}).
+            to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => 'login', :index => 0, :severity => 'info', :text => 'Updated 1 member'},]}.to_json, :status => 200})
+        end
+        it { expect { run }.to exit_with_code(0) }
+        it { run_output.should =~ /Updating 1 viewer to domain .*done/ }
+      end
+
+      context 'with a valid team' do
+        let(:arguments) { ['update-member', 'testteam', '-n', 'test', '-r', 'view', '--type', 'team'] }
+        before do
+          stub_api_request(:get, "broker/rest/domains/test/members").
+            to_return({:body => {:type => 'members', :data => [{:id => 1, :name => 'testteam', :owner => false, :role => 'edit', :explicit_role => 'edit', :type => 'team'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing members'},]}.to_json, :status => 200})
+          stub_api_request(:patch, "broker/rest/domains/test/members").
+            with(:body => {:members => [{'id' => 1, 'role' => 'view', 'type' => 'team'}]}).
+            to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => 'login', :index => 0, :severity => 'info', :text => 'Updated 1 member'},]}.to_json, :status => 200})
+        end
+        it { expect { run }.to exit_with_code(0) }
+        it { run_output.should =~ /Updating 1 viewer to domain .*done/ }
+      end
+
+      context 'with multiple team exact matches' do
+        let(:arguments) { ['update-member', 'testteam', '-n', 'test', '-r', 'view', '--type', 'team'] }
+        before do
+          stub_api_request(:get, "broker/rest/domains/test/members").
+            to_return({:body => {:type => 'members', :data => [{:id => 1, :name => 'testteam', :owner => false, :role => 'edit', :explicit_role => 'edit', :type => 'team'}, {:id => 12, :name => 'testteam', :owner => false, :role => 'edit', :explicit_role => 'edit', :type => 'team'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing members'},]}.to_json, :status => 200})
+          stub_api_request(:patch, "broker/rest/domains/test/members").
+            with(:body => {:members => [{'id' => 1, 'role' => 'view', 'type' => 'team'}]}).
+            to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => 'login', :index => 0, :severity => 'info', :text => 'Updated 1 member'},]}.to_json, :status => 200})
+        end
+        it { expect { run }.to exit_with_code(163) }
+        it { run_output.should =~ /Updating 1 viewer to domain .*There is more than one member team named 'testteam'/ }
+      end
+
+      context 'with multiple team case-insensitive matches' do
+        let(:arguments) { ['update-member', 'testteam', '-n', 'test', '-r', 'view', '--type', 'team'] }
+        before do
+          stub_api_request(:get, "broker/rest/domains/test/members").
+            to_return({:body => {:type => 'members', :data => [{:id => 1, :name => 'TESTTEAM', :owner => false, :role => 'edit', :explicit_role => 'edit', :type => 'team'}, {:id => 12, :name => 'TestTeam', :owner => false, :role => 'edit', :explicit_role => 'edit', :type => 'team'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing members'},]}.to_json, :status => 200})
+        end
+        it { expect { run }.to exit_with_code(163) }
+        it { run_output.should =~ /Updating 1 viewer to domain .*No member team found with the name 'testteam'. Did you mean one of the following\?\nTESTTEAM, TestTeam/ }
+      end
+
+      context 'with a single exact case insensitive match' do
+        let(:arguments) { ['update-member', 'testteam', '-n', 'test', '-r', 'view', '--type', 'team'] }
+        before do
+          stub_api_request(:get, "broker/rest/domains/test/members").
+            to_return({:body => {:type => 'members', :data => [{:id => 1, :name => 'TESTTEAM', :owner => false, :role => 'edit', :explicit_role => 'edit', :type => 'team'}, {:id => 2, :name => 'TESTTEAM2', :owner => false, :role => 'edit', :explicit_role => 'edit', :type => 'team'}, {:id => 3, :name => 'TESTTEAM3', :owner => false, :role => 'edit', :explicit_role => 'edit', :type => 'team'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing members'},]}.to_json, :status => 200})
+          stub_api_request(:patch, "broker/rest/domains/test/members").
+            with(:body => {:members => [{'id' => 1, 'role' => 'view', 'type' => 'team'}]}).
+            to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => 'login', :index => 0, :severity => 'info', :text => 'Updated 1 member'},]}.to_json, :status => 200})
+        end
+        it { expect { run }.to exit_with_code(0) }
+        it { run_output.should =~ /Updating 1 viewer to domain .*done/ }
+      end
+
+      context 'with an exact case sensitive match and some exact case insensitive matches' do
+        let(:arguments) { ['update-member', 'testteam', '-n', 'test', '-r', 'view', '--type', 'team'] }
+        before do
+          stub_api_request(:get, "broker/rest/domains/test/members").
+            to_return({:body => {:type => 'members', :data => [{:id => 1, :name => 'testteam', :owner => false, :role => 'edit', :explicit_role => 'edit', :type => 'team'}, {:id => 2, :name => 'TESTTEAM', :owner => false, :role => 'edit', :explicit_role => 'edit', :type => 'team'}, {:id => 3, :name => 'TeStTeAm', :owner => false, :role => 'edit', :explicit_role => 'edit', :type => 'team'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing members'},]}.to_json, :status => 200})
+          stub_api_request(:patch, "broker/rest/domains/test/members").
+            with(:body => {:members => [{'id' => 1, 'role' => 'view', 'type' => 'team'}]}).
+            to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => 'login', :index => 0, :severity => 'info', :text => 'Updated 1 member'},]}.to_json, :status => 200})
+        end
+        it { expect { run }.to exit_with_code(0) }
+        it { run_output.should =~ /Updating 1 viewer to domain .*done/ }
+      end
+
+      context 'with a team name containing special characters' do
+        let(:arguments) { ['update-member', '*1()', '-n', 'test', '-r', 'view', '--type', 'team'] }
+        before do
+          stub_api_request(:get, "broker/rest/domains/test/members").
+            to_return({:body => {:type => 'members', :data => [{:id => 1, :name => '*1()', :owner => false, :role => 'edit', :explicit_role => 'edit', :type => 'team'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing members'},]}.to_json, :status => 200})
+          stub_api_request(:patch, "broker/rest/domains/test/members").
+            with(:body => {:members => [{'id' => 1, 'role' => 'view', 'type' => 'team'}]}).
+            to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => 'login', :index => 0, :severity => 'info', :text => 'Updated 1 member'},]}.to_json, :status => 200})
+        end
+        it { expect { run }.to exit_with_code(0) }
+        it { run_output.should =~ /Updating 1 viewer to domain .*done/ }
+      end
+
+      context 'with a missing user' do
+        let(:arguments) { ['update-member', 'testuser', '-n', 'test', '-r', 'view'] }
+        before do
+          stub_api_request(:patch, "broker/rest/domains/test/members").
+            with(:body => {:members => [{'login' => 'testuser', 'role' => 'view', 'type' => 'user'}]}).
+            to_return({:body => {:messages => [{:exit_code => 132, :field => 'login', :index => 0, :severity => 'error', :text => 'There is no user with a login testuser'},]}.to_json, :status => 422})
+        end
+        it { expect { run }.to exit_with_code(1) }
+        it { run_output.should =~ /Updating 1 viewer to domain.*There is no user with a login testuser/ }
+      end
+
+      context 'with a missing team' do
+        let(:arguments) { ['update-member', 'testteam', '-n', 'test', '-r', 'view', '--type', 'team'] }
+        before do
+          stub_api_request(:get, "broker/rest/domains/test/members").
+            to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing teams'},]}.to_json, :status => 200})
+        end
+        it { expect { run }.to exit_with_code(163) }
+        it { run_output.should =~ /Updating 1 viewer to domain.*No member team found with the name 'testteam'/ }
+      end
+
+      context 'with a missing team with an identical user name' do
+        let(:arguments) { ['update-member', 'testteam', '-n', 'test', '-r', 'view', '--type', 'team'] }
+        before do
+          stub_api_request(:get, "broker/rest/domains/test/members").
+            to_return({:body => {:type => 'members', :data => [{:id => 1, :name => 'testteam', :login => 'testteam', :owner => false, :role => 'edit', :explicit_role => 'edit', :type => 'user'}], :messages => [{:exit_code => 0, :field => nil, :index => nil, :severity => 'info', :text => 'Listing members'},]}.to_json, :status => 200})
+        end
+        it { expect { run }.to exit_with_code(163) }
+        it { run_output.should =~ /Updating 1 viewer to domain.*No member team found with the name 'testteam'/ }
+      end
+
+      context 'with a missing user id and role' do
+        let(:arguments) { ['update-member', '123', '-n', 'test', '--ids', '-r', 'view'] }
+        before do
+          stub_api_request(:patch, "broker/rest/domains/test/members").
+            with(:body => {:members => [{'id' => '123', 'role' => 'view', 'type' => 'user'}]}).
+            to_return({:body => {:messages => [{:exit_code => 132, :field => 'id', :index => 0, :severity => 'error', :text => 'There is no user with the id 123'},]}.to_json, :status => 422})
+        end
+        it { expect { run }.to exit_with_code(1) }
+        it { run_output.should =~ /Updating 1 viewer to domain.*There is no user with the id 123/ }
+      end
+
+      context 'when the user is not a member' do
+        let(:arguments) { ['update-member', 'testuser', '-n', 'test', '-r', 'view'] }
+        before do
+          stub_api_request(:patch, "broker/rest/domains/test/members").
+            with(:body => {:members => [{'login' => 'testuser', 'role' => 'view', 'type' => 'user'}]}).
+            to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => 'login', :index => 0, :severity => 'warning', :text => 'testuser is not a member of this domain.'},]}.to_json, :status => 200})
+        end
+        it { expect { run }.to exit_with_code(0) }
+        it { run_output.should =~ /Updating 1 viewer to domain.*testuser is not a member of this domain.*done/m }
+      end
+    end
+  end
+
   describe 'remove-member' do
     context "when the resource doesn't support membership changes" do
       before{ stub_api }
@@ -193,7 +556,7 @@ describe RHC::Commands::Member do
         let(:arguments) { ['remove-member', 'testuser', '-n', 'test'] }
         before do
           stub_api_request(:patch, "broker/rest/domains/test/members").
-            with(:body => {:members => [{'login' => 'testuser', 'role' => 'none'}]}).
+            with(:body => {:members => [{'login' => 'testuser', 'role' => 'none', 'type' => 'user'}]}).
             to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => 'login', :index => 0, :severity => 'info', :text => 'Removed 1 member'},]}.to_json, :status => 200})
         end
         it { expect { run }.to exit_with_code(0) }
@@ -214,7 +577,7 @@ describe RHC::Commands::Member do
         let(:arguments) { ['remove-member', 'testuser', '-n', 'test'] }
         before do
           stub_api_request(:patch, "broker/rest/domains/test/members").
-            with(:body => {:members => [{'login' => 'testuser', 'role' => 'none'}]}).
+            with(:body => {:members => [{'login' => 'testuser', 'role' => 'none', 'type' => 'user'}]}).
             to_return({:body => {:messages => [{:exit_code => 132, :field => 'login', :index => 0, :severity => 'error', :text => 'There is no user with a login testuser'},]}.to_json, :status => 422})
         end
         it { expect { run }.to exit_with_code(1) }
@@ -225,18 +588,18 @@ describe RHC::Commands::Member do
         let(:arguments) { ['remove-member', '123', '-n', 'test', '--ids'] }
         before do
           stub_api_request(:patch, "broker/rest/domains/test/members").
-            with(:body => {:members => [{'id' => '123', 'role' => 'none'}]}).
+            with(:body => {:members => [{'id' => '123', 'role' => 'none', 'type' => 'user'}]}).
             to_return({:body => {:messages => [{:exit_code => 132, :field => 'id', :index => 0, :severity => 'error', :text => 'There is no user with the id 123'},]}.to_json, :status => 422})
         end
         it { expect { run }.to exit_with_code(1) }
         it { run_output.should =~ /Removing 1 member from domain.*There is no user with the id 123/ }
       end
 
-      context 'when the user isn''t a member' do
+      context 'when the user is not a member' do
         let(:arguments) { ['remove-member', 'testuser', '-n', 'test'] }
         before do
           stub_api_request(:patch, "broker/rest/domains/test/members").
-            with(:body => {:members => [{'login' => 'testuser', 'role' => 'none'}]}).
+            with(:body => {:members => [{'login' => 'testuser', 'role' => 'none', 'type' => 'user'}]}).
             to_return({:body => {:type => 'members', :data => [], :messages => [{:exit_code => 0, :field => 'login', :index => 0, :severity => 'warning', :text => 'testuser is not a member of this domain.'},]}.to_json, :status => 200})
         end
         it { expect { run }.to exit_with_code(0) }