tddium-preview 0.7.2 → 0.7.3

data/Gemfile.lock

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

data/lib/tddium.rb

@@ -26,6 +26,14 @@ require File.expand_path("../tddium/heroku", __FILE__)
 #
 #      tddium help     # Print this usage message
 
+class TddiumError < Exception
+  attr_reader :message
+
+  def initialize(message)
+    @message = message
+  end
+end
+
 class Tddium < Thor
   include TddiumConstant
 
@@ -47,12 +55,15 @@ class Tddium < Thor
       unless options[:password]
         password_confirmation = HighLine.ask(Text::Prompt::PASSWORD_CONFIRMATION) { |q| q.echo = "*" }
         unless password_confirmation == params[:password]
-          say Text::Process::PASSWORD_CONFIRMATION_INCORRECT
-          return
+          exit_failure Text::Process::PASSWORD_CONFIRMATION_INCORRECT
         end
       end
 
-      params[:user_git_pubkey] = prompt_ssh_key(options[:ssh_key_file])
+      begin
+        params[:user_git_pubkey] = prompt_ssh_key(options[:ssh_key_file])
+      rescue TddiumError => e
+        exit_failure e.message
+      end
 
       # Prompt for accepting license
       content =  File.open(File.join(File.dirname(__FILE__), "..", License::FILE_NAME)) do |file|
@@ -63,9 +74,15 @@ class Tddium < Thor
       return unless license_accepted.downcase == Text::Prompt::Response::AGREE_TO_LICENSE.downcase
 
       begin
+        say Text::Process::STARTING_ACCOUNT_CREATION
         new_user = call_api(:post, Api::Path::USERS, {:user => params}, false, false)
         write_api_key(new_user["user"]["api_key"])
-        say Text::Process::ACCOUNT_CREATED % [new_user["user"]["email"], new_user["user"]["recurly_url"]]
+        role = new_user["user"]["account_role"]
+        if role.nil? || role == "owner"
+          say Text::Process::ACCOUNT_CREATED % [new_user["user"]["email"], new_user["user"]["recurly_url"]]
+        else
+          say Text::Process::ACCOUNT_ADDED % [new_user["user"]["email"], new_user["user"]["account_role"], new_user["user"]["account"]]
+        end
       rescue TddiumClient::Error::API => e
         say((e.status == Api::ErrorCode::INVALID_INVITATION) ? Text::Error::INVALID_INVITATION : e.message)
       rescue TddiumClient::Error::Base => e
@@ -531,7 +548,11 @@ class Tddium < Thor
       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
+        params[:user_git_pubkey] = prompt_ssh_key(options[:ssh_key])
+      rescue TddiumError => e
+        exit_failure e.message
+      end
 
       begin
         user_id = user["user"]["id"]
@@ -567,6 +588,12 @@ class Tddium < Thor
     # 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}
+    if data =~ /^-+BEGIN [DR]SA PRIVATE KEY-+/ then
+      raise TddiumError.new(Text::Error::INVALID_SSH_PUBLIC_KEY % ssh_file)
+    end
+    if data !~ /^\s*ssh-(dss|rsa)/ then
+      raise TddiumError.new(Text::Error::INVALID_SSH_PUBLIC_KEY % ssh_file)
+    end
     data
   end
 

data/lib/tddium/constant.rb

@@ -100,6 +100,20 @@ tddium suite
 tddium spec
 
 "
+      ACCOUNT_ADDED = "
+Congratulations %s, your tddium account has been activated.
+
+You are a %s of the account: %s
+
+Next, you should:
+
+1. Register your test suite by running:
+tddium suite
+
+2. Start tests by running:
+tddium spec
+"
+      STARTING_ACCOUNT_CREATION = "Creating account.  This may take a few seconds..."
       ALREADY_LOGGED_IN = "You're already logged in"
       LOGGED_IN_SUCCESSFULLY = "Logged in successfully"
       LOGGED_OUT_SUCCESSFULLY = "Logged out successfully"
@@ -185,7 +199,9 @@ EOF
       USER_DETAILS =<<EOF;
 Username: <%=user["email"]%>
 Account Created: <%=user["created_at"]%>
