zensana 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b94c9bb7aedae5805ed90054a3a565bb872d4c73
-  data.tar.gz: bfc11506fedbc028540e80e809dcd6ff58b2def4
+  metadata.gz: 1832214144fb9cf8e0af229da4ad08ca2f3977e8
+  data.tar.gz: 7887bc8414164f1945aefb1c1a3c7b877330c8ad
 SHA512:
-  metadata.gz: 4e9f316b42b0ab2bfca14c28d8b31fdf88ad6cf3273cc6dbb06dd62e39bd6e9551ad3878a4465dea6b6ef536839fc68d8719a81b3b9251e1c8a5b70c7228ecd3
-  data.tar.gz: 9c9dba2fd5d2f4bab8b28c36f60adabdf29cc655932802791ab8c122e378e27a0921147cf40c507c0ec534398ecc76f45b77b7507af7df2a38969dbbc3663266
+  metadata.gz: 979c0c4796428272d3fa60676b28c344fde588686b1f98e7cd2a690e0d0de45ba3f1f5bd82ff6b282b02d5b87c760d8e12c8815f49b9f099c1dc1976e962b7cf
+  data.tar.gz: df196da8ba97fe840b8903e184f66b47342d329f9449a37f1427af4169995faa2c6d1dafc62c36078138e6ac05d26e08ecaf66c29b0dfcd7fb574820324280f5

data/lib/zensana/commands/project.rb

@@ -1,3 +1,5 @@
+require 'pry'
+
 module Zensana
   class Command::Project < Zensana::Command
 
@@ -31,7 +33,7 @@ module Zensana
     option :completed,    type: 'boolean', aliases: '-c', default: false,       desc: 'include tasks that are completed'
     option :global_tags,  type: 'array',   aliases: '-t', default: ['zensana'], desc: 'array of tag(s) to be applied to every ticket imported'
     option :stories,      type: 'boolean', aliases: '-s', default: true,        desc: 'import stories as comments'
-    option :default_user, type: 'string',  aliases: '-u', default: nil,         desc: 'set a default user to assign to tickets'
+    option :default_user, type: 'string',  aliases: '-u', default: nil,         desc: 'set a default user to assign to invalid asana user items'
     option :verified,     type: 'boolean', aliases: '-v', default: true,        desc: '`false` will send email to zendesk users created'
     def convert(project)
       @asana_project = Zensana::Asana::Project.new(project)
@@ -51,6 +53,16 @@ using options #{options}
         exit
       end
 
+      if options[:default_user]
+        default_user = Zensana::Zendesk::User.new
+        if default_user.find(options[:default_user])
+          options[:default_user] = default_user
+        else
+          say "\nDefault user '#{options[:default_user]}' does not exist in ZenDesk!\n", :red
+          exit(1)
+        end
+      end
+
       # LIFO tags for recursive tagging
       #
       # `project_tag_list` holds the project tags
@@ -110,6 +122,9 @@ using options #{options}
       if task.attributes['completed'] && !options[:completed]
         say "\nSkipping completed task: #{task.name}! ", :yellow
         return
+      elsif task.attributes['name'].nil? || task.attributes['name'].empty?
+        say "\nSkipping blank task: #{task.id}! ", :yellow
+        return
       end
 
       # sections contribute their tags but nothing else
@@ -171,13 +186,13 @@ using options #{options}
 
             Task attributes:  #{task.attributes}
             EOF
-            :assignee_id  => zendesk_assignee_id(task),
+            :assignee_id  => zendesk_assignee_id(task.attributes['assignee']),
             :created_at   => task.created_at,
             :tags         => flatten_tags(project_tags, section_tags),
             :comments     => comments
           )
           ticket.import
-          say "\n >>> ticket imported "
+          say "\n >>> ticket successfully imported ", :green
         end
 
         # rinse and repeat for subtasks and their subtasks and ...
@@ -194,42 +209,44 @@ using options #{options}
 
     # lookup up asana user on zendesk and
     # optionally create new if not exists
