tddium-preview 0.0.8 → 0.1.0

data/CHANGELOG

@@ -2,4 +2,5 @@
 Copyright (c) 2011 Solano Labs All Rights Reserved
 =end
 
-v0.0.1 - Initial Version
+v0.0.1 - Initial version
+v0.0.8 - First preview version

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    tddium-preview (0.0.7)
+    tddium-preview (0.0.8)
+      bundler
       highline
       json
       tddium_client (>= 0.0.6)

data/README.rdoc

@@ -3,58 +3,23 @@
 tddium takes the pain out of running Selenium testing in cloud.
 
 It automatically starts private Amazon EC2 Instances, runs your test,
-collect results, and cleans up the EC2 resources it used so you only pay for
-what you use.
+collect results, and cleans up the EC2 resources it used so you only
+pay for what you use.
 
 == Getting Started
 
-1.  Sign up for an EC2 account, by going here:
-  
-    https://aws-portal.amazon.com/gp/aws/developer/registration/index.html
+1. Install rvm (https://rvm.beginrescueend.com).  As of this writing,
+version 1.2.x is supported but version 1.5.x is not.
 
-    Note that if you have a personal Amazon account, you'll want to make a new one
-    for Amazon Web Services. 
+2. Install ruby into your rvm and create a gemset
 
-    The registration process generates a variety of certificates and keys.  Please
-    keep track of them.
+3. Install the tddium-preview gem into your new gemset
 
-2.  Note your AWS Access Key and AWS Secret.  You can find them by the following
-    steps:
+4. In your GIT repo run tddium suite to create a new suite
 
-    - go to the AWS Management Console
-    - click on the "Account" link in the upper navigation menu
-    - click on "Security Credentials"
-    - scroll down to the first section "Access Credentials"
-    - the Access Key is a 20-character alphabetic string.  The Secret is hidden. Click the 'show' link to reveal it.
-
-3.  In the AWS Management Console, create a selenium-grid security group, and
-    create rules for:
-
-    * allow dest port 4444 (Selenium-Grid)
-    * allow dest port 5900 (Windows Remote Desktop)
-    * allow http
-    * allow https
-    * allow vnc
-    * allow ssh
-
-4.  In the AWS Management Console, create a keypair called sg-keypair.
-
-3.  Subscribe to tddium:
-
-    Subscribe your Amazon EC2 account to tddium here:
-
-    https://aws-portal.amazon.com/gp/aws/user/subscription/index.html?ie=UTF8&offeringCode=FA429DE5
-
-4.  Start using tddium:
-
-    <tt>$ tddium config:init</tt>
-
-    # Asks you for the AWS Access Key and AWS Secret
-
-    <tt>$ tddium test:sequential</tt>
-
-    # Starts an EC2 Instance, sets SELENIUM_RC_HOST to it, and runs **/*_spec.rb in sequence
+4. Run tddium spec to run your hosted tests
 
 == Copyright
 
-Copyright (c) 2011 Solano Labs All Rights Reserved. See LICENSE.txt for further details.
+Copyright (c) 2011 Solano Labs All Rights Reserved. See LICENSE.txt for
+further details.

data/lib/tddium.rb

@@ -107,7 +107,11 @@ class Tddium < Thor
     return unless git_repo? && tddium_settings && suite_for_current_branch?
 
     test_execution_params = {}
-    if user_data_file_path = options[:user_data_file]
+
+    # 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"]
+
       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)
@@ -119,7 +123,10 @@ class Tddium < Thor
     end
 
     # Set max parallelism param
-    test_execution_params[:max_parallelism] = options[:max_parallelism] if options[:max_parallelism]
+    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"]
+      test_execution_params[:max_parallelism] = max_parallelism
+    end
 
     start_time = Time.now
 
@@ -164,7 +171,7 @@ class Tddium < Thor
         # Print out the progress of running tests
         current_test_executions["tests"].each do |test_name, result_params|
           test_status = result_params["status"]
