bloomr.build: mask sys and xlx funcs

Author: AntonioFasano

README.html

@@ -134,12 +134,12 @@ <h3>More options and requirements</h3>
 </div>
 <div id="internet-connection" class="section level3">
 <h3>Internet connection</h3>
-<p>Since <code>bloomr.build.R</code> downloads resources from the net, therefore one problem you might face is a download error.</p>
+<p>Since <code>bloomr.build.R</code> downloads resources from the net, one problem you might face is a download error.</p>
 <p>Based on my experiences, the script does a good job in detecting download errors, despite it is always possible that a corrupted download is not identified.</p>
-<p>When a donwnload error is detected, <code>bloomr.build.R</code> make a second attempt. You can control this with:</p>
+<p>When a donwnload error is detected, <code>bloomr.build.R</code> makes a second attempt. You can control this with:</p>
 <pre><code>makeBloomR(&quot;path\to\workDir&quot;, ndown = n)</code></pre>
-<p>where <em>n</em> are the download attempts.</p>
-<p>When the maximum number of attempt is reached, the script exits deleting any incompleted file and emitting a message detailing the download error.<br />When you start over (hoping in a better connection), you might not want to download again every and each file, but only those affected by the errors. This is done with the option:</p>
+<p>where <em>n</em> are the download attempts.<br />When the maximum number of attempt is reached, the script exits deleting any incompleted file and emitting a message detailing the download error.</p>
+<p>When you start over (hoping in a better connection), you might not want to download again every and each file, but only those affected by the errors. This is done with the option:</p>
 <pre><code>makeBloomR(&quot;path\to\workDir&quot;, tight = TRUE)</code></pre>
 <!-- Local Variables: -->
 <!-- mode: markdown -->

README.md

@@ -98,17 +98,17 @@ If you want to find  `BloomR.zip` too in your work directory use:
 
 ### Internet connection 
 
-Since `bloomr.build.R` downloads resources  from the net, therefore one problem you might face is a download error.
+Since `bloomr.build.R` downloads resources  from the net,  one problem you might face is a download error.
 
 Based on my experiences, the script does a good job in detecting download errors, despite it is always  possible that a corrupted download is not identified.
 
-When a donwnload error is  detected,  `bloomr.build.R` make a second attempt. You can control this with:
+When a donwnload error is  detected,  `bloomr.build.R` makes a second attempt. You can control this with:
 
 	makeBloomR("path\to\workDir", ndown = n)
 
-where _n_ are the download attempts.
+where _n_ are the download attempts.  
+When the maximum number of attempt is reached, the script exits deleting any incompleted file and emitting a message detailing the download error.
 
-When the maximum number of attempt is reached, the script exits deleting any incompleted file and emitting a message detailing the download error.  
 When you start over (hoping in a better connection), you might not want to download again every and each file, but only those affected by the errors. This is done with the option: 
 
 

bloomr.R

@@ -438,11 +438,6 @@ store(last.day)
 store(day.us)
 
 
-## ----br.attach.test, opts.label='purlme'---------------------------------
-### this is just a test 
-br.attach.test=function() print("attach.test")
-store(br.attach.test)
-
 ## ----attach, opts.label='purlme'-----------------------------------------
 ### Make visible br.* in bloomr env and base ns
 attach(bloomr)

bloomr.build.R

@@ -285,7 +285,7 @@ expand=function(){
 ### Make BloomR directory tree
 bloomrTree=function(ndown){
 
-    message("Creating BloomR tree")
+    message("\nCreating BloomR tree")
     existMake('bloomR', TRUE, FALSE, "main BloomR dir:")
 
     ## Copy R and make site direcory
@@ -364,11 +364,7 @@ initScripts=function(ndown){
     download.git("res/tickers.csv", "bloomR/mybloomr/tickers.csv", ,ndown)
     download.git("res/tickers.eqt.csv", "bloomR/mybloomr/tickers.eqt.csv", ,ndown)
     download.git("tryme.R", "bloomR/mybloomr/tryme.R", ,ndown)
-
-
-               
-
-    
+                  
     ## Make R bootstrapper
     makeBoot(ndown)
 
@@ -394,7 +390,7 @@ Run, main\\bin\\x64\\Rgui.exe --internet2 LANGUAGE=en
     download.git("bloomr.ico", to, ,ndown)
 
     ## Make exe
-    cat("Making BloomR executable\n")
+    cat("\nMaking BloomR executable\n")
     cd=normalizePath(ahkdir)
     cd= paste0('cd "', cd, '" &')
     run="Ahk2Exe.exe /in bloomr.run /icon bloomr.ico /bin \"Unicode 32-bit.bin\""
@@ -423,8 +419,12 @@ PROF=function(){ #Keep this on separate line
     library("rJava")
     library("Rbbg")
     source(paste0(R.home("share"), "/bloomr/bloomr.R"))
-    source(paste0(R.home("share"), "/bloomr/bloomr.sys.R"))
-    source(paste0(R.home("share"), "/bloomr/xlx.R"))
+    
+    assign('bloomr.addons',  new.env(parent=asNamespace("base")), envir=asNamespace("base"))
+    source(paste0(R.home("share"), "/bloomr/bloomr.sys.R"), local=bloomr.addons)
+    source(paste0(R.home("share"), "/bloomr/xlx.R"), local=bloomr.addons)
+    attach(bloomr.addons)
+
 
     ## end BloomR----------
 }
@@ -436,11 +436,12 @@ PROF=function(){ #Keep this on separate line
 makeExe=function(ask,ndown){
 
     message('\nCreating BloomR.exe installer')
-    to=makePath(G.work, "BloomR.exe")
+    to=makePath(G.work, "Extract_BloomR.exe")
     if(is.path(to)) del.ask(to, ask, "already exists")    
     del.path(to)
 
     download.git("bloomr.nsi", "bloomr.nsi", ,ndown)
+    message('Creating self-extracting executable Extract_BloomR.exe.   \nThis may take a bit...')
     nsi=makePath(G.work, 'bloomr.nsi')   
     nexe=makePath(G.work, paste0(G.nsiszip,'.d/App/NSIS/makensis.exe'))
     cmd=paste(wPath(nexe), "/v2", wPath(nsi))

bloomr.html

@@ -254,13 +254,6 @@ <h2>Demonstration</h2>
 <pre class="r"><code>con=NULL  #Simulated mode: replace with con=br.open() on terminal</code></pre>
 <pre class="r"><code>data=br.bulk.csv(con, &quot;mybloomr/tickers.csv&quot;) </code></pre>
 <pre><code>## Processing Financial ...
-## 
-## Attaching package: 'zoo'
-## 
-## The following objects are masked from 'package:base':
-## 
-##     as.Date, as.Date.numeric
-## 
 ## Loading 3988 HK Equity
 ## Loading C US Equity
 ## Loading 601288 CH Equity
@@ -281,24 +274,27 @@ <h2>Demonstration</h2>
 <pre class="r"><code>data</code></pre>
 <pre><code>## $Financial
 ##            3988 HK   C US 601288 CH BAC US HSBA LN
-## 2015-02-28      NA     NA    11.666     NA  10.116
-## 2015-03-01      NA 10.327        NA     NA      NA
-## 2015-03-02  10.723     NA     8.144  9.223  10.526
-## 2015-03-04  10.437 10.246        NA     NA   9.512
+## 2015-02-28      NA 11.070    10.444  9.635  10.136
+## 2015-03-01      NA 11.749     9.367     NA   9.760
+## 2015-03-02      NA     NA        NA     NA  12.508
+## 2015-03-03   8.851     NA    10.298     NA      NA
+## 2015-03-04   9.510     NA        NA 10.657      NA
 ## 
 ## $Technology
 ##            QCOM US CSCO US 700 HK IBM US INTC US
-## 2015-02-28   9.264  11.006     NA 10.337  11.405
-## 2015-03-01  11.009  10.134     NA  8.566      NA
-## 2015-03-02   9.703  10.786     NA     NA      NA
-## 2015-03-03      NA  10.023  6.854  8.297   9.772
-## 2015-03-04      NA   8.852     NA 11.110      NA
+## 2015-02-28      NA   8.147     NA 10.543      NA
+## 2015-03-01      NA   8.834  8.866     NA      NA
+## 2015-03-02      NA  10.034  8.984 10.006      NA
+## 2015-03-03      NA   9.750     NA  9.566      NA
+## 2015-03-04  10.397      NA 10.828     NA   9.817
 ## 
 ## $Indices
 ##               DJI DJUSFN  W1TEC
-## 2015-03-02 13.374  9.328 10.989
-## 2015-03-03 10.374     NA     NA
-## 2015-03-04 10.180     NA  9.466</code></pre>
+## 2015-02-28  9.461  9.118  9.661
+## 2015-03-01 10.255     NA 11.603
+## 2015-03-02  9.847 10.425     NA
+## 2015-03-03  9.993     NA  9.687
+## 2015-03-04  8.082  9.797  8.453</code></pre>
 <p>Note:</p>
 <ul>
 <li><p>The name of the securities tickers is stored without the security type: “Equity”, “Index”, etc.<br />If this piece of info is significant for you, pass <code>showtype = TRUE</code>.</p></li>
@@ -468,10 +464,9 @@ <h2>Example</h2>
 <pre><code>## Loading MSFT US Equity
 ## Loading AMZN US Equity</code></pre>
 <pre><code>##            MSFT US AMZN US
-## 2015-02-28   9.980      NA
-## 2015-03-02   9.632   9.796
-## 2015-03-03   6.868   9.605
-## 2015-03-04  11.289      NA</code></pre>
+## 2015-03-01      NA   8.664
+## 2015-03-02   9.701      NA
+## 2015-03-04  11.072      NA</code></pre>
 <pre class="r"><code>br.close(con) # Use the token to release the connection</code></pre>
 </div>
 <div id="see-also" class="section level2">
@@ -699,9 +694,6 @@ <h2>Arguments</h2>
 <div id="details-6" class="section level2">
 <h2>Details</h2>
 <p>If <code>component</code> is <code>day</code>, <code>month</code> or <code>year</code>: <code>component(d)</code> returns the <em>component</em> of the date <code>d</code> as an integer; <code>component(d, n)</code> returns the date <code>d</code> with the <em>component</em> set to the integer <code>n</code>; <code>component(d)= n</code> sets to the <em>component</em> of the date <code>d</code> to the integer <code>n</code>.<br /><code>%+%</code> and <code>%-%</code> add and subtract months to a date.<br /><code>last.day</code> returns last day of the month as an integer. <code>day.us</code> calculates date differences with the US convention.</p>
-<pre class="r"><code>### this is just a test 
-br.attach.test()</code></pre>
-<pre><code>## [1] &quot;attach.test&quot;</code></pre>
 <!-- Local Variables: -->
 <!-- mode: rmd -->
 <!-- End: -->

bloomr.md

@@ -22,7 +22,6 @@ R topics documented:
 
 
 
-
 br.bdh{#br.bdh}
 ===============
 *Historical data*
@@ -262,13 +261,6 @@ data=br.bulk.csv(con, "mybloomr/tickers.csv")
 
 ```
 ## Processing Financial ...
-## 
-## Attaching package: 'zoo'
-## 
-## The following objects are masked from 'package:base':
-## 
-##     as.Date, as.Date.numeric
-## 
 ## Loading 3988 HK Equity
 ## Loading C US Equity
 ## Loading 601288 CH Equity
@@ -299,24 +291,27 @@ data
 ```
 ## $Financial
 ##            3988 HK   C US 601288 CH BAC US HSBA LN
-## 2015-02-28      NA     NA    11.666     NA  10.116
-## 2015-03-01      NA 10.327        NA     NA      NA
-## 2015-03-02  10.723     NA     8.144  9.223  10.526
-## 2015-03-04  10.437 10.246        NA     NA   9.512
+## 2015-02-28      NA 11.070    10.444  9.635  10.136
+## 2015-03-01      NA 11.749     9.367     NA   9.760
+## 2015-03-02      NA     NA        NA     NA  12.508
+## 2015-03-03   8.851     NA    10.298     NA      NA
+## 2015-03-04   9.510     NA        NA 10.657      NA
 ## 
 ## $Technology
 ##            QCOM US CSCO US 700 HK IBM US INTC US
-## 2015-02-28   9.264  11.006     NA 10.337  11.405
-## 2015-03-01  11.009  10.134     NA  8.566      NA
-## 2015-03-02   9.703  10.786     NA     NA      NA
-## 2015-03-03      NA  10.023  6.854  8.297   9.772
-## 2015-03-04      NA   8.852     NA 11.110      NA
+## 2015-02-28      NA   8.147     NA 10.543      NA
+## 2015-03-01      NA   8.834  8.866     NA      NA
+## 2015-03-02      NA  10.034  8.984 10.006      NA
+## 2015-03-03      NA   9.750     NA  9.566      NA
+## 2015-03-04  10.397      NA 10.828     NA   9.817
 ## 
 ## $Indices
 ##               DJI DJUSFN  W1TEC
-## 2015-03-02 13.374  9.328 10.989
-## 2015-03-03 10.374     NA     NA
-## 2015-03-04 10.180     NA  9.466
+## 2015-02-28  9.461  9.118  9.661
+## 2015-03-01 10.255     NA 11.603
+## 2015-03-02  9.847 10.425     NA
+## 2015-03-03  9.993     NA  9.687
+## 2015-03-04  8.082  9.797  8.453
 ```
 
 Note:
@@ -621,10 +616,9 @@ br.bulk.tiks(con, c("MSFT US", "AMZN US"), addtype=TRUE)
 
 ```
 ##            MSFT US AMZN US
-## 2015-02-28   9.980      NA
-## 2015-03-02   9.632   9.796
-## 2015-03-03   6.868   9.605
-## 2015-03-04  11.289      NA
+## 2015-03-01      NA   8.664
+## 2015-03-02   9.701      NA
+## 2015-03-04  11.072      NA
 ```
 
 ```r
@@ -889,17 +883,6 @@ If `component` is `day`, `month` or `year`: `component(d)` returns the *componen
 
 
 
-```r
-### this is just a test 
-br.attach.test()
-```
-
-```
-## [1] "attach.test"
-```
-
-
-
 
 
 

bloomr.pdf

@@ -44,7 +44,6 @@ knit_hooks$set(purl = hook_purl)
 ```
 
 
-
 ```{r store, opts.label='purlme'}
 ## Purl this first
 ## Store br.* objects in bloomr env in base namespace
@@ -1198,16 +1197,6 @@ topics=function(){
 }
 ```
 
-```{r br.attach.test, opts.label='purlme'}
-### this is just a test 
-br.attach.test=function() print("attach.test")
-store(br.attach.test)
-```
-```{r br.attach.test.2, opts.label='demofull'}
-### this is just a test 
-br.attach.test()
-```
-
 
 ```{r attach, opts.label='purlme'}
 ### Make visible br.* in bloomr env and base ns
@@ -1216,16 +1205,7 @@ rm(store)
 ```
 
 ```{r build, purl=FALSE, eval=FALSE, include=FALSE}
-require(knitr)
-require(rmarkdown)
 opts_chunk$set(tidy.opts=list(width.cutoff=60))
-#knit("bloomr.rmd")
-#purl("bloomr.rmd")
-#topics()
-#render("bloomr.md", html_document())
-#render("bloomr.md", pdf_document())
-#render("README.md", html_document())
-
 knit2=function(file){
     require(knitr); require(rmarkdown)
     fse=tools:::file_path_sans_ext(file)
@@ -1241,7 +1221,6 @@ knit2=function(file){
 knit2("bloomr.rmd")
  
 
-
 ## if with markdown lib, but topics needs rewrite
 ## shell("pandoc bloomr.md -o bloomr.pdf", shell=Sys.getenv("COMSPEC"))
 ## markdownToHTML("bloomr.md", "bloomr.html") 

bloomr.rmd

@@ -121,7 +121,7 @@ Currently the script is not in package form so, after downloading it,  just sour
     source('path\to\xlx.r')
 
 ```{r xlx.source, include=FALSE}
-    source('xlx.r')
+    source('xlx.R')
 ```