tddium-preview 0.1.5 → 0.5.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tddium-preview (0.1.4)
+    tddium-preview (0.1.5)
       bundler
       highline
       json
@@ -14,8 +14,8 @@ GEM
     crack (0.1.8)
     diff-lcs (1.1.2)
     fakefs (0.3.1)
-    highline (1.6.1)
-    httparty (0.7.4)
+    highline (1.6.2)
+    httparty (0.7.7)
       crack (= 0.1.8)
     json (1.5.1)
     rake (0.8.7)
@@ -30,7 +30,7 @@ GEM
     simplecov (0.4.1)
       simplecov-html (~> 0.4.3)
     simplecov-html (0.4.3)
-    tddium_client (0.0.6)
+    tddium_client (0.0.8)
       httparty
       json
     thor (0.14.6)

data/lib/tddium.rb

@@ -9,6 +9,7 @@ require "json"
 require "tddium_client"
 require "base64"
 require File.expand_path("../tddium/constant", __FILE__)
+require File.expand_path("../tddium/heroku", __FILE__)
 
 #      Usage:
 #
@@ -26,7 +27,7 @@ require File.expand_path("../tddium/constant", __FILE__)
 
 class Tddium < Thor
   include TddiumConstant
-
+  
   desc "account", "View/Manage account information"
   method_option :environment, :type => :string, :default => nil
   method_option :email, :type => :string, :default => nil
@@ -37,6 +38,10 @@ class Tddium < Thor
     if user_details = user_logged_in?
       # User is already logged in, so just display the info
       show_user_details(user_details)
+    elsif heroku_config = HerokuConfig.read_config
+      # User has logged in to heroku, and TDDIUM environment variables are
+      # present
+      handle_heroku_user(options, heroku_config)
     else
       params = get_user_credentials(options.merge(:invited => true))
 
@@ -49,9 +54,7 @@ class Tddium < Thor
         end
       end
 
-      # Prompt for ssh-key file
-      ssh_file = prompt(Text::Prompt::SSH_KEY, options[:ssh_key_file], Default::SSH_FILE)
-      params[:user_git_pubkey] = File.open(File.expand_path(ssh_file)) {|file| file.read}
+      params[:user_git_pubkey] = prompt_ssh_key(options[:ssh_key_file])
 
       # Prompt for accepting license
       content =  File.open(File.join(File.dirname(__FILE__), "..", License::FILE_NAME)) do |file|
@@ -420,6 +423,33 @@ class Tddium < Thor
     message.nil?
   end
 
+  def handle_heroku_user(options, heroku_config)
+    api_key = heroku_config['TDDIUM_API_KEY']
+    user = tddium_client.call_api(:get, Api::Path::USERS, {}, api_key) rescue nil
+    if user && user["user"]["heroku_needs_activation"] != true
+      say Text::Status::HEROKU_CONFIG
+    elsif user
+      say Text::Process::HEROKU_WELCOME
+      params = get_user_credentials(:email => heroku_config['TDDIUM_USER_NAME'])
+      params.delete(:email)
+      params[:password_confirmation] = HighLine.ask(Text::Prompt::PASSWORD_CONFIRMATION) { |q| q.echo = "*" }
+      params[:user_git_pubkey] = prompt_ssh_key(options[:ssh_key])
+
+      begin
+        user_id = user["user"]["id"]
+        result = tddium_client.call_api(:put, "#{Api::Path::USERS}/#{user_id}/", {:user=>params, :heroku_activation=>true}, api_key)
+        write_api_key(user["user"]["api_key"])
+        say Text::Status::HEROKU_CONFIG
+      rescue TddiumClient::Error::API => e
+        exit_failure Text::Error::HEROKU_MISCONFIGURED % e
+      rescue TddiumClient::Error::Base => e
+        exit_failure Text::Error::HEROKU_MISCONFIGURED % e
+      end
+    else
+      exit_failure Text::Error::HEROKU_MISCONFIGURED % "Unrecognized user"
+    end
+  end
+
   def login_user(options = {})
     # POST (email, password) to /users/sign_in to retrieve an API key
     begin
@@ -436,6 +466,14 @@ class Tddium < Thor
     value.empty? ? default_value : value
   end
 
+  def prompt_ssh_key(current)
+    # Prompt for ssh-key file
+    ssh_file = prompt(Text::Prompt::SSH_KEY, options[:ssh_key_file], Default::SSH_FILE)
+    data = File.open(File.expand_path(ssh_file)) {|file| file.read}
+    data
+  end
+
+
   def set_default_environment(env)
     if env.nil?
       tddium_client.environment = :development

