tddium-preview 0.7.3 → 0.7.4

data/Gemfile.lock

@@ -5,19 +5,23 @@ PATH
       bundler
       highline
       json
-      tddium_client (>= 0.0.9)
+      tddium_client (>= 0.0.10)
       tddium_reporting (>= 0.0.3)
       thor
 
 GEM
   remote: http://rubygems.org/
   specs:
-    aruba (0.3.6)
-      childprocess (>= 0.1.7)
-      cucumber (>= 0.10.0)
-      rspec (>= 2.5.0)
+    aruba (0.4.6)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.2.0)
+      cucumber (>= 1.0.2)
+      rdiscount (>= 1.6.8)
+      rspec (>= 2.6.0)
+    bcat (0.6.1)
+      rack (~> 1.0)
     builder (3.0.0)
-    childprocess (0.2.0)
+    childprocess (0.2.2)
       ffi (~> 1.0.6)
     crack (0.1.8)
     cucumber (1.0.2)
@@ -27,10 +31,10 @@ GEM
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
     daemons (1.1.4)
-    diff-lcs (1.1.2)
-    fakefs (0.3.1)
+    diff-lcs (1.1.3)
+    fakefs (0.3.2)
     ffi (1.0.9)
-    gherkin (2.4.5)
+    gherkin (2.4.16)
       json (>= 1.4.6)
     highline (1.6.2)
     httparty (0.7.8)
@@ -45,29 +49,30 @@ GEM
       cucumber (>= 0.8)
       rake
     plist (3.1.0)
-    rack (1.3.0)
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rack (1.3.2)
+    rake (0.9.2)
+    rdiscount (1.6.8)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    simplecov (0.4.1)
-      simplecov-html (~> 0.4.3)
-    simplecov-html (0.4.3)
+    rspec-mocks (2.6.0)
+    simplecov (0.4.2)
+      simplecov-html (~> 0.4.4)
+    simplecov-html (0.4.5)
     sinatra (1.2.6)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
-    tddium_client (0.0.9)
+    tddium_client (0.0.10)
       httparty
       json
     tddium_reporting (0.0.3)
     term-ansicolor (1.0.6)
     thor (0.14.6)
-    tilt (1.3.2)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby

data/features/login_command.feature

@@ -0,0 +1,40 @@
+@mimic
+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
+    And I type "foo@example.com"
+    And I type "barbarbar"
+    And the console session ends
+    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"
+
+  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`
+    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"
+
+  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`
+    Then the output should contain:
+    """
+    Access Denied
+    """
+    And the exit status should be 1
+    And the file ".tddium.mimic" should not exist
+    And the file ".gitignore" should not exist

data/features/logout_command.feature

@@ -0,0 +1,16 @@
+@mimic
+Feature: Logout Command
+
+  Scenario: Logout successfully
+    Given a file named ".tddium.mimic" with:
+    """
+    {'api_key':'abcdef'}
+    """
+    When I run `tddium logout --environment=mimic` interactively
+    And the console session ends
+    Then the output should contain:
+    """
+    Logged out successfully
+    """
+    And the exit status should be 0
+    And the file ".tddium.mimic" should not exist

data/features/step_definitions/aruba_steps.rb

@@ -0,0 +1,4 @@
+
+When /^the console session ends$/ do
+  @last_exit_status = @interactive.stop(true)
+end

data/features/step_definitions/login_steps.rb

@@ -0,0 +1,18 @@
+Given /^the user is logged in$/ do
+  @api_key = "abcdef"
+  steps %Q{
+    Given a file named ".tddium.mimic" with:
+    """
+    {"api_key":"#{@api_key}"}
+    """
+  }
+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})
+end
+
+Given /^the user cannot log in$/ do
+  MimicServer.server.install(:post, "/1/users/sign_in", {:status=>1, :explanation=>"Access Denied."}, :code=>403)
+end
+

data/features/step_definitions/mimic_steps.rb