+    # NOTE: if asana user is invalid we
+    # must substitute the default user
     #
     # return: zendesk user or nil
     #
     def asana_to_zendesk_user(spec, create)
       key = spec.is_a?(Hash) ? spec['id'] : spec
       asana   = Zensana::Asana::User.new(key)
-      zendesk = Zensana::Zendesk::User.new
-      zendesk.find(asana.email)
-    rescue NotFound
-      if create
-        zendesk.create(
-          :email => asana.email,
-          :name  => asana.name,
-          :verified => options[:verified]
-        )
-        zendesk
+      unless asana.attributes['email']
+        raise NotFound, "Invalid asana email in #{asana}; please provide 'default_user' option" unless options[:default_user]
+        zendesk = options[:default_user]
       else
-        nil
+        zendesk = Zensana::Zendesk::User.new
+        unless zendesk.find(asana.email)
+          if create
+            zendesk.create(
+              :email => asana.email,
+              :name  => asana.name,
+              :verified => options[:verified]
+            )
+          else
+            zendesk = nil
+          end
+        end
       end
-    else
       zendesk
     end
 
-    # lookup the asana task assignee in zendesk and
+    # lookup the asana user in zendesk and
     # return their id if they are an agent or admin
     #
-    def zendesk_assignee_id(task)
-      assignee_id = nil
-      if (assignee_key = options[:default_user] || task.attributes['assignee'])
-        if (assignee = asana_to_zendesk_user(assignee_key, false))
-          if assignee.attributes && assignee.attributes['role'] != 'end-user'
-            assignee_id = assignee.attributes['id']
-          end
+    def zendesk_assignee_id(asana_user_id)
+      if (assignee = asana_to_zendesk_user(asana_user_id, false))
+        if assignee.attributes && assignee.attributes['role'] != 'end-user'
+          assignee_id = assignee.attributes['id']
         end
       end
-      assignee_id
+      assignee_id || (options[:default_user] ? options[:default_user].attributes['id'] : nil)
     end
 
     # download the attachments to the local file system
@@ -264,10 +281,15 @@ using options #{options}
       [].tap do |tokens|
         attachments.each do |attachment|
           tries = 3
+          file = attachment.full_path
           begin
             uploader = Zensana::Zendesk::Attachment.new
-            tokens << uploader.upload(attachment.full_path)['token']
-            print '.'
+            if uploader.too_big?(file)
+              say "\n --> skip: #{file} exceeds filesize limit! ", :red
+            else
+              tokens << uploader.upload(attachment.full_path)['token']
+              print '.'
+            end
           rescue
             retry unless (tries-= 1).zero?
             raise

data/lib/zensana/models/zendesk/attachment.rb

@@ -3,6 +3,8 @@ module Zensana
     class Attachment
       include Zensana::Zendesk::Access
 
+      MAX_ATTACHMENT_SIZE = 2*10**6
+
       attr_reader :attributes
 
       def initialize
@@ -13,6 +15,10 @@ module Zensana
         @attributes = upload_file(filename)
       end
 
+      def too_big?(file)
+        File.size(file).to_f > MAX_ATTACHMENT_SIZE
+      end
+
       def method_missing(name, *args, &block)
         attributes[name.to_s] || super
       end

data/lib/zensana/models/zendesk/user.rb

@@ -21,9 +21,8 @@ module Zensana
 
       def create(attributes)
         validate_keys attributes
-        email = attributes['email'] || attributes['user']['email']
-        raise AlreadyExists, "User '#{email}' already exists" if lookup_by_email(email)
-      rescue NotFound
+        email = attributes['email'] || (attributes['user'] && attributes['user']['email'])
+        raise AlreadyExists, "User '#{email}' already exists" if email && lookup_by_email(email)
         user = create_user(attributes)
         update_cache user
         @attributes = user

data/lib/zensana/services/zendesk.rb

@@ -3,7 +3,7 @@ require 'httmultiparty'
 module Zensana
   class Zendesk
     include HTTMultiParty
-    default_timeout 10
+    default_timeout 20
     #debug_output
 
     def self.inst

data/lib/zensana/version.rb

@@ -1,3 +1,3 @@
 module Zensana
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zensana
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Warren Bain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httmultiparty