data/lib/tddium/constant.rb

@@ -91,6 +91,13 @@ tddium spec
       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"
+      HEROKU_WELCOME = "
+Thanks for installing the Tddium Heroku Add-On!
+
+Next, set a password and provide an SSH key to authenticate your communication
+with Tddium.
+
+"
     end
 
     module Status
@@ -106,6 +113,20 @@ tddium spec
       ATTRIBUTE_DETAIL = "    %s: %s"
       SEPARATOR = "====="
       USING_SUITE = "Using suite: '%s' on branch: '%s'"
+      HEROKU_CONFIG = "
+Tddium is configured to work with your Heroku app.
+
+Next, you should:
+
+1. Register your test suite by running:
+
+$ tddium suite
+
+2. Start tests by running:
+
+$ tddium spec
+
+"
     end
 
     module Error
@@ -122,6 +143,7 @@ http://blog.tddium.com/home/
       NO_USER_DATA_FILE = "User data file '%s' does not exist"
       NO_MATCHING_FILES = "No files match '%s'"
       PASSWORD_ERROR = "Error changing password: %s"
+      HEROKU_MISCONFIGURED = "There was an error linking your Heroku account to Tddium: %s"
     end
   end
 

data/lib/tddium/heroku.rb

@@ -0,0 +1,24 @@
+=begin
+Copyright (c) 2011 Solano Labs All Rights Reserved
+=end
+
+class HerokuConfig
+  def self.read_config
+    result = nil
+    begin
+      config = {}
+      output = `heroku config -s`
+      output.lines.each do |line|
+        line.chomp!
+        k, v = line.split('=')
+        if k =~ /^TDDIUM_/ && v.length > 0
+          config[k] = v
+        end
+      end
+      result = config if config.keys.length > 0
+    rescue Errno::ENOENT
+    rescue Errno::EPERM
+    end
+    result
+  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.5"
+  VERSION = "0.5.0"
 end

data/spec/heroku_spec.rb

@@ -0,0 +1,54 @@
+=begin
+Copyright (c) 2011 Solano Labs All Rights Reserved
+=end
+
+require "rubygems"
+require "rspec"
+require "tddium/heroku"
+
+describe HerokuConfig do
+  SAMPLE_HEROKU_CONFIG_TDDIUM = "
+TDDIUM_API_KEY=abcdefg
+TDDIUM_USER_NAME=app1234@heroku.com
+"
+  SAMPLE_HEROKU_CONFIG_NO_TDDIUM = "
+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)
+      end
+
+      it "should return a hash of the TDDIUM config vars" do
+        result = HerokuConfig.read_config
+        result.should be_a(Hash)
+        result.each do |k,v|
+          k.should =~ /^TDDIUM_/
+          v.length.should > 0
+        end
+        result.should include('TDDIUM_API_KEY')
+        result['TDDIUM_API_KEY'].should == 'abcdefg'
+      end
+    end
+
+    context "addon not installed" do
+      before do
+        HerokuConfig.stub(:`).with("heroku config -s").and_return(SAMPLE_HEROKU_CONFIG_NO_TDDIUM)
+      end
+
+      it "should return nil" do
+        HerokuConfig.read_config.should be_nil
+      end
+    end
+
+    context "heroku not installed" do
+      before do
+        HerokuConfig.stub(:`).with("heroku config -s").and_raise(Errno::ENOENT)
+      end
+      it "should return nil" do
+        HerokuConfig.read_config.should be_nil
+      end
+    end
+  end
+end

data/spec/tddium_spec.rb

@@ -21,6 +21,7 @@ describe Tddium do
   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_HEROKU_CONFIG = {"TDDIUM_API_KEY" => SAMPLE_API_KEY, "TDDIUM_USER_NAME" => SAMPLE_EMAIL}
   SAMPLE_LICENSE_TEXT = "LICENSE"
   SAMPLE_PASSWORD = "foobar"
   SAMPLE_NEW_PASSWORD = "foobar2"
@@ -37,7 +38,20 @@ describe Tddium do
   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_USER_RESPONSE = {"user"=> {"id"=>SAMPLE_USER_ID, "api_key" => SAMPLE_API_KEY, "email" => SAMPLE_EMAIL, "created_at" => SAMPLE_DATE_TIME, "recurly_url" => SAMPLE_RECURLY_URL}}
+  SAMPLE_USER_RESPONSE = {"status"=>0, "user"=>
+    { "id"=>SAMPLE_USER_ID, 
+      "api_key" => SAMPLE_API_KEY, 
+      "email" => SAMPLE_EMAIL, 
+      "created_at" => SAMPLE_DATE_TIME, 
+      "recurly_url" => SAMPLE_RECURLY_URL}}
+  SAMPLE_SSH_PUBKEY = "ssh-rsa 1234567890"
+  SAMPLE_HEROKU_USER_RESPONSE = {"user"=>
+    { "id"=>SAMPLE_USER_ID, 
+      "api_key" => SAMPLE_API_KEY, 
+      "email" => SAMPLE_EMAIL, 
+      "created_at" => SAMPLE_DATE_TIME, 
+      "heroku_needs_activation" => true,
+      "recurly_url" => SAMPLE_RECURLY_URL}}
   PASSWORD_ERROR_EXPLANATION = "bad confirmation"
   PASSWORD_ERROR_RESPONSE = {"status"=>1, "explanation"=> PASSWORD_ERROR_EXPLANATION}
 
@@ -91,7 +105,10 @@ describe Tddium do
         tddium_client_result = mock(TddiumClient::Result::API)
         response_mocks << tddium_client_result
       else
-        tddium_client_result = mock(TddiumClient::Error::API, :body => current_response.to_json)
+        tddium_client_result = mock(TddiumClient::Error::API)
+        tddium_client_result.stub(:body => current_response.to_json,
+                                    :code => 200,
+                                    :response => mock(:header => mock(:msg => "OK")))
         result.and_raise(TddiumClient::Error::API.new(tddium_client_result))
       end
       current_response.each do |k, v|
@@ -157,7 +174,9 @@ describe Tddium do
   def stub_tddium_client
     TddiumClient::Client.stub(:new).and_return(tddium_client)
     tddium_client.stub(:environment).and_return("test")
-    tddium_client.stub(:call_api).and_raise(TddiumClient::Error::Base)
+    tddium_client.stub(:call_api) do |x,y,z,k|
+      raise TddiumClient::Error::Base.new("unstubbed call_api(#{x.inspect},#{y.inspect},#{z.inspect},#{k.inspect})")
+    end
   end
 
   let(:tddium) { Tddium.new }
@@ -440,7 +459,7 @@ describe Tddium do
       tddium.stub(:ask).and_return("")
       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, "ssh-rsa blah")
+      create_file(Tddium::Default::SSH_FILE, SAMPLE_SSH_PUBKEY)
     end
 
     it_should_behave_like "set the default environment"
@@ -468,6 +487,122 @@ describe Tddium do
 
     end
 
+    shared_examples_for "prompt for ssh key" do
+      context "--ssh-key-file is not supplied" do
+        it "should prompt the user for their ssh key file" do
+          tddium.should_receive(:ask).with(Tddium::Text::Prompt::SSH_KEY % Tddium::Default::SSH_FILE)
+          run_account(tddium)
+        end
+      end
+
+      context "--ssh-key-file is supplied" do
+        it "should not prompt the user for their ssh key file" do
+          tddium.should_not_receive(:ask).with(Tddium::Text::Prompt::SSH_KEY % Tddium::Default::SSH_FILE)
+          run_account(tddium, :ssh_key_file => Tddium::Default::SSH_FILE)
+        end
+      end
+    end
+
+    def account_should_fail(options={})
+      options[:environment] = "test" unless options.has_key?(:environment)
+      stub_cli_options(tddium, options)
+      tddium.stub(:exit_failure).and_raise(SystemExit)
+      yield if block_given?
+      expect { tddium.account }.to raise_error(SystemExit)
+    end
+
+    context "the user is logged in to heroku, but not to tddium" do
+      before do
+        HerokuConfig.stub(:read_config).and_return(SAMPLE_HEROKU_CONFIG)
+        @user_path = "#{Tddium::Api::Path::USERS}/#{SAMPLE_USER_ID}/"
+      end
+
+      context "the user has a properly configured add-on" do
+
+        context "first-time account activation" do
+          before do
+            stub_call_api_response(:get, Tddium::Api::Path::USERS, SAMPLE_HEROKU_USER_RESPONSE)
+            stub_call_api_response(:put, @user_path, {"status"=>0})
+          end
+
+          it_behaves_like "prompting for password" do
+            let(:password_prompt) {Tddium::Text::Prompt::PASSWORD}
+          end
+
+          it_behaves_like "prompting for password" do
+            let(:password_prompt) {Tddium::Text::Prompt::PASSWORD_CONFIRMATION}
+          end
+
+          it_behaves_like "prompt for ssh key"
+
+          it "should display the heroku welcome" do
+            tddium.should_receive(:say).with(Tddium::Text::Process::HEROKU_WELCOME)
+            run_account(tddium)
+          end
+
+          it "should send a 'PUT' request to user_path with passwords" do
+            HighLine.stub(:ask).with(Tddium::Text::Prompt::PASSWORD).and_return(SAMPLE_PASSWORD)
+            HighLine.stub(:ask).with(Tddium::Text::Prompt::PASSWORD_CONFIRMATION).and_return(SAMPLE_PASSWORD)
+            call_api_should_receive(:method => :put,
+                                :path => /#{@user_path}$/,
+                                :params => {:user =>
+                                   {:password => SAMPLE_PASSWORD,
+                                    :password_confirmation => SAMPLE_PASSWORD,
+                                    :user_git_pubkey => SAMPLE_SSH_PUBKEY},
+                                   :heroku_activation => true},
+                                :api_key => SAMPLE_API_KEY)
+            account_should_fail # call_api_should_receive stubs call_api with an error
+          end
+
+          context "PUT with passwords is successful" do
+            before do
+              stub_call_api_response(:put, @user_path, {"status"=>0})
+            end
+
+            it_should_behave_like "writing the api key to the .tddium file"
+
+            it "should display the heroku configured welcome" do
+              tddium.should_receive(:say).with(Tddium::Text::Status::HEROKU_CONFIG)
+              run_account(tddium)
+            end
+          end
+
+          context "PUT is unsuccessful" do
+            before do
+              stub_call_api_response(:put, @user_path, {"status" => 1, "explanation"=> "PUT error"})
+            end
+
+            it "should display an error message and fail" do
+              account_should_fail do
+                tddium.should_receive(:exit_failure).with(Tddium::Text::Error::HEROKU_MISCONFIGURED % "200 OK (1) PUT error")
+              end
+            end
+          end
+        end
+
+        context "re-run after account is activated" do
+          before do 
+            stub_call_api_response(:get, Tddium::Api::Path::USERS, SAMPLE_USER_RESPONSE)
+          end
+
+          it "should display the heroku configured welcome" do
+            tddium.should_receive(:say).with(Tddium::Text::Status::HEROKU_CONFIG)
+            run_account(tddium)
+          end
+        end
+      end
+
+      context "the heroku config contains an unrecognized API key" do
+        let(:call_api_result) {[403, "Forbidden"]}
+
+        it "should display an error message and fail" do
+          account_should_fail do
+            tddium.should_receive(:exit_failure).with(Tddium::Text::Error::HEROKU_MISCONFIGURED % "Unrecognized user")
+          end
+        end
+      end
+    end
+
     context "the user is not already logged in" do
       let(:call_api_result) {[403, "Forbidden"]}
 
@@ -489,19 +624,7 @@ describe Tddium do
           HighLine.stub(:ask).with(Tddium::Text::Prompt::PASSWORD_CONFIRMATION).and_return(SAMPLE_PASSWORD)
         end
 
-        context "--ssh-key-file is not supplied" do
-          it "should prompt the user for their ssh key file" do
-            tddium.should_receive(:ask).with(Tddium::Text::Prompt::SSH_KEY % Tddium::Default::SSH_FILE)
-            run_account(tddium)
-          end
-        end
-
-        context "--ssh-key-file is supplied" do
-          it "should not prompt the user for their ssh key file" do
-            tddium.should_not_receive(:ask).with(Tddium::Text::Prompt::SSH_KEY % Tddium::Default::SSH_FILE)
-            run_account(tddium, :ssh_key_file => Tddium::Default::SSH_FILE)
-          end
-        end
+        it_behaves_like "prompt for ssh key"
 
         it "should show the user the license" do
           tddium.should_receive(:say).with(SAMPLE_LICENSE_TEXT)

metadata

@@ -2,7 +2,7 @@
 name: tddium-preview
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.5.0
 platform: ruby
 authors: 
 - Solano Labs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-08 00:00:00 -07:00
+date: 2011-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -138,7 +138,9 @@ files:
 - bin/tddium
 - lib/tddium.rb
 - lib/tddium/constant.rb
+- lib/tddium/heroku.rb
 - lib/tddium/version.rb
+- spec/heroku_spec.rb
 - spec/spec_helper.rb
 - spec/tddium_spec.rb
 - tddium.gemspec
@@ -166,10 +168,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tddium
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: tddium Hosted Ruby Testing
-test_files: 
-- spec/spec_helper.rb
-- spec/tddium_spec.rb
+test_files: []
+