rhc 1.23.7 → 1.24.4

data/lib/rhc/rest/team.rb

@@ -2,6 +2,8 @@ module RHC
   module Rest
     class Team < Base
 
+      include Membership
+
       define_attr :id, :name, :global
 
       def global?
@@ -15,6 +17,18 @@ module RHC
       def to_s
         self.name
       end
+
+      def destroy(force=false)
+        debug "Deleting team #{name} (#{id})"
+        raise RHC::OperationNotSupportedException.new("The server does not support deleting this resource.") unless supports? 'DELETE'
+        rest_method "DELETE"
+      end
+      alias :delete :destroy
+
+      def default_member_role
+        'view'
+      end
+
     end
   end
 end

data/lib/rhc/usage_templates/command_help.erb

@@ -1,4 +1,14 @@
+<% if @command.syntax.is_a?(Array) -%>
+Usage
+<%= table(
+		@command.syntax.map do |s|
+			s ? [Array(program :name).first, @command.name, s] : [' ']
+		end, 
+	  table_args('  ')
+	).join("\n") %>
+<% else -%>
 Usage: <%= Array(program :name).first %> <%= @command.name %> <%= @command.syntax %>
+<% end -%>
 
 <%= @command.description || @command.summary %>
 <% if @actions.blank? or @command.root? and @command.info.present? and @command.info[:method].present? -%>

data/lib/rhc/usage_templates/command_syntax_help.erb

@@ -1,4 +1,15 @@
+<% if @command.syntax.is_a?(Array) -%>
+Usage
+<%= table(
+    @command.syntax.map do |s|
+      s ? [Array(program :name).first, @command.name, s] : [' ']
+    end, 
+    table_args('  ')
+  ).join("\n") %>
+
+<% else -%>
 Usage: <%= Array(program :name).first %> <%= @command.name %><%= " #{@command.syntax}" if @command.syntax %>
+<% end -%>
 <% unless @command.options.blank? or @command.options.all?{ |o| o[:hide] } -%>
 Pass '--help' to see the full list of options
 <% end -%>

data/spec/rhc/command_spec.rb

@@ -246,6 +246,21 @@ describe RHC::Commands::Base do
     end
   end
 
+  describe "find_team" do
+    let(:instance){ subject }
+    let(:rest_client){ subject.send(:rest_client) }
+    let(:options){ subject.send(:options) }
+    def expects_method(*args)
+      expect{ subject.send(:find_team, *args) }
+    end
+
+    it("should raise without option"){ expects_method(nil).to raise_error(ArgumentError, /You must specify a team name with -t, or a team id with --team-id/) }
+    it("should handle team_id option"){ options[:team_id] = 'team_id_o'; expects_method.to call(:find_team_by_id).on(rest_client).with('team_id_o', {}) }
+    it("should handle team_name option"){ options[:team_name] = 'team_o'; expects_method.to call(:find_team).on(rest_client).with('team_o', {}) }
+    it("should handle team_name param"){ options[:team_name] = 'team_o'; expects_method.to call(:find_team).on(rest_client).with('team_o', {}) }
+
+  end
+
   describe "find_domain" do
     let(:instance){ subject }
     let(:rest_client){ subject.send(:rest_client) }
@@ -284,19 +299,23 @@ describe RHC::Commands::Base do
     end
   end
 
-  describe "find_domain_or_app" do
+  describe "find_membership_container" do
     let(:instance){ subject }
     let(:rest_client){ subject.send(:rest_client) }
     let(:options){ subject.send(:options) }
     before{ subject.stub(:namespace_context).and_return('domain_s') }
     def expects_method(*args)
-      expect{ subject.send(:find_app_or_domain, *args) }
+      expect{ subject.send(:find_membership_container, *args) }
     end
 
-    it("should not infer domain")             { expects_method.to raise_error(ArgumentError, /You must specify a domain with -n, or an application with -a/) }
+    it("should prompt for domain, app, or team") { expects_method.to raise_error(ArgumentError, /You must specify a domain with -n, an application with -a, or a team with -t/) }
+    it("should prompt for domain, or team")   { expects_method(:writable => true).to raise_error(ArgumentError, /You must specify a domain with -n, or a team with -t/) }
     it("should assume domain with -n")        { options[:namespace] = 'domain_o'; expects_method.to call(:find_domain).on(rest_client).with('domain_o') }
     it("should infer -n when -a is available"){ options[:app] = 'app_o'; expects_method.to call(:find_application).on(rest_client).with('domain_s', 'app_o') }
     it("should split -a param")               { options[:app] = 'domain_o/app_o'; expects_method.to call(:find_application).on(rest_client).with('domain_o', 'app_o') }
+    it("should split target arg")             { options[:target] = 'domain_o/app_o'; expects_method.to call(:find_application).on(rest_client).with('domain_o', 'app_o') }
+    it("should find team by name")            { options[:team_name] = 'team_o'; expects_method.to call(:find_team).on(rest_client).with('team_o') }
+    it("should find team by id")              { options[:team_id] = 'team_id_o'; expects_method.to call(:find_team_by_id).on(rest_client).with('team_id_o') }
 
     context "when an app context is available" do
       before{ subject.instance_variable_set(:@local_git_config, {:app => 'app_s'}) }

data/spec/rhc/commands/app_spec.rb

@@ -490,6 +490,25 @@ describe RHC::Commands::App do
       end
     end
 
+    context 'when cloning a scalable app as not scalable' do
+      before do
+        @scaled = @domain.add_application("scaled", "mock_standalone_cart-1", true)
+        @scaled.cartridges.each do |c|
+          c.scales_from = 2
+          c.scales_to = -1
+        end
+      end
+      let(:arguments) { ['app', 'create', 'clone', '--from-app', 'scaled', '--no-git', '--no-scaling'] }
+      it "should result in only one gear" do
+        expect { run }.to exit_with_code(0)
+        @domain.applications.size.should == 3
+        @domain.applications.select{|a| a.name == 'clone'}.size.should == 1
+        @domain.applications.select{|a| a.name == 'clone'}.first.cartridges.size.should == 1
+        @domain.applications.select{|a| a.name == 'clone'}.first.cartridges.first.scales_from.should == 1
+        @domain.applications.select{|a| a.name == 'clone'}.first.cartridges.first.scales_to.should == 1
+      end
+    end
+
     context 'alias already registered' do
       let(:arguments) { ['app', 'create', 'clone', '--from-app', 'app1', '--no-git'] }
       before do 
@@ -611,6 +630,28 @@ describe RHC::Commands::App do
       it { run_output.should match(/Gears:\s+1 medium/) }
     end
 
+    context 'when run with premium cartridge with single rate' do
+      before do
+        @domain = rest_client.add_domain("mockdomain")
+        app = @domain.add_application("app1", "mock_type", true)
+        cart1 = app.add_cartridge('mock_premium_cart-1')
+        cart1.usage_rates = {0.01 => []}
+      end
+      it { run_output.should match(/This cartridge costs an additional \$0.01 per gear after the first 3 gears\./) }
+    end
+
+    context 'when run with premium cartridge with multiple rates' do
+      before do
+        @domain = rest_client.add_domain("mockdomain")
+        app = @domain.add_application("app1", "mock_type", true)
+        cart1 = app.add_cartridge('mock_premium_cart-2')
+        cart1.usage_rates = {0.01 => ['plan1','plan2', 'plan3'], 0.02 => ['plan4'], 0.03 => []}
+      end
+      it { run_output.should match(/This cartridge costs an additional \$0\.01 per gear after the first 3 gears on the Plan1, Plan2 and Plan3 plans\./) }
+      it { run_output.should match(/This cartridge costs an additional \$0\.02 per gear after the first 3 gears on the Plan4 plan\./) }
+      it { run_output.should match(/This cartridge costs an additional \$0\.03 per gear after the first 3 gears\./) }
+    end
+
     context 'when run with custom app' do
       before do
         @domain = rest_client.add_domain("mockdomain")

data/spec/rhc/commands/cartridge_spec.rb

@@ -220,7 +220,7 @@ describe RHC::Commands::Cartridge do
         app = domain.add_application("app1", "mock_type")
       end
       it {
-        succeed_with_message /This gear costs an additional \$0\.05 per gear after the first 3 gears\./
+        succeed_with_message /This cartridge costs an additional \$0\.05 per gear after the first 3 gears\./
       }
     end
   end
@@ -424,7 +424,7 @@ describe RHC::Commands::Cartridge do
     end
 
     context 'when run with a premium cartridge' do
-      it { run_output.should match(/This gear costs an additional \$0\.05 per gear after the first 3 gears./) }
+      it { run_output.should match(/This cartridge costs an additional \$0\.05 per gear after the first 3 gears./) }
     end
   end
 

data/spec/rhc/commands/member_spec.rb

@@ -34,6 +34,9 @@ describe RHC::Commands::Member do
       app
     end
   end
+  def with_mock_team
+    @team ||= with_mock_rest_client.add_team("mock-team-0")
+  end
 
   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') }
@@ -212,8 +215,13 @@ describe RHC::Commands::Member do
 
       context 'with an invalid type' do
         let(:arguments) { ['add-member', 'invalidteam', '-n', 'test', '--type', 'foo'] }
+        before do
+          stub_api_request(:patch, "broker/rest/domains/test/members").
+            with(:body => {:members => [{'login' => 'invalidteam', 'role' => 'edit', 'type' => 'foo'}]}).
+            to_return({:body => {:messages => [{:exit_code => 1, :field => 'type', :index => 0, :severity => 'error', :text => "Members of type foo not supported for domain. Supported types are 'user', 'team'."}]}.to_json, :status => 422})
+        end
         it { expect { run }.to exit_with_code(1) }
-        it { run_output.should =~ /Type must be/ }
+        it { run_output.should =~ /type foo not supported for domain/ }
       end
 
       context 'with an invalid team' do

data/spec/rhc/commands/team_spec.rb

@@ -0,0 +1,191 @@
+require 'spec_helper'
+require 'rest_spec_helper'
+require 'rhc/commands/team'
+
+describe RHC::Commands::Team do
+  let(:rest_client){ MockRestClient.new }
+  before{ 
+    user_config
+  }
+
+  describe 'default action' do
+    before{ rest_client }
+    context 'when run with no teams' do
+      let(:arguments) { ['team'] }
+
+      it { expect { run }.to exit_with_code(1) }
+      it { run_output.should match(/To create.*rhc create-team/m) }
+    end
+    context 'when help is shown' do
+      let(:arguments) { ['team', '--noprompt', '--help'] }
+
+      it { expect { run }.to exit_with_code(0) }
+      it { run_output.should match(/create.*delete.*leave.*list/m) }
+    end
+  end
+
+  describe 'show' do
+    before{ rest_client }
+
+    context 'when run with no teams' do
+      let(:arguments) { ['team', 'show'] }
+      it { expect { run }.to exit_with_code(1) }
+      it { run_output.should match(/specify a team name/) }
+    end
+
+    context 'when run with one team' do
+      let(:arguments) { ['team', 'show', 'oneteam'] }
+      before{ rest_client.add_team("oneteam") }
+      it { expect { run }.to exit_with_code(0) }
+      it { run_output.should match(/oneteam/) }
+      it { run_output.should match(/ID: 123/) }
+    end
+
+    context 'when run with two teams' do
+      let(:arguments) { ['team', 'show', 'twoteam'] }
+      before do
+        rest_client.add_team("oneteam")
+        rest_client.add_team("twoteam") 
+      end
+      it { expect { run }.to exit_with_code(0) }
+      it { run_output.should match(/twoteam/) }
+      it { run_output.should_not match(/oneteam/) }
+    end
+  end
+
+  describe 'list' do
+    before{ rest_client }
+    let(:arguments) { ['team', 'list'] }
+
+    context 'when run with no teams' do
+      it { expect { run }.to exit_with_code(0) }
+      it { run_output.should match(/member of 0 teams/) }
+    end
+
+    context 'when run with one team' do
+      before{ rest_client.add_team("oneteam") }
+
+      it { expect { run }.to exit_with_code(0) }
+      it "should match output" do
+        output = run_output
+        output.should match("You are a member of 1 team\\.")
+        output.should match("oneteam")
+      end
+
+      context 'when has no members' do
+        before{ rest_client.teams.first.attributes.merge(:members => nil, :id => '123') }
+        it { expect { run }.to exit_with_code(0) }
+        it "should match output" do
+          output = run_output
+          output.should match("oneteam")
+          output.should_not match ("Members:")
+          output.should match ("ID: 123")
+        end
+      end
+
+      context 'when an ID is present and differs from name' do
+        let(:arguments) { ['team', 'list'] }
+        before{ rest_client.teams.first.attributes['id'] = '123' }
+        it { expect { run }.to exit_with_code(0) }
+        it "should match output" do
+          output = run_output
+          output.should match("oneteam")
+          output.should match ("ID:.*123")
+        end
+      end
+
+    end
+
+    context 'when run with one owned team' do
+      let(:arguments) { ['teams', '--mine'] }
+      before{ t = rest_client.add_team('mine', true); rest_client.stub(:owned_teams).and_return([t]) }
+
+      it { expect { run }.to exit_with_code(0) }
+      it "should match output" do
+        output = run_output
+        output.should match("You have 1 team\\.")
+        output.should match("mine")
+      end
+    end
+  end
+
+  describe 'create' do
+    before{ rest_client }
+    let(:arguments) { ['team', 'create', 'testname'] }
+
+    context 'when no issues with ' do
+
+      it "should create a team" do
+        expect { run }.to exit_with_code(0)
+        rest_client.teams[0].name.should == 'testname'
+      end
+      it { run_output.should match(/Creating.*'testname'.*done/m) }
+    end
+  end
+
+  describe 'leave' do
+    before{ rest_client.add_team("deleteme") }
+    let(:arguments) { ['team', 'leave', 'deleteme'] }
+
+    it "should leave the team" do
+      rest_client.teams.first.should_receive(:leave).and_return(RHC::Rest::Membership::Member.new)
+      expect { run }.to exit_with_code(0)
+    end
+  end
+
+  describe 'delete' do
+    before{ rest_client }
+    let(:arguments) { ['team', 'delete', 'deleteme'] }
+
+    context 'when no issues with ' do
+      before{ 
+        t = rest_client.add_team("deleteme")
+        rest_client.should_receive(:owned_teams).and_return([t])
+      }
+
+      it "should delete a team" do
+        expect { run }.to exit_with_code(0)
+        rest_client.teams.empty?.should be_true
+      end
+    end
+
+    context 'when there is a different team' do
+      before do
+        t = rest_client.add_team("dontdelete")
+        rest_client.should_receive(:owned_teams).and_return([t])
+      end
+
+      it "should error out" do
+        expect { run }.to exit_with_code(162)
+        rest_client.teams[0].name.should == 'dontdelete'
+      end
+      it { run_output.should match("Team with name deleteme not found") }
+    end
+
+    context 'when the server does not allow deleting' do
+      before do
+        t = rest_client.add_team("dontdelete")
+        t.links.delete 'DELETE'
+        t.id = "123"
+      end
+      let(:arguments) { ['team','delete','--team-id','123'] }
+      it "should error out" do
+        expect { run }.to exit_with_code(1)
+        rest_client.teams[0].name.should == 'dontdelete'
+      end
+      it { run_output.should match(/not support/) }
+    end
+
+  end
+
+  describe 'help' do
+    let(:arguments) { ['team', '--help'] }
+
+    context 'help is run' do
+      it "should display help" do
+        expect { run }.to exit_with_code(0)
+      end
+      it('should output usage') { run_output.should match("Usage: rhc team") }
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 127
   prerelease: 
   segments: 
   - 1
