From fb76ce944e5d454220bb4e1e3d0a95b29230de96 Mon Sep 17 00:00:00 2001
From: msperlin <marceloperlin@gmail.com>
Date: Fri, 27 Nov 2020 14:47:50 -0300
Subject: [PATCH] fixed issue #19

---
 DESCRIPTION             | 4 ++--
 NEWS.md                 | 5 +++++
 R/BatchGetSymbols.R     | 5 -----
 R/GetFTSE100Stocks.R    | 3 ++-
 R/GetSP500Stocks.R      | 3 ++-
 R/Get_Ibov_Stocks.R     | 3 ++-
 man/GetFTSE100Stocks.Rd | 5 ++++-
 man/GetIbovStocks.Rd    | 6 +++++-
 man/GetSP500Stocks.Rd   | 5 ++++-
 9 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 347a13c..174dcb2 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,9 +1,9 @@
 Package: BatchGetSymbols
 Title: Downloads and Organizes Financial Data for Multiple Tickers
-Version: 2.6
+Version: 2.6.1
 Authors@R: person("Marcelo", "Perlin", email = "marceloperlin@gmail.com", role = c("aut", "cre"))
 Description: Makes it easy to download financial data from Yahoo Finance <https://finance.yahoo.com/>.
-Date: 2020-11-22
+Date: 2020-11-27
 Depends:
     R (>= 3.4.0), rvest, dplyr
 Imports: stringr, curl, quantmod, XML, tidyr, 
diff --git a/NEWS.md b/NEWS.md
index c4143cd..8daab29 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,8 @@
+## Version 2.6.1 (2020-11-27)
+
+- Fixed issue [issue 19](https://github.com/msperlin/BatchGetSymbols/issues/19), which only happened in Windows. 
+- changed default cache dir for ticker grabbing function
+
 ## Version 2.6 (2020-11-22)
 
 - The cache system is now session-persistent with `cache.dir = file.path(tempdir(), 'BGS_Cache')`. This solves the problem with mismatching price series from cached data between splits or dividends. A new warning is set whenever the user uses cache.dir different from temp.dir()
diff --git a/R/BatchGetSymbols.R b/R/BatchGetSymbols.R
index 27215be..c240f06 100644
--- a/R/BatchGetSymbols.R
+++ b/R/BatchGetSymbols.R
@@ -342,13 +342,8 @@ BatchGetSymbols <- function(tickers,
                df.tickers = df.tickers)
 
   # check if cach folder is tempdir()
-<<<<<<< HEAD
-  flag <- stringr::str_detect(string = cache.folder,
-                              pattern = tempdir())
-=======
   flag <- stringr::str_detect(cache.folder,
                               pattern = stringr::fixed(tempdir()))
->>>>>>> 63694a0635c7d0bca8688ddb652d150a28354f98
 
   if (!flag) {
     warning(stringr::str_glue('\nIt seems you are using a non-default cache folder at {cache.folder}. ',
diff --git a/R/GetFTSE100Stocks.R b/R/GetFTSE100Stocks.R
index c2cbaa1..b7bbfa3 100644
--- a/R/GetFTSE100Stocks.R
+++ b/R/GetFTSE100Stocks.R
@@ -16,7 +16,8 @@ GetFTSE100Stocks <- function(do.cache = TRUE,
                              cache.folder = file.path(tempdir(),
                                                       'BGS_Cache')){
 
-  cache.file <- file.path(cache.folder, paste0('FTSE100_Composition_', Sys.Date(), '.rds') )
+  cache.file <- file.path(cache.folder,
+                          paste0('FTSE100_Composition_', Sys.Date(), '.rds') )
 
   if (do.cache) {
     # check if file exists
diff --git a/R/GetSP500Stocks.R b/R/GetSP500Stocks.R
index 3b1b6a9..1a1d5b4 100644
--- a/R/GetSP500Stocks.R
+++ b/R/GetSP500Stocks.R
@@ -16,7 +16,8 @@ GetSP500Stocks <- function(do.cache = TRUE,
                            cache.folder = file.path(tempdir(),
                                                     'BGS_Cache')){
 
-  cache.file <- file.path(cache.folder, paste0('SP500_Composition_', Sys.Date(), '.rds') )
+  cache.file <- file.path(cache.folder,
+                          paste0('SP500_Composition_', Sys.Date(), '.rds') )
 
   if (do.cache) {
     # check if file exists
diff --git a/R/Get_Ibov_Stocks.R b/R/Get_Ibov_Stocks.R
index c7ea367..44c0a4d 100644
--- a/R/Get_Ibov_Stocks.R
+++ b/R/Get_Ibov_Stocks.R
@@ -17,7 +17,8 @@ GetIbovStocks <- function(do.cache = TRUE,
                                                    'BGS_Cache'),
                           max.tries  = 10){
 
-  cache.file <- file.path(cache.folder, paste0('Ibov_Composition_', Sys.Date(), '.rds') )
+  cache.file <- file.path(cache.folder,
+                          paste0('Ibov_Composition_', Sys.Date(), '.rds') )
 
   # get list of ibovespa's tickers from wbsite
 
diff --git a/man/GetFTSE100Stocks.Rd b/man/GetFTSE100Stocks.Rd
index eed4098..733f54e 100644
--- a/man/GetFTSE100Stocks.Rd
+++ b/man/GetFTSE100Stocks.Rd
@@ -4,7 +4,10 @@
 \alias{GetFTSE100Stocks}
 \title{Function to download the current components of the FTSE100 index from Wikipedia}
 \usage{
-GetFTSE100Stocks(do.cache = TRUE, cache.folder = "BGS_Cache")
+GetFTSE100Stocks(
+  do.cache = TRUE,
+  cache.folder = file.path(tempdir(), "BGS_Cache")
+)
 }
 \arguments{
 \item{do.cache}{Use cache system? (default = TRUE)}
diff --git a/man/GetIbovStocks.Rd b/man/GetIbovStocks.Rd
index fa4a5a5..836117d 100644
--- a/man/GetIbovStocks.Rd
+++ b/man/GetIbovStocks.Rd
@@ -4,7 +4,11 @@
 \alias{GetIbovStocks}
 \title{Function to download the current components of the Ibovespa index from Bovespa website}
 \usage{
-GetIbovStocks(do.cache = TRUE, cache.folder = "BGS_Cache", max.tries = 10)
+GetIbovStocks(
+  do.cache = TRUE,
+  cache.folder = file.path(tempdir(), "BGS_Cache"),
+  max.tries = 10
+)
 }
 \arguments{
 \item{do.cache}{Use cache system? (default = TRUE)}
diff --git a/man/GetSP500Stocks.Rd b/man/GetSP500Stocks.Rd
index 32d9f08..7140653 100644
--- a/man/GetSP500Stocks.Rd
+++ b/man/GetSP500Stocks.Rd
@@ -4,7 +4,10 @@
 \alias{GetSP500Stocks}
 \title{Function to download the current components of the SP500 index from Wikipedia}
 \usage{
-GetSP500Stocks(do.cache = TRUE, cache.folder = "BGS_Cache")
+GetSP500Stocks(
+  do.cache = TRUE,
+  cache.folder = file.path(tempdir(), "BGS_Cache")
+)
 }
 \arguments{
 \item{do.cache}{Use cache system? (default = TRUE)}