-          if result_params["end_time"] && !finished_tests[test_name]
+          if result_params["finished"] && !finished_tests[test_name]
             message = case test_status
                         when "passed" then [".", :green, false]
                         when "failed" then ["F", :red, false]
@@ -185,6 +192,9 @@ class Tddium < Thor
       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"
+
+      # Save the spec options
+      write_suite(current_suite_id, {"user_data_file" => user_data_file_path, "max_parallelism" => max_parallelism})
     rescue TddiumClient::Error::Base
     end
   end
@@ -214,6 +224,9 @@ class Tddium < Thor
           say Text::Status::CURRENT_SUITE_UNAVAILABLE
         end
       end
+
+      account_usage = call_api(:get, Api::Path::ACCOUNT_USAGE)
+      say account_usage["usage"]
     rescue TddiumClient::Error::Base
     end
   end
@@ -313,7 +326,13 @@ class Tddium < Thor
   end
 
   def current_suite_id
-    tddium_settings["branches"][current_git_branch] if tddium_settings["branches"]
+    tddium_settings["branches"][current_git_branch]["id"] if tddium_settings["branches"] && tddium_settings["branches"][current_git_branch]
+  end
+
+  def current_suite_options
+    if tddium_settings["branches"] && tddium_settings["branches"][current_git_branch]
+      tddium_settings["branches"][current_git_branch]["options"]
+    end || {}
   end
 
   def current_suite_path
@@ -351,7 +370,7 @@ class Tddium < Thor
   end
 
   def git_push
-    system("git push #{Git::REMOTE_NAME} #{current_git_branch}")
+    system("git push -f #{Git::REMOTE_NAME} #{current_git_branch}")
   end
 
   def git_repo?
@@ -450,7 +469,7 @@ class Tddium < Thor
   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 rm #{Git::REMOTE_NAME} > /dev/null 2>&1`
       `git remote add #{Git::REMOTE_NAME} #{git_repo_uri}`
     end
     git_push
@@ -466,13 +485,24 @@ class Tddium < Thor
     File.open(tddium_file_name, "w") do |file|
       file.write(settings.merge({"api_key" => api_key}).to_json)
     end
+    write_tddium_to_gitignore
   end
 
-  def write_suite(suite_id)
+  def write_suite(suite_id, options = {})
     branches = tddium_settings["branches"] || {}
-    branches.merge!({current_git_branch => suite_id})
+    branches.merge!({current_git_branch => {"id" => suite_id, "options" => options}})
     File.open(tddium_file_name, "w") do |file|
       file.write(tddium_settings.merge({"branches" => branches}).to_json)
     end
+    write_tddium_to_gitignore
+  end
+
+  def write_tddium_to_gitignore
+    content = File.read(Git::GITIGNORE)
+    unless content.include?("#{tddium_file_name}\n")
+      File.open(Git::GITIGNORE, "a") do |file|
+        file.write("#{tddium_file_name}\n")
+      end
+    end
   end
 end

data/lib/tddium/constant.rb

@@ -8,7 +8,6 @@ module TddiumConstant
     VERSION_REGEXP = /([\d\.]+)/
   end
 
-
   module Default
     SLEEP_TIME_BETWEEN_POLLS = 2
     ENVIRONMENT = "production"
@@ -18,6 +17,7 @@ module TddiumConstant
 
   module Git
     REMOTE_NAME = "tddium"
+    GITIGNORE = ".gitignore"
   end
 
   module Api
@@ -30,6 +30,7 @@ module TddiumConstant
       REGISTER_TEST_EXECUTIONS = "#{TEST_EXECUTIONS}/register"
       START_TEST_EXECUTIONS = "#{TEST_EXECUTIONS}/start"
       REPORT_TEST_EXECUTIONS = "#{TEST_EXECUTIONS}/report"
+      ACCOUNT_USAGE = "accounts/usage"
     end
     module ErrorCode
       INVALID_INVITATION = 2