+<% if user["recurly_url"] %>
 Recurly Management URL: <%=user["recurly_url"]%>
+<% end %>
 <% if user["heroku"] %>
 Heroku Account Linked: <%=user["heroku_activation_done"]%>
 <% end %>
@@ -273,6 +289,7 @@ EOF
     end
 
     module Error
+      INVALID_SSH_PUBLIC_KEY = '%s does not appear to be a valid SSH public key'
       GIT_CHANGES_NOT_COMMITTED =<<EOF
 There are uncommitted changes in the local git repository.
 
@@ -304,8 +321,8 @@ EOF
       INVALID_INVITATION = "
 Your invitation token wasn't recognized. If you have a token, make sure you enter it correctly.
 If you want an invite, visit this URL to sign up:
-http://blog.tddium.com/home/
 
+http://www.tddium.com/
 "
       NO_USER_DATA_FILE = "User data file '%s' does not exist"
       NO_MATCHING_FILES = "No files match '%s'"

data/lib/tddium/version.rb

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

data/spec/tddium_spec.rb

@@ -32,6 +32,8 @@ describe Tddium do
   SAMPLE_SESSION_ID = 1
   SAMPLE_SUITE_ID = 1
   SAMPLE_USER_ID = 1
+  SAMPLE_ROLE = "member"
+  SAMPLE_ACCOUNT_NAME = "owner@example.com"
   DEFAULT_TEST_PATTERN = "**/*_spec.rb"
   SAMPLE_SUITE_PATTERN = "features/*.feature, spec/**/*_spec.rb"
   CUSTOM_TEST_PATTERN = "**/cat_spec.rb"
@@ -54,7 +56,15 @@ describe Tddium do
       "api_key" => SAMPLE_API_KEY, 
       "email" => SAMPLE_EMAIL, 
       "created_at" => SAMPLE_DATE_TIME, 
+      "account" => SAMPLE_EMAIL,
       "recurly_url" => SAMPLE_RECURLY_URL}}
+  SAMPLE_ADDED_USER_RESPONSE = {"status"=>0, "user"=>
+    { "id"=>SAMPLE_USER_ID, 
+      "api_key" => SAMPLE_API_KEY, 
+      "email" => SAMPLE_EMAIL, 
+      "created_at" => SAMPLE_DATE_TIME, 
+      "account" => SAMPLE_ACCOUNT_NAME,
+      "account_role" => SAMPLE_ROLE}}
   SAMPLE_HEROKU_USER_RESPONSE = {"user"=>
     { "id"=>SAMPLE_USER_ID, 
       "api_key" => SAMPLE_API_KEY, 
@@ -497,6 +507,28 @@ describe Tddium do
     end
   end
 
+
+  shared_examples_for "show account usage" do
+    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(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(tddium)
+      end
+
+      it "should show all suites" do
+        tddium.should_receive(:say).with(Tddium::Text::Status::ALL_SUITES % SAMPLE_APP_NAME)
+        run(tddium)
+      end
+    end
+  end
+
   describe "#password" do
     before do
       stub_defaults
@@ -581,6 +613,23 @@ describe Tddium do
         tddium.should_not_receive(:ask).with(Tddium::Text::Prompt::SSH_KEY % Tddium::Default::SSH_FILE, anything)
         run(tddium, :ssh_key_file => Tddium::Default::SSH_FILE)
       end
+
+      it "should fail if key file doesn't contain an SSH key" do
+        create_file(Tddium::Default::SSH_FILE, 'blah blah blah')
+        tddium.should_not_receive(:ask).with(Tddium::Text::Prompt::SSH_KEY % Tddium::Default::SSH_FILE, anything)
+        account_should_fail(tddium, :ssh_key_file => Tddium::Default::SSH_FILE) do
+          tddium.should_receive(:exit_failure).with(Tddium::Text::Error::INVALID_SSH_PUBLIC_KEY % Tddium::Default::SSH_FILE)
+	end
+      end
+
+      it "should fail if key file is an SSH private key" do
+        create_file(Tddium::Default::SSH_FILE, "-----BEGIN RSA PRIVATE KEY-----\n")
+        tddium.should_not_receive(:ask).with(Tddium::Text::Prompt::SSH_KEY % Tddium::Default::SSH_FILE, anything)
+        account_should_fail(tddium, :ssh_key_file => Tddium::Default::SSH_FILE) do
+          tddium.should_receive(:exit_failure).with(Tddium::Text::Error::INVALID_SSH_PUBLIC_KEY % Tddium::Default::SSH_FILE)
+	end
+      end
+
     end
   end
 
@@ -723,6 +772,7 @@ describe Tddium do
         run_account(tddium)
       end
 
+     # it_should_behave_like "show account usage"
     end
 
     context "the user is not already logged in" do
@@ -735,8 +785,9 @@ describe Tddium do
       context "the user does not confirm their password correctly" do
         before {HighLine.stub(:ask).with(Tddium::Text::Prompt::PASSWORD_CONFIRMATION).and_return("wrong confirmation")}
         it "should tell the user '#{Tddium::Text::Process::PASSWORD_CONFIRMATION_INCORRECT}'" do
-          tddium.should_receive(:say).with(Tddium::Text::Process::PASSWORD_CONFIRMATION_INCORRECT)
-          run_account(tddium)
+          account_should_fail(tddium) do
+            tddium.should_receive(:exit_failure).with(Tddium::Text::Process::PASSWORD_CONFIRMATION_INCORRECT)
+          end
         end
       end
 
@@ -770,7 +821,7 @@ describe Tddium do
             run_account(tddium)
           end
 
-          context "'POST #{Tddium::Api::Path::USERS}' is successful" do
+          context "'POST #{Tddium::Api::Path::USERS}' succeeds in creating a new account" do
             before{stub_call_api_response(:post, Tddium::Api::Path::USERS, SAMPLE_USER_RESPONSE)}
 
             it_should_behave_like "writing the api key to the .tddium file"
@@ -780,6 +831,17 @@ describe Tddium do
               run_account(tddium)
             end
           end
+
+          context "'POST #{Tddium::Api::Path::USERS}' succeeds in adding a new account" do
+            before{stub_call_api_response(:post, Tddium::Api::Path::USERS, SAMPLE_ADDED_USER_RESPONSE)}
+
+            it_should_behave_like "writing the api key to the .tddium file"
+
+            it "should show the user '#{Tddium::Text::Process::ACCOUNT_ADDED % [SAMPLE_EMAIL, SAMPLE_ROLE, SAMPLE_ACCOUNT_NAME]}'" do
+              tddium.should_receive(:say).with(Tddium::Text::Process::ACCOUNT_ADDED % [SAMPLE_EMAIL, SAMPLE_ROLE, SAMPLE_ACCOUNT_NAME])
+              run_account(tddium)
+            end
+          end
           context "'POST #{Tddium::Api::Path::USERS}' is unsuccessful" do
 
             it_should_behave_like "an unsuccessful api call"
@@ -1260,6 +1322,7 @@ describe Tddium do
     before do
       stub_defaults
       stub_config_file(:api_key => true, :branches => true)
+      stub_call_api_response(:get, Tddium::Api::Path::SESSIONS, {"sessions"=>[]})
     end
 
     it_should_behave_like "set the default environment"
@@ -1288,11 +1351,6 @@ describe Tddium do
           stub_call_api_response(:get, Tddium::Api::Path::SUITES, {"suites"=>[suite_attributes]})
         end
 
-        it "should show all suites" do
-          tddium.should_receive(:say).with(Tddium::Text::Status::ALL_SUITES % SAMPLE_APP_NAME)
-          run_status(tddium)
-        end
-
         context "without current suite" do
           before { stub_config_file(:branches => {SAMPLE_BRANCH_NAME => {"id" => 0}}) }
           it "should show the user '#{Tddium::Text::Status::CURRENT_SUITE_UNAVAILABLE}'" do
@@ -1375,19 +1433,6 @@ describe Tddium do
           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
 

metadata

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