trackinator 0.0.10 → 0.0.11

data/lib/trackinator/google.rb

@@ -14,6 +14,8 @@ module Trackinator
     end
 
     def get_tickets file_name
+      puts "reading document..."
+
       spreadsheet_feed = @client.get("http://spreadsheets.google.com/feeds/worksheets/#{get_spreadsheet_key(file_name)}/private/full").to_xml
       spreadsheet_list_data = @client.get(spreadsheet_feed.elements[1, 'entry'].elements[1, 'content'].attributes['src']).to_xml
 
@@ -42,7 +44,7 @@ module Trackinator
       data = {}
 
       REXML::XPath.match(entry, 'gsx:*').each do |col|
-        data[col.name] = URI.escape(col.text) unless col.text.nil?
+        data[col.name] = col.text unless col.text.nil?
       end
 
       data

data/lib/trackinator/importer.rb

@@ -19,31 +19,36 @@ module Trackinator
       issues = validate_tickets(ticket_data)
 
       if issues.length == 0
+        puts "importing..."
+
         ticket_data.each do |entry|
           issue_id = @you_track.is_issue_exists? entry
           false unless !issue_id.nil? ? @you_track.update_ticket(issue_id, entry) : @you_track.create_ticket(entry)
         end
       end
 
+      puts "done..."
+
       issues
     end
 
     private
 
     def validate_tickets tickets
+      puts "validating..."
       issues = []
 
       project = tickets[0]['project']
 
       issues.concat(@you_track.project_exists?(project))
-      issues.concat(@you_track.you_track_fields_defined?(project, tickets[0].keys))
 
       tickets.each do |ticket|
+        issues.concat(@you_track.you_track_fields_defined?(project, ticket.keys.collect! { |key| key.downcase }))
         issues.concat(validate_fields(ticket))
         issues.concat(validate_formats(ticket))
       end
 
-      issues
+      issues.uniq
     end
 
     def validate_fields ticket

data/lib/trackinator/version.rb

@@ -1,3 +1,3 @@
 module Trackinator
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/trackinator/you_track.rb

@@ -1,3 +1,6 @@
+require 'erb'
+include ERB::Util
+
 module Trackinator
   class YouTrack
     def initialize opts
@@ -32,10 +35,10 @@ module Trackinator
 
     def update_ticket issue_id, data
       success = set_platform(issue_id, data['platform'])
-      success ? (success = set_summary_and_description(issue_id, data['summary'], data['description'])) : (return success)
+      success ? (success = set_summary_and_description(issue_id, data['summary'], data['description'], data['outcome'])) : (return success)
       success ? (success = set_type(issue_id, data['type'])) : (return success)
       success ? (success = set_import_identifier(issue_id, "#{data['project']}-#{data['id']}")) : (return success)
-      success ? (success = set_design_reference(issue_id, "#{data['references']}")) : (return success) unless data['references'].nil?
+      success ? (success = set_design_reference(issue_id, "#{data['designreference']}")) : (return success) unless data['designreference'].nil?
 
       success
     end
@@ -57,11 +60,15 @@ module Trackinator
       response = @connection.get("#{@path_prefix}rest/admin/project/#{project}/customfield", { 'Cookie' => @cookie, 'Content-Type' => 'text/plain; charset=utf-8' })
       response_xml = REXML::Document.new(response.body)
 
-      you_track_fields = []
+      you_track_fields = %w{ notes }
+
+      response_xml.elements.each('projectCustomFieldRefs/projectCustomField') do |element|
+        you_track_fields << element.attributes["name"].sub(' ', '').downcase
+      end
 
-      response_xml.elements.each('projectCustomFieldRefs/projectCustomField') { |element| you_track_fields << element.attributes["name"].downcase }
+      required_fields = fields - REQUIRED
 
-      (fields - REQUIRED).each do |document_field|
+      required_fields.each do |document_field|
         unless you_track_fields.include?(document_field)
           issues << "Validation Error: Custom field '#{document_field}' not found in YouTrack"
         end
