stockcruncher 1.3.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c5f9d2cc2dba8ad0fbd9882cebcda893500e0f029610107004481b0b236d6b9
-  data.tar.gz: 65815caea89d856ef4e4c76365df166bdb971302a95f6665d657c0ba6420e671
+  metadata.gz: 03dfe0d9f40c0b298cbe4c7d5f3d37683765ccb737b3a4d82ec75f6e04f46e06
+  data.tar.gz: e0da9a269671deb3400042cf87a7bfb39bf7b0842af91483d979d3c672c6c7a6
 SHA512:
-  metadata.gz: 19b7f5eafd15cbcc5713a6729e17c3a2ae5dd4c471f0d77c7becb4ba10be08c6c492f4469b7ab4a93858215a406d95fced52cde98cffd0644c081ce331b43e9a
-  data.tar.gz: c73d7c0caa396f0cf1b06f88f74e2e1cdbd0c7b7fa1739e4b72df4e5852b16e847a46d09071699db51bc6ed07a85e51766c8259221214d62e845ed15331bc980
+  metadata.gz: d858ff01048b66b048ec634519b9e19123e2b74204dc71826118e9c41fec707612e0424260b628fdc3a2e228366c1c1d7b2312bf8191beef0683f88ede20481d
+  data.tar.gz: 70fb3692a8d45ce7c292b89b551a0d78b11076b93a53caeefae4fc642d1f8ae2d50ebd09b43d6ec7cd59edf1117214aa7723a04bd96b958d866015f0479cd35d

data/README.md

@@ -5,12 +5,14 @@
 [![Gem Version][gem-img]][gem]
 
 1. [Overview](#overview)
-2. [Description](#role-description)
-3. [Setup](#setup)
-4. [Usage](#usage)
-5. [Limitations](#limitations)
-6. [Development](#development)
-7. [Miscellaneous](#miscellaneous)
+1. [Description](#description)
+1. [Setup](#setup)
+1. [Usage](#usage)
+1. [Environment variables](#environment-variables)
+1. [Examples](#examples)
+1. [Limitations](#limitations)
+1. [Development](#development)
+1. [Miscellaneous](#miscellaneous)
 
 ## Overview
 
@@ -41,6 +43,17 @@ An interactive help is available with:
 
     $ stockcruncher help [subcommand]
 
+## Environment variables
+
+Parameters in /etc/stockcruncher/stockcrunucher.yml can be overloaded with
+environment variables.
+Environment variables should match SCR_<COMPONENTID>_<ITEM>.
+Component ID are as follow.
+- AlphaVantage: AV
+- InfluxDB: IDB
+Items are upcase keys. See template /etc/stockcruncher/stockcrunucher.yml for
+reference.
+
 ## Examples
 
 To get daily time serie data of a symbol:
@@ -51,6 +64,10 @@ To get last day endpoint data of a symbol:
 
     $ stockcruncher quote AAPL
 
+To override a parameter with environment variable:
+
+    $ SCR_IDB_HOST=192.168.0.80; stockcruncher quote AAPL
+
 ## Limitations
 
 Data are currently scraped from AlphaVantage API.

data/lib/stockcruncher/cli.rb

@@ -45,12 +45,20 @@ module StockCruncher
       default: false,
       desc: 'Full data size.'
     )
+    option(
+      :catchup,
+      aliases: ['-u'],
+      type: :boolean,
+      default: false,
+      desc: 'Catch up the missing data only.'
+    )
     def daily(symbol)
       opts = options.dup
       config = YAML.load_file(opts['config'])
       cruncher = StockCruncher::AlphaVantage.new(config, opts['insecure'])
       data = cruncher.crunch_daily(symbol, opts['full'])
-      StockCruncher::InfluxDB.new(config).export_history(symbol, data)
+      influx = StockCruncher::InfluxDB.new(config)
+      influx.export_history(symbol, data, opts['catchup'])
       puts JSON.pretty_generate(data) unless opts['quiet']
     end
 
@@ -63,10 +71,18 @@ module StockCruncher
       default: false,
       desc: 'Recalculate all MA historical values.'
     )
+    option(
+      :catchup,
+      aliases: ['-u'],
+      type: :boolean,
+      default: false,
+      desc: 'Catch up the missing data only.'
+    )
     def movingaverages(symbol)
       opts = options.dup
       config = YAML.load_file(opts['config'])
-      StockCruncher::InfluxDB.new(config).moving_averages(symbol, opts['all'])
+      influx = StockCruncher::InfluxDB.new(config)
+      influx.moving_averages(symbol, opts['all'], opts['catchup'])
     end
 
     desc('quote SYMBOL [options]',
@@ -76,7 +92,8 @@ module StockCruncher
       config = StockCruncher::Config.load(opts['config'])
       cruncher = StockCruncher::AlphaVantage.new(config, opts['insecure'])
       data = cruncher.crunch_quote(symbol)
-      StockCruncher::InfluxDB.new(config).export_last_day(data)
+      influx = StockCruncher::InfluxDB.new(config)
+      influx.export_last_day(data)
       puts JSON.pretty_generate(data) unless opts['quiet']
     end
   end

data/lib/stockcruncher/influxdb.rb

@@ -20,15 +20,22 @@ module StockCruncher
       data['columns'].zip(data['values'].transpose).to_h
     end
 
+    def get_ma_values(symbol, fullsize)
+      values = %w[ema200]
+      data = query('ema', symbol, values, fullsize)
+      data['columns'].zip(data['values'].transpose).to_h
+    end
+
     # Method to calculate moving averages based on last day values
-    def moving_averages(symbol, fullsize)
-      series = get_daily_values(symbol, fullsize)
+    def moving_averages(symbol, fullsize, catchup)
+      data = get_daily_values(symbol, fullsize)
+      mas = catchup ? get_ma_values(symbol, fullsize) : { 'time' => [] }
       tags = create_tags(symbol)
-      series['close'].each_index do |i|
-        date = series['time'][i]
-        serie = series['close'][i, 201]
-        weights = series['volume'][i, 201]
-        write_moving_averages(tags, serie, weights, date)
+      dates, series, weights = data.values_at 'time', 'close', 'volume'
+      series.each_index do |i|
+        next if mas['time'].include? dates[i]
+
+        write_moving_averages(tags, series[i, 201], weights[i, 201], dates[i])
         break unless fullsize
       end
     end
@@ -39,8 +46,12 @@ module StockCruncher
     end
 
     # Method to export historical data to database
-    def export_history(symbol, timeseries)
+    def export_history(symbol, timeseries, catchup)
       tags = create_tags(symbol)
+      if catchup
+        series = get_daily_values(symbol, true)
+        series['time'].each { |date| timeseries.delete(date) }
+      end
       timeseries.each_pair do |date, values|
         write('daily', tags, values, date)
       end

data/lib/stockcruncher/stats.rb

@@ -48,7 +48,7 @@ module StockCruncher
       RANGES.each do |n|
         next if values.size < n
 
-        h["lwma#{n}"] = sma(values[0, n], volumes[0, n])
+        h["vwma#{n}"] = sma(values[0, n], volumes[0, n])
       end
       h
     end

data/lib/stockcruncher/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module StockCruncher
-  VERSION = '1.3.1'
+  VERSION = '1.4.2'
 end

data/spec/stockcruncher/cli_spec.rb

@@ -26,12 +26,24 @@ describe StockCruncher::CLI do # rubocop:disable Metrics/BlockLength
     end
   end
 
+  context 'daily SYM -u -c spec/files/stockcruncher.yml' do
+    it 'Get the daily time serie for SYM.' do
+      expect { start(self) }.to output(daily).to_stdout
+    end
+  end
+
   context 'movingaverages SYM -c spec/files/stockcruncher.yml' do
     it 'Get the daily time serie for SYM.' do
       expect { start(self) }.to output('').to_stdout
     end
   end
 
+  context 'movingaverages SYM -u -c spec/files/stockcruncher.yml' do
+    it 'Get the daily time serie for SYM.' do
+      expect { start(self) }.to output('').to_stdout
+    end
+  end
+
   context 'quote NODATA -c spec/files/stockcruncher.yml' do
     it 'Should not get any data and should fail.' do
       expect { start(self) }.to raise_error(SystemExit)

data/spec/stockcruncher/stubs/servers_stubs.rb

@@ -12,6 +12,10 @@ daily = "timestamp,open,high,low,close,volume\r\n2020-08-03,23.8500,24.6500," \
         "\n2020-07-29,24.7500,25.0300,24.0400,24.5600,4605804\r\n2020-07-28," \
         "25.9900,26.0700,24.5100,24.7500,6904261\r\n"
 d_err = "{\n    \"Error Message\": \"Invalid API call.\"\n}"
+i_ema = "q=SELECT ema200 FROM ema WHERE symbol = 'SYM' ORDER BY time DESC"
+maval = '{"results":[{"statement_id":0,"series":[{"name":"ema","columns":[' \
+        '"time","ema200"],"values":[["2017-' \
+        '03-01T18:00:00Z",1]]}]}]}'
 mvavg = '{"results":[{"statement_id":0,"series":[{"name":"daily","columns":[' \
         '"time","close","change","changePercent","volume"],"values":[["2017-' \
         '03-01T18:00:00Z",1,0,0,1],["2017-03-02T18:00:00Z",1,0,0,1],["2017-0' \
@@ -35,6 +39,9 @@ RSpec.configure do |config|
       'function=TIME_SERIES_DAILY&symbol=SYM&apikey=demo' \
       '&datatype=csv&outputsize=compact')
       .to_return('status' => 200, 'body' => daily, 'headers' => {})
+    stub_request(:post, 'http://localhost:8086/query?db=test')
+      .with(body: i_ema)
+      .to_return('status' => 204, 'body' => maval, 'headers' => {})
     stub_request(:post, 'http://localhost:8086/query?db=test')
       .to_return('status' => 204, 'body' => mvavg, 'headers' => {})
     stub_request(:post, 'http://localhost:8086/write?db=test')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stockcruncher
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Richard Delaplace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler