stockcruncher 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00734941064bb0a639312c8908fb983698df14f5ccfe50b5957c0631998d0da7'
-  data.tar.gz: 5e27da219578442b05ceebc79863d7e02048d1b97a13b5bd5fa6c8939e1fe2a4
+  metadata.gz: aff25a8077f9f28f5a5a82e91d1f7bc75bebc6c2f84a71b56bc40c003d2ed2fb
+  data.tar.gz: fd3e9d18afdc9b7a2a32353b2a1705e21873b6eec4e53ee1e78fb3adcb6f7456
 SHA512:
-  metadata.gz: 27ed506233c74a8690cb75e1e994f5ae639d55e281cd9adde3f2af9b96a675f7043d87395dfd42898af50b6759da7471352716bdd844f3a743ff3f1482ab4dae
-  data.tar.gz: 9780064a2b3928040b7acbababb3ba47f2b4ca115c750e8765a8d5bce48b7584c3542c87f2f996c31d81a62eb01676324254fd40c3db6778b9913b03599adbd6
+  metadata.gz: 39e33d26ee32fd116eaf6421149721a678ffbcbab220c9ffbe00e7e5138320ea5d46e557c62fbdfa201364939764f21568fc9df0e0c8321fc69cc82961c8a7d2
+  data.tar.gz: 121229b80af6b2945acd446dfd2dfa5313ba3f4afaa900c834e1c262c2aa1161808074aad04d6e4a96f40b757f5568a4a3d1c024f64189867b4d2d6b544b1969

data/.gitlab-ci.yml

@@ -1,9 +1,11 @@
+
 image: ruby:2.4
 
+before_script:
+  - bundle install
+
 rubocop:
   stage: test
-  before_script:
-    - gem install --silent rubocop
   script:
     - rubocop
 
@@ -25,7 +27,6 @@ git_history:
 rspec:
   stage: test
   script:
-    - bundle install
     - rspec
   artifacts:
     paths:

data/.rubocop.yml

@@ -4,3 +4,4 @@ AllCops:
   DisplayStyleGuide: true
   DisplayCopNames: false
   TargetRubyVersion: 2.4
+  NewCops: disable

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/alphavantage.rb

@@ -39,7 +39,7 @@ module StockCruncher
     # Main method to crunch data.
     def crunch_daily(symbol, fullsize)
       url = API_URL + parameters(symbol, 'TIME_SERIES_DAILY')
-      url += '&datatype=csv&outputsize=' + (fullsize ? 'full' : 'compact')
+      url += "&datatype=csv&outputsize=#{fullsize ? 'full' : 'compact'}"
       res = request(url)
       transform_daily(res.body)
     end
@@ -63,9 +63,9 @@ module StockCruncher
 
     # Set parameters of api call
     def parameters(symbol, serie)
-      p = 'function=' + serie
-      p += '&symbol=' + symbol
-      p += '&apikey=' + @config[self.class.name.split('::').last]['apikey']
+      p = "function=#{serie}"
+      p += "&symbol=#{symbol}"
+      p += "&apikey=#{@config[self.class.name.split('::').last]['apikey']}"
       p
     end
 
@@ -87,8 +87,7 @@ module StockCruncher
       raise StandardError, 'No data' if rawdata.match?(/Error Message/)
 
       values = prepare_daily_timeserie(rawdata)
-      values = calculate_missing_data(values)
-      values
+      calculate_missing_data(values)
     end
 
     # Method to transform quote result to hash

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,20 +71,29 @@ 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]',
          'Crunch SYMBOL stock market data for last day quote.')
     def quote(symbol)
       opts = options.dup
-      config = YAML.load_file(opts['config'])
+      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/config.rb

@@ -0,0 +1,40 @@
+#!/usr/bin/ruby
+# frozen_string_literal: true
+
+require 'yaml'
+
+module StockCruncher
+  # this is a module to load configuration file and environment variable
+  module Config
+    module_function
+
+    # Load config file and override with env variables
+    def load(file)
+      config = YAML.load_file(file)
+      overload_alphavantage(config)
+      overload_influxdb(config)
+    end
+
+    def overload(config, prefix, component, items)
+      items.each do |key|
+        var = "#{prefix}#{key.upcase}"
+        config[component][key] = ENV[var] unless ENV[var].nil?
+      end
+      config
+    end
+
+    def overload_alphavantage(config)
+      prefix = 'SCR_AV_'
+      component = 'AlphaVantage'
+      items = %w[apikey]
+      overload(config, prefix, component, items)
+    end
+
+    def overload_influxdb(config)
+      prefix = 'SCR_IDB_'
+      component = 'InfluxDB'
+      items = %w[scheme host port user password dbname]
+      overload(config, prefix, component, items)
+    end
+  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)
+    def moving_averages(symbol, fullsize, catchup)
       series = get_daily_values(symbol, fullsize)
+      mas = catchup ? get_ma_values(symbol, fullsize) : {}
       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)
+        write_moving_averages(tags, serie, weights, date) unless mas.key? date
         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
@@ -95,7 +106,7 @@ module StockCruncher
     def write(name, tags, values, date)
       url = "#{@cfg['scheme']}://#{@cfg['host']}:#{@cfg['port']}/write?" \
             "db=#{@cfg['dbname']}"
-      timestamp = DateTime.parse(date + 'T18:00:00').strftime('%s%N')
+      timestamp = DateTime.parse("#{date}T18:00:00").strftime('%s%N')
       body = "#{name},#{format_values(tags)} #{format_values(values)} " \
              "#{timestamp}"
       request(url, body)

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.0'
+  VERSION = '1.4.1'
 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')

data/stockcruncher.gemspec

@@ -8,7 +8,7 @@ dev_deps = {
   'bundler' => '~> 1.17',
   'rspec' => '~> 3.9',
   'rake' => '~> 11.3',
-  'rubocop' => '0.88',
+  'rubocop' => '0.90',
   'webmock' => '~> 2.0.3',
   'simplecov' => '~> 0.18'
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stockcruncher
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Richard Delaplace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.88'
+        version: '0.90'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.88'
+        version: '0.90'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +129,7 @@ files:
 - lib/stockcruncher.rb
 - lib/stockcruncher/alphavantage.rb
 - lib/stockcruncher/cli.rb
+- lib/stockcruncher/config.rb
 - lib/stockcruncher/cruncher.rb
 - lib/stockcruncher/influxdb.rb
 - lib/stockcruncher/stats.rb