@@ -1,7 +1,6 @@
-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})
-end
-
-When /^the console session ends$/ do
-  @last_exit_status = @interactive.stop
+When /^I respond to "([^"]*)" with "([^"]*)"$/ do |expect, response|
+  steps %Q{
+    Then the output from "tddium suite --environment=mimic" should contain "#{expect}"
+    When I type "#{response}"
+  }
 end

data/features/step_definitions/suite_steps.rb

@@ -0,0 +1,43 @@
+def make_suite_response(name, branch)
+  suite = SAMPLE_SUITE_RESPONSE
+  suite["repo_name"] = name
+  suite["branch"] = branch
+  suite["git_repo_uri"] = "file:///#{Dir.tmpdir}/aruba/repo"
+  suite
+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)]})
+end
+
+Given /^the user has no suites/ do
+  MimicServer.server.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)
+end
+
+Given /^the destination repo exists$/ do
+  steps %Q{
+    Given a directory named "repo"
+    And I cd to "repo"
+    And I successfully run `git init --bare .`
+    And I cd to ".."
+  }
+end
+
+Given /^a git repo is initialized on branch "([^"]*)"$/ do |branch|
+  steps %Q{
+    Given a directory named "work"
+    And I cd to "work"
+    And I successfully run `git init .`
+    And a file named "testfile" with:
+    """
+    some data
+    """
+    And I successfully run `git add .`
+    And I successfully run `git commit -am 'testfile'`
+    And I successfully run `git checkout -b #{branch}`
+  }
+end

data/features/suite_command.feature

@@ -0,0 +1,24 @@
+@mimic
+Feature: suite command
+  As a user
+  In order to interact with Tddium
+  I want to configure a test 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"
+    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
+    And I respond to "repo name" with "beta"
+    Then the output from "tddium suite --environment=mimic" 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..."
+    When the console session ends
+    Then the exit status should be 0
+

data/features/support/aruba.rb

@@ -0,0 +1,6 @@
+Before do
+  @aruba_timeout_seconds = 10
+  @aruba_io_wait_seconds = 2
+  @dirs = [Dir.tmpdir, "aruba"]
+  FileUtils.rm_rf(current_dir)
+end

data/features/support/constants.rb

