tddium-preview 0.5.1 → 0.5.2

data/Gemfile.lock

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

data/lib/tddium/constant.rb

@@ -56,13 +56,14 @@ module TddiumConstant
       NEW_PASSWORD = "Enter a new password: "
       PASSWORD_CONFIRMATION = "Confirm your password: "
       INVITATION_TOKEN = "Enter your invitation token:"
-      USE_EXISTING_SUITE = "The suite name '%s' already exists. Enter '#{Response::YES}' to use it, or enter a new name:"
+      USE_EXISTING_SUITE = "A suite exists '%%s' (branch %s). Enter '#{Response::YES}' to use it, or enter a new repo name:"
     end
 
     module Process
       TERMINATE_INSTRUCTION = "Press Ctrl-C to stop waiting.  Tests will continue running."
       INTERRUPT = "Interrupted"
-      STARTING_TEST = "Starting %s tests..."
+      GIT_PUSH = "Pushing changes to Tddium..."
+      STARTING_TEST = "Startng %s tests..."
       CHECK_TEST_STATUS = "Use 'tddium status' to check on pending jobs"
       FINISHED_TEST = "Finished in %s seconds"
       CHECK_TEST_REPORT = "Test report: %s"
@@ -88,9 +89,10 @@ tddium spec
       ALREADY_LOGGED_IN = "You're already logged in"
       LOGGED_IN_SUCCESSFULLY = "Logged in successfully"
       LOGGED_OUT_SUCCESSFULLY = "Logged out successfully"
-      USING_PREVIOUS_USER_DATA_FILE = "Using the previous user data file '%s'"
-      USING_PREVIOUS_MAX_PARALLELISM = "Using the previous value of max_parallelism = %s"
-      USING_PREVIOUS_TEST_PATTERN = "Using the previous value of test_pattern = %s"
+      USING_SPEC_OPTION = {:max_parallelism => "Max number of tests in parallel = %s",
+                           :user_data_file => "Sending user data from %s",
+                           :test_pattern => "Selecting tests that match '%s'"}
+      REMEMBERED = " (Remembered value)"
       HEROKU_WELCOME = "
 Thanks for installing the Tddium Heroku Add-On!
 

data/lib/tddium/version.rb

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

data/lib/tddium.rb

@@ -134,10 +134,7 @@ class Tddium < Thor
 
     test_execution_params = {}
 
-    # Set the user data for spec
-    if user_data_file_path = options[:user_data_file] || current_suite_options["user_data_file"]
-      say Text::Process::USING_PREVIOUS_USER_DATA_FILE % user_data_file_path if user_data_file_path == current_suite_options["user_data_file"]
-
+    user_data_file_path = get_remembered_option(options, :user_data_file, nil) do |user_data_file_path|
       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)
@@ -147,19 +144,11 @@ class Tddium < Thor
       end
     end
 
-    # Set max parallelism param
-    if max_parallelism = options[:max_parallelism] || current_suite_options["max_parallelism"]
-      say Text::Process::USING_PREVIOUS_MAX_PARALLELISM % max_parallelism if max_parallelism == current_suite_options["max_parallelism"]
+    max_parallelism = get_remembered_option(options, :max_parallelism, nil) do |max_parallelism|
       test_execution_params[:max_parallelism] = max_parallelism
     end
     
-    # Set test_pattern param
-    if current_suite_options["test_pattern"]
-      test_pattern = current_suite_options["test_pattern"]
-      say Text::Process::USING_PREVIOUS_TEST_PATTERN % test_pattern if options[:test_pattern] == current_suite_options["test_pattern"]
-    else
-      test_pattern = options[:test_pattern]
-    end
+    test_pattern = get_remembered_option(options, :test_pattern, Default::TEST_PATTERN)
 
     start_time = Time.now
 
@@ -184,13 +173,13 @@ class Tddium < Thor
       # Register the tests
       call_api(:post, "#{Api::Path::SESSIONS}/#{session_id}/#{Api::Path::REGISTER_TEST_EXECUTIONS}", {:suite_id => current_suite_id, :tests => test_files})
 
+      say Text::Process::STARTING_TEST % test_files.size
       # Start the tests
       start_test_executions = call_api(:post, "#{Api::Path::SESSIONS}/#{session_id}/#{Api::Path::START_TEST_EXECUTIONS}", test_execution_params)
       tests_not_finished_yet = true
       finished_tests = {}
       test_statuses = Hash.new(0)
 
-      say Text::Process::STARTING_TEST % test_files.size
       say Text::Process::CHECK_TEST_REPORT % start_test_executions["report"]
       say Text::Process::TERMINATE_INSTRUCTION
       while tests_not_finished_yet do
@@ -305,7 +294,7 @@ class Tddium < Thor
           current_suite_name = params[:repo_name]
           if existing_suite
             # Prompt for using existing suite (unless suite name is passed from command line) or entering new one
-            params[:repo_name] = prompt(Text::Prompt::USE_EXISTING_SUITE, options[:name], current_suite_name)
+            params[:repo_name] = prompt(Text::Prompt::USE_EXISTING_SUITE % params[:branch], options[:name], current_suite_name)
             if options[:name] || params[:repo_name] == Text::Prompt::Response::YES
               # Use the existing suite, so assign the value back and exit the loop
               params[:repo_name] = current_suite_name
@@ -396,6 +385,28 @@ class Tddium < Thor
     abort msg
   end
 
+  def get_remembered_option(options, key, default, &block)
+    remembered = false
+    if options[key] != default
+      result = options[key]
+    elsif remembered = current_suite_options[key.to_s]
+      result = remembered
+      remembered = true
+    else
+      result = default
+    end
+    
+    if result
+      msg = Text::Process::USING_SPEC_OPTION[key] % result
+      msg +=  Text::Process::REMEMBERED if remembered
+      msg += "\n"
+      say msg
+      yield result if block_given?
+    end
+    result
+  end
+
+
   def get_user
     call_api(:get, Api::Path::USERS, {}, nil, false) rescue nil
   end
@@ -413,6 +424,7 @@ class Tddium < Thor
   end
 
   def git_push
+    say Text::Process::GIT_PUSH
     system("git push -f #{Git::REMOTE_NAME} #{current_git_branch}")
   end
 

data/spec/tddium_spec.rb

@@ -1334,7 +1334,7 @@ describe Tddium do
       context "but this user has already registered some suites" do
         before do
           stub_call_api_response(:get, Tddium::Api::Path::SUITES, SAMPLE_SUITES_RESPONSE, {"suites" => []})
-          tddium.stub(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_APP_NAME).and_return(Tddium::Text::Prompt::Response::YES)
+          tddium.stub(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_BRANCH_NAME % SAMPLE_APP_NAME).and_return(Tddium::Text::Prompt::Response::YES)
         end
 
         shared_examples_for "writing the suite to file" do
@@ -1360,8 +1360,8 @@ describe Tddium do
         end
 
         context "passing no cli options" do
-          it "should ask the user: '#{Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_APP_NAME}' " do
-            tddium.should_receive(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_APP_NAME).and_return("something")
+          it "should ask the user: '#{Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_BRANCH_NAME % SAMPLE_APP_NAME}' " do
+            tddium.should_receive(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_BRANCH_NAME % SAMPLE_APP_NAME).and_return("something")
             run_suite(tddium)
           end
         end
@@ -1404,7 +1404,7 @@ describe Tddium do
         end
 
         context "the user does not want to use the existing suite" do
-          before{ tddium.stub(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_APP_NAME).and_return("some_other_suite") }
+          before{ tddium.stub(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_BRANCH_NAME % SAMPLE_APP_NAME).and_return("some_other_suite") }
 
 
           it "should send a 'POST' request to '#{Tddium::Api::Path::SUITES}'" do
@@ -1438,7 +1438,7 @@ describe Tddium do
 
           context "interactive mode" do
             before do
-              tddium.stub(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_APP_NAME).and_return("foobar")
+              tddium.stub(:ask).with(Tddium::Text::Prompt::USE_EXISTING_SUITE % SAMPLE_BRANCH_NAME % SAMPLE_APP_NAME).and_return("foobar")
               stub_default_suite_name
             end
 

metadata

@@ -2,7 +2,7 @@
 name: tddium-preview
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Solano Labs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-28 00:00:00 -07:00
+date: 2011-06-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency