Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for CRAN submission #136

Merged
merged 4 commits into from
Jun 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
^_pkgdown\.yml$
^docs$
^pkgdown$
^LICENSE\.md$
8 changes: 5 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ Authors@R:
person(given = "Frans",
family = "van Dunne",
role = c("cre", "aut"),
email = "frans@ixpantia.com"),
email = "frans@ixpantia.com",
comment = c(ORCID = "0000-0002-7853-2811")),
person(given = "Ronny",
family = "Hernández Mora",
role = "aut",
email = "ronny@ixpantia.com"),
email = "ronny@ixpantia.com",
comment = c(ORCID = "0000-0001-6225-7096")),
person(given = "Daniel",
family = "Granados Campos",
role = "ctb",
Expand All @@ -22,7 +24,7 @@ Authors@R:
role = "ctb",
email = "nayib@ixpantia.com"))
Description: Create and view tickets in 'gitea', a self-hosted git service <https://gitea.io>, using an RStudio addin, and use helper functions to publish documentation and use git.
License: file LICENCE
License: AGPL (>= 3) + file LICENCE
Depends:
R (>= 3.4)
Imports:
Expand Down
7 changes: 2 additions & 5 deletions LICENCE
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
Proprietary

Copyright 2018 ixpantia S.R.L.

All rights reserved. Do not distribute.
YEAR: 2022
COPYRIGHT HOLDER: ixpantia S.R.L.
659 changes: 659 additions & 0 deletions LICENSE.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion R/git.R
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ incluye_upstream <- function(instancia = "guardada") {
#' @param timeout number of seconds before timeout
#' @param global whether the change should be global or local to the repo
#'
#' @return No return value, called for side effects
#' @export
set_git_timeout <- function(timeout = 14400, global = FALSE) {

Expand Down Expand Up @@ -141,4 +142,3 @@ fijar_tiempo_credenciales <- function(pausa = 14400, global = FALSE) {
set_git_timeout(timeout = pausa, global = TRUE)
}
}

12 changes: 6 additions & 6 deletions R/verify_authenticacion.R
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ NULL
#' Verifique si hay un archivo .ixplorer en el directorio de trabajo y
#' configure las variables.
#'
#' @return No return value, called for side effects
verify_ixplorer_file <- function() {
api_creds <- list()
working_directory <- rstudioapi::getActiveProject()
Expand Down Expand Up @@ -53,7 +54,7 @@ verify_ixplorer_file <- function() {
#' @description Verifies token exists for a repository.
#'
#' @param gitear_access parameters to access into an ixplorer instance

#' @return No return value, called for side effects
verify_ixtoken <- function(gitear_access) {
if (!(TRUE %in% stringr::str_detect(gitear_access$variable, "IXTOKEN") &&
FALSE %in% any(is.na(gitear_access[1, 2])))) {
Expand All @@ -78,7 +79,7 @@ verify_ixurl <- function(gitear_access) {
#' @description Verifies if the project's name exists in the repository.
#'
#' @param gitear_access parameters to access into an ixplorer instance

#' @return No return value, called for side effects
verify_ixproject <- function(gitear_access) {
if (!(TRUE %in% stringr::str_detect(gitear_access$variable, "IXPROJECT") &&
FALSE %in% any(is.na(gitear_access[3, 2])))) {
Expand All @@ -91,7 +92,7 @@ verify_ixproject <- function(gitear_access) {
#' @description Verifies if ixplorer repository's name exists.
#'
#' @param gitear_access parameters to access into an ixplorer instance

#' @return No return value, called for side effects
verify_ixrepo <- function(gitear_access) {
if (!(TRUE %in% stringr::str_detect(gitear_access$variable, "IXREPO") &&
FALSE %in% any(is.na(gitear_access[4, 2])))) {
Expand All @@ -103,8 +104,8 @@ verify_ixrepo <- function(gitear_access) {
#' @title Verifies ixplorer user
#' @description Verifies if user name exists.
#'
#' @return No return value, called for side effects
#' @param gitear_access parameters to access into an ixplorer instance

verify_ixuser <- function(gitear_access) {
if (!(TRUE %in% stringr::str_detect(gitear_access$variable, "IXUSER") &&
FALSE %in% any(is.na(gitear_access[5, 2])))) {
Expand All @@ -116,8 +117,8 @@ verify_ixuser <- function(gitear_access) {
#' @description Set the authentification into ixplorer
#'
#' @param access_data Data needed to get into ixplorer
#' @return No return value, called for side effects
#' @export

set_authentication <- function(access_data) {
ixurl <- verify_ixurl(access_data)
ixtoken <- verify_ixtoken(access_data)
Expand All @@ -127,4 +128,3 @@ set_authentication <- function(access_data) {
msj <- c(ixurl, ixtoken, ixproject, ixrepo, ixuser)
return(msj)
}

3 changes: 3 additions & 0 deletions man/set_authentication.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions man/set_git_timeout.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions man/verify_ixplorer_file.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions man/verify_ixproject.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions man/verify_ixrepo.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions man/verify_ixtoken.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions man/verify_ixuser.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.