sappho-data-publisher 0.2.3 → 0.2.4

data/lib/sappho-data-publisher/atlassian_app.rb

@@ -14,33 +14,44 @@ module Sappho
         def initialize
           @appName = self.class.name.split("::").last
           @appServer = nil
-          @loggedIn = false
+          @token = nil
         end
 
         def connect
-          raise "you have already attempted to connect to #{@appName}" if @appServer or @loggedIn
+          raise "you have already attempted to connect to #{@appName}" if @appServer
           modules = Sappho::ApplicationModuleRegister.instance
           @config = modules.get :configuration
           @logger = modules.get :log
           url = @config.data["#{@appName.downcase}.url"]
           mock = "mock#{@appName}"
           @appServer = modules.set?(mock) ? modules.get(mock).mockInstance(url) : yield(url)
+          @logger.info "connected to #{@appName} #{url}"
+          login
+        end
+
+        def login
           @token = @appServer.login @config.data["#{@appName.downcase}.username"], @config.data["#{@appName.downcase}.password"]
-          @logger.info "logged into #{@appName} #{url}"
-          @loggedIn = true
+          @logger.info "logged in to #{@appName}"
         end
 
-        def shutdown
+        def logout
           if loggedIn?
-            @appServer.logout @token
-            @logger.info "logged out of #{@appName}"
+            begin
+              @appServer.logout @token
+              @logger.info "logged out of #{@appName}"
+            rescue
+            end
+            @token = nil
           end
-          @loggedIn = false
+        end
+
+        def shutdown
+          logout
           @appServer = nil
         end
 
         def loggedIn?
-          @appServer and @loggedIn
+          @token
         end
 
         private

data/lib/sappho-data-publisher/confluence.rb

@@ -43,25 +43,30 @@ module Sappho
 
         def getPage spaceKey, pageName
           checkLoggedIn
+          logout
+          login
           @logger.info "reading wiki page #{spaceKey}:#{pageName}"
           @appServer.getPage(@token, spaceKey, pageName)['content']
         end
 
         def setPage spaceKey, parentPageName, pageName, content
           checkLoggedIn
+          logout
+          login
           begin
-            page = @appServer.getPage(@token, spaceKey, pageName)
+            page = @appServer.getPage @token, spaceKey, pageName
             page['content'] = content
             @logger.info "rewriting existing wiki page #{spaceKey}:#{pageName}"
+            @appServer.updatePage @token, page, {'versionComment' => "Automatic update", 'minorEdit' => false}
           rescue
             page = {
-              'space' => spaceKey,
-              'parentId' => @appServer.getPage(@token, spaceKey, parentPageName)['id'],
-              'title' => pageName,
-              'content' => content }
+                'space' => spaceKey,
+                'parentId' => @appServer.getPage(@token, spaceKey, parentPageName)['id'],
+                'title' => pageName,
+                'content' => content}
             @logger.info "creating new wiki page #{spaceKey}:#{pageName} as child of #{parentPageName}"
+            @appServer.storePage @token, page
           end
-          @appServer.storePage @token, page
         end
 
       end

data/lib/sappho-data-publisher/jira.rb

@@ -74,33 +74,29 @@ module Sappho
 
         def jqlQuery jql, maxresults
           @logger.info "fetching up to #{maxresults} Jira issues for #{jql}"
-          return @appServer.getIssuesFromJqlSearch @token, jql, maxresults
-        end
-
-        def getJiraIssueDetails issue, cookedIssue
-          ['id', 'key', 'summary', 'description', 'assignee', 'created', 'duedate', 'priority',
-           'project', 'reporter', 'resolution', 'status', 'type', 'updated'].each { |key|
-            cookedIssue[key] = issue[key]
-          }
-          cookedIssue['components'] = components = []
-          issue['components'].each { |component| components << component['name'] }
-          cookedIssue['cf'] = customFields = {}
-          @allCustomFields.each { |customField|
-            customFields[cfname customField['id']] = {'name' => customField['name']}
-          }
-          issue['customFieldValues'].each { |customFieldValue|
-            customFields[cfname customFieldValue['customfieldId']]['values'] =
-                customFieldValue['values']
-          }
-          cookedIssue['subtasks'] = cookedSubtasks = []
-          subtasks = jqlQuery "parent=#{issue['key']}", 100
-          cookIssues subtasks, cookedSubtasks
+          @appServer.getIssuesFromJqlSearch @token, jql, maxresults
         end
 
         def cookIssues issues, cookedIssues
           issues.each { |issue|
             cookedIssue = {}
-            getJiraIssueDetails issue, cookedIssue
+            ['id', 'key', 'summary', 'description', 'assignee', 'created', 'duedate', 'priority',
+             'project', 'reporter', 'resolution', 'status', 'type', 'updated'].each { |key|
+              cookedIssue[key] = issue[key]
+            }
+            cookedIssue['components'] = components = []
+            issue['components'].each { |component| components << component['name'] }
+            cookedIssue['cf'] = customFields = {}
+            @allCustomFields.each { |customField|
+              customFields[cfname customField['id']] = {'name' => customField['name']}
+            }
+            issue['customFieldValues'].each { |customFieldValue|
+              customFields[cfname customFieldValue['customfieldId']]['values'] =
+                  customFieldValue['values']
+            }
+            cookedIssue['subtasks'] = cookedSubtasks = []
+            subtasks = jqlQuery "parent=#{issue['key']}", 100
+            cookIssues subtasks, cookedSubtasks
             cookedIssues << cookedIssue
           }
         end

data/lib/sappho-data-publisher/version.rb

@@ -7,7 +7,7 @@ module Sappho
   module Data
     module Publisher
       NAME = 'sappho-data-publisher'
-      VERSION = '0.2.3'
+      VERSION = '0.2.4'
       AUTHORS = ['Andrew Heald']
       EMAILS = ['andrew@heald.co.uk']
       HOMEPAGE = 'https://wiki.sappho.org.uk/display/DP/sappho-data-publisher'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sappho-data-publisher
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Andrew Heald