tddium-preview 0.5.4 → 0.5.5

data/Gemfile.lock

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

data/lib/tddium/heroku.rb

@@ -2,15 +2,23 @@
 Copyright (c) 2011 Solano Labs All Rights Reserved
 =end
 
+require 'timeout'
+
 class HerokuConfig
   REQUIRED_KEYS = %w{TDDIUM_API_KEY TDDIUM_USER_NAME}
   def self.read_config(app=nil)
     result = nil
     begin
       config = {}
+      
       command = "heroku config -s"
       command += " --app #{app}" if app
-      output = `#{command}`
+
+      output = ''
+      Timeout::timeout(5) {
+        output = `#{command} 2>&1`
+      }
+
       output.lines.each do |line|
         line.chomp!
         k, v = line.split('=')
@@ -18,7 +26,7 @@ class HerokuConfig
           config[k] = v
         end
       end
-      return nil if REQUIRED_KEYS.inject(false) {|missing, x| !config[x]}
+      return nil if REQUIRED_KEYS.inject(false) {|missing, x| missing || !config[x]}
       result = config if config.keys.length > 0
     rescue 
     end

data/lib/tddium/version.rb

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

data/lib/tddium.rb

@@ -227,8 +227,11 @@ class Tddium < Thor
                                      "max_parallelism" => max_parallelism,
                                      "test_pattern" => test_pattern})
 
-      exit_failure if test_statuses["failed"] > 0 || test_statuses["errors"] > 0
+      exit_failure if test_statuses["failed"] > 0 || test_statuses["error"] > 0
     rescue TddiumClient::Error::Base
+      exit_failure "Failed due to error communicating with Tddium"
+    rescue RuntimeError => e
+      exit_failure "Failed due to internal error: #{e.inspect} #{e.backtrace}"
     end
   end
 
@@ -518,9 +521,14 @@ class Tddium < Thor
     # Given the user is logged in, she should be able to use "tddium account" to display information about her account:
     # Email address
     # Account creation date
-    say api_response["user"]["email"]
-    say api_response["user"]["created_at"]
-    say api_response["user"]["recurly_url"]
+    say "Username: "+api_response["user"]["email"]
+    say "Account Created: " + api_response["user"]["created_at"]
+    say "Recurly Management URL: " + api_response["user"]["recurly_url"]
+    say "CI Public Key: " + api_response["user"]["ci_ssh_pubkey"] if api_response["user"]["ci_ssh_pubkey"]
+    say "Suites: " + api_response["user"]["suites"] if api_response["user"]["suites"]
+  end
+
+  def show_ci_info(api_response)
   end
 
   def suite_for_current_branch?

data/spec/heroku_spec.rb

@@ -21,7 +21,7 @@ DB_URL=postgres://foo/bar
   describe ".read_config" do
     context "addon installed" do
       before do
-        HerokuConfig.stub(:`).with("heroku config -s").and_return(SAMPLE_HEROKU_CONFIG_TDDIUM)
+        HerokuConfig.stub(:`).with("heroku config -s 2>&1").and_return(SAMPLE_HEROKU_CONFIG_TDDIUM)
       end
 
       it "should return a hash of the TDDIUM config vars" do
@@ -38,8 +38,8 @@ DB_URL=postgres://foo/bar
 
     context "with app specified" do
       before do
-        HerokuConfig.stub(:`).with("heroku config -s --app #{SAMPLE_APP}").and_return(SAMPLE_HEROKU_CONFIG_TDDIUM)
-        HerokuConfig.should_receive(:`).with("heroku config -s --app #{SAMPLE_APP}")
+        HerokuConfig.stub(:`).with("heroku config -s --app #{SAMPLE_APP} 2>&1").and_return(SAMPLE_HEROKU_CONFIG_TDDIUM)
+        HerokuConfig.should_receive(:`).with("heroku config -s --app #{SAMPLE_APP} 2>&1")
       end
 
       it "should pass the app to heroku config" do
@@ -50,7 +50,7 @@ DB_URL=postgres://foo/bar
 
     context "missing config" do
       before do
-        HerokuConfig.stub(:`).with("heroku config -s").and_return(SAMPLE_HEROKU_CONFIG_PARTIAL)
+        HerokuConfig.stub(:`).with("heroku config -s 2>&1").and_return(SAMPLE_HEROKU_CONFIG_PARTIAL)
       end
 
       it "should return nil" do
@@ -60,7 +60,7 @@ DB_URL=postgres://foo/bar
 
     context "addon not installed" do
       before do
-        HerokuConfig.stub(:`).with("heroku config -s").and_return(SAMPLE_HEROKU_CONFIG_NO_TDDIUM)
+        HerokuConfig.stub(:`).with("heroku config -s 2>&1").and_return(SAMPLE_HEROKU_CONFIG_NO_TDDIUM)
       end
 
       it "should return nil" do
@@ -70,7 +70,7 @@ DB_URL=postgres://foo/bar
 
     context "heroku not installed" do
       before do
-        HerokuConfig.stub(:`).with("heroku config -s").and_raise(Errno::ENOENT)
+        HerokuConfig.stub(:`).with("heroku config -s 2>&1").and_raise(Errno::ENOENT)
       end
       it "should return nil" do
         HerokuConfig.read_config.should be_nil

data/spec/tddium_spec.rb

@@ -118,6 +118,15 @@ describe Tddium do
     result.and_return(*response_mocks) unless response_mocks.empty?
   end
 
+  def stub_call_api_error(method, path, code=500, response="Server Error")
+    result = tddium_client.stub(:call_api).with(method, path, anything, anything)
+    http_response = mock(TddiumClient::Error::Server)
+    http_response.stub(:body => nil,
+                              :code => code,
+                              :response => mock(:header => mock(:msg => response)))
+    result.and_raise(TddiumClient::Error::Server.new(http_response))
+  end
+
   def stub_cli_options(tddium, options = {})
     tddium.stub(:options).and_return(options)
   end
@@ -460,6 +469,7 @@ describe Tddium do
       HighLine.stub(:ask).and_return("")
       create_file(File.join(File.dirname(__FILE__), "..", Tddium::License::FILE_NAME), SAMPLE_LICENSE_TEXT)
       create_file(Tddium::Default::SSH_FILE, SAMPLE_SSH_PUBKEY)
+      HerokuConfig.stub(:read_config).and_return(nil)
     end
 
     it_should_behave_like "set the default environment"
@@ -471,17 +481,17 @@ describe Tddium do
       end
 
       it "should show the user's email address" do
-        tddium.should_receive(:say).with(SAMPLE_EMAIL)
+        tddium.should_receive(:say).with(/#{SAMPLE_EMAIL}/)
         run_account(tddium)
       end
 
       it "should show the user's account creation date" do
-        tddium.should_receive(:say).with(SAMPLE_DATE_TIME)
+        tddium.should_receive(:say).with(/#{SAMPLE_DATE_TIME}/)
         run_account(tddium)
       end
 
       it "should show the user's recurly account url" do
-        tddium.should_receive(:say).with(SAMPLE_RECURLY_URL)
+        tddium.should_receive(:say).with(/#{SAMPLE_RECURLY_URL}/)
         run_account(tddium)
       end
 
@@ -868,6 +878,16 @@ describe Tddium do
 
       it_should_behave_like "sending the api key"
 
+      it "should fail on an API error" do
+        stub_call_api_error(:post, Tddium::Api::Path::SESSIONS, 403, "Access Denied")
+        spec_should_fail
+      end
+
+      it "should fail on any other error" do
+        tddium_client.stub(:call_api).with(anything, anything, anything, anything).and_raise("generic runtime error")
+        spec_should_fail
+      end
+
       context "'POST #{Tddium::Api::Path::SESSIONS}' is successful" do
         before do
           response = {"session"=>{"id"=>SAMPLE_SESSION_ID}}
@@ -1067,6 +1087,21 @@ describe Tddium do
 
                 it_should_behave_like("test output summary")
               end
+
+              context "with only errors" do
+                before do
+                  get_test_executions_response_errors = {"report"=>SAMPLE_REPORT_URL, "tests"=>{"spec/mouse_spec.rb"=>{"finished" => true, "status"=>"error"}, "spec/pig_spec.rb"=>{"finished" => true, "status"=>"error"}, "spec/dog_spec.rb"=>{"finished" => true, "status"=>"error"}, "spec/cat_spec.rb"=>{"finished" => true, "status"=>"error"}}}
+                  stub_call_api_response(:get, "#{Tddium::Api::Path::SESSIONS}/#{SAMPLE_SESSION_ID}/#{Tddium::Api::Path::TEST_EXECUTIONS}", get_test_executions_response_errors)
+                  stub_sleep(tddium)
+                end
+                it "should display a summary of all the tests and exit failure" do
+                  tddium.should_receive(:say).with("4 tests, 0 failures, 4 errors, 0 pending")
+                  spec_should_fail do
+                    tddium.should_receive(:exit_failure).once
+                  end
+                end
+              end
+
               context "with no errors" do
                 before do
                   get_test_executions_response_all_passed = {

metadata

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