@@ -0,0 +1,63 @@
+require 'aruba/api'
+
+  SAMPLE_API_KEY = "afb12412bdafe124124asfasfabebafeabwbawf1312342erbfasbb"
+  SAMPLE_APP_NAME = "tddelicious"
+  SAMPLE_BRANCH_NAME = "test"
+  SAMPLE_BUNDLER_VERSION = "Bundler version 1.10.10"
+  SAMPLE_DATE_TIME = "2011-03-11T08:43:02Z"
+  SAMPLE_EMAIL = "someone@example.com"
+  SAMPLE_FILE_PATH = "./my_user_file.png"
+  SAMPLE_FILE_PATH2 = "./my_user_file2.png"
+  SAMPLE_INVITATION_TOKEN = "TZce3NueiXp2lMTmaeRr"
+  SAMPLE_HEROKU_CONFIG = {"TDDIUM_API_KEY" => SAMPLE_API_KEY, "TDDIUM_USER_NAME" => SAMPLE_EMAIL}
+  SAMPLE_LICENSE_TEXT = "LICENSE"
+  SAMPLE_PASSWORD = "foobar"
+  SAMPLE_NEW_PASSWORD = "foobar2"
+  SAMPLE_REPORT_URL = "http://api.tddium.com/1/sessions/1/test_executions/report"
+  SAMPLE_RUBYGEMS_VERSION = "1.3.7"
+  SAMPLE_RUBY_VERSION = "ruby 1.8.7 (2010-08-16 patchlevel 302) [i686-darwin10.5.0]"
+  SAMPLE_RECURLY_URL = "https://tddium.recurly.com/account/1"
+  SAMPLE_SESSION_ID = 1
+  SAMPLE_SUITE_ID = 1
+  SAMPLE_USER_ID = 1
+  SAMPLE_ROLE = "member"
+  SAMPLE_ACCOUNT_NAME = "owner@example.com"
+  DEFAULT_TEST_PATTERN = "**/*_spec.rb"
+  SAMPLE_SUITE_PATTERN = "features/*.feature, spec/**/*_spec.rb"
+  CUSTOM_TEST_PATTERN = "**/cat_spec.rb"
+  SAMPLE_SSH_PUBKEY = "ssh-rsa 1234567890"
+  SAMPLE_SUITE_RESPONSE = {"repo_name" => SAMPLE_APP_NAME,
+                           "branch" => SAMPLE_BRANCH_NAME, 
+                           "id" => SAMPLE_SUITE_ID, 
+                           "ruby_version"=>SAMPLE_RUBY_VERSION,
+                           "rubygems_version"=>SAMPLE_RUBYGEMS_VERSION,
+                           "bundler_version"=>SAMPLE_BUNDLER_VERSION,
+                           "ci_ssh_pubkey" => SAMPLE_SSH_PUBKEY,
+                           "test_pattern" => SAMPLE_SUITE_PATTERN}
+  SAMPLE_SUITES_RESPONSE = {"suites" => [SAMPLE_SUITE_RESPONSE]}
+  SAMPLE_TDDIUM_CONFIG_FILE = ".tddium.test"
+  SAMPLE_TDDIUM_DEPLOY_KEY_FILE = ".tddium-deploy-key.test"
+  SAMPLE_TEST_EXECUTION_STATS = "total 1, notstarted 0, started 1, passed 0, failed 0, pending 0, error 0", "start_time"
+  SAMPLE_USER_RESPONSE = {"status"=>0, "user"=>
+    { "id"=>SAMPLE_USER_ID, 
+      "api_key" => SAMPLE_API_KEY, 
+      "email" => SAMPLE_EMAIL, 
+      "created_at" => SAMPLE_DATE_TIME, 
+      "account" => SAMPLE_EMAIL,
+      "recurly_url" => SAMPLE_RECURLY_URL}}
+  SAMPLE_ADDED_USER_RESPONSE = {"status"=>0, "user"=>
+    { "id"=>SAMPLE_USER_ID, 
+      "api_key" => SAMPLE_API_KEY, 
+      "email" => SAMPLE_EMAIL, 
+      "created_at" => SAMPLE_DATE_TIME, 
+      "account" => SAMPLE_ACCOUNT_NAME,
+      "account_role" => SAMPLE_ROLE}}
+  SAMPLE_HEROKU_USER_RESPONSE = {"user"=>
+    { "id"=>SAMPLE_USER_ID, 
+      "api_key" => SAMPLE_API_KEY, 
+      "email" => SAMPLE_EMAIL, 
+      "created_at" => SAMPLE_DATE_TIME, 
+      "heroku_needs_activation" => true,
+      "recurly_url" => SAMPLE_RECURLY_URL}}
+  PASSWORD_ERROR_EXPLANATION = "bad confirmation"
+  PASSWORD_ERROR_RESPONSE = {"status"=>1, "explanation"=> PASSWORD_ERROR_EXPLANATION}

data/features/support/mimic.rb

@@ -1,3 +1,5 @@
+# Copyright (c) 2011 Solano Labs All Rights Reserved
+
 require 'mimic'
 require 'timeout'
 require 'daemons'
@@ -6,32 +8,34 @@ require 'httparty'
 class MimicServer
   attr_reader :port
 
-  def initialize
-    @port = 8080
-    @pid_dir = File.join(Dir.tmpdir, 'mimic')
-    FileUtils.mkdir_p(@pid_dir)
+  def initialize(port, log=nil)
+    @port = port || 8080
+    @pid_list = []
+    @log = log
   end
 
   def start
-    options = {:ARGV => ['start'], :log_output => true, :dir_mode => :normal, :dir => @pid_dir}
-    args = {:fork => false,
-            :host => 'localhost',
-            :port => @port,
-            :remote_configuration_path => '/api'}
-    @mimic_group = Daemons.run_proc("mimic", options) do
+    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) { STDERR.puts "got sig!"; Kernel.exit!(0) } }
+        [:INT, :TERM].each { |sig| trap(sig) { Kernel.exit!(0) } }
       end
+      Kernel.exit!(0)
     end
-    @mimic_group.setup
+    @pid_list.push(pid)
     wait
   end
 
   def stop
-    return nil unless @mimic_group
-    @mimic_group.stop_all
-    @mimic_group.find_applications(@pid_dir)
-    @mimic_group.zap_all
+    @pid_list.each do |pid|
+      Process.kill("TERM", pid)
+    end
+    @pid_list = []
   end
 
   def wait