@@ -101,7 +108,7 @@ module Trackinator
     end
 
     def create_youtrack_ticket data
-      response = @connection.put("#{@path_prefix}rest/issue?project=#{data['project']}&summary=#{data['summary']}&description=#{data['description']}&priority=#{data['priority']}", nil, { 'Cookie' => @cookie, 'Content-Type' => 'text/plain; charset=utf-8' })
+      response = @connection.put("#{@path_prefix}rest/issue?project=#{data['project']}&summary=#{url_encode(data['summary'])}&description=#{url_encode(construct_description(data['description'], data['outcome']))}&priority=#{data['priority']}", nil, { 'Cookie' => @cookie, 'Content-Type' => 'text/plain; charset=utf-8' })
       return response.header["Location"].split("/").last, response.header.msg
     end
 
@@ -110,40 +117,50 @@ module Trackinator
       response.header.msg.eql? "OK"
     end
 
-    def set_summary_and_description issue_id, summary, description
+    def set_summary_and_description issue_id, summary, description, outcome
       return true if summary.nil? || description.nil?
 
-      response = @connection.post("#{@path_prefix}rest/issue/#{issue_id}/?summary=#{summary}&description=#{description}&disableNotifications=true", nil, { 'Cookie' => @cookie })
+      response = @connection.post("#{@path_prefix}rest/issue/#{issue_id}/?summary=#{url_encode(summary)}&description=#{url_encode(construct_description(description, outcome))}&disableNotifications=true", nil, { 'Cookie' => @cookie })
       response.header.msg.eql? "OK"
     end
 
     def set_platform issue_id, platform
       return true if platform.nil?
 
-      response = @connection.post("#{@path_prefix}rest/issue/#{issue_id}/execute?command=Platform+#{platform}&disableNotifications=true", nil, { 'Cookie' => @cookie })
+      response = @connection.post("#{@path_prefix}rest/issue/#{issue_id}/execute?command=Platform+#{URI.escape(platform)}&disableNotifications=true", nil, { 'Cookie' => @cookie })
       response.header.msg.eql? "OK"
     end
 
     def set_type issue_id, type
       return true if type.nil?
 
-      response = @connection.post("#{@path_prefix}rest/issue/#{issue_id}/execute?command=Type+#{type}&disableNotifications=true", nil, { 'Cookie' => @cookie })
+      response = @connection.post("#{@path_prefix}rest/issue/#{issue_id}/execute?command=Type+#{URI.escape(type)}&disableNotifications=true", nil, { 'Cookie' => @cookie })
       response.header.msg.eql? "OK"
     end
 
     def set_import_identifier issue_id, import_id
       return true if import_id.nil?
 
-      response = @connection.post("#{@path_prefix}rest/issue/#{issue_id}/execute?command=Import+Identifier+#{import_id}&disableNotifications=true", nil, { 'Cookie' => @cookie })
+      response = @connection.post("#{@path_prefix}rest/issue/#{issue_id}/execute?command=Import+Identifier+#{URI.escape(import_id)}&disableNotifications=true", nil, { 'Cookie' => @cookie })
       response.header.msg.eql? "OK"
     end
 
     def set_design_reference issue_id, reference
       return true if reference.nil?
 
-      response = @connection.post("#{@path_prefix}rest/issue/#{issue_id}/execute?command=Design+Reference+#{reference}&disableNotifications=true", nil, { 'Cookie' => @cookie })
+      response = @connection.post("#{@path_prefix}rest/issue/#{issue_id}/execute?command=Design+Reference+#{URI.escape(reference)}&disableNotifications=true", nil, { 'Cookie' => @cookie })
       response.header.msg.eql? "OK"
     end
 
+    def construct_description description, outcome
+      template = ERB.new <<-EOF
+<% unless outcome.nil? %>'''Steps'''<% end %>
+<%= description %>
+<% unless outcome.nil? %>'''Outcome'''<% end %>
+<%= outcome %>
+      EOF
+
+      template.result(binding)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackinator
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors: