tddium-preview 0.7.4 → 0.8.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tddium-preview (0.7.3)
+    tddium-preview (0.7.4)
       bundler
       highline
       json

data/features/account_command.feature

@@ -0,0 +1,67 @@
+@mimic
+Feature: Account command
+  As a Tddium user
+  In order to use Tddium in my organization
+  I want to be able to see billing info and control who has access to my account
+
+  Background:
+    Given the user has the following memberships in his account:
+      | id | role    | email               | display                 |
+      | 1  | member  | member@example.com  | [member] member@example.com |
+      | 2  | admin   | admin@example.com   | [admin]  admin@example.com  |
+      | 3  | owner   | owner@example.com   | [owner]  owner@example.com |
+      | 4  | admin   | someone@example.com | [admin]  someone@example.com  |
+
+  Scenario: Display account information
+    Given the user is logged in
+    And the user has a suite for "alpha" on "master"
+    When I run `tddium account`
+    Then the output should contain "someone@example.com"
+    And the output should contain:
+    """
+    [member] member@example.com
+    [admin]  admin@example.com
+    """
+
+  Scenario: Add member to account successfully
+    Given the user is logged in
+    And adding a member to the account will succeed
+    When I successfully run `tddium account:add member member2@example.com`
+    Then the output should contain "Added member2@example.com"
+
+  Scenario: Add member to account unsuccessfully
+    Given the user is logged in
+    And adding a member to the account will fail with error "add member error"
+    When I run `tddium account:add member member@example.com`
+    Then the output should not contain "Added member@example.com"
+    And the output should contain "add member error"
+    And the exit status should not be 0
+
+  Scenario: Fail to add to account when not logged in
+    When I run `tddium account:add member member@example.com`
+    Then it should fail with:
+    """
+    tddium must be initialized. Try 'tddium login'
+    """
+
+  Scenario: Remove member from account successfully
+    Given the user is logged in
+    And removing "member@example.com" from the account will succeed
+    When I successfully run `tddium account:remove member@example.com`
+    Then the output should contain "Removed member@example.com"
+
+  Scenario: Remove member to account unsuccessfully
+    Given the user is logged in
+    And removing "member@example.com" from the account will fail with error "remove member error"
+    When I run `tddium account:remove member@example.com`
+    Then the output should not contain "Removed member@example.com"
+    And the output should contain "remove member error"
+    And the exit status should not be 0
+
+  Scenario: Fail to remove from account when not logged in
+    When I run `tddium account:remove member@example.com`
+    Then it should fail with:
+    """
+    tddium must be initialized. Try 'tddium login'
+    """
+

data/features/login_command.feature

@@ -3,7 +3,7 @@ Feature: Login command
 
   Scenario: Interactively log in successfully
     Given the user can log in and gets API key "apikey"
-    When I run `tddium login --environment=mimic` interactively
+    When I run `tddium login` interactively
     And I type "foo@example.com"
     And I type "barbarbar"
     And the console session ends
@@ -12,25 +12,21 @@ Feature: Login command
     Logged in successfully
     """
     And the exit status should be 0
-    And the file ".tddium.mimic" should contain "apikey"
-    And the file ".gitignore" should contain ".tddium.mimic"
-    And the file ".gitignore" should contain ".tddium-deploy-key.mimic"
+    And dotfiles should be updated
 
   Scenario: Non-interactively log in successfully
     Given the user can log in and gets API key "apikey"
-    When I run `tddium login --environment=mimic --email=foo@example.com --password=barbarbar`
+    When I run `tddium login --email=foo@example.com --password=barbarbar`
     Then the output should contain:
     """
     Logged in successfully
     """
     And the exit status should be 0
-    And the file ".tddium.mimic" should contain "apikey"
-    And the file ".gitignore" should contain ".tddium.mimic"
-    And the file ".gitignore" should contain ".tddium-deploy-key.mimic"
+    And dotfiles should be updated
 
   Scenario: Non-interactively log in unsuccessfully
     Given the user cannot log in
-    When I run `tddium login --environment=mimic --email=foo@example.com --password=barbarbar`
+    When I run `tddium login --email=foo@example.com --password=barbarbar`
     Then the output should contain:
     """
     Access Denied

data/features/step_definitions/account_steps.rb

@@ -0,0 +1,24 @@
+Given /^the user has the following memberships in his account:$/ do |table|
+  MimicServer.server.install(:get, "/1/memberships", {:status=>0, :memberships=>table.hashes})
+  @memberships = {}
+  table.hashes.each do |row|
+    @memberships[row['email']]=row
+  end
+end
+
+Given /^adding a member to the account will succeed$/ do
+  MimicServer.server.install(:post, "/1/memberships", {:status=>0}, :code=>201)
+end
+
+Given /^adding a member to the account will fail with error "([^"]*)"$/ do |error|
+  MimicServer.server.install(:post, "/1/memberships", {:status=>1, :explanation=>error}, :code=>409)
+end
+
+Given /^removing "([^"]*)" from the account will succeed$/ do |member|
+  MimicServer.server.install(:delete, "/1/memberships/#{member}", {:status=>0}, :code=>200)
+end
+
+Given /^removing "([^"]*)" from the account will fail with error "([^"]*)"$/ do |member, error|
+  MimicServer.server.install(:delete, "/1/memberships/#{member}", {:status=>1, :explanation=>error}, :code=>409)
+end
+

data/features/step_definitions/login_steps.rb

@@ -1,5 +1,7 @@
 Given /^the user is logged in$/ do
   @api_key = "abcdef"
+  MimicServer.server.install(:get, "/1/users", SAMPLE_USER_RESPONSE)
+  MimicServer.server.install(:get, "/1/accounts/usage", SAMPLE_ACCOUNT_USAGE)
   steps %Q{
     Given a file named ".tddium.mimic" with:
     """
@@ -16,3 +18,10 @@ Given /^the user cannot log in$/ do
   MimicServer.server.install(:post, "/1/users/sign_in", {:status=>1, :explanation=>"Access Denied."}, :code=>403)
 end
 
+Then /^dotfiles should be updated$/ do
+  steps %Q{
+    And the file ".tddium.mimic" should contain "apikey"
+    And the file ".gitignore" should contain ".tddium.mimic"
+    And the file ".gitignore" should contain ".tddium-deploy-key.mimic"
+  }
+end

data/features/step_definitions/mimic_steps.rb

@@ -1,6 +1,6 @@
 When /^I respond to "([^"]*)" with "([^"]*)"$/ do |expect, response|
   steps %Q{
-    Then the output from "tddium suite --environment=mimic" should contain "#{expect}"
+    Then the output from "tddium suite" should contain "#{expect}"
     When I type "#{response}"
   }
 end

data/features/suite_command.feature

@@ -10,15 +10,15 @@ Feature: suite command
     And the user is logged in
     And the user has no suites
     And the user can create a suite named "beta" on branch "test/foobar"
-    When I run `tddium suite --environment=mimic` interactively
+    When I run `tddium suite` interactively
     And I respond to "repo name" with "beta"
-    Then the output from "tddium suite --environment=mimic" should contain "Detected branch test/foobar"
+    Then the output from "tddium suite" should contain "Detected branch test/foobar"
     And I respond to "test pattern" with ""
     And I respond to "URL to pull from" with "disable"
     And I respond to "URL to push to" with "disable"
     And I respond to "Campfire subdomain" with "disable"
-    Then the output from "tddium suite --environment=mimic" should contain "Pushing changes to Tddium..."
-     And the output from "tddium suite --environment=mimic" should contain "Created suite..."
+    Then the output from "tddium suite" should contain "Pushing changes to Tddium..."
+     And the output from "tddium suite" should contain "Created suite..."
     When the console session ends
     Then the exit status should be 0
 

data/features/support/constants.rb

@@ -61,3 +61,4 @@ require 'aruba/api'
       "recurly_url" => SAMPLE_RECURLY_URL}}
   PASSWORD_ERROR_EXPLANATION = "bad confirmation"
   PASSWORD_ERROR_RESPONSE = {"status"=>1, "explanation"=> PASSWORD_ERROR_EXPLANATION}
+  SAMPLE_ACCOUNT_USAGE = {"status"=>0, "usage"=>"Usage: something"}

data/features/support/mimic.rb

@@ -123,6 +123,7 @@ Before('@mimic') do
   tid = ENV['TDDIUM_TID'] || 0
   port = 8500 + tid.to_i
   ENV['TDDIUM_CLIENT_PORT'] = port.to_s
+  ENV['TDDIUM_CLIENT_ENVIRONMENT'] = 'mimic'
   MimicServer.start(port)
 end
 

data/lib/tddium.rb

@@ -93,6 +93,39 @@ class Tddium < Thor
     end
   end
 
+  desc "account:add [ROLE] [EMAIL]", "Authorize and invite a user to use your account"
+  define_method "account:add" do |role, email|
+    set_shell
+    set_default_environment
+    user_details = user_logged_in?(true, true)
+    exit_failure unless user_details
+
+    params = {:role=>role, :email=>email}
+    begin
+      say Text::Process::ADDING_MEMBER % params
+      result = call_api(:post, Api::Path::MEMBERSHIPS, params)
+      say Text::Process::ADDED_MEMBER % email
+    rescue TddiumClient::Error::API => e
+      exit_failure Text::Error::ADD_MEMBER_ERROR % [email, e.message]
+    end
+  end
+
+  desc "account:remove [EMAIL]", "Remove a user from your account"
+  define_method "account:remove" do |email|
+    set_shell
+    set_default_environment
+    user_details = user_logged_in?(true, true)
+    exit_failure unless user_details
+
+    begin
+      say Text::Process::REMOVING_MEMBER % email
+      result = call_api(:delete, "#{Api::Path::MEMBERSHIPS}/#{email}")
+      say Text::Process::REMOVED_MEMBER % email
+    rescue TddiumClient::Error::API => e
+      exit_failure Text::Error::REMOVE_MEMBER_ERROR % [email, e.message]
+    end
+  end
+
   desc "heroku", "Connect Heroku account with Tddium"
   method_option :email, :type => :string, :default => nil
   method_option :password, :type => :string, :default => nil
@@ -676,7 +709,7 @@ class Tddium < Thor
   end
 
   def set_default_environment
-    env = options[:environment]
+    env = options[:environment] || ENV['TDDIUM_CLIENT_ENVIRONMENT']
     if env.nil?
       tddium_client.environment = :development
       tddium_client.environment = :production unless File.exists?(tddium_file_name)
@@ -723,6 +756,13 @@ class Tddium < Thor
         say Text::Status::ALL_SUITES % current_suites["suites"].collect {|suite| suite["repo_name"]}.join(", ")
       end
 
+      memberships = call_api(:get, Api::Path::MEMBERSHIPS)
+      if memberships["memberships"].length > 1
+        say Text::Status::ACCOUNT_MEMBERS
+        say memberships["memberships"].collect{|x|x['display']}.join("\n")
+        say "\n"
+      end
+
       account_usage = call_api(:get, Api::Path::ACCOUNT_USAGE)
       say account_usage["usage"]
     rescue TddiumClient::Error::Base => e

data/lib/tddium/constant.rb

@@ -31,6 +31,7 @@ module TddiumConstant
       START_TEST_EXECUTIONS = "#{TEST_EXECUTIONS}/start"
       REPORT_TEST_EXECUTIONS = "#{TEST_EXECUTIONS}/report"
       ACCOUNT_USAGE = "accounts/usage"
+      MEMBERSHIPS = "memberships"
     end
     module ErrorCode
       INVALID_INVITATION = 2
@@ -181,6 +182,10 @@ Subdomain and API token are shared by all suites that belong to you (%s).
 Set the "Campfire room name" to 'disable' to disable Campfire notifications
 for this suite.
 EOF
+      ADDING_MEMBER = "Adding %<email>s as %<role>s..."
+      ADDED_MEMBER = "Added %s"
+      REMOVING_MEMBER = "Removing %s. This may take a few seconds..."
+      REMOVED_MEMBER = "Removed %s"
     end
 
     module Status
@@ -286,6 +291,7 @@ Run 'tddium suite --edit' to edit suite settings.
 
 Run 'tddium spec' to run tests in this suite.
 EOF
+      ACCOUNT_MEMBERS = "\nAuthorized users in this account:\n"
     end
 
     module Error
@@ -343,7 +349,8 @@ EOF
         NOT_LOGGED_IN = "Log in to your heroku account first using 'heroku login'"
         APP_NOT_FOUND = "The app '%s' is not recognized by Heroku"
       end
-      
+      ADD_MEMBER_ERROR = "Error adding %s: %s"
+      REMOVE_MEMBER_ERROR = "Error removing %s: %s"
     end
   end
 

data/lib/tddium/version.rb

@@ -3,5 +3,5 @@ Copyright (c) 2011 Solano Labs All Rights Reserved
 =end
 
 module TddiumVersion
-  VERSION = "0.7.4"
+  VERSION = "0.8.0"
 end

metadata

@@ -2,7 +2,7 @@
 name: tddium-preview
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors: 
 - Solano Labs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-30 00:00:00 -07:00
+date: 2011-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,8 +151,10 @@ files:
 - README.rdoc
 - Rakefile
 - bin/tddium
+- features/account_command.feature
 - features/login_command.feature
 - features/logout_command.feature
+- features/step_definitions/account_steps.rb
 - features/step_definitions/aruba_steps.rb
 - features/step_definitions/login_steps.rb
 - features/step_definitions/mimic_steps.rb