@@ -84,6 +85,8 @@ 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"
     end
 
     module Status

data/lib/tddium/version.rb

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

data/spec/tddium_spec.rb

@@ -16,6 +16,7 @@ describe Tddium do
   SAMPLE_DATE_TIME = "2011-03-11T08:43:02Z"
   SAMPLE_EMAIL = "someone@example.com"
   SAMPLE_FILE_PATH = "./my_user_file.png"
+  SAMPLE_FILE_PATH2 = "./my_user_file2.png"
   SAMPLE_INVITATION_TOKEN = "TZce3NueiXp2lMTmaeRr"
   SAMPLE_GIT_REPO_URI = "ssh://git@api.tddium.com/home/git/repo/#{SAMPLE_APP_NAME}"
   SAMPLE_LICENSE_TEXT = "LICENSE"
@@ -91,7 +92,7 @@ describe Tddium do
 
   def stub_config_file(options = {})
     params = {}
-    params.merge!(:branches => (options[:branches].is_a?(Hash)) ? options[:branches] : {SAMPLE_BRANCH_NAME => SAMPLE_SUITE_ID}) if options[:branches]
+    params.merge!(:branches => (options[:branches].is_a?(Hash)) ? options[:branches] : {SAMPLE_BRANCH_NAME => {"id" => SAMPLE_SUITE_ID}}) if options[:branches]
     params.merge!(:api_key => (options[:api_key].is_a?(String)) ? options[:api_key] : SAMPLE_API_KEY) if options[:api_key]
     json = params.to_json unless params.empty?
     create_file(SAMPLE_TDDIUM_CONFIG_FILE, json)
@@ -106,6 +107,7 @@ describe Tddium do
     stub_git_branch(tddium)
     stub_tddium_client
     create_file(File.join(".git", "something"), "something")
+    create_file(Tddium::Git::GITIGNORE, "something")
   end
 
   def stub_git_branch(tddium, default_branch_name = SAMPLE_BRANCH_NAME)
@@ -269,7 +271,7 @@ describe Tddium do
       end
 
       it "should remove all existing remotes called '#{Tddium::Git::REMOTE_NAME}'" do
-        tddium.should_receive(:`).with("git remote rm #{Tddium::Git::REMOTE_NAME}")
+        tddium.should_receive(:`).with("git remote rm #{Tddium::Git::REMOTE_NAME} > /dev/null 2>&1")
         run(tddium)
       end
 
@@ -297,7 +299,7 @@ describe Tddium do
     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}")
+      tddium.should_receive(:system).with("git push -f #{Tddium::Git::REMOTE_NAME} #{SAMPLE_BRANCH_NAME}")
       run(tddium)
     end
   end
@@ -561,11 +563,22 @@ describe Tddium do
     it_should_behave_like ".tddium file is missing or corrupt"
     it_should_behave_like "suite has not been initialized"
 
-    context "--user-data-file=#{SAMPLE_FILE_PATH}" do
+    context "user-data-file" 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)
+        context "from command line option" do
+          it "should be picked first" 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
+        end
+
+        context "from the previous option" do
+          before { stub_config_file(:branches => {SAMPLE_BRANCH_NAME => {"id" => SAMPLE_SUITE_ID, "options" => {"user_data_file" => SAMPLE_FILE_PATH2}}}) }
+
+          it "should be picked if no command line option" do
+            tddium.should_receive(:say).with(Tddium::Text::Error::NO_USER_DATA_FILE % SAMPLE_FILE_PATH2)
+            run_spec(tddium)
+          end
         end
 
         it "should not try to git push" do
@@ -656,17 +669,28 @@ describe Tddium do
             end
           end
 
