tddium-preview 0.8.1 → 0.9.0

data/Gemfile

@@ -9,4 +9,5 @@ group :development, :test do
   gem 'mimic'
   gem 'daemons'
   gem 'httparty'
+  gem 'antilles'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tddium-preview (0.8.0)
+    tddium-preview (0.9.0)
       bundler
       highline
       json
@@ -12,6 +12,12 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
+    antilles (0.1.3)
+      bundler
+      daemons
+      httparty
+      json
+      mimic
     aruba (0.4.6)
       bcat (>= 0.6.1)
       childprocess (>= 0.2.0)
@@ -34,12 +40,12 @@ GEM
     diff-lcs (1.1.3)
     fakefs (0.3.2)
     ffi (1.0.9)
-    gherkin (2.4.16)
+    gherkin (2.4.21)
       json (>= 1.4.6)
     highline (1.6.2)
     httparty (0.7.8)
       crack (= 0.1.8)
-    json (1.5.3)
+    json (1.6.1)
     mimic (0.4.3)
       json
       plist
@@ -69,7 +75,7 @@ GEM
     tddium_client (0.0.10)
       httparty
       json
-    tddium_reporting (0.0.3)
+    tddium_reporting (0.0.4)
     term-ansicolor (1.0.6)
     thor (0.14.6)
     tilt (1.3.3)
@@ -78,6 +84,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  antilles
   aruba
   daemons
   fakefs

data/bin/tddium

@@ -1,6 +1,10 @@
 #!/usr/bin/env ruby
 # 
 # Copyright (c) 2011 Solano Labs All Rights Reserved
+#
+
+require 'yaml'
+YAML::ENGINE.yamler = 'syck'
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require "tddium"

data/features/account_command.feature

@@ -23,6 +23,11 @@ Feature: Account command
     [admin]  admin@example.com
     """
 
+  Scenario: Fail if user isn't logged in
+    When I run `tddium account`
+    Then the exit status should not be 0
+    And the output should contain "tddium login"
+
   Scenario: Add member to account successfully
     Given the user is logged in
     And adding a member to the account will succeed

data/features/activate_command.feature

@@ -0,0 +1,91 @@
+@mimic
+Feature: Activate command
+  As a Tddium user
+  In order to use an invitation code
+  I want to activate my account and upload an ssh key
+
+  Background:
+    Given the command is "tddium activate"
+
+  Scenario:  Try to activate when logged in
+    Given the user is logged in
+    When I run `tddium activate`
+    Then the exit status should not be 0
+    And the output should contain "You are logged in."
+
+  Scenario: Activate for the first time
+    Given "abcdef" is a valid invitation token
+    And a file named "ssh_public_key" with:
+    """
+    ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAkbX/gEl+anbWCMG1qbliaIrI2mcoDk0qPkHFnrlHVCn00zFSY8nHzJoTzkCvBW43iPjagfhHz2mYzChXdbNesf2fxxrvXQbDRrpEyQzw42Iak0OiscomVUkVDyG4J+yR2QH8FiIvx9n2Umow1BLCB/b8socBkyJekMk7NzLf+7/RIOWCgdbj2qY3S8uDNzAVse+lpwkClb+dTLIsy8nYQHnKuG9pLNeTwca5Wu+3+BkgS/Ub6H7m1uaeCxnDz6MiN42uWxwAzWHWd3tZO/cVitTgGpGqDut+E0qbUpg+p8/KNQLYRBb2Mm6DhV4bUVGOJ6/s6bgqr/LjB9WFz4Qjww== moorthi@localhost
+    """
+    When I run `tddium activate` interactively
+    And I respond to "token" with "abcdef"
+    And I respond to "Enter password" with "password"
+    And I respond to "Confirm your password" with "password"
+    And I respond to "Enter your ssh key" with "ssh_public_key"
+    And I respond to "accept the license" with "I AGREE"
+    Then the output from "tddium activate" should contain "Creating account"
+    When the console session ends
+    Then the exit status should be 0
+
+  Scenario: Activate fails with no ssh key
+    Given "abcdef" is a valid invitation token
+    When I run `tddium activate` interactively
+    And I respond to "token" with "abcdef"
+    And I respond to "Enter password" with "password"
+    And I respond to "Confirm your password" with "password"
+    And I respond to "Enter your ssh key" with "ssh_public_key"
+    Then the output from "tddium activate" should contain "not accessible"
+     And the output from "tddium activate" should not contain "accept the license"
+     And the output from "tddium activate" should not contain "Creating account"
+    When the console session ends
+    Then the exit status should not be 0
+
+  Scenario: Activate fails with bad invite token
+    Given "abcdef" is not a valid invitation token
+    And a file named "ssh_public_key" with:
+    """
+    ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAkbX/gEl+anbWCMG1qbliaIrI2mcoDk0qPkHFnrlHVCn00zFSY8nHzJoTzkCvBW43iPjagfhHz2mYzChXdbNesf2fxxrvXQbDRrpEyQzw42Iak0OiscomVUkVDyG4J+yR2QH8FiIvx9n2Umow1BLCB/b8socBkyJekMk7NzLf+7/RIOWCgdbj2qY3S8uDNzAVse+lpwkClb+dTLIsy8nYQHnKuG9pLNeTwca5Wu+3+BkgS/Ub6H7m1uaeCxnDz6MiN42uWxwAzWHWd3tZO/cVitTgGpGqDut+E0qbUpg+p8/KNQLYRBb2Mm6DhV4bUVGOJ6/s6bgqr/LjB9WFz4Qjww== moorthi@localhost
+    """
+    When I run `tddium activate` interactively
+    And I respond to "token" with "abcdef"
+    And I respond to "Enter password" with "password"
+    And I respond to "Confirm your password" with "password"
+    And I respond to "Enter your ssh key" with "ssh_public_key"
+    And I respond to "accept the license" with "I AGREE"
+    Then the output from "tddium activate" should contain "Creating account"
+     And the output from "tddium activate" should contain "409"
+    When the console session ends
+    Then the exit status should not be 0
+
+  Scenario: Activate fails if license isn't accepted
+    Given "abcdef" is not a valid invitation token
+    And a file named "ssh_public_key" with:
+    """
+    ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAkbX/gEl+anbWCMG1qbliaIrI2mcoDk0qPkHFnrlHVCn00zFSY8nHzJoTzkCvBW43iPjagfhHz2mYzChXdbNesf2fxxrvXQbDRrpEyQzw42Iak0OiscomVUkVDyG4J+yR2QH8FiIvx9n2Umow1BLCB/b8socBkyJekMk7NzLf+7/RIOWCgdbj2qY3S8uDNzAVse+lpwkClb+dTLIsy8nYQHnKuG9pLNeTwca5Wu+3+BkgS/Ub6H7m1uaeCxnDz6MiN42uWxwAzWHWd3tZO/cVitTgGpGqDut+E0qbUpg+p8/KNQLYRBb2Mm6DhV4bUVGOJ6/s6bgqr/LjB9WFz4Qjww== moorthi@localhost
+    """
+    When I run `tddium activate` interactively
+    And I respond to "token" with "abcdef"
+    And I respond to "Enter password" with "password"
+    And I respond to "Confirm your password" with "password"
+    And I respond to "Enter your ssh key" with "ssh_public_key"
+    And I respond to "accept the license" with "NO WAY"
+    Then the output from "tddium activate" should not contain "Creating account"
+    When the console session ends
+    Then the exit status should not be 0
+
+  Scenario: Activate fails with password mismatch
+    Given "abcdef" is a valid invitation token
+    And a file named "ssh_public_key" with:
+    """
+    ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAkbX/gEl+anbWCMG1qbliaIrI2mcoDk0qPkHFnrlHVCn00zFSY8nHzJoTzkCvBW43iPjagfhHz2mYzChXdbNesf2fxxrvXQbDRrpEyQzw42Iak0OiscomVUkVDyG4J+yR2QH8FiIvx9n2Umow1BLCB/b8socBkyJekMk7NzLf+7/RIOWCgdbj2qY3S8uDNzAVse+lpwkClb+dTLIsy8nYQHnKuG9pLNeTwca5Wu+3+BkgS/Ub6H7m1uaeCxnDz6MiN42uWxwAzWHWd3tZO/cVitTgGpGqDut+E0qbUpg+p8/KNQLYRBb2Mm6DhV4bUVGOJ6/s6bgqr/LjB9WFz4Qjww== moorthi@localhost
+    """
+    When I run `tddium activate` interactively
+    And I respond to "token" with "abcdef"
+    And I respond to "Enter password" with "password"
+    And I respond to "Confirm your password" with "wordpass"
+    Then the output from "tddium activate" should contain "confirmation incorrect"
+     And the output from "tddium activate" should not contain "Creating account"
+    When the console session ends
+    Then the exit status should not be 0

data/features/login_command.feature

@@ -14,6 +14,12 @@ Feature: Login command
     And the exit status should be 0
     And dotfiles should be updated
 
+  Scenario: Already logged in
+    Given the user is logged in
+    When I run `tddium login`
+    Then the output should contain "already"
+    And the exit status should be 0
+
   Scenario: Non-interactively log in successfully
     Given the user can log in and gets API key "apikey"
     When I run `tddium login --email=foo@example.com --password=barbarbar`

data/features/step_definitions/account_steps.rb

@@ -1,5 +1,5 @@
 Given /^the user has the following memberships in his account:$/ do |table|
-  MimicServer.server.install(:get, "/1/memberships", {:status=>0, :memberships=>table.hashes})
+  Antilles.install(:get, "/1/memberships", {:status=>0, :memberships=>table.hashes})
   @memberships = {}
   table.hashes.each do |row|
     @memberships[row['email']]=row
@@ -7,18 +7,18 @@ Given /^the user has the following memberships in his account:$/ do |table|
 end
 
 Given /^adding a member to the account will succeed$/ do
-  MimicServer.server.install(:post, "/1/memberships", {:status=>0}, :code=>201)
+  Antilles.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)
+  Antilles.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)
+  Antilles.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)
+  Antilles.install(:delete, "/1/memberships/#{member}", {:status=>1, :explanation=>error}, :code=>409)
 end
 

data/features/step_definitions/activate_steps.rb

@@ -0,0 +1,7 @@
+Given /^"([^"]*)" is a valid invitation token$/ do |arg1|
+  Antilles.install(:post, "/1/users", SAMPLE_USER_RESPONSE, :code=>201)
+end
+
+Given /^"([^"]*)" is not a valid invitation token$/ do |arg1|
+  Antilles.install(:post, "/1/users", {:status=>1, :explanation=>"unrecognized"}, :code=>409)
+end

data/features/step_definitions/login_steps.rb

@@ -1,7 +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)
+  Antilles.install(:get, "/1/users", SAMPLE_USER_RESPONSE)
+  Antilles.install(:get, "/1/accounts/usage", SAMPLE_ACCOUNT_USAGE)
   steps %Q{
     Given a file named ".tddium.mimic" with:
     """