@@ -57,9 +61,10 @@ class MimicServer
     return http
   end
 
-  def install(verb, path, body, headers = {})
-    params = { 'path' => path, 'body' => body.to_json }.to_json
-    http = call_api(:post,  "/api/#{verb}", params, headers)
+  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
 
@@ -91,9 +96,9 @@ class MimicServer
       mimic.stop
     end
 
-    def start
+    def start(port=nil, log=nil)
       return @server if @server
-      @server = MimicServer.new
+      @server = MimicServer.new(port, log || @log)
       @server.start
       @server
     end
@@ -105,16 +110,20 @@ class MimicServer
     def clear
       @server.clear rescue nil
     end
+
+    def log=(log)
+      @log = log
+    end
   end
 end
 
-if __FILE__ == $0 then
-  MimicServer.test
-end
+MimicServer.log = STDOUT
 
 Before('@mimic') do
-  MimicServer.start
-#  @aruba_io_wait_seconds = 4
+  tid = ENV['TDDIUM_TID'] || 0
+  port = 8500 + tid.to_i
+  ENV['TDDIUM_CLIENT_PORT'] = port.to_s
+  MimicServer.start(port)
 end
 
 After('@mimic') do
@@ -125,5 +134,3 @@ at_exit do
   server = MimicServer.server
   server.stop if server
 end
-
-MimicServer.start

data/lib/tddium.rb

@@ -36,15 +36,17 @@ end
 
 class Tddium < Thor
   include TddiumConstant
+  
+  class_option :environment, :type => :string, :default => nil
+  class_option :port, :type => :numeric, :default => nil
 
   desc "account", "View/Manage account information"
-  method_option :environment, :type => :string, :default => nil
   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
     set_shell
-    set_default_environment(options[:environment])
+    set_default_environment
     if user_details = user_logged_in?
       # User is already logged in, so just display the info
       show_user_details(user_details)
@@ -92,14 +94,13 @@ class Tddium < Thor
   end
 
   desc "heroku", "Connect Heroku account with Tddium"
-  method_option :environment, :type => :string, :default => nil
   method_option :email, :type => :string, :default => nil
   method_option :password, :type => :string, :default => nil
   method_option :ssh_key_file, :type => :string, :default => nil
   method_option :app, :type => :string, :default => nil
   def heroku
     set_shell
-    set_default_environment(options[:environment])
+    set_default_environment
     if user_details = user_logged_in?
       # User is already logged in, so just display the info
       show_user_details(user_details)
@@ -127,10 +128,9 @@ class Tddium < Thor
 
   desc "password", "Change password"
   map "passwd" => :password
-  method_option :environment, :type => :string, :default => nil
   def password
     set_shell
-    set_default_environment(options[:environment])
+    set_default_environment
     return unless tddium_settings
     user_details = user_logged_in?
     return unless user_details
@@ -153,37 +153,36 @@ class Tddium < Thor
   end
 
   desc "login", "Log in to tddium using your email address and password"
-  method_option :environment, :type => :string, :default => nil
   method_option :email, :type => :string, :default => nil
   method_option :password, :type => :string, :default => nil
   def login
     set_shell
-    set_default_environment(options[:environment])
+    set_default_environment
     if user_logged_in?
       say Text::Process::ALREADY_LOGGED_IN
+    elsif login_user(:params => get_user_credentials(options), :show_error => true)
+      say Text::Process::LOGGED_IN_SUCCESSFULLY 
     else
-      say Text::Process::LOGGED_IN_SUCCESSFULLY if login_user(:params => get_user_credentials(options), :show_error => true)
+      exit_failure
     end
   end
 
   desc "logout", "Log out of tddium"
-  method_option :environment, :type => :string, :default => nil
   def logout
     set_shell
-    set_default_environment(options[:environment])
+    set_default_environment
     FileUtils.rm(tddium_file_name) if File.exists?(tddium_file_name)
     say Text::Process::LOGGED_OUT_SUCCESSFULLY
   end
 
   desc "spec", "Run the test suite"
-  method_option :environment, :type => :string, :default => nil
   method_option :user_data_file, :type => :string, :default => nil
   method_option :max_parallelism, :type => :numeric, :default => nil
   method_option :test_pattern, :type => :string, :default => nil
   method_option :force, :type => :boolean, :default => false
   def spec
     set_shell
-    set_default_environment(options[:environment])
+    set_default_environment
     git_version_ok
     if git_changes then
       exit_failure(Text::Error::GIT_CHANGES_NOT_COMMITTED) if !options[:force]
@@ -293,10 +292,9 @@ class Tddium < Thor
   end
 
   desc "status", "Display information about this suite, and any open dev sessions"
-  method_option :environment, :type => :string, :default => nil
   def status
     set_shell
-    set_default_environment(options[:environment])
+    set_default_environment
     git_version_ok
     return unless git_repo? && tddium_settings && suite_for_current_branch?
 
@@ -325,9 +323,8 @@ class Tddium < Thor
   method_option :pull_url, :type => :string, :default => nil
   method_option :push_url, :type => :string, :default => nil
   method_option :test_pattern, :type => :string, :default => nil
-  method_option :environment, :type => :string, :default => nil
   def suite
-    set_default_environment(options[:environment])
+    set_default_environment
     git_version_ok
     return unless git_repo? && tddium_settings
 
@@ -436,7 +433,7 @@ class Tddium < Thor
   end
 
   def current_git_branch
-    @current_git_branch ||= File.basename(`git symbolic-ref HEAD`.gsub("\n", ""))
+    @current_git_branch ||= `git symbolic-ref HEAD`.gsub("\n", "").split("/")[2..-1].join("/")
   end
 
   def current_suite_id
@@ -506,7 +503,8 @@ class Tddium < Thor
     params = {}
     # prompt for email/invitation and password
     if options[:invited]
-      params[:invitation_token] = options[:invitation_token] || ask(Text::Prompt::INVITATION_TOKEN)
+      token = options[:invitation_token] || ask(Text::Prompt::INVITATION_TOKEN)
+      params[:invitation_token] = token.strip
     else
       params[:email] = options[:email] || ask(Text::Prompt::EMAIL)
     end
@@ -624,9 +622,11 @@ class Tddium < Thor
       say(Text::Process::SETUP_CAMPFIRE_FIRST_TIME)
     end
 
-    ask_or_update.call(:campfire_subdomain, Text::Prompt::CAMPFIRE_SUBDOMAIN, nil)
-    ask_or_update.call(:campfire_token, Text::Prompt::CAMPFIRE_TOKEN, nil)
-    ask_or_update.call(:campfire_room, Text::Prompt::CAMPFIRE_ROOM, nil)
+    subdomain = ask_or_update.call(:campfire_subdomain, Text::Prompt::CAMPFIRE_SUBDOMAIN, nil)
+    if !subdomain.nil? && subdomain != 'disable' then
+      ask_or_update.call(:campfire_token, Text::Prompt::CAMPFIRE_TOKEN, nil)
+      ask_or_update.call(:campfire_room, Text::Prompt::CAMPFIRE_ROOM, nil)
+    end
   end
 
   def update_suite(suite, options)
@@ -675,13 +675,19 @@ class Tddium < Thor
     end
   end
 
-  def set_default_environment(env)
+  def set_default_environment
+    env = options[:environment]
     if env.nil?
       tddium_client.environment = :development
       tddium_client.environment = :production unless File.exists?(tddium_file_name)
     else
       tddium_client.environment = env.to_sym
     end
+
+    port = options[:port] || ENV['TDDIUM_CLIENT_PORT']
+    if port
+      tddium_client.port = port.to_i
+    end
   end
 
   def show_session_details(params, no_session_prompt, all_session_prompt)

data/lib/tddium/version.rb

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

data/spec/tddium_spec.rb

@@ -14,6 +14,7 @@ describe Tddium do
   SAMPLE_API_KEY = "afb12412bdafe124124asfasfabebafeabwbawf1312342erbfasbb"
   SAMPLE_APP_NAME = "tddelicious"
   SAMPLE_BRANCH_NAME = "test"
