zend 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d8a9f8dfc7a58be94400d7f2895ae4414b6c82
-  data.tar.gz: 510f86a5312ce14fc1aabfc679061dc24cdb1ebb
+  metadata.gz: 4c1178446585c5f606205714915228b0fe248fcc
+  data.tar.gz: 97b9a0116551f9e79c7f1a5ed510b4c6b32703f7
 SHA512:
-  metadata.gz: 503627f9466251962d5999cebc51452592036c556cb204cb3027015b1d59b69bfd9c76b6a55fb368d646e1214eefef01906f350b7806abee03d72a659b1ca20e
-  data.tar.gz: 7a14d6722f3878d64960822113b2e291c002c0b302d273119d698b917808ebc6faf2d4f065a19a0626811ddbaa3905af9b26f114251f8a294643c81c64e23ac0
+  metadata.gz: fa7f07b87d15c27a2ffda1aa08217b5660fd504df39fedb0961d3fcabe99ade287fcc39f2a72a58a4ed4fd7ea20d9324e90267aaf821166a013701be6c7c06c0
+  data.tar.gz: 34b63cc227da84131d496aac3e6e6090799ad5c3f7ff4b894f967dfd36d8e624eb37cf6f26defe3cf5ba1de288506de4a3cf9389e0e843917184413149e5e5af

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.1.1 (September 7, 2013)
+
+Bugfixes:
+
+  - show correct help message for `zend show`
+  - remove stored credentials on failed authentication
+
+Features:
+
+  - use Zendesk user passwords instead of API token which are only
+    available to admins
+  - allow 3 authentication retries before exiting command
+
 ## 0.1.0 (September 7, 2013)
 
 Features:

data/lib/zend/auth.rb

@@ -10,7 +10,7 @@ module Zend
           @api = ZendeskAPI::Client.new do |config|
             config.url = "https://#{domain}/api/v2"
             config.username = user
-            config.token = password
+            config.password = password
           end
           unauthorized_callback(@api)
         end
@@ -47,9 +47,7 @@ module Zend
 
       def unauthorized_callback(api)
         api.insert_callback do |response|
-          if response[:status] == 401
-            Kernel.abort 'Incorrect Zendesk API authentication credentials'
-          end
+          authentication_failed if response[:status] == 401
         end
       end
 
@@ -91,7 +89,7 @@ module Zend
           netrc.delete(domain)
           netrc.save
         end
-        @email, @token = nil
+        @email, @password = nil
       end
 
       def read_credentials
@@ -115,9 +113,9 @@ module Zend
         say 'Enter your Zendesk credentials.' if ENV['ZEND_ACCOUNT']
 
         email = ask 'E-mail address: '
-        token = ask_token 'Secret token (typing will be hidden): '
+        password = ask_secret 'Password (typing will be hidden): '
 
-        [email, token]
+        [email, password]
       end
 
       def ask_for_and_save_credentials
@@ -128,11 +126,27 @@ module Zend
         @credentials
       end
 
-      def ask_token(message)
+      def authentication_failed
+        say 'Authentication failed.'
+        if retry_login?
+          ask_for_and_save_credentials
+        else
+          delete_credentials
+          exit 1
+        end
+      end
+
+      def ask_secret(message)
         HighLine.new.ask(message) do |q|
           q.echo = false
         end
       end
+
+      def retry_login?
+        @login_attempts ||= 0
+        @login_attempts += 1
+        @login_attempts < 3
+      end
     end
   end
 end

data/lib/zend/cli.rb

@@ -11,7 +11,7 @@ module Zend
       Zend::Auth.logout
     end
 
-    desc 'ticket details', 'Get details of a Zendesk ticket'
+    desc 'show <ticket id>', 'Get details of a Zendesk ticket'
     def show(ticket_id)
       puts Zend::Command::Ticket.new(ticket_id).print
     end

data/lib/zend/version.rb

@@ -1,3 +1,3 @@
 module Zend
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zend
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jean Mertz