jenkinsutil 1.0.64 → 1.0.65

data/jenkins/test.groovy

@@ -1,64 +1,56 @@
 #!groovy
 
-parallel(
-        'linux': {
-            stage('linux test') {
-                node('docker') {
-                    checkout scm
-
-                    def dockerRepository = "${env.JOB_NAME}".toLowerCase()
-                    def dockerTag = "${dockerRepository}:${env.BUILD_NUMBER}"
-                    def dockerContainerName = "${dockerRepository}_${env.BUILD_NUMBER}"
-
-                    sh """docker build \
-                        -t ${dockerTag} \
-                        ."""
-
-                    sh """docker run \
-                        -e BUILD_NUMBER=${env.BUILD_NUMBER} \
-                        -e DROPBOX_ACCESS_TOKEN=${env.DROPBOX_ACCESS_TOKEN} \
-                        --name ${dockerContainerName} \
-                        ${dockerTag}"""
-
-                    sh "docker cp ${dockerContainerName}:/artifacts ${env.WORKSPACE}"
-                    sh "docker stop ${dockerContainerName}"
-
-                    step([$class: 'JUnitResultArchiver', testResults: 'artifacts/**/*.xml'])
-                    //step([$class: 'RcovPublisher', reportDir: 'artifacts/coverage/rcov/'])
-                }
-            }
-        },
-        'osx': {
-            stage('osx test') {
-                node('ruby-osx') {
-                    checkout scm
-
-                    sh "bundle install --path='./gems/'"
-
-                    sh """DROPBOX_ACCESS_TOKEN=${env.DROPBOX_ACCESS_TOKEN} \
-                        RUBYOPT='-W0' \
-                        CI_CAPTURE=off \
-                        bundle exec \
-                        rake ci:setup:testunit \
-                        test:all \
-                        build"""
-
-                    step([$class: 'JUnitResultArchiver', testResults: 'test/reports/**/*.xml'])
-                }
-            }
-        },
-        'windows': {
-            stage('windows test') {
-                node('ruby-windows') {
-                    checkout scm
-
-                    bat 'call bundle install --path=./gems'
-                    bat 'set DROPBOX_ACCESS_TOKEN=${env.DROPBOX_ACCESS_TOKEN}'
-                    bat 'call bundle exec rake ci:setup:testunit test:default build'
-
-                    step([$class: 'JUnitResultArchiver', testResults: 'test/reports/**/*.xml'])
-                    //step([$class: 'RcovPublisher', reportDir: 'coverage/rcov/'])
-                }
-            }
-        }
-)
+stage('linux test') {
+    node('docker') {
+        checkout scm
+
+        def dockerRepository = "${env.JOB_NAME}".toLowerCase()
+        def dockerTag = "${dockerRepository}:${env.BUILD_NUMBER}"
+        def dockerContainerName = "${dockerRepository}_${env.BUILD_NUMBER}"
+
+        sh """docker build \
+            -t ${dockerTag} \
+            ."""
+
+        sh """docker run \
+            -e BUILD_NUMBER=${env.BUILD_NUMBER} \
+            -e DROPBOX_ACCESS_TOKEN=${env.DROPBOX_ACCESS_TOKEN} \
+            --name ${dockerContainerName} \
+            ${dockerTag}"""
+
+        sh "docker cp ${dockerContainerName}:/artifacts ${env.WORKSPACE}"
+        sh "docker stop ${dockerContainerName}"
+
+        step([$class: 'JUnitResultArchiver', testResults: 'artifacts/**/*.xml'])
+        //step([$class: 'RcovPublisher', reportDir: 'artifacts/coverage/rcov/'])
+    }
+}
+stage('osx test') {
+    node('ruby-osx') {
+        checkout scm
+
+        sh "bundle install --path='./gems/'"
+
+        sh """DROPBOX_ACCESS_TOKEN=${env.DROPBOX_ACCESS_TOKEN} \
+            RUBYOPT='-W0' \
+            CI_CAPTURE=off \
+            bundle exec \
+            rake ci:setup:testunit \
+            test:all \
+            build"""
+
+        step([$class: 'JUnitResultArchiver', testResults: 'test/reports/**/*.xml'])
+    }
+}
+stage('windows test') {
+    node('ruby-windows') {
+        checkout scm
+
+        bat 'call bundle install --path=./gems'
+        bat 'set DROPBOX_ACCESS_TOKEN=${env.DROPBOX_ACCESS_TOKEN}'
+        bat 'call bundle exec rake SSL_CERT_FILE=%cd%\\certs\\cacert.pem ci:setup:testunit test:default build'
+
+        step([$class: 'JUnitResultArchiver', testResults: 'test/reports/**/*.xml'])
+        //step([$class: 'RcovPublisher', reportDir: 'coverage/rcov/'])
+    }
+}

