tddium-preview 0.10.0 → 0.11.0

data/Gemfile.lock

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

data/features/spec_command.feature

@@ -14,7 +14,34 @@ Feature: spec command
     And the output should contain "tddium login"
     And the output should contain "tddium heroku"
 
-  Scenario: Output machine readable data
+  Scenario: Don't remember test pattern or max-parallelism
+    Given the destination repo exists
+    And a git repo is initialized
+    And the user is logged in with a configured suite
+    And the user can create a session
+    And the user successfully registers tests for the suite with test_pattern: "spec/foo"
+    And the tests start successfully
+    And the test all pass
+    When I run `tddium spec --max-parallelism=1 --test-pattern=spec/foo`
+    Then the exit status should be 0
+    And the output should contain "Test report"
+    And options should not be saved
+
+  Scenario: Ignore remembered test pattern and max-parallelism
+    Given the destination repo exists
+    And a git repo is initialized
+    And the user is logged in with a configured suite and remembered options
+    And the user can create a session
+    And the user successfully registers tests for the suite with test_pattern: default
+    And the tests start successfully
+    And the test all pass
+    When I run `tddium spec`
+    Then the exit status should be 0
+    And the output should contain "Test report"
+    And the output should not contain "emembered"
+    And options should not be saved
+
+  Scenario: Output machine readable data with --machine
     Given the destination repo exists
     And a git repo is initialized
     And the user is logged in with a configured suite
@@ -33,7 +60,7 @@ Feature: spec command
       %%%% TDDIUM CI DATA END %%%%
       """
 
-  Scenario: Don't output machine readable data
+  Scenario: Don't output machine readable data in normal mode
     Given the destination repo exists
     And a git repo is initialized
     And the user is logged in with a configured suite

data/features/step_definitions/git_steps.rb

@@ -8,6 +8,10 @@ Given /^the destination repo exists$/ do
   }
 end
 
+Given /^an old version of git is installed$/ do
+  pending
+end
+
 Given /^a git repo is initialized(?: on branch "([^"]*)")?$/ do |branch|
   steps %Q{
     Given a directory named "work"

data/features/step_definitions/login_steps.rb

@@ -26,6 +26,21 @@ Given /^the user is logged in with a configured suite(?: on branch "(.*)")?$/ do
   }
 end
 
+Given /^the user is logged in with a configured suite and remembered options$/ do
+  @api_key = "abcdef"
+  branch ||= "master"
+  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:
+    """
+    {"api_key":"#{@api_key}", "branches":{"#{branch}":{"id":1,"options":{"user_data_file":null,"max_parallelism":1,"test_pattern":"abc"}}}}
+    """
+    And the user has a suite for "repo" on "#{branch}"
+  }
+end
+
+
 Given /^the user can log in and gets API key "([^"]*)"$/ do |apikey|
   Antilles.install(:post, "/1/users/sign_in", {:status=>0, :api_key=>apikey})
 end
@@ -41,3 +56,12 @@ Then /^dotfiles should be updated$/ do
     And the file ".gitignore" should contain ".tddium*"
   }
 end
+
+Then /^options should not be saved$/ do
+  steps %Q{
+    Then the file ".tddium.mimic" should not contain "test_pattern"
+    And the file ".tddium.mimic" should not contain "max_parallelism"
+    And the file ".tddium.mimic" should not contain "user_data_file"
+  }
+end
+

data/features/step_definitions/session_steps.rb

@@ -2,8 +2,15 @@ Given /^the user can create a session$/ do
   Antilles.install(:post, "/1/sessions", {:status=>0, :session=>{"id"=>SAMPLE_SESSION_ID}}, :code=>201)
 end
 
-Given /^the user successfully registers tests for the suite$/ do
-  Antilles.install(:post, "/1/sessions/#{SAMPLE_SESSION_ID}/test_executions/register", {:status=>0})
+Given /^the user successfully registers tests for the suite(?: with test_pattern: (.*))?$/ do |pattern|
+  options = {}
+  if pattern == 'default'
+    options['params'] = {'suite_id'=>SAMPLE_SUITE_ID.to_s, 'test_pattern'=>''}
+  elsif pattern
+    options['params'] = {'suite_id'=>SAMPLE_SUITE_ID.to_s, 'test_pattern'=>pattern.gsub(/"/,'')}
+  end
+  res = Antilles.install(:post, "/1/sessions/#{SAMPLE_SESSION_ID}/test_executions/register", {:status=>0}, options)
+  puts res.parsed_response
 end
 
 Given /^the tests start successfully$/ do

data/features/suite_command_tddium_yml.feature

@@ -17,14 +17,11 @@ Feature: suite command
     :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"
-    Then the output from "tddium suite" should contain "Configured ruby ruby-1.9.2-p290-psych from config/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
+    When I run `tddium suite --name=beta --ci-pull-url=disable --ci-push-url=disable --test-pattern=spec/* --campfire-subdomain=disable`
+    Then the output should contain "Looks like"
+    Then the output should contain "Detected branch test/foobar"
+    Then the output should contain "Configured ruby ruby-1.9.2-p290-psych from config/tddium.yml"
+    Then the output should contain "Created suite..."
     Then the exit status should be 0
 
   Scenario: Configure new suite with tddium.yml without matching key
@@ -35,15 +32,10 @@ Feature: suite command
     :foo:
        :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"
-    Then the output from "tddium suite" should not contain "Configured ruby ruby-1.9.2-p290-psych from config/tddium.yml"
-    Then the output from "tddium suite" should contain "Detected ruby"
-    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
+    When I run `tddium suite --name=beta --ci-pull-url=disable --ci-push-url=disable --test-pattern=spec/* --campfire-subdomain=disable`
+    Then the output should not contain "Configured ruby ruby-1.9.2-p290-psych from config/tddium.yml"
+    Then the output should contain "Detected ruby"
+    Then the output should contain "Created suite..."
     Then the exit status should be 0
 
   Scenario: Configure new suite with empty tddium.yml
@@ -51,15 +43,12 @@ Feature: suite command
     And a file named "config/tddium.yml" with:
     """
     """
-    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"
-    Then the output from "tddium suite" should not contain "Configured ruby ruby-1.9.2-p290-psych from config/tddium.yml"
-    Then the output from "tddium suite" should contain "Detected ruby"
-    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
+    When I run `tddium suite --name=beta --ci-pull-url=disable --ci-push-url=disable --test-pattern=spec/* --campfire-subdomain=disable`
+    Then the output should contain "Looks like"
+    Then the output should contain "Detected branch test/foobar"
+    Then the output should not contain "Configured ruby ruby-1.9.2-p290-psych from config/tddium.yml"
+    Then the output should contain "Detected ruby"
+    Then the output should contain "Created suite..."
     Then the exit status should be 0
 
   Scenario: Non-YAML tddium.yml should generate a warning and then prompt

data/features/support/mimic.rb

@@ -1,5 +1,28 @@
 # Copyright (c) 2011 Solano Labs All Rights Reserved
 
+require 'mimic'
+
+module Mimic
+  class FakeHost
+    class StubbedRequest
+      def unmatched_response
+        res = [404, {}, '{"status":1, "explanation":"not found"}']
+        puts "unmatched: #{res}"
+        res
+      end
+
+      def matches?(request)
+        if @params.any?
+          puts "checking params... got: #{request.params.inspect}, expected: #{@params}"
+          request.params == @params
+        else
+          true
+        end
+      end
+    end
+  end
+end
+
 require 'antilles/cucumber'
 
 port = Antilles.find_available_port

data/lib/tddium.rb

@@ -418,10 +418,10 @@ class Tddium < Thor
     write_tddium_to_gitignore
   end
 
-  def write_suite(suite, options = {})
+  def write_suite(suite)
     suite_id = suite["id"]
     branches = tddium_settings["branches"] || {}
-    branches.merge!({current_git_branch => {"id" => suite_id, "options" => options}})
+    branches.merge!({current_git_branch => {"id" => suite_id}})
     File.open(tddium_file_name, "w") do |file|
       file.write(tddium_settings.merge({"branches" => branches}).to_json)
     end

data/lib/tddium/commands/account.rb

@@ -8,6 +8,7 @@ class Tddium
   def account
     set_shell
     set_default_environment
+    git_version_ok
     if user_details = user_logged_in?(true, true)
       # User is already logged in, so just display the info
       show_user_details(user_details)
@@ -19,6 +20,7 @@ class Tddium
   desc "account:add [ROLE] [EMAIL]", "Authorize and invite a user to use your account"
   define_method "account:add" do |role, email|
     set_shell
+    git_version_ok
     set_default_environment
     user_details = user_logged_in?(true, true)
     exit_failure unless user_details
@@ -36,6 +38,7 @@ class Tddium
   desc "account:remove [EMAIL]", "Remove a user from your account"
   define_method "account:remove" do |email|
     set_shell
+    git_version_ok
     set_default_environment
     user_details = user_logged_in?(true, true)
     exit_failure unless user_details

data/lib/tddium/commands/activate.rb

@@ -10,6 +10,7 @@ class Tddium
   def activate
     set_shell
     set_default_environment
+    git_version_ok
     if user_details = user_logged_in?
       exit_failure Text::Error::ACTIVATE_LOGGED_IN
     else

data/lib/tddium/commands/heroku.rb

@@ -11,6 +11,7 @@ class Tddium
   def heroku
     set_shell
     set_default_environment
+    git_version_ok
     if user_details = user_logged_in?
       # User is already logged in, so just display the info
       show_user_details(user_details)

data/lib/tddium/commands/spec.rb

@@ -6,13 +6,13 @@ class Tddium
   map "cucumber" => :spec
   map "test" => :spec
   map "run" => :spec
-  desc "spec", "Run the test suite"
+  desc "spec [PATTERN]", "Run the test suite, or tests that match PATTERN"
   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
   method_option :machine, :type => :boolean, :default => false
-  def spec
+  def spec(test_pattern=nil)
     machine_data = {}
 
     set_shell
@@ -27,21 +27,26 @@ class Tddium
 
     test_execution_params = {}
 
-    user_data_file_path = get_remembered_option(options, :user_data_file, nil) do |user_data_file_path|
+    if user_data_file_path = options[:user_data_file]
       if File.exists?(user_data_file_path)
         user_data = File.open(user_data_file_path) { |file| file.read }
         test_execution_params[:user_data_text] = Base64.encode64(user_data)
         test_execution_params[:user_data_filename] = File.basename(user_data_file_path)
+        say Text::Process::USING_SPEC_OPTION[:user_data_file] % user_data_file_path
       else
         exit_failure Text::Error::NO_USER_DATA_FILE % user_data_file_path
       end
     end
 
-    max_parallelism = get_remembered_option(options, :max_parallelism, nil) do |max_parallelism|
+    if max_parallelism = options[:max_parallelism]
       test_execution_params[:max_parallelism] = max_parallelism
+      say Text::Process::USING_SPEC_OPTION[:max_parallelism] % max_parallelism
+    end
+
+    test_pattern ||= options[:test_pattern]
+    if test_pattern
+      say Text::Process::USING_SPEC_OPTION[:test_pattern] % test_pattern
     end
-    
-    test_pattern = get_remembered_option(options, :test_pattern, nil)
 
     start_time = Time.now
 
@@ -62,8 +67,10 @@ class Tddium
 
     # Start the tests
     start_test_executions = call_api(:post, "#{Api::Path::SESSIONS}/#{session_id}/#{Api::Path::START_TEST_EXECUTIONS}", test_execution_params)
+
+    num_tests_started = start_test_executions["started"].to_i
     
-    say Text::Process::STARTING_TEST % start_test_executions["started"]
+    say Text::Process::STARTING_TEST % num_tests_started.to_s
 
     tests_not_finished_yet = true
     finished_tests = {}
@@ -101,7 +108,7 @@ class Tddium
       end
 
       # If all tests finished, exit the loop else sleep
-      if finished_tests.size == current_test_executions["tests"].size
+      if finished_tests.size >= num_tests_started
         tests_not_finished_yet = false
       else
         sleep(Default::SLEEP_TIME_BETWEEN_POLLS)
@@ -113,11 +120,7 @@ class Tddium
     say Text::Process::FINISHED_TEST % (Time.now - start_time)
     say "#{finished_tests.size} tests, #{test_statuses["failed"]} failures, #{test_statuses["error"]} errors, #{test_statuses["pending"]} pending"
 
-    # Save the spec options
-    write_suite(suite_details["suite"].merge({"id" => current_suite_id}),
-                                  {"user_data_file" => user_data_file_path,
-                                   "max_parallelism" => max_parallelism,
-                                   "test_pattern" => test_pattern})
+    write_suite(suite_details["suite"].merge({"id" => current_suite_id}))
 
     exit_failure if test_statuses["failed"] > 0 || test_statuses["error"] > 0
   rescue TddiumClient::Error::Base

data/lib/tddium/commands/suite.rb

@@ -7,8 +7,11 @@ class Tddium
   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
-  method_option :push_url, :type => :string, :default => nil
+  method_option :ci_pull_url, :type => :string, :default => nil
+  method_option :ci_push_url, :type => :string, :default => nil
+  method_option :campfire_subdomain, :type=> :string, :default => nil
+  method_option :campfire_room, :type=> :string, :default => nil
+  method_option :campfire_token, :type=> :string, :default => nil
   method_option :test_pattern, :type => :string, :default => nil
   def suite
     set_default_environment

data/lib/tddium/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tddium-preview
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-18 00:00:00.000000000 Z
+date: 2011-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &14172440 !ruby/object:Gem::Requirement
+  requirement: &8804000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14172440
+  version_requirements: *8804000
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &14171680 !ruby/object:Gem::Requirement
+  requirement: &8798280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14171680
+  version_requirements: *8798280
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &14170980 !ruby/object:Gem::Requirement
+  requirement: &8797580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14170980
+  version_requirements: *8797580
 - !ruby/object:Gem::Dependency
   name: tddium_client
-  requirement: &14170100 !ruby/object:Gem::Requirement
+  requirement: &8796740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *14170100
+  version_requirements: *8796740
 - !ruby/object:Gem::Dependency
   name: tddium_reporting
-  requirement: &14169480 !ruby/object:Gem::Requirement
+  requirement: &8796080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *14169480
+  version_requirements: *8796080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &14169040 !ruby/object:Gem::Requirement
+  requirement: &8795600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14169040
+  version_requirements: *8795600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14168460 !ruby/object:Gem::Requirement
+  requirement: &8795080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14168460
+  version_requirements: *8795080
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &14167740 !ruby/object:Gem::Requirement
+  requirement: &8794340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14167740
+  version_requirements: *8794340
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &14167000 !ruby/object:Gem::Requirement
+  requirement: &8793600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14167000
+  version_requirements: *8793600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &14166320 !ruby/object:Gem::Requirement
+  requirement: &8792920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14166320
+  version_requirements: *8792920
 description: ! 'tddium runs your rspec, cucumber, and test::unit tests in our managed
 
   cloud environment.  You can run tests by hand, or enable our hosted CI to watch