@@ -11,11 +11,11 @@ Given /^the user is logged in$/ do
 end
 
 Given /^the user can log in and gets API key "([^"]*)"$/ do |apikey|
-  MimicServer.server.install(:post, "/1/users/sign_in", {:status=>0, :api_key=>apikey})
+  Antilles.install(:post, "/1/users/sign_in", {:status=>0, :api_key=>apikey})
 end
 
 Given /^the user cannot log in$/ do
-  MimicServer.server.install(:post, "/1/users/sign_in", {:status=>1, :explanation=>"Access Denied."}, :code=>403)
+  Antilles.install(:post, "/1/users/sign_in", {:status=>1, :explanation=>"Access Denied."}, :code=>403)
 end
 
 Then /^dotfiles should be updated$/ do

data/features/step_definitions/mimic_steps.rb

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

data/features/step_definitions/suite_steps.rb

@@ -7,15 +7,15 @@ def make_suite_response(name, branch)
 end
 
 Given /^the user has a suite for "([^"]*)" on "([^"]*)"$/ do |name, branch|
-  MimicServer.server.install(:get, "/1/suites", {:status=>0, :suites=>[make_suite_response(name, branch)]})
+  Antilles.install(:get, "/1/suites", {:status=>0, :suites=>[make_suite_response(name, branch)]})
 end
 
 Given /^the user has no suites/ do
-  MimicServer.server.install(:get, "/1/suites", {:status=>0, :suites=>[]})
+  Antilles.install(:get, "/1/suites", {:status=>0, :suites=>[]})
 end
 
 Given /^the user can create a suite named "([^"]*)" on branch "([^"]*)"$/ do |name, branch|
-  MimicServer.server.install(:post, "/1/suites", {:status=>0, :suite=>make_suite_response(name, branch)}, :code=>201)
+  Antilles.install(:post, "/1/suites", {:status=>0, :suite=>make_suite_response(name, branch)}, :code=>201)
 end
 
 Given /^the destination repo exists$/ do
@@ -41,3 +41,12 @@ Given /^a git repo is initialized on branch "([^"]*)"$/ do |branch|
     And I successfully run `git checkout -b #{branch}`
   }
 end
+
+Given /^I choose defaults for test pattern, CI and campfire settings$/ do
+  steps %Q{
+    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"
+  }
+end

data/features/suite_command.feature

@@ -4,6 +4,9 @@ Feature: suite command
   In order to interact with Tddium
   I want to configure a test suite
 
+  Background:
+    Given the command is "tddium suite"
+
   Scenario: Configure a new suite with a complex branch
     Given the destination repo exists
     And a git repo is initialized on branch "test/foobar"
@@ -11,14 +14,35 @@ Feature: suite command
     And the user has no suites
     And the user can create a suite named "beta" on branch "test/foobar"
     When I run `tddium suite` interactively
+    Then the output from "tddium suite" should contain "Looks like"
+    And I respond to "repo name" with "beta"
+    Then the output from "tddium suite" should contain "Detected branch test/foobar"
+    When I choose defaults for test pattern, CI and campfire settings
+    Then the output from "tddium suite" should contain "Created suite..."
+    When the console session ends
+    Then the exit status should be 0
+
+  Scenario: Configure new suite with ruby from tddium.yml
+    Given the destination repo exists
+    And a git repo is initialized on branch "test/foobar"
+    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"
+    And a file named "config/tddium.yml" with:
+    """
+    ---
+    :tddium:
+       :ruby_version:  ruby-1.9.2-p290-psych
+    """
+    When I run `tddium suite` interactively
+    Then the output from "tddium suite" should contain "Looks like"
     And I respond to "repo name" with "beta"
     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" should contain "Pushing changes to Tddium..."
-     And the output from "tddium suite" should contain "Created suite..."
+    Then the output from "tddium suite" should contain "Configured ruby ruby-1.9.2-p290-psych from tddium.yml"
+    When I choose defaults for test pattern, CI and campfire settings
+    Then the output from "tddium suite" should contain "Created suite..."
     When the console session ends
     Then the exit status should be 0
 
+
+

data/features/support/mimic.rb

@@ -1,137 +1,13 @@
 # Copyright (c) 2011 Solano Labs All Rights Reserved
 
-require 'mimic'
-require 'timeout'
-require 'daemons'
-require 'httparty'
+require 'antilles/cucumber'
 
-class MimicServer
-  attr_reader :port
+tid = ENV['TDDIUM_TID'] || 0
+port = 8500 + tid.to_i
+ENV['TDDIUM_CLIENT_PORT'] = port.to_s
+ENV['TDDIUM_CLIENT_ENVIRONMENT'] = 'mimic'
 
-  def initialize(port, log=nil)
-    @port = port || 8080
-    @pid_list = []
-    @log = log
-  end
-
-  def start
-    pid = Kernel.fork
-    if pid.nil? then
-      args = {:fork => false,
-              :host => 'localhost',
-              :port => @port,
-              :remote_configuration_path => '/api'}
-      args[:log] = @log if @log
-      Mimic.mimic(args) do
-        [:INT, :TERM].each { |sig| trap(sig) { Kernel.exit!(0) } }
-      end
-      Kernel.exit!(0)
-    end
-    @pid_list.push(pid)
-    wait
-  end
-
-  def stop
-    @pid_list.each do |pid|
-      Process.kill("TERM", pid)
-    end
-    @pid_list = []
-  end
-
-  def wait
-    (0...5).each do |i|
-      if ping then
-        break
-      end
-      Kernel.sleep(0.1)
-    end
-  end
-
-  def ping
-    begin
-      http = call_api(:get,  '/api/ping')
-    rescue Exception, Timeout::Error
-      return false
-    end
-    return http.code == 200
-  end
-
-  def clear
-    http = call_api(:post,  '/api/clear')
-    return http
-  end
-
-  def install(verb, path, body, options={})
-    api_headers = options.delete(:api_headers)
-    params = { 'path' => path, 'body' => body.to_json }.merge(options)
-    http = call_api(:post,  "/api/#{verb}", params.to_json, api_headers)
-    return http
-  end
-
-  def call_api(method, path, params = {}, headers = {})
-    tries = 0
-    retries = 7
-    done = false
-    while (tries <= retries) && !done
-      begin
-        http = HTTParty.send(method, "http://localhost:#{@port}#{path}",
-                             :body => params, :headers => headers)
-        done = true
-      rescue SystemCallError
-        Kernel.sleep(0.5)
-      rescue Timeout::Error
-        Kernel.sleep(0.5)
-      ensure
-        tries += 1
-      end
-    end
-    raise Timeout::Error if tries > retries && retries >= 0
-    return http
-  end
-
-  class << self
-    def test
-      mimic = MimicServer.start
-      mimic.clear
-      mimic.stop
-    end
-
-    def start(port=nil, log=nil)
-      return @server if @server
-      @server = MimicServer.new(port, log || @log)
-      @server.start
-      @server
-    end
-
-    def server
-      @server
-    end
-
-    def clear
-      @server.clear rescue nil
-    end
-
-    def log=(log)
-      @log = log
-    end
-  end
-end
-
-MimicServer.log = STDOUT
-
-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
-
-After('@mimic') do
-  MimicServer.clear
-end
-
-at_exit do
-  server = MimicServer.server
-  server.stop if server
+Antilles.configure do |server|
+  server.log = STDOUT
+  server.port = port
 end

data/lib/tddium.rb

@@ -40,16 +40,27 @@ class Tddium < Thor
   class_option :environment, :type => :string, :default => nil
   class_option :port, :type => :numeric, :default => nil
 
-  desc "account", "View/Manage account information"
+  desc "account", "View account information"
+  def account
+    set_shell
+    set_default_environment
+    if user_details = user_logged_in?(true, true)
+      # User is already logged in, so just display the info
+      show_user_details(user_details)
+    else
+      exit_failure Text::Error::USE_ACTIVATE
+    end
+  end
+
+  desc "activate", "Activate an account with an invitation token"
   method_option :email, :type => :string, :default => nil
   method_option :password, :type => :string, :default => nil
   method_option :ssh_key_file, :type => :string, :default => nil
-  def account
+  def activate
     set_shell
     set_default_environment
     if user_details = user_logged_in?
-      # User is already logged in, so just display the info
-      show_user_details(user_details)
+      exit_failure Text::Error::ACTIVATE_LOGGED_IN
     else
       params = get_user_credentials(options.merge(:invited => true))
 
@@ -73,7 +84,7 @@ class Tddium < Thor
       end
       say content
       license_accepted = ask(Text::Prompt::LICENSE_AGREEMENT)
-      return unless license_accepted.downcase == Text::Prompt::Response::AGREE_TO_LICENSE.downcase
+      exit_failure unless license_accepted.downcase == Text::Prompt::Response::AGREE_TO_LICENSE.downcase
 
       begin
         say Text::Process::STARTING_ACCOUNT_CREATION
@@ -86,9 +97,9 @@ class Tddium < Thor
           say Text::Process::ACCOUNT_ADDED % [new_user["user"]["email"], new_user["user"]["account_role"], new_user["user"]["account"]]
         end
       rescue TddiumClient::Error::API => e
-        say((e.status == Api::ErrorCode::INVALID_INVITATION) ? Text::Error::INVALID_INVITATION : e.message)
+        exit_failure ((e.status == Api::ErrorCode::INVALID_INVITATION) ? Text::Error::INVALID_INVITATION : e.message)
       rescue TddiumClient::Error::Base => e
