tddium-preview 0.1.2 → 0.1.3

data/lib/tddium.rb

@@ -20,6 +20,7 @@ require File.expand_path("../tddium/constant", __FILE__)
 #      tddium logout   # Log out
 #
 #      tddium account  # View/Manage account information
+#      tddium account:password # Change password
 #
 #      tddium dev      # Enter "dev" mode, for single-test quick-turnaround debugging.
 #      tddium stopdev  # Leave "dev" mode.
@@ -77,6 +78,31 @@ class Tddium < Thor
     end
   end
 
+  desc "password", "Change password"
+  method_option :environment, :type => :string, :default => nil
+  def password
+    set_default_environment(options[:environment])
+    return unless tddium_settings
+    user_details = user_logged_in?
+    return unless user_details
+    
+    params = {}
+    params[:current_password] = HighLine.ask(Text::Prompt::CURRENT_PASSWORD) { |q| q.echo = "*" }
+    params[:password] = HighLine.ask(Text::Prompt::NEW_PASSWORD) { |q| q.echo = "*" }
+    params[:password_confirmation] = HighLine.ask(Text::Prompt::PASSWORD_CONFIRMATION) { |q| q.echo = "*" }
+
+    begin
+      user_id = user_details["user"]["id"]
+      result = call_api(:put, "#{Api::Path::USERS}/#{user_id}/", {:user=>params},
+                        tddium_settings["api_key"], false)
+      say Text::Process::PASSWORD_CHANGED
+    rescue TddiumClient::Error::API => e
+      say Text::Error::PASSWORD_ERROR % e.explanation
+    rescue TddiumClient::Error::Base => e
+      say e.message
+    end
+  end
+
   desc "login", "Log in to tddium using your email address and password"
   method_option :environment, :type => :string, :default => nil
   method_option :email, :type => :string, :default => nil
@@ -483,8 +509,8 @@ class Tddium < Thor
     git_push
   end
 
-  def user_logged_in?(active = true)
-    result = tddium_settings(:fail_with_message => false) && tddium_settings["api_key"]
+  def user_logged_in?(active = true, message = false)
+    result = tddium_settings(:fail_with_message => message) && tddium_settings["api_key"]
     (result && active) ? get_user : result
   end
 

data/lib/tddium/constant.rb

@@ -51,7 +51,9 @@ module TddiumConstant
       SUITE_NAME = "Enter a suite name or press 'Return'. Using '%s' by default:"
       LICENSE_AGREEMENT = "Type '%s' to accept the license and continue:" % Response::AGREE_TO_LICENSE
       EMAIL = "Enter your email address:"
-      PASSWORD = "Enter a password: "
+      CURRENT_PASSWORD = "Enter your old password: "
+      PASSWORD = "Enter password: "
+      NEW_PASSWORD = "Enter a new password: "
       PASSWORD_CONFIRMATION = "Confirm your password: "
       INVITATION_TOKEN = "Enter your invitation token:"
       USE_EXISTING_SUITE = "The suite name '%s' already exists. Enter '#{Response::YES}' to use it, or enter a new name:"
@@ -67,6 +69,7 @@ module TddiumConstant
       EXISTING_SUITE = "Current suite: %s"
       CREATING_SUITE = "Creating suite '%s'.  This will take a few seconds."
       PASSWORD_CONFIRMATION_INCORRECT = "Password confirmation incorrect"
+      PASSWORD_CHANGED = "Your password has been changed."
       ACCOUNT_CREATED = "
 Congratulations %s, your tddium account has been created!
 
@@ -118,6 +121,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"
     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.2"
+  VERSION = "0.1.3"
 end

data/spec/tddium_spec.rb

@@ -21,19 +21,23 @@ describe Tddium do
   SAMPLE_GIT_REPO_URI = "ssh://git@api.tddium.com/home/git/repo/#{SAMPLE_APP_NAME}"
   SAMPLE_LICENSE_TEXT = "LICENSE"
   SAMPLE_PASSWORD = "foobar"
+  SAMPLE_NEW_PASSWORD = "foobar2"
   SAMPLE_REPORT_URL = "http://api.tddium.com/1/sessions/1/test_executions/report"
   SAMPLE_RUBYGEMS_VERSION = "1.3.7"
   SAMPLE_RUBY_VERSION = "1.8.7"
   SAMPLE_RECURLY_URL = "https://tddium.recurly.com/account/1"
   SAMPLE_SESSION_ID = 1
   SAMPLE_SUITE_ID = 1
+  SAMPLE_USER_ID = 1
   DEFAULT_TEST_PATTERN = "**/*_spec.rb"
   CUSTOM_TEST_PATTERN = "**/cat_spec.rb"
   SAMPLE_SUITE_RESPONSE = {"repo_name" => SAMPLE_APP_NAME, "branch" => SAMPLE_BRANCH_NAME, "id" => SAMPLE_SUITE_ID, "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_USER_RESPONSE = {"user"=> {"api_key" => SAMPLE_API_KEY, "email" => SAMPLE_EMAIL, "created_at" => SAMPLE_DATE_TIME, "recurly_url" => SAMPLE_RECURLY_URL}}
+  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}}
+  PASSWORD_ERROR_EXPLANATION = "bad confirmation"
+  PASSWORD_ERROR_RESPONSE = {"status"=>1, "explanation"=> PASSWORD_ERROR_EXPLANATION}
 
   def call_api_should_receive(options = {})
     params = [options[:method] || anything, options[:path] || anything, options[:params] || anything, (options[:api_key] || options[:api_key] == false) ? options[:api_key] : anything]
@@ -53,7 +57,7 @@ describe Tddium do
     send("run_#{example.example_group.ancestors.map(&:description)[-2][1..-1]}", tddium, options)
   end
 
-  [:suite, :spec, :status, :account, :login, :logout].each do |method|
+  [:suite, :spec, :status, :account, :login, :logout, :password].each do |method|
     define_method("run_#{method}") do |tddium, *params|
       options = params.first || {}
       if method == :spec 
@@ -339,6 +343,86 @@ describe Tddium do
     end
   end
 
+  shared_examples_for "prompting for password" do
+    it "should prompt for a password"  do
+      highline = mock(HighLine)
+      HighLine.should_receive(:ask).with(password_prompt).and_yield(highline)
+      highline.should_receive(:echo=).with("*")
+      run(tddium)
+    end
+  end
+
+  describe "#password" do
+    before do
+      stub_defaults
+      stub_config_file(:api_key => true, :branches => true)
+      tddium.stub(:ask).and_return("")
+      HighLine.stub(:ask).and_return("")
+    end
+
+    it_should_behave_like ".tddium file is missing or corrupt"
+
+    context "the user is already logged in" do
+      before do
+        stub_call_api_response(:get, Tddium::Api::Path::USERS, SAMPLE_USER_RESPONSE)
+      end
+
+      it_should_behave_like "set the default environment"
+
+      it_should_behave_like "prompting for password" do
+        let(:password_prompt) {Tddium::Text::Prompt::CURRENT_PASSWORD}
+      end
+
+      it_should_behave_like "prompting for password" do
+        let(:password_prompt) {Tddium::Text::Prompt::NEW_PASSWORD}
+      end
+
+      it_should_behave_like "prompting for password" do
+        let(:password_prompt) {Tddium::Text::Prompt::PASSWORD_CONFIRMATION}
+      end
+
+      context "the user confirms their password correctly" do
+        before do
+          @user_path = "#{Tddium::Api::Path::USERS}/#{SAMPLE_USER_ID}/"
+          HighLine.stub(:ask).with(Tddium::Text::Prompt::CURRENT_PASSWORD).and_return(SAMPLE_PASSWORD)
+          HighLine.stub(:ask).with(Tddium::Text::Prompt::NEW_PASSWORD).and_return(SAMPLE_NEW_PASSWORD)
+          HighLine.stub(:ask).with(Tddium::Text::Prompt::PASSWORD_CONFIRMATION).and_return(SAMPLE_NEW_PASSWORD)
+        end
+
+
+        it "should send a 'PUT' request to user_path with passwords" do
+          call_api_should_receive(:method => :put,
+                              :path => /#{@user_path}$/,
+                              :params => {:user =>
+                                 {:current_password=>SAMPLE_PASSWORD,
+                                  :password => SAMPLE_NEW_PASSWORD,
+                                  :password_confirmation => SAMPLE_NEW_PASSWORD}},
+                              :api_key => SAMPLE_API_KEY)
+          run_password(tddium)
+        end
+
+        context "'PUT user_path' is successful" do
+          before{stub_call_api_response(:put, @user_path, {"status"=>0})}
+
+          it "should show the user '#{Tddium::Text::Process::PASSWORD_CHANGED}'" do
+            tddium.should_receive(:say).with(Tddium::Text::Process::PASSWORD_CHANGED)
+            run_password(tddium)
+          end
+        end
+        context "'PUT user_path' is unsuccessful" do
+
+          context "invalid original password" do
+            before{stub_call_api_response(:put, @user_path, PASSWORD_ERROR_RESPONSE)}
+            it "should show the user: '#{Tddium::Text::Error::PASSWORD_ERROR}'" do
+              tddium.should_receive(:say).with(Tddium::Text::Error::PASSWORD_ERROR % PASSWORD_ERROR_EXPLANATION)
+              run_password(tddium)
+            end
+          end
+        end
+      end
+    end
+  end
+
   describe "#account" do
     before do
       stub_defaults

metadata

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