stockcruncher 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00734941064bb0a639312c8908fb983698df14f5ccfe50b5957c0631998d0da7'
-  data.tar.gz: 5e27da219578442b05ceebc79863d7e02048d1b97a13b5bd5fa6c8939e1fe2a4
+  metadata.gz: 6c5f9d2cc2dba8ad0fbd9882cebcda893500e0f029610107004481b0b236d6b9
+  data.tar.gz: 65815caea89d856ef4e4c76365df166bdb971302a95f6665d657c0ba6420e671
 SHA512:
-  metadata.gz: 27ed506233c74a8690cb75e1e994f5ae639d55e281cd9adde3f2af9b96a675f7043d87395dfd42898af50b6759da7471352716bdd844f3a743ff3f1482ab4dae
-  data.tar.gz: 9780064a2b3928040b7acbababb3ba47f2b4ca115c750e8765a8d5bce48b7584c3542c87f2f996c31d81a62eb01676324254fd40c3db6778b9913b03599adbd6
+  metadata.gz: 19b7f5eafd15cbcc5713a6729e17c3a2ae5dd4c471f0d77c7becb4ba10be08c6c492f4469b7ab4a93858215a406d95fced52cde98cffd0644c081ce331b43e9a
+  data.tar.gz: c73d7c0caa396f0cf1b06f88f74e2e1cdbd0c7b7fa1739e4b72df4e5852b16e847a46d09071699db51bc6ed07a85e51766c8259221214d62e845ed15331bc980

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/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

@@ -73,7 +73,7 @@ module StockCruncher
          '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)

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

@@ -95,7 +95,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/version.rb

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

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.3.1
 platform: ruby
 authors:
 - Richard Delaplace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2021-02-19 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