-        say e.message
+        exit_failure say e.message
       end
     end
   end
@@ -208,6 +219,9 @@ class Tddium < Thor
     say Text::Process::LOGGED_OUT_SUCCESSFULLY
   end
 
+  map "cucumber" => :spec
+  map "test" => :spec
+  map "run" => :spec
   desc "spec", "Run the test suite"
   method_option :user_data_file, :type => :string, :default => nil
   method_option :max_parallelism, :type => :numeric, :default => nil
@@ -248,7 +262,7 @@ class Tddium < Thor
       suite_details = call_api(:get, current_suite_path)
 
       # Push the latest code to git
-      exit_failure unless update_git_remote_and_push(suite_details)
+      exit_failure Text::Error::GIT_PUSH_FAILED unless update_git_remote_and_push(suite_details)
 
       # Create a session
       new_session = call_api(:post, Api::Path::SESSIONS)
@@ -350,7 +364,7 @@ class Tddium < Thor
     end
   end
 
-  desc "suite", "Register the suite for this project, or edit its settings"
+  desc "suite", "Register the current repo/branch, view/edit CI repos & deploy keys"
   method_option :edit, :type => :boolean, :default => false
   method_option :name, :type => :string, :default => nil
   method_option :pull_url, :type => :string, :default => nil
@@ -376,6 +390,8 @@ class Tddium < Thor
         default_suite_name = File.basename(Dir.pwd)
         params[:repo_name] = options[:name] || default_suite_name
 
+        say Text::Process::NO_CONFIGURED_SUITE % [params[:repo_name], params[:branch]]
+
         use_existing_suite, existing_suite = resolve_suite_name(options, params, default_suite_name)
 
         if use_existing_suite
@@ -397,9 +413,6 @@ class Tddium < Thor
         # Save the created suite
         write_suite(new_suite["suite"])
 
-        # Manage git
-        exit_failure("Failed to push repo to Tddium!") unless update_git_remote_and_push(new_suite)
-
         say Text::Process::CREATED_SUITE % format_suite_details(new_suite["suite"])
       end
     rescue TddiumClient::Error::Base
@@ -465,6 +478,20 @@ class Tddium < Thor
     end
   end
 
+  def tool_version(tool)
+    key = "#{tool}_version".to_sym
+    result = tddium_config[key]
+
+    if result
+      say Text::Process::CONFIGURED_VERSION % [tool, result]
+      return result
+    end
+
+    result = `#{tool} -v`.strip
+    say Text::Process::DEPENDENCY_VERSION % [tool, result]
+    result
+  end
+
   def current_git_branch
     @current_git_branch ||= `git symbolic-ref HEAD`.gsub("\n", "").split("/")[2..-1].join("/")
   end
@@ -483,12 +510,6 @@ class Tddium < Thor
     "#{Api::Path::SUITES}/#{current_suite_id}"
   end
 
-  def dependency_version(command)
-    result = `#{command} -v`.strip
-    say Text::Process::DEPENDENCY_VERSION % [command, result]
-    result
-  end
-
   def display_attributes(names_to_display, attributes)
     names_to_display.each do |attr|
       say Text::Status::ATTRIBUTE_DETAIL % [attr.gsub("_", " ").capitalize, attributes[attr]] if attributes[attr]
@@ -618,7 +639,13 @@ class Tddium < Thor
   def prompt_ssh_key(current)
     # Prompt for ssh-key file
     ssh_file = prompt(Text::Prompt::SSH_KEY, options[:ssh_key_file], Default::SSH_FILE)
-    data = File.open(File.expand_path(ssh_file)) {|file| file.read}
+
+    begin
+      data = File.open(File.expand_path(ssh_file)) {|file| file.read}
+    rescue Errno::ENOENT => e
+      raise TddiumError.new(Text::Error::INACCESSIBLE_SSH_PUBLIC_KEY % [ssh_file, e])
+    end
+
     if data =~ /^-+BEGIN [DR]SA PRIVATE KEY-+/ then
       raise TddiumError.new(Text::Error::INVALID_SSH_PUBLIC_KEY % ssh_file)
     end
@@ -630,9 +657,9 @@ class Tddium < Thor
 
   def prompt_suite_params(options, params, current={})
     say Text::Process::DETECTED_BRANCH % params[:branch] if params[:branch]
-    params[:ruby_version] = dependency_version(:ruby)
-    params[:bundler_version] = dependency_version(:bundle)
-    params[:rubygems_version] = dependency_version(:gem)
+    params[:ruby_version] = tool_version(:ruby)
+    params[:bundler_version] = tool_version(:bundle)
+    params[:rubygems_version] = tool_version(:gem)
 
     ask_or_update = lambda do |key, text, default|
       params[key] = prompt(text, options[key], current.fetch(key.to_s, default))
@@ -794,6 +821,10 @@ puts "EXN: #{e.inspect}"
     @tddium_client ||= TddiumClient::Client.new
   end
 
+  def tddium_config
+    YAML.load(File.read(Config::CONFIG_PATH))[:tddium] rescue {}
+  end
+
   def tddium_file_name
     extension = ".#{environment}" unless environment == :production
     ".tddium#{extension}"