-          context "--max_parallelism=5" do
-            it "should send max_parallelism=5 to '#{Tddium::Api::Path::START_TEST_EXECUTIONS}'" do
-              call_api_should_receive(:method => :post, :path => /#{Tddium::Api::Path::START_TEST_EXECUTIONS}$/, :params => hash_including(:max_parallelism => 5))
-              run_spec(tddium, :max_parallelism => 5)
+          context "max_parallelism" do
+            context "from command line option" do
+              it "should be picked first" do
+                call_api_should_receive(:method => :post, :path => /#{Tddium::Api::Path::START_TEST_EXECUTIONS}$/, :params => hash_including(:max_parallelism => 5))
+                run_spec(tddium, :max_parallelism => 5)
+              end
+            end
+
+            context "from the previous option" do
+              before { stub_config_file(:branches => {SAMPLE_BRANCH_NAME => {"id" => SAMPLE_SUITE_ID, "options" => {"max_parallelism" => 10}}}) }
+
+              it "should be picked if no command line option" do
+                call_api_should_receive(:method => :post, :path => /#{Tddium::Api::Path::START_TEST_EXECUTIONS}$/, :params => hash_including(:max_parallelism => 10))
+                run_spec(tddium)
+              end
             end
           end
 
           it_should_behave_like "sending the api key"
 
           context "'POST #{Tddium::Api::Path::START_TEST_EXECUTIONS}' is successful" do
-            let(:get_test_executions_response) { {"report"=>SAMPLE_REPORT_URL, "tests"=>{"spec/mouse_spec.rb"=>{"end_time"=>SAMPLE_DATE_TIME, "status"=>"pending"}, "spec/pig_spec.rb"=>{"end_time"=>nil, "status"=>"started"}, "spec/dog_spec.rb"=>{"end_time"=>SAMPLE_DATE_TIME, "status"=>"failed"}, "spec/cat_spec.rb"=>{"end_time"=>SAMPLE_DATE_TIME, "status"=>"passed"}}} }
+            let(:get_test_executions_response) { {"report"=>SAMPLE_REPORT_URL, "tests"=>{"spec/mouse_spec.rb"=>{"finished" => true, "status"=>"pending"}, "spec/pig_spec.rb"=>{"finished" => false, "status"=>"started"}, "spec/dog_spec.rb"=>{"finished" => true, "status"=>"failed"}, "spec/cat_spec.rb"=>{"finished" => true, "status"=>"passed"}}} }
             before {stub_call_api_response(:post, "#{Tddium::Api::Path::SESSIONS}/#{SAMPLE_SESSION_ID}/#{Tddium::Api::Path::START_TEST_EXECUTIONS}", {"started"=>1, "status"=>0, "report" => SAMPLE_REPORT_URL})}
 
             it "should show the user: '#{Tddium::Text::Process::CHECK_TEST_REPORT % SAMPLE_REPORT_URL}'" do
@@ -730,7 +754,7 @@ describe Tddium do
 
             context "'GET #{Tddium::Api::Path::TEST_EXECUTIONS}' is successful" do
               before do
-              get_test_executions_response_all_finished = {"report"=>SAMPLE_REPORT_URL, "tests"=>{"spec/mouse_spec.rb"=>{"end_time"=>SAMPLE_DATE_TIME, "status"=>"pending"}, "spec/pig_spec.rb"=>{"end_time"=>SAMPLE_DATE_TIME, "status"=>"error"}, "spec/dog_spec.rb"=>{"end_time"=>SAMPLE_DATE_TIME, "status"=>"failed"}, "spec/cat_spec.rb"=>{"end_time"=>SAMPLE_DATE_TIME, "status"=>"passed"}}}
+                get_test_executions_response_all_finished = {"report"=>SAMPLE_REPORT_URL, "tests"=>{"spec/mouse_spec.rb"=>{"finished" => true, "status"=>"pending"}, "spec/pig_spec.rb"=>{"finished" => true, "status"=>"error"}, "spec/dog_spec.rb"=>{"finished" => true, "status"=>"failed"}, "spec/cat_spec.rb"=>{"finished" => true, "status"=>"passed"}}}
                 stub_call_api_response(:get, "#{Tddium::Api::Path::SESSIONS}/#{SAMPLE_SESSION_ID}/#{Tddium::Api::Path::TEST_EXECUTIONS}", get_test_executions_response, get_test_executions_response_all_finished)
                 stub_sleep(tddium)
               end
@@ -765,6 +789,11 @@ describe Tddium do
                 run_spec(tddium)
               end
 
+              it "should save the spec options" do
+                tddium.should_receive(:write_suite).with(SAMPLE_SUITE_ID, {"user_data_file" => nil, "max_parallelism" => 3})
+                run_spec(tddium, {:max_parallelism => 3})
+              end
+
               it_should_behave_like("test output summary")
             end
 
@@ -821,7 +850,7 @@ describe Tddium do
         end
 
         context "without current suite" do
-          before { stub_config_file(:branches => {SAMPLE_BRANCH_NAME => 0}) }
+          before { stub_config_file(:branches => {SAMPLE_BRANCH_NAME => {"id" => 0}}) }
           it "should show the user '#{Tddium::Text::Status::CURRENT_SUITE_UNAVAILABLE}'" do
             tddium.should_receive(:say).with(Tddium::Text::Status::CURRENT_SUITE_UNAVAILABLE)
             run_status(tddium)
@@ -901,8 +930,23 @@ describe Tddium do
             end
           end
         end
+
+        it "should send a 'GET' request to '#{Tddium::Api::Path::ACCOUNT_USAGE}'" do
+          call_api_should_receive(:method => :get, :path => Tddium::Api::Path::ACCOUNT_USAGE)
+          run_status(tddium)
+        end
+
+        context "'GET #{Tddium::Api::Path::SUITES}' is successful" do
+          before { stub_call_api_response(:get, Tddium::Api::Path::ACCOUNT_USAGE, {"usage" => "something"}) }
+
+          it "should display the account usage" do
+            tddium.should_receive(:say).with("something")
+            run_status(tddium)
+          end
+        end
       end
     end
+
     it_should_behave_like "an unsuccessful api call"
   end
 
@@ -979,7 +1023,14 @@ describe Tddium do
           it "should write the suite id and branch name to the .tddium file" do
             run_suite(tddium)
             tddium_file = File.open(SAMPLE_TDDIUM_CONFIG_FILE) { |file| file.read }
-            JSON.parse(tddium_file)["branches"][SAMPLE_BRANCH_NAME].should == SAMPLE_SUITE_ID
+            JSON.parse(tddium_file)["branches"][SAMPLE_BRANCH_NAME]["id"].should == SAMPLE_SUITE_ID
+          end
+
+          it "should update the gitignore file with tddium" do
+            run_suite(tddium)
+            gitignore_file = File.open(Tddium::Git::GITIGNORE) { |file| file.read }
+            gitignore_file.should include(".tddium.test")
+            gitignore_file.should include("something")
           end
         end
 

data/tddium.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.name        = "tddium-preview"
   s.version     = TddiumVersion::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Jay Moorthi"]
+  s.authors     = ["Solano Labs"]
   s.email       = ["info@tddium.com"]
   s.homepage    = "http://www.tddium.com/"
   s.summary     = %q{tddium Hosted Testing}
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("highline")
   s.add_runtime_dependency("json")
   s.add_runtime_dependency("tddium_client", ">=0.0.6")
+  s.add_runtime_dependency("bundler")
 
   s.add_development_dependency("rspec")
   s.add_development_dependency("fakefs")

metadata

@@ -2,15 +2,15 @@
 name: tddium-preview
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
-- Jay Moorthi
+- Solano Labs
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 -07:00
+date: 2011-04-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,7 +58,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: bundler
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -66,10 +66,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: fakefs
+  name: rspec
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -80,7 +80,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: fakefs
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -91,7 +91,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: simplecov
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -101,6 +101,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id009
 description: tddium runs your rspec (and Selenium) tests in the cloud, in parallel!
 email: 
 - info@tddium.com