tddium-preview 0.0.5 → 0.0.6

data/lib/tddium.rb

@@ -7,6 +7,7 @@ require "thor"
 require "highline/import"
 require "json"
 require "tddium_client"
+require "base64"
 require File.expand_path("../tddium/constant", __FILE__)
 
 #      Usage:
@@ -99,18 +100,33 @@ class Tddium < Thor
 
   desc "spec", "Run the test suite"
   method_option :environment, :type => :string, :default => nil
+  method_option :user_data_file, :type => :string, :default => nil
   def spec
     set_default_environment(options[:environment])
     return unless git_repo? && tddium_settings && suite_for_current_branch?
 
-    start_time = Time.now
+    test_execution_params = {}
+    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)
+      else
+        say Text::Error::NO_USER_DATA_FILE % user_data_file_path
+        return
+      end
+    end
 
-    # Push the latest code to git
-    return unless git_push
+    start_time = Time.now
 
     # Call the API to get the suite and its tests
     begin
       suite_details = call_api(:get, current_suite_path)
+
+      # Push the latest code to git
+      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}}
 
@@ -122,7 +138,7 @@ class Tddium < Thor
       call_api(:post, "#{Api::Path::SESSIONS}/#{session_id}/#{Api::Path::REGISTER_TEST_EXECUTIONS}", {:suite_id => current_suite_id, :tests => test_files})
 
       # Start the tests
-      start_test_executions = call_api(:post, "#{Api::Path::SESSIONS}/#{session_id}/#{Api::Path::START_TEST_EXECUTIONS}")
+      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)
@@ -162,7 +178,7 @@ class Tddium < Thor
       end
 
       # Print out the result
-      say " "
+      say ""
       say Text::Process::FINISHED_TEST % (Time.now - start_time)
       say "#{finished_tests.size} examples, #{test_statuses["failed"]} failures, #{test_statuses["error"]} errors, #{test_statuses["pending"]} pending"
     rescue TddiumClient::Error::Base
@@ -269,9 +285,7 @@ class Tddium < Thor
         write_suite(new_suite["suite"]["id"])
 
         # Manage git
-        `git remote rm #{Git::REMOTE_NAME}`
-        `git remote add #{Git::REMOTE_NAME} #{new_suite["suite"]["git_repo_uri"]}`
-        git_push
+        update_git_remote_and_push(new_suite)
       end
     rescue TddiumClient::Error::Base
     end
@@ -430,6 +444,15 @@ class Tddium < Thor
     @tddium_settings
   end
 
+  def update_git_remote_and_push(suite_details)
+    git_repo_uri = suite_details["suite"]["git_repo_uri"]
+    unless `git remote show -n #{Git::REMOTE_NAME}` =~ /#{git_repo_uri}/
+      `git remote rm #{Git::REMOTE_NAME}`
+      `git remote add #{Git::REMOTE_NAME} #{git_repo_uri}`
+    end
+    git_push
+  end
+
   def user_logged_in?(active = true)
     result = tddium_settings(:fail_with_message => false) && tddium_settings["api_key"]
     (result && active) ? get_user : result

data/lib/tddium/constant.rb

@@ -112,6 +112,7 @@ If you want an invite, visit this URL to sign up:
 http://blog.tddium.com/home/
 
 "
+      NO_USER_DATA_FILE = "User data file '%s' does not exist"
     end
   end
 

data/lib/tddium/version.rb

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

data/spec/tddium_spec.rb

@@ -15,6 +15,7 @@ describe Tddium do
   SAMPLE_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_INVITATION_TOKEN = "TZce3NueiXp2lMTmaeRr"
   SAMPLE_GIT_REPO_URI = "ssh://git@api.tddium.com/home/git/repo/#{SAMPLE_APP_NAME}"
   SAMPLE_LICENSE_TEXT = "LICENSE"
@@ -25,10 +26,11 @@ describe Tddium do
   SAMPLE_RECURLY_URL = "https://tddium.recurly.com/account/1"
   SAMPLE_SESSION_ID = 1
   SAMPLE_SUITE_ID = 1
-  SAMPLE_SUITES_RESPONSE = {"suites" => [{"repo_name" => SAMPLE_APP_NAME, "branch" => SAMPLE_BRANCH_NAME, "id" => SAMPLE_SUITE_ID}]}
+  SAMPLE_TEST_PATTERN = "**/*_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"
   SAMPLE_TEST_EXECUTION_STATS = "total 1, notstarted 0, started 1, passed 0, failed 0, pending 0, error 0", "start_time"
-  SAMPLE_TEST_PATTERN = "**/*_spec.rb"
   SAMPLE_USER_RESPONSE = {"user"=> {"api_key" => SAMPLE_API_KEY, "email" => SAMPLE_EMAIL, "created_at" => SAMPLE_DATE_TIME, "recurly_url" => SAMPLE_RECURLY_URL}}
 
   def call_api_should_receive(options = {})
@@ -114,6 +116,11 @@ describe Tddium do
     tddium.stub(:system).with(/^git push/).and_return(success)
   end
 
+  def stub_git_remote(tddium, action = :show, success = true)
+    git_response = success ? "some text that contains #{SAMPLE_GIT_REPO_URI}" : "some text that does not contain the git repo uri" if action == :show
+    tddium.stub(:`).with(/^git remote #{action}/).and_return(git_response)
+  end
+
   def stub_ruby_version(tddium, version = SAMPLE_RUBY_VERSION)
     tddium.stub(:`).with("ruby -v").and_return("ruby #{version} (2010-08-16 patchlevel 302) [i686-darwin10.5.0]")
   end
@@ -253,6 +260,48 @@ describe Tddium do
     end
   end
 
+  shared_examples_for "update the git remote and push" do
+    context "git remote has changed" do
+      before do
+        stub_git_remote(tddium, :show, false)
+        stub_git_remote(tddium, :add)
+        stub_git_remote(tddium, :rm)
+      end
+
+      it "should remove all existing remotes called '#{Tddium::Git::REMOTE_NAME}'" do
+        tddium.should_receive(:`).with("git remote rm #{Tddium::Git::REMOTE_NAME}")
+        run(tddium)
+      end
+
+      it "should add a new remote called '#{Tddium::Git::REMOTE_NAME}' to '#{SAMPLE_GIT_REPO_URI}'" do
+        tddium.should_receive(:`).with("git remote add #{Tddium::Git::REMOTE_NAME} #{SAMPLE_GIT_REPO_URI}")
+        run(tddium)
+      end
+
+    end
+
+    context "git remote has not changed" do
+      before do
+        stub_git_remote(tddium)
+      end
+
+      it "should not remove any existing remotes" do
+        tddium.should_not_receive(:`).with(/git remote rm/)
+        run(tddium)
+      end
+
+      it "should not add any new remotes" do
+        tddium.should_not_receive(:`).with(/git remote add/)
+        run(tddium)
+      end
+    end
+
+    it "should push the latest code to '#{Tddium::Git::REMOTE_NAME}'" do
+      tddium.should_receive(:system).with("git push #{Tddium::Git::REMOTE_NAME} #{SAMPLE_BRANCH_NAME}")
+      run(tddium)
+    end
+  end
+
   shared_examples_for "with the correct environment extension" do
     it "should write the api key to the .tddium file with the relevent environment extension" do
       run(tddium)
@@ -505,7 +554,6 @@ describe Tddium do
     before do
       stub_defaults
       stub_config_file(:api_key => true, :branches => true)
-      stub_git_push(tddium)
     end
 
     it_should_behave_like "set the default environment"
@@ -513,16 +561,22 @@ describe Tddium do
     it_should_behave_like ".tddium file is missing or corrupt"
     it_should_behave_like "suite has not been initialized"
 
-    it "should push the latest code to tddium" do
-      tddium.should_receive(:system).with("git push #{Tddium::Git::REMOTE_NAME} #{SAMPLE_BRANCH_NAME}")
-      run_spec(tddium)
-    end
+    context "--user-data-file=#{SAMPLE_FILE_PATH}" do
+      context "does not exist" do
+        it "should show the user: #{Tddium::Text::Error::NO_USER_DATA_FILE % SAMPLE_FILE_PATH}" do
+          tddium.should_receive(:say).with(Tddium::Text::Error::NO_USER_DATA_FILE % SAMPLE_FILE_PATH)
+          run_spec(tddium, :user_data_file => SAMPLE_FILE_PATH)
+        end
 
-    context "git push was unsuccessful" do
-      before { stub_git_push(tddium, false) }
-      it "should not try to contact the api" do
-        tddium_client.should_not_receive(:call_api)
-        run_spec(tddium)
+        it "should not try to git push" do
+          tddium.should_not_receive(:system).with(/^git push/)
+          run_spec(tddium, :user_data_file => SAMPLE_FILE_PATH)
+        end
+
+        it "should not call the api" do
+          tddium_client.should_not_receive(:call_api)
+          run_spec(tddium, :user_data_file => SAMPLE_FILE_PATH)
+        end
       end
     end
 
@@ -531,13 +585,24 @@ describe Tddium do
 
     context "'GET #{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}' is successful" do
       before do
-        response = {"suite"=>{"test_pattern"=>SAMPLE_TEST_PATTERN, "id"=>SAMPLE_SUITE_ID, "suite_name"=>"tddium/demo", "ruby_version"=>SAMPLE_RUBY_VERSION}}
-        stub_call_api_response(:get, "#{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}", response)
+        stub_call_api_response(:get, "#{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}", {"suite"=>SAMPLE_SUITE_RESPONSE})
+        stub_git_push(tddium)
+        stub_git_remote(tddium)
         create_file("spec/mouse_spec.rb")
         create_file("spec/cat_spec.rb")
         create_file("spec/dog_spec.rb")
       end
 
+      it_should_behave_like "update the git remote and push"
+
+      context "git push was unsuccessful" do
+        before { stub_git_push(tddium, false) }
+        it "should not try to create a new session" do
+          tddium_client.should_not_receive(:call_api).with(:post, Tddium::Api::Path::SESSIONS)
+          run_spec(tddium)
+        end
+      end
+
       it "should send a 'POST' request to '#{Tddium::Api::Path::SESSIONS}'" do
         call_api_should_receive(:method => :post, :path => Tddium::Api::Path::SESSIONS)
         run_spec(tddium)
@@ -578,6 +643,19 @@ describe Tddium do
             run_spec(tddium)
           end
 
+          context "--user-data-file=#{SAMPLE_FILE_PATH}" do
+            before { create_file(SAMPLE_FILE_PATH, SAMPLE_PASSWORD) }
+            it "should send 'user_data_filename=#{File.basename(SAMPLE_FILE_PATH)}' to '#{Tddium::Api::Path::START_TEST_EXECUTIONS}'" do
+              call_api_should_receive(:method => :post, :path => /#{Tddium::Api::Path::START_TEST_EXECUTIONS}$/, :params => hash_including(:user_data_filename => File.basename(SAMPLE_FILE_PATH)))
+              run_spec(tddium, :user_data_file => SAMPLE_FILE_PATH)
+            end
+
+            it "should send 'user_data-text=#{Base64.encode64(SAMPLE_PASSWORD)}' (Base64 encoded file content)" do
+              call_api_should_receive(:method => :post, :path => /#{Tddium::Api::Path::START_TEST_EXECUTIONS}$/, :params => hash_including(:user_data_text => Base64.encode64(SAMPLE_PASSWORD)))
+              run_spec(tddium, :user_data_file => SAMPLE_FILE_PATH)
+            end
+          end
+
           it_should_behave_like "sending the api key"
 
           context "'POST #{Tddium::Api::Path::START_TEST_EXECUTIONS}' is successful" do
@@ -608,7 +686,7 @@ describe Tddium do
 
             shared_examples_for("test output summary") do
               it "should put a new line before displaying the summary" do
-                tddium.should_receive(:say).with(" ")
+                tddium.should_receive(:say).with("")
                 run_spec(tddium)
               end
 
@@ -1005,34 +1083,13 @@ describe Tddium do
 
           context "API response successful" do
             before do
-              stub_call_api_response(:post, Tddium::Api::Path::SUITES, {"suite"=>{"id"=>SAMPLE_SUITE_ID, "git_repo_uri" => SAMPLE_GIT_REPO_URI}})
-              tddium.stub(:`).with(/^git remote/)
+              stub_call_api_response(:post, Tddium::Api::Path::SUITES, {"suite"=>SAMPLE_SUITE_RESPONSE})
+              stub_git_remote(tddium)
               stub_git_push(tddium)
             end
 
             it_should_behave_like("writing the suite to file")
-
-            it "should remove any existing remotes named 'tddium'" do
-              tddium.should_receive(:`).with("git remote rm tddium")
-              run_suite(tddium)
-            end
-
-            it "should add a new remote called '#{Tddium::Git::REMOTE_NAME}'" do
-              stub_default_suite_name
-              tddium.should_receive(:`).with("git remote add #{Tddium::Git::REMOTE_NAME} #{SAMPLE_GIT_REPO_URI}")
-              run_suite(tddium)
-            end
-
-            context "in the branch 'oaktree'" do
-              before do
-                tddium.stub(:current_git_branch).and_return("oaktree")
-              end
-
-              it "should push the current git branch to tddium oaktree" do
-                tddium.should_receive(:system).with("git push tddium oaktree")
-                run_suite(tddium)
-              end
-            end
+            it_should_behave_like("update the git remote and push")
           end
           it_should_behave_like "an unsuccessful api call"
         end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: tddium-preview
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
+  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jay Moorthi
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -07:00
+date: 2011-04-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -38,8 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -51,8 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -64,10 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 6
         version: 0.0.6
   type: :runtime
   version_requirements: *id004
@@ -79,8 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -92,8 +76,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -105,8 +87,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -118,8 +98,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -162,21 +140,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: tddium
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: tddium Hosted Testing