@@ -803,10 +834,10 @@ puts "EXN: #{e.inspect}"
     options[:fail_with_message] = true unless options[:fail_with_message] == false
     if @tddium_settings.nil? || options[:force_reload]
       if File.exists?(tddium_file_name)
-        tddium_config = File.open(tddium_file_name) do |file|
+        settings_file = File.open(tddium_file_name) do |file|
           file.read
         end
-        @tddium_settings = JSON.parse(tddium_config) rescue nil
+        @tddium_settings = JSON.parse(settings_file) rescue nil
         say (Text::Error::INVALID_TDDIUM_FILE % environment) if @tddium_settings.nil? && options[:fail_with_message]
       else
         say Text::Error::NOT_INITIALIZED if options[:fail_with_message]

data/lib/tddium/constant.rb

@@ -15,6 +15,10 @@ module TddiumConstant
     SUITE_TEST_PATTERN = "features/*.feature, spec/**/*_spec.rb, test/**/*_test.rb"
   end
 
+  module Config
+    CONFIG_PATH = "config/tddium.yml"
+  end
+
   module Git
     REMOTE_NAME = "tddium"
     GITIGNORE = ".gitignore"
@@ -74,6 +78,7 @@ module TddiumConstant
     end
 
     module Process
+      NO_CONFIGURED_SUITE = "Looks like you haven't set up a suite on this computer for %s/%s..."
       TERMINATE_INSTRUCTION = "Press Ctrl-C to stop waiting.  Tests will continue running."
       INTERRUPT = "Interrupted"
       GIT_PUSH = "Pushing changes to Tddium..."
@@ -134,6 +139,7 @@ with Tddium.
 "
       UPDATED_SUITE = "Updated suite successfully."
       DEPENDENCY_VERSION = "Detected %s %s"
+      CONFIGURED_VERSION = "Configured %s %s from tddium.yml"
       DETECTED_BRANCH = "Detected branch %s"
       SETUP_CI_FIRST_TIME =<<EOF;
 
@@ -295,7 +301,19 @@ EOF
     end
 
     module Error
+      GIT_PUSH_FAILED = <<EOF;
+
+The git push to Tddium failed.
+
+SSH may not be configured to authenticate with the keypair you provided when you set up your account.
+
+See this URL for SSH configuration instructions:
+
+https://www.tddium.com/support/faq#othersshkey
+
+EOF
       INVALID_SSH_PUBLIC_KEY = '%s does not appear to be a valid SSH public key'
+      INACCESSIBLE_SSH_PUBLIC_KEY = '%s is not accessible: %s'
       GIT_CHANGES_NOT_COMMITTED =<<EOF
 There are uncommitted changes in the local git repository.
 
@@ -351,6 +369,8 @@ EOF
       end
       ADD_MEMBER_ERROR = "Error adding %s: %s"
       REMOVE_MEMBER_ERROR = "Error removing %s: %s"
+      ACTIVATE_LOGGED_IN = "You are logged in.  Use 'tddium account' for account information"
+      USE_ACTIVATE = "Use 'tddium activate' to accept an invitation token"
     end
   end
 

data/lib/tddium/version.rb

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

data/spec/tddium_spec.rb

@@ -307,23 +307,6 @@ describe Tddium do
     end
   end
 
-  shared_examples_for "a password prompt" do
-    context "--password was not passed in" do
-      it "should prompt for a password or confirmation" do
-        highline = mock(HighLine)
-        HighLine.should_receive(:ask).with(password_prompt).and_yield(highline)
-        highline.should_receive(:echo=).with("*")
-        run(tddium)
-      end
-    end
-    context "--password was passed in" do
-      it "should not prompt for a password or confirmation" do
-        HighLine.should_not_receive(:ask).with(password_prompt)
-        run(tddium, :password => SAMPLE_PASSWORD)
-      end
-    end
-  end
-
   shared_examples_for "an unsuccessful api call" do
     it "should show the error" do
       tddium_client.stub(:call_api).and_raise(TddiumClient::Error::Base)
@@ -508,28 +491,6 @@ describe Tddium do
     end
   end
 
-
-  shared_examples_for "show account usage" do
-    it "should send a 'GET' request to '#{Tddium::Api::Path::ACCOUNT_USAGE}'" do
-      call_api_should_receive(:method => :get, :path => Tddium::Api::Path::ACCOUNT_USAGE)
-      run(tddium)
-    end
-
-    context "'GET #{Tddium::Api::Path::SUITES}' is successful" do
-      before { stub_call_api_response(:get, Tddium::Api::Path::ACCOUNT_USAGE, {"usage" => "something"}) }
-
-      it "should display the account usage" do
-        tddium.should_receive(:say).with("something")
-        run(tddium)
-      end
-
-      it "should show all suites" do
-        tddium.should_receive(:say).with(Tddium::Text::Status::ALL_SUITES % SAMPLE_APP_NAME)
-        run(tddium)
-      end
-    end
-  end
-
   describe "#password" do
     before do
       stub_defaults
@@ -739,204 +700,6 @@ describe Tddium do
     end
   end
 
-
-  describe "#account" do
-    before do
-      stub_defaults
-      tddium.stub(:ask).and_return("")
-      HighLine.stub(:ask).and_return("")
-      create_file(File.join(File.dirname(__FILE__), "..", Tddium::License::FILE_NAME), SAMPLE_LICENSE_TEXT)
-      create_file(Tddium::Default::SSH_FILE, SAMPLE_SSH_PUBKEY)
-      HerokuConfig.stub(:read_config).and_return(nil)
-    end
-
-    it_should_behave_like "set the default environment"
-
-    context "the user is already logged in" do
-      before do
-        stub_config_file(:api_key => SAMPLE_API_KEY)
-        stub_call_api_response(:get, Tddium::Api::Path::USERS, SAMPLE_USER_RESPONSE)
-        stub_call_api_response(:get, Tddium::Api::Path::SUITES, {"suites" => []})
-        stub_call_api_response(:get, Tddium::Api::Path::ACCOUNT_USAGE, {"usage" => "something"})
-      end
-
-      it "should show the user's email address" do
-        tddium.should_receive(:say).with(/#{SAMPLE_EMAIL}/)
-        run_account(tddium)
-      end
-
-      it "should show the user's account creation date" do
-        tddium.should_receive(:say).with(/#{SAMPLE_DATE_TIME}/)
-        run_account(tddium)
-      end
-
-      it "should show the user's recurly account url" do
-        tddium.should_receive(:say).with(/#{SAMPLE_RECURLY_URL}/)
-        run_account(tddium)
-      end
-
-     # it_should_behave_like "show account usage"
-    end
-
-    context "the user is not already logged in" do
-      let(:call_api_result) {[403, "Forbidden"]}
-
-      it_should_behave_like "a password prompt" do
-        let(:password_prompt) {Tddium::Text::Prompt::PASSWORD_CONFIRMATION}
-      end
-
-      context "the user does not confirm their password correctly" do
-        before {HighLine.stub(:ask).with(Tddium::Text::Prompt::PASSWORD_CONFIRMATION).and_return("wrong confirmation")}
-        it "should tell the user '#{Tddium::Text::Process::PASSWORD_CONFIRMATION_INCORRECT}'" do
-          account_should_fail(tddium) do
-            tddium.should_receive(:exit_failure).with(Tddium::Text::Process::PASSWORD_CONFIRMATION_INCORRECT)
-          end
-        end
-      end
-
-      context "the user confirms their password correctly" do
-        before do
-          HighLine.stub(:ask).with(Tddium::Text::Prompt::PASSWORD).and_return(SAMPLE_PASSWORD)
-          HighLine.stub(:ask).with(Tddium::Text::Prompt::PASSWORD_CONFIRMATION).and_return(SAMPLE_PASSWORD)
-        end
-
-        it_behaves_like "prompt for ssh key"
-
-        it "should show the user the license" do
-          tddium.should_receive(:say).with(SAMPLE_LICENSE_TEXT)
-          run_account(tddium)
-        end
-
-        it "should ask the user to accept the license" do
-          tddium.should_receive(:ask).with(Tddium::Text::Prompt::LICENSE_AGREEMENT)
-          run_account(tddium)
-        end
-
-        context "accepting the license" do
-          before do
-            tddium.stub(:ask).with(Tddium::Text::Prompt::LICENSE_AGREEMENT).and_return(Tddium::Text::Prompt::Response::AGREE_TO_LICENSE)
-            tddium.stub(:ask).with(Tddium::Text::Prompt::INVITATION_TOKEN).and_return(SAMPLE_INVITATION_TOKEN)
-            create_file(Tddium::Default::SSH_FILE, "ssh-rsa 1234")
-          end
-
-          it "should send a 'POST' request to '#{Tddium::Api::Path::USERS}' with the user's invitation token, password and ssh key" do
-            call_api_should_receive(:method => :post, :path => /#{Tddium::Api::Path::USERS}$/, :params => {:user => {:invitation_token => SAMPLE_INVITATION_TOKEN, :password => SAMPLE_PASSWORD, :user_git_pubkey => "ssh-rsa 1234"}}, :api_key => false)
-            run_account(tddium)
-          end
-
-          context "'POST #{Tddium::Api::Path::USERS}' succeeds in creating a new account" do
-            before{stub_call_api_response(:post, Tddium::Api::Path::USERS, SAMPLE_USER_RESPONSE)}
-
-            it_should_behave_like "writing the api key to the .tddium file"
-
-            it "should show the user '#{Tddium::Text::Process::ACCOUNT_CREATED % [SAMPLE_EMAIL, SAMPLE_RECURLY_URL]}'" do
-              tddium.should_receive(:say).with(Tddium::Text::Process::ACCOUNT_CREATED % [SAMPLE_EMAIL, SAMPLE_RECURLY_URL])
-              run_account(tddium)
-            end
-          end
-
-          context "'POST #{Tddium::Api::Path::USERS}' succeeds in adding a new account" do
-            before{stub_call_api_response(:post, Tddium::Api::Path::USERS, SAMPLE_ADDED_USER_RESPONSE)}
-
-            it_should_behave_like "writing the api key to the .tddium file"
-
-            it "should show the user '#{Tddium::Text::Process::ACCOUNT_ADDED % [SAMPLE_EMAIL, SAMPLE_ROLE, SAMPLE_ACCOUNT_NAME]}'" do
-              tddium.should_receive(:say).with(Tddium::Text::Process::ACCOUNT_ADDED % [SAMPLE_EMAIL, SAMPLE_ROLE, SAMPLE_ACCOUNT_NAME])
-              run_account(tddium)
-            end
-          end
-          context "'POST #{Tddium::Api::Path::USERS}' is unsuccessful" do
-
-            it_should_behave_like "an unsuccessful api call"
-
-            context "because the invitation is invalid" do
-              before { stub_call_api_response(:post, Tddium::Api::Path::USERS, {"status" => Tddium::Api::ErrorCode::INVALID_INVITATION}) }
-              it "should show the user: '#{Tddium::Text::Error::INVALID_INVITATION}'" do
-                tddium.should_receive(:say).with(Tddium::Text::Error::INVALID_INVITATION)
-                run_account(tddium)
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-
-  describe "#login" do
-    before do
-      stub_defaults
-      tddium.stub(:ask).and_return("")
-      HighLine.stub(:ask).and_return("")
-    end
-
-    it_should_behave_like "set the default environment"
-
-    context "there is a tddium config file with an api key" do
-      before {stub_config_file(:api_key => "some api key")}
-
-      it "should send a 'GET' request to '#{Tddium::Api::Path::USERS}'" do
-        call_api_should_receive(:method => :get, :path => /#{Tddium::Api::Path::USERS}$/)
-        run(tddium)
-      end
-    end
-
-    context "the tddium config file is missing or corrupt or the api key is invalid" do
-      context "--email was not passed in" do
-        it "should prompt for the user's email address" do
-          tddium.should_receive(:ask).with(Tddium::Text::Prompt::EMAIL)
-          run(tddium)
-        end
-      end
-
-      context "--email was passed in" do
-        it "should not prompt for the user's email address" do
-          tddium.should_not_receive(:ask).with(Tddium::Text::Prompt::EMAIL)
-          run(tddium, :email => SAMPLE_EMAIL)
-        end
-      end
-
-      it_should_behave_like "a password prompt" do
-        let(:password_prompt) {Tddium::Text::Prompt::PASSWORD}
-      end
-
-      it "should try to sign in the user with their email & password" do
-        tddium.stub(:ask).with(Tddium::Text::Prompt::EMAIL).and_return(SAMPLE_EMAIL)
-        HighLine.stub(:ask).with(Tddium::Text::Prompt::PASSWORD).and_return(SAMPLE_PASSWORD)
-        call_api_should_receive(:method => :post, :path => /#{Tddium::Api::Path::SIGN_IN}$/, :params => {:user => {:email => SAMPLE_EMAIL, :password => SAMPLE_PASSWORD}}, :api_key => false)
-        run(tddium)
-      end
-
-      context "the user logs in successfully with their email and password" do
-        before{stub_call_api_response(:post, Tddium::Api::Path::SIGN_IN, {"api_key" => SAMPLE_API_KEY})}
-        it_should_behave_like "writing the api key to the .tddium file"
-      end
-    end
-
-    context "user is already logged in" do
-      before do
-        stub_config_file(:api_key => SAMPLE_API_KEY)
-        stub_call_api_response(:get, Tddium::Api::Path::USERS)
-      end
-
-      it "should show the user: '#{Tddium::Text::Process::ALREADY_LOGGED_IN}'" do
-        tddium.should_receive(:say).with(Tddium::Text::Process::ALREADY_LOGGED_IN)
-        run_login(tddium)
-      end
-    end
-
-    context "the user logs in successfully" do
-      before{ stub_call_api_response(:post, Tddium::Api::Path::SIGN_IN, {"api_key" => SAMPLE_API_KEY})}
-      it "should show the user: '#{Tddium::Text::Process::LOGGED_IN_SUCCESSFULLY}'" do
-        tddium.should_receive(:say).with(Tddium::Text::Process::LOGGED_IN_SUCCESSFULLY)
-        run_login(tddium)
-      end
-    end
-
-    context "the user does not sign in successfully" do
-      it_should_behave_like "an unsuccessful api call"
-    end
-  end
-
   describe "#spec" do
     before do
       stub_defaults

metadata

@@ -2,7 +2,7 @@
 name: tddium-preview
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors: 
 - Solano Labs
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 -07:00
-default_executable: 
+date: 2011-09-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -152,9 +151,11 @@ files:
 - Rakefile
 - bin/tddium
 - features/account_command.feature
+- features/activate_command.feature
 - features/login_command.feature
 - features/logout_command.feature
 - features/step_definitions/account_steps.rb
+- features/step_definitions/activate_steps.rb
 - features/step_definitions/aruba_steps.rb
 - features/step_definitions/login_steps.rb
 - features/step_definitions/mimic_steps.rb
@@ -172,7 +173,6 @@ files:
 - spec/spec_helper.rb
 - spec/tddium_spec.rb
 - tddium.gemspec
-has_rdoc: true
 homepage: http://www.tddium.com/
 licenses: []
 
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tddium
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: tddium Hosted Ruby Testing