+  SAMPLE_REF_NAME = "refs/heads/test"
   SAMPLE_BUNDLER_VERSION = "Bundler version 1.10.10"
   SAMPLE_DATE_TIME = "2011-03-11T08:43:02Z"
   SAMPLE_EMAIL = "someone@example.com"
@@ -195,7 +196,7 @@ describe Tddium do
     create_file(Tddium::Git::GITIGNORE, "something")
   end
 
-  def stub_git_branch(tddium, default_branch_name = SAMPLE_BRANCH_NAME)
+  def stub_git_branch(tddium, default_branch_name = SAMPLE_REF_NAME)
     tddium.stub(:`).with("git symbolic-ref HEAD").and_return(default_branch_name)
   end
 
@@ -755,6 +756,8 @@ describe Tddium 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
@@ -934,30 +937,6 @@ describe Tddium do
     end
   end
 
-  describe "#logout" do
-    before { stub_defaults }
-
-    context ".tddium file exists" do
-      before { stub_config_file }
-      it "should delete the file" do
-        run_logout(tddium)
-        File.should_not be_exists(SAMPLE_TDDIUM_CONFIG_FILE)
-      end
-    end
-
-    context ".tddium file does not exists" do
-      it "should do nothing" do
-        FileUtils.should_not_receive(:rm)
-        run_logout(tddium)
-      end
-    end
-
-    it "should show the user: '#{Tddium::Text::Process::LOGGED_OUT_SUCCESSFULLY}'" do
-      tddium.should_receive(:say).with(Tddium::Text::Process::LOGGED_OUT_SUCCESSFULLY)
-      run_logout(tddium)
-    end
-  end
-
   describe "#spec" do
     before do
       stub_defaults
@@ -1457,11 +1436,18 @@ describe Tddium do
       end
 
       it "should prompt for campfire" do
-        tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_SUBDOMAIN % current['campfire_subdomain'], anything)
+        tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_SUBDOMAIN % current['campfire_subdomain'], anything).and_return('tddium')
         tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_TOKEN % current['campfire_token'], anything)
         tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_ROOM % current['campfire_room'], anything)
         run_suite(tddium, options)
       end
+
+      it "should not prompt for campfire token or room if no domain" do
+        tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_SUBDOMAIN % current['campfire_subdomain'], anything).and_return('disable')
+        tddium.should_not_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_TOKEN % current['campfire_token'], anything)
+        tddium.should_not_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_ROOM % current['campfire_room'], anything)
+        run_suite(tddium, options)
+      end
     end
 
     it_should_behave_like "set the default environment"

data/tddium.gemspec

@@ -35,7 +35,7 @@ EOF
   s.add_runtime_dependency("thor")
   s.add_runtime_dependency("highline")
   s.add_runtime_dependency("json")
-  s.add_runtime_dependency("tddium_client", ">=0.0.9")
+  s.add_runtime_dependency("tddium_client", ">=0.0.10")
   s.add_runtime_dependency("tddium_reporting", ">=0.0.3")
   s.add_runtime_dependency("bundler")
 

metadata

@@ -2,7 +2,7 @@
 name: tddium-preview
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors: 
 - Solano Labs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 -07:00
+date: 2011-08-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.9
+        version: 0.0.10
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -151,9 +151,15 @@ files:
 - README.rdoc
 - Rakefile
 - bin/tddium
-- features/manage_login.feature
+- features/login_command.feature
+- features/logout_command.feature
+- features/step_definitions/aruba_steps.rb
 - features/step_definitions/login_steps.rb
 - features/step_definitions/mimic_steps.rb
+- features/step_definitions/suite_steps.rb
+- features/suite_command.feature
+- features/support/aruba.rb
+- features/support/constants.rb
 - features/support/env.rb
 - features/support/mimic.rb
 - lib/tddium.rb

data/features/manage_login.feature

@@ -1,18 +0,0 @@
-@mimic
-Feature: Manage Login
-
-  Scenario: Log in successfully
-    Given the user can log in and gets API key "apikey"
-    #When I run `tddium login --environment=mimic --email=user@example.org --password=password`
-    When I run `tddium login --environment=mimic` interactively
-    And I type "foo@example.com"
-    And I type "barbarbar"
-    And the console session ends
-    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"