morale 0.1.2 → 0.1.3

data/features/tickets.feature

@@ -38,6 +38,21 @@ Feature: Running the tickets command
       No project specified.
       """
 
+  @interactive
+  Scenario: Deleting a ticket should return the ticket results
+    Given a file named "credentials" with:
+      """
+      spartan
+      12345
+      1
+      """
+    When I run `morale This should be deleted`
+    And I run `morale "d #10"` interactively
+    Then the output should contain:
+      """
+      This should be deleted
+      """
+
   @interactive
   Scenario: Running tickets should return a list of all active tickets
     Given a file named "credentials" with:

data/lib/morale/account.rb

@@ -9,9 +9,9 @@ module Morale
       include Morale::CredentialsStore
       include Morale::Flow
       
-      def subdomain
+      def subdomain(ask=true)
         if @subdomain.nil?
-          get_credentials
+          get_credentials ask
           @subdomain = @credentials[0]
         end
         @subdomain
@@ -29,8 +29,8 @@ module Morale
         @credentials[1]
       end
       
-      def project
-        get_credentials
+      def project(ask=true)
+        get_credentials ask
         @credentials[2] if !@credentials.nil? && @credentials.length > 2
       end
       
@@ -46,10 +46,10 @@ module Morale
         @login_attempts < 3
       end
       
-      def get_credentials
+      def get_credentials(ask=true)
         return if @credentials
         unless @credentials = read_credentials
-          ask_for_and_save_credentials
+          ask_for_and_save_credentials if ask
         end
         @credentials
       end

data/lib/morale/command.rb

@@ -57,7 +57,7 @@ module Morale
     end
     
     no_tasks do
-      def self.handle_no_task_error(task, has_namespace = $thor_runner) #:nodoc:
+      def self.handle_no_task_error(task, has_namespace = $thor_runner)
         self.new.ticket ARGV.compact.join(" ")
       end
     end

data/lib/morale/commands/account.rb

@@ -16,7 +16,7 @@ module Morale::Commands
 
           if !accounts.nil?
             accounts.sort{|a,b| a['account']['group_name'] <=> b['account']['group_name']}.each_with_index do |record, i|
-              say "#{i += 1}. #{record['account']['group_name']}"
+              say "#{i += 1}. #{record['account']['group_name']}#{' *' if Morale::Account.subdomain(false) == record['account']['site_address']}"
             end
             
             if change

data/lib/morale/commands/project.rb

@@ -12,7 +12,7 @@ module Morale::Commands
           projects = Morale::Command.client.projects
           if !projects.nil?
             projects.sort{|a,b| a['project']['name'] <=> b['project']['name']}.each_with_index do |record, i|
-              puts "#{i += 1}. #{record['project']['name']}"
+              puts "#{i += 1}. #{record['project']['name']}#{' *' if Morale::Account.project(false) == record['project']['id'].to_s}"
             end
             
             if change

data/lib/morale/commands/ticket.rb

@@ -11,13 +11,29 @@ module Morale::Commands
       include Morale::Flow
       
       def command(command)
-        ask_for_project
-        print Morale::Command.client.ticket(Morale::Account.project, command) unless Morale::Account.project.nil?
+        begin
+          ask_for_project
+          print Morale::Command.client.ticket(Morale::Account.project, command) unless Morale::Account.project.nil?
+        rescue Morale::Client::Unauthorized
+          say "Authentication failure"
+          Morale::Commands::Authorization.login
+          retry if Morale::Authorization.retry_login?
+        rescue Morale::Client::NotFound
+          say "Communication failure"
+        end
       end
       
       def list
-        ask_for_project
-        print Morale::Command.client.tickets({ :project_id => Morale::Account.project }) unless Morale::Account.project.nil?
+        begin
+          ask_for_project
+          print Morale::Command.client.tickets({ :project_id => Morale::Account.project }) unless Morale::Account.project.nil?
+        rescue Morale::Client::Unauthorized
+          say "Authentication failure"
+          Morale::Commands::Authorization.login
+          retry if Morale::Authorization.retry_login?
+        rescue Morale::Client::NotFound
+          say "Communication failure"
+        end
       end
       
       private

data/lib/morale.rb

@@ -1,5 +1,5 @@
 module Morale
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end
 
 require 'morale/command'

data/morale.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'morale'
-  s.version           = '0.1.2'
-  s.date              = '2011-10-01'
+  s.version           = '0.1.3'
+  s.date              = '2011-10-02'
   s.rubyforge_project = 'morale'
 
   s.summary     = "Command line interface to create & manage tickets on Morale."

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Brilliant Fantastic
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-01 00:00:00 -04:00
+date: 2011-10-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency