tddium-preview 0.1.0 → 0.1.1

data/Gemfile.lock

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

data/lib/tddium.rb

@@ -102,6 +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"
   def spec
     set_default_environment(options[:environment])
     return unless git_repo? && tddium_settings && suite_for_current_branch?
@@ -127,6 +128,12 @@ class Tddium < Thor
       say Text::Process::USING_PREVIOUS_MAX_PARALLELISM % max_parallelism if max_parallelism == current_suite_options["max_parallelism"]
       test_execution_params[:max_parallelism] = max_parallelism
     end
+    
+    # Set test_pattern param
+    test_pattern = options[:test_pattern]
+    if current_suite_options["test_pattern"]
+      say Text::Process::USING_PREVIOUS_TEST_PATTERN % test_pattern if test_pattern == current_suite_options["test_pattern"]
+    end
 
     start_time = Time.now
 
@@ -138,9 +145,13 @@ class Tddium < Thor
       return unless update_git_remote_and_push(suite_details)
 
       # Get a list of files to be tested
-      test_pattern = suite_details["suite"]["test_pattern"]
       test_files = Dir.glob(test_pattern).collect {|file_path| {:test_name => file_path}}
 
+      if test_files.empty?
+        say Text::Error::NO_MATCHING_FILES % test_pattern
+        return
+      end
+
       # Create a session
       new_session = call_api(:post, Api::Path::SESSIONS)
       session_id = new_session["session"]["id"]
@@ -194,7 +205,9 @@ class Tddium < Thor
       say "#{finished_tests.size} examples, #{test_statuses["failed"]} failures, #{test_statuses["error"]} errors, #{test_statuses["pending"]} pending"
 
       # Save the spec options
-      write_suite(current_suite_id, {"user_data_file" => user_data_file_path, "max_parallelism" => max_parallelism})
+      write_suite(current_suite_id, {"user_data_file" => user_data_file_path,
+                                     "max_parallelism" => max_parallelism,
+                                     "test_pattern" => test_pattern})
     rescue TddiumClient::Error::Base
     end
   end

data/lib/tddium/constant.rb

@@ -87,6 +87,7 @@ tddium spec
       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"
     end
 
     module Status
@@ -116,6 +117,7 @@ http://blog.tddium.com/home/
 
 "
       NO_USER_DATA_FILE = "User data file '%s' does not exist"
+      NO_MATCHING_FILES = "No files match '%s'"
     end
   end
 

data/lib/tddium/version.rb

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

data/spec/tddium_spec.rb

@@ -27,7 +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"
+  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_SUITES_RESPONSE = {"suites" => [SAMPLE_SUITE_RESPONSE]}
   SAMPLE_TDDIUM_CONFIG_FILE = ".tddium.test"
@@ -48,13 +50,16 @@ describe Tddium do
     (array.last.is_a?(Hash) && is_options) ? array.pop : {}
   end
 
-  def run(tddium, options = {:environment => "test"})
+  def run(tddium, options = {:test_pattern => DEFAULT_TEST_PATTERN, :environment => "test"})
     send("run_#{example.example_group.ancestors.map(&:description)[-2][1..-1]}", tddium, options)
   end
 
   [:suite, :spec, :status, :account, :login, :logout].each do |method|
     define_method("run_#{method}") do |tddium, *params|
       options = params.first || {}
+      if method == :spec 
+        options[:test_pattern] = DEFAULT_TEST_PATTERN unless options.has_key?(:test_pattern)
+      end
       options[:environment] = "test" unless options.has_key?(:environment)
       stub_cli_options(tddium, options)
       tddium.send(method)
@@ -636,15 +641,27 @@ describe Tddium do
 
         it_should_behave_like "sending the api key"
 
-        it "should POST the names of the file names extracted from the suite's test_pattern" do
-          current_dir = Dir.pwd
-          call_api_should_receive(:params => {:suite_id => SAMPLE_SUITE_ID,
-                                  :tests => [{:test_name => "#{current_dir}/spec/cat_spec.rb"},
-                                             {:test_name => "#{current_dir}/spec/dog_spec.rb"},
-                                             {:test_name => "#{current_dir}/spec/mouse_spec.rb"}]})
-          run_spec(tddium)
+        context "default test pattern" do
+          it "should POST the names of the file names extracted from the test_pattern parameter" do
+            current_dir = Dir.pwd
+            call_api_should_receive(:params => {:suite_id => SAMPLE_SUITE_ID,
+                                    :tests => [{:test_name => "#{current_dir}/spec/cat_spec.rb"},
+                                               {:test_name => "#{current_dir}/spec/dog_spec.rb"},
+                                               {:test_name => "#{current_dir}/spec/mouse_spec.rb"}]})
+            run_spec(tddium)
+          end
         end
 
+        context "--test-pattern=#{CUSTOM_TEST_PATTERN}" do
+          it "should POST the names of the file names extracted from the test_pattern parameter" do
+            current_dir = Dir.pwd
+            call_api_should_receive(:params => {:suite_id => SAMPLE_SUITE_ID,
+                                    :tests => [{:test_name => "#{current_dir}/spec/cat_spec.rb"}]})
+            run_spec(tddium, {:test_pattern=>CUSTOM_TEST_PATTERN})
+          end
+        end
+
+
         context "'POST #{Tddium::Api::Path::REGISTER_TEST_EXECUTIONS}' is successful" do
           before do
             response = {"added"=>0, "existing"=>1, "errors"=>0, "status"=>0}
@@ -790,7 +807,7 @@ describe Tddium do
               end
 
               it "should save the spec options" do
-                tddium.should_receive(:write_suite).with(SAMPLE_SUITE_ID, {"user_data_file" => nil, "max_parallelism" => 3})
+                tddium.should_receive(:write_suite).with(SAMPLE_SUITE_ID, {"user_data_file" => nil, "max_parallelism" => 3, "test_pattern" => "**/*_spec.rb"})
                 run_spec(tddium, {:max_parallelism => 3})
               end
 

metadata

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