-  - 23
-  - 7
-  version: 1.23.7
+  - 24
+  - 4
+  version: 1.24.4
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-04-22 00:00:00 Z
+date: 2014-05-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
@@ -267,6 +267,7 @@ files:
 - lib/rhc/context_helper.rb
 - lib/rhc/config.rb
 - lib/rhc/exceptions.rb
+- lib/rhc/commands/team.rb
 - lib/rhc/commands/threaddump.rb
 - lib/rhc/commands/cartridge.rb
 - lib/rhc/commands/base.rb
@@ -356,6 +357,7 @@ files:
 - spec/rhc/commands/apps_spec.rb
 - spec/rhc/commands/account_spec.rb
 - spec/rhc/commands/domain_spec.rb
+- spec/rhc/commands/team_spec.rb
 - spec/rhc/commands/cartridge_spec.rb
 - spec/rhc/commands/app_spec.rb
 - spec/rhc/commands/snapshot_spec.rb
@@ -452,6 +454,7 @@ test_files:
 - spec/rhc/commands/apps_spec.rb
 - spec/rhc/commands/account_spec.rb
 - spec/rhc/commands/domain_spec.rb
+- spec/rhc/commands/team_spec.rb
 - spec/rhc/commands/cartridge_spec.rb
 - spec/rhc/commands/app_spec.rb
 - spec/rhc/commands/snapshot_spec.rb