data/lib/jenkins_util/dropbox_util.rb

@@ -1,4 +1,4 @@
-require 'dropbox_sdk'
+require 'dropbox_api'
 require 'jenkins_util/logger_util'
 require 'jenkins_util/version'
 require 'pathname'
@@ -14,7 +14,7 @@ module DropboxUtil
     LoggerUtil.fatal('Root must be passed if flatten is false') if !flatten && root.nil?
     LoggerUtil.fatal('Please set environment variable DROPBOX_ACCESS_TOKEN') if ENV['DROPBOX_ACCESS_TOKEN'].nil?
 
-    @dropbox_client ||= DropboxClient.new(ENV['DROPBOX_ACCESS_TOKEN'])
+    @dropbox_client ||= DropboxApi::Client.new(ENV['DROPBOX_ACCESS_TOKEN'])
     @sources = sources
     @destination = destination
     @flatten = flatten
@@ -23,14 +23,12 @@ module DropboxUtil
     upload_files
   end
 
-  def self.delete(dropbox_location)
-    @dropbox_client ||= DropboxClient.new(JenkinsUtil::DROPBOX_ACCESS_TOKEN)
-
-    LoggerUtil.fatal('Location passed is nil') if dropbox_location.nil?
+  def self.delete(file_path)
+    retrier(file_path) { @dropbox_client.delete(file_path) } unless @dropbox_client.nil?
   end
 
   def self.upload_files
-    LoggerUtil.log.debug(@dropbox_client.account_info.inspect) # Check auth
+    LoggerUtil.log.debug(@dropbox_client.get_current_account.inspect) # Check auth
     @sources = [@sources] unless @sources.respond_to?('each')
 
     @sources.each do |source|
@@ -40,7 +38,7 @@ module DropboxUtil
         upload_and_share(file)
       end
     end
-  rescue DropboxAuthError
+  rescue DropboxApi::Errors::UploadError
     LoggerUtil.fatal('User is not authenticated, please verify access token')
   end
 
@@ -65,27 +63,43 @@ module DropboxUtil
     return if File.directory?(file)
 
     @uploaded_files ||= []
+    retrier(file) do
+      dropbox_file = @dropbox_client.upload(dropbox_file_destination(file), IO.read(file))
+      LoggerUtil.log.debug("Successfully uploaded #{file}")
 
-    retries = 0
+      @dropbox_client.share_folder(@destination)
+      temp_link = @dropbox_client.get_temporary_link(dropbox_file.path_display)
+
+      LoggerUtil.log.info("path: #{dropbox_file.path_display}")
+      LoggerUtil.log.info("url: #{temp_link.link}")
+    end
+  end
 
+  def self.download(file_path)
+    retrier(file_path) { @dropbox_client.download(file_path) }
+  end
+
+  def self.retrier(file)
+    retries = 0
     begin
-      dropbox_file = @dropbox_client.put_file(dropbox_file_destination(file), open(file), false)
-      LoggerUtil.log.debug("Successfully uploaded #{file}")
-    rescue DropboxError => e
+      response = yield
+    rescue DropboxApi::Errors::BasicError, DropboxApi::Errors::HttpError => e
       retries += 1
-      if retries < 5
-        LoggerUtil.log.debug("Attempt #{retries} failed. Retrying #{file}")
+      if retries <= 5
+        # Rate Limit and Namespace Lock Contentions introduced in v2 APIs
+        # https://www.dropbox.com/developers/reference/data-ingress-guide
+        delay = e.is_a?(DropboxApi::Errors::TooManyWriteOperationsError) ? e.retry_after * retries : retries
+        sleep(delay)
+        LoggerUtil.log.debug("Attempt #{retries} failed. Retrying #{file} after #{delay} seconds")
+
         retry
       end
 
-      LoggerUtil.log.debug("Exceeded maximum retries. Failed to upload #{file}")
+      LoggerUtil.fatal("Exceeded maximum retries. Failed to #{caller_locations[0].label} #{file}")
       raise e
     end
 
-    share = @dropbox_client.shares(dropbox_file['path'])
-
-    LoggerUtil.log.info("path: #{dropbox_file['path']}")
-    LoggerUtil.log.info("url: #{share['url']}")
+    response unless response.nil?
   end
 
   private_class_method :upload_files, :dropbox_file_destination, :upload_and_share

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenkinsutil
 version: !ruby/object:Gem::Version
-  version: 1.0.64
+  version: 1.0.65
 platform: ruby
 authors:
 - Brett McGinnis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
@@ -51,25 +51,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.3
 - !ruby/object:Gem::Dependency
-  name: dropbox-sdk
+  name: dropbox_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
@@ -373,6 +367,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- certs/cacert.pem
 - exe/jenkinsutil
 - jenkins/deploy.Jenkinsfile
 - jenkins/deploy.groovy