tddium-preview 0.1.1 → 0.1.2

data/Gemfile.lock

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

data/lib/tddium/constant.rb

@@ -48,7 +48,6 @@ module TddiumConstant
         YES = "y"
       end
       SSH_KEY = "Enter your ssh key or press 'Return'. Using '%s' by default:"
-      TEST_PATTERN = "Enter a test pattern or press 'Return'. Using '%s' by default:"
       SUITE_NAME = "Enter a suite name or press 'Return'. Using '%s' by default:"
       LICENSE_AGREEMENT = "Type '%s' to accept the license and continue:" % Response::AGREE_TO_LICENSE
       EMAIL = "Enter your email address:"
@@ -65,7 +64,8 @@ module TddiumConstant
       CHECK_TEST_STATUS = "Use 'tddium status' to check on pending jobs"
       FINISHED_TEST = "Finished in %s seconds"
       CHECK_TEST_REPORT = "You can check out the test report details at %s"
-      UPDATE_SUITE = "The suite has been updated successfully"
+      EXISTING_SUITE = "Current suite: %s"
+      CREATING_SUITE = "Creating suite '%s'.  This will take a few seconds."
       PASSWORD_CONFIRMATION_INCORRECT = "Password confirmation incorrect"
       ACCOUNT_CREATED = "
 Congratulations %s, your tddium account has been created!

data/lib/tddium/version.rb

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

data/lib/tddium.rb

@@ -102,7 +102,7 @@ class Tddium < Thor
   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 => "**/*_spec.rb"
+  method_option :test_pattern, :type => :string, :default => Default::TEST_PATTERN
   def spec
     set_default_environment(options[:environment])
     return unless git_repo? && tddium_settings && suite_for_current_branch?
@@ -245,7 +245,6 @@ class Tddium < Thor
   end
 
   desc "suite", "Register the suite for this project, or manage its settings"
-  method_option :test_pattern, :type => :string, :default => nil
   method_option :name, :type => :string, :default => nil
   method_option :environment, :type => :string, :default => nil
   def suite
@@ -255,13 +254,9 @@ class Tddium < Thor
     params = {}
     begin
       if current_suite_id
-        current_suite = call_api(:get, current_suite_path)
-        # Get the current test pattern and prompt for updates
-        params[:test_pattern] = prompt(Text::Prompt::TEST_PATTERN, options[:test_pattern], current_suite["suite"]["test_pattern"])
+        current_suite = call_api(:get, current_suite_path)["suite"]
 
-        # Update the current suite if it exists already
-        call_api(:put, current_suite_path, {:suite => params})
-        say Text::Process::UPDATE_SUITE
+        say Text::Process::EXISTING_SUITE % "#{current_suite["repo_name"]}/#{current_suite["branch"]}"
       else
         params[:branch] = current_git_branch
         default_suite_name = File.basename(Dir.pwd)
@@ -307,9 +302,9 @@ class Tddium < Thor
         params[:bundler_version] = dependency_version(:bundle)
         params[:rubygems_version] = dependency_version(:gem)
 
-        params[:test_pattern] = prompt(Text::Prompt::TEST_PATTERN, options[:test_pattern], Default::TEST_PATTERN)
 
         # Create new suite if it does not exist yet
+        say Text::Process::CREATING_SUITE % params[:repo_name]
         new_suite = call_api(:post, Api::Path::SUITES, {:suite => params})
         # Save the created suite
         write_suite(new_suite["suite"]["id"])

data/spec/tddium_spec.rb

@@ -27,10 +27,9 @@ describe Tddium do
   SAMPLE_RECURLY_URL = "https://tddium.recurly.com/account/1"
   SAMPLE_SESSION_ID = 1
   SAMPLE_SUITE_ID = 1
-  SAMPLE_TEST_PATTERN = "**/*_spec.rb" # XXX Bogus.  Removeme.
   DEFAULT_TEST_PATTERN = "**/*_spec.rb"
   CUSTOM_TEST_PATTERN = "**/cat_spec.rb"
-  SAMPLE_SUITE_RESPONSE = {"repo_name" => SAMPLE_APP_NAME, "branch" => SAMPLE_BRANCH_NAME, "id" => SAMPLE_SUITE_ID, "test_pattern"=>SAMPLE_TEST_PATTERN, "ruby_version"=>SAMPLE_RUBY_VERSION, "git_repo_uri" => SAMPLE_GIT_REPO_URI}
+  SAMPLE_SUITE_RESPONSE = {"repo_name" => SAMPLE_APP_NAME, "branch" => SAMPLE_BRANCH_NAME, "id" => SAMPLE_SUITE_ID, "ruby_version"=>SAMPLE_RUBY_VERSION, "git_repo_uri" => SAMPLE_GIT_REPO_URI}
   SAMPLE_SUITES_RESPONSE = {"suites" => [SAMPLE_SUITE_RESPONSE]}
   SAMPLE_TDDIUM_CONFIG_FILE = ".tddium.test"
   SAMPLE_TEST_EXECUTION_STATS = "total 1, notstarted 0, started 1, passed 0, failed 0, pending 0, error 0", "start_time"
@@ -856,7 +855,7 @@ describe Tddium do
       end
 
       context "and returns some suites" do
-        let(:suite_attributes) { {"id"=>SAMPLE_SUITE_ID, "repo_name"=>SAMPLE_APP_NAME, "ruby_version"=>SAMPLE_RUBY_VERSION, "branch" => SAMPLE_BRANCH_NAME, "test_pattern" => SAMPLE_TEST_PATTERN, "bundler_version" => SAMPLE_BUNDLER_VERSION, "rubygems_version" => SAMPLE_RUBYGEMS_VERSION}}
+        let(:suite_attributes) { {"id"=>SAMPLE_SUITE_ID, "repo_name"=>SAMPLE_APP_NAME, "ruby_version"=>SAMPLE_RUBY_VERSION, "branch" => SAMPLE_BRANCH_NAME, "bundler_version" => SAMPLE_BUNDLER_VERSION, "rubygems_version" => SAMPLE_RUBYGEMS_VERSION}}
         before do
           stub_call_api_response(:get, Tddium::Api::Path::SUITES, {"suites"=>[suite_attributes]})
         end
@@ -1023,10 +1022,10 @@ describe Tddium do
         end
       end
 
-      context "passing '--name=my_suite --test-pattern=**/*_selenium.rb'" do
+      context "passing '--name=my_suite'" do
         it "should POST request with the passed in values to the API" do
-          call_api_should_receive(:method => :post, :path => Tddium::Api::Path::SUITES, :params => {:suite => hash_including(:repo_name => "my_suite", :test_pattern => "**/*_selenium.rb")})
-          run_suite(tddium, :name => "my_suite", :test_pattern => "**/*_selenium.rb")
+          call_api_should_receive(:method => :post, :path => Tddium::Api::Path::SUITES, :params => {:suite => hash_including(:repo_name => "my_suite")})
+          run_suite(tddium, :name => "my_suite")
         end
       end
 
@@ -1098,10 +1097,6 @@ describe Tddium do
         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") }
 
-          it "should ask for a test file pattern" do
-            tddium.should_receive(:ask).with(Tddium::Text::Prompt::TEST_PATTERN % Tddium::Default::TEST_PATTERN)
-            run_suite(tddium)
-          end
 
           it "should send a 'POST' request to '#{Tddium::Api::Path::SUITES}'" do
             call_api_should_receive(:method => :post, :path => Tddium::Api::Path::SUITES)
@@ -1132,22 +1127,15 @@ describe Tddium do
             run_suite(tddium)
           end
 
-          context "using defaults" do
-            it "should POST the default test pattern to the API" do
-              call_api_should_receive(:params => {:suite => hash_including(:test_pattern => SAMPLE_TEST_PATTERN)})
-              run_suite(tddium)
-            end
-          end
-
           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::TEST_PATTERN % Tddium::Default::TEST_PATTERN).and_return("**/*_test")
               stub_default_suite_name
             end
 
             it "should POST the user's entered values to the API" do
-              call_api_should_receive(:method => :post, :params => {:suite => hash_including(:repo_name => "foobar", :test_pattern => "**/*_test")})
+              tddium.should_receive(:say).with(Tddium::Text::Process::CREATING_SUITE % "foobar")
+              call_api_should_receive(:method => :post, :params => {:suite => hash_including(:repo_name => "foobar")})
               run_suite(tddium)
             end
           end
@@ -1173,11 +1161,12 @@ describe Tddium do
       end
 
       context "'GET #{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}' is successful" do
-        before do
+        before(:each) do
           response = {
             "suite" => {
-              "test_pattern" => "**/*_test.rb",
-              "id" => SAMPLE_SUITE_ID
+              "id" => SAMPLE_SUITE_ID,
+              "repo_name" => SAMPLE_APP_NAME,
+              "branch" => SAMPLE_BRANCH_NAME
             }
           }
           stub_call_api_response(:get, "#{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}", response)
@@ -1194,24 +1183,11 @@ describe Tddium do
           run_suite(tddium)
         end
 
-        it "should prompt for a test pattern using the current test pattern as the default" do
-          tddium.should_receive(:ask).with(/\*\*\/\*\_test\.rb/)
+        it "should display '#{Tddium::Text::Process::EXISTING_SUITE}'" do
+          tddium.should_receive(:say).with(Tddium::Text::Process::EXISTING_SUITE % "#{SAMPLE_APP_NAME}/#{SAMPLE_BRANCH_NAME}")
           run_suite(tddium)
         end
 
-        it "should send a 'PUT' request to '#{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}'" do
-          call_api_should_receive(:method => :put, :path => "#{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}")
-          run_suite(tddium)
-        end
-
-        context "'PUT #{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}' is successful" do
-          before { stub_call_api_response(:put, "#{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}", {}) }
-          it "should display '#{Tddium::Text::Process::UPDATE_SUITE}'" do
-            tddium.should_receive(:say).with(Tddium::Text::Process::UPDATE_SUITE)
-            run_suite(tddium)
-          end
-        end
-
         it_should_behave_like "sending the api key"
         it_should_behave_like "an unsuccessful api call"
       end

metadata

@@ -2,7 +2,7 @@
 name: tddium-preview
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Solano Labs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -04:00
+date: 2011-05-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency