watchcow 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cda7d68cc1cb1ba53871ca1e4b2f1cdb3884daff8abfa148363395b44a18213d
-  data.tar.gz: 975be9a7765e07031eb6ca6d6acb7a287c53bbf22793c7b41fae0f1ed3c0e5a0
+  metadata.gz: f68067affe43ba8f13442ef5d8d26bf2b5a4baf441baeabea15ca35caee8abcc
+  data.tar.gz: 724b3b7c74be7ec4f3a760372b264f66fc23e6c1c9784d206c20a1fcaccdbf4f
 SHA512:
-  metadata.gz: 920372c2c7e02c94e15018a7b71baf1a607b81c249ad4ae79bd4fd77f9e470d4262ec0861f701922cf2d1ba62fd00e220503323e508ef62b6f867be43dbb3416
-  data.tar.gz: 3a9b4a02242835cd1afc3e9cf0c216c28bde4ba066a3434e32d352d69937a0b04815ef7cc4ee5bd8b601bb6fb39b88bbd399e87a3ec5f3215575dbc241107d5d
+  metadata.gz: 3c680b39a2544d5416edcde25deab194654b1cfe8d8ba2f7431712139032c9e4dd1c3ea2cbde691a72df0c1329d5dafcdca9baaaec61ce4e182cfce617c5e9d1
+  data.tar.gz: e0bf02ae041a6f187b37436525249ed7e786c0defa92e7de959d035cc9009176d4a4c99ef3144298880b3d15ab0dfcb9af30f6f63db103966d0d5f3d1a1cc55b

data/Gemfile

@@ -10,7 +10,7 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 
 gem "httparty", '0.14.0'
-gem 'redis', '~> 3.3.5'
-gem 'sidekiq', '5.2.9'
+# gem 'redis', '~> 3.3.5'
+# gem 'sidekiq', '5.2.9'
 gem 'pry-rails'
 gem 'activesupport', '~> 6.1', '>= 6.1.3.2'

data/Gemfile.lock

@@ -4,8 +4,6 @@ PATH
     watchcow (0.0.1)
       httparty (~> 0.14, >= 0.14.0)
       pry-rails (~> 0.3.9)
-      redis (~> 3.3, >= 3.3.5)
-      sidekiq (~> 5.2, >= 5.2.9)
 
 GEM
   remote: https://rubygems.org/
@@ -30,7 +28,6 @@ GEM
     rack-protection (2.0.4)
       rack
     rake (13.0.3)
-    redis (3.3.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -44,11 +41,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    sidekiq (5.2.9)
       connection_pool (~> 2.2, >= 2.2.2)
       rack (~> 2.0)
       rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 4.2)
 
 PLATFORMS
   x86_64-darwin-17

data/lib/watchcow.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require 'json'
-require "redis"
 require 'httparty'
 require "pry"
 require 'watchcow/client'

data/lib/watchcow/api_symbol.rb

@@ -6,7 +6,7 @@ module Watchcow
       end
 
       def dm_types
-        %w{nq cq}
+        %w{nq cq cw nw}
       end
     end
   end

data/lib/watchcow/client.rb

@@ -3,100 +3,23 @@ require 'watchcow/contract_info'
 require 'watchcow/market_depth'
 require 'active_support'
 require 'watchcow/rate'
-require 'watchcow/output'
-
-$redis = Redis.new(url: ENV["REDIS_URL"] || "redis://localhost:6379/0")
 
 module Watchcow
   class Client
     class << self
       def call
-        while true
-          results = Watchcow::Rate.call
-          best_cq = results[:cq_best]
-          best_nq = results[:nq_best]
-          mark! best_cq
-          # CQ
-          coin = best_cq.dig(:coin)
-          best_margin = "annual margin: #{best_cq.dig(:margin)}%"
-          days_remained = "days remained: #{best_cq.dig(:days)}"
-          expected_margin = "expected margin: #{best_cq.dig(:expected_margin)}%"
-          real_margin = "landed margin: #{best_cq.dig(:real_margin_expected)}%"
-          puts "---"
-          puts "CQ"
-          cq_string = "#{coin}, #{best_margin}, #{days_remained}, #{expected_margin}, #{real_margin}"
-          puts cq_string
-          # NQ
-          coin = best_nq.dig(:coin)
-          best_margin = "annual margin: #{best_nq.dig(:margin)}%"
-          days_remained = "days remained: #{best_nq.dig(:days)}"
-          expected_margin = "expected margin: #{best_nq.dig(:expected_margin)}%"
-          real_margin = "landed margin: #{best_nq.dig(:real_margin_expected)}%"
-          puts "NQ"
-          nq_string = "#{coin}, #{best_margin}, #{days_remained}, #{expected_margin}, #{real_margin}"
-          puts nq_string
-          puts "---"
-          Watchcow::Output.call("<p>#{cq_string}</p><p>#{nq_string}</p>")
-          sleep(30)
-        end
-      end
-
-      private
-      def mark! coin_offer
-        offer_margin = coin_offer.dig(:margin)
-        if better_than_best? offer_margin
-          key = Time.now.strftime('%m-%d')
-          set_redis coin_offer
-          if worth_notification?(offer_margin)
-            # TODO
-            # Trigger SMS notification
-          end
-        end
-      end
-
-      def set_redis coin_offer
-        coin_info_str = "#{coin_offer.dig(:coin)}, #{coin_offer.dig(:margin)}, #{coin_offer.dig(:days)}, record at #{Time.now.strftime('%m-%d %H:%M')}"
-        coin_attr = {coin: coin_offer.dig(:coin), margin: coin_offer.dig(:margin), days: coin_offer.dig(:days), record_at: Time.now.strftime('%Y-%m-%d %H:%M')}
-        best_margin_of_day = $redis.get('margin_of_day')
-        if best_margin.blank? || two_hous_past?
-          $redis.set('offer', coin_info_str)
-          $redis.set('coin', coin_attr.to_json)
-        end
-        if best_margin_of_day.blank? || coin_offer.dig(:margin).to_f - best_margin_of_day.to_f > 1
-          $redis.set('margin_of_day', coin_offer.dig(:margin))
-        end
-      end
-
-      def best_margin
-        key = $redis.get('margin_of_day')
-        if key.blank?
-          nil
-        else
-          key.to_f
-        end
-      end
-
-      def better_than_best? offer_margin
-        return true if best_margin.blank?
-        return true if best_margin > 30 && offer_margin > best_margin
-      end
-
-      def worth_notification? offer_margin
-        return true if best_margin > 30 && (offer_margin - best_margin) > 2
-      end
-
-      def two_hous_past?
-        (Time.now - last_time_records).ceil / 3600 >= 2
-      end
-
-      def last_time_records
-        key = $redis.get('coin')
-        if key.blank?
-          puts "redis 'coin' nothing returns"
-          return nil
-        else
-          JSON.parse(key).dig('record_at').to_datetime
-        end
+        results = Watchcow::Rate.call
+        cq_list = results[:cq_list]
+        nq_list = results[:nq_list]
+        nw_list = results[:nw_list]
+        cw_list = results[:cw_list]
+        results = {
+          cq_list: cq_list,
+          nq_list: nq_list,
+          nw_list: nw_list,
+          cw_list: cw_list
+        }
+        results.to_json
       end
     end
   end

data/lib/watchcow/output.rb

@@ -1,10 +1,10 @@
-module Watchcow
-  class Output
-    class << self
-      def call text
-        path = File.expand_path('~/', __FILE__)
-        File.open("#{path}/info.html", 'w+'){|f| f.write(text)}
-      end
-    end
-  end
-end
+# module Watchcow
+#   class Output
+#     class << self
+#       def call text
+#         path = File.expand_path('~/', __FILE__)
+#         File.open("#{path}/info.html", 'w+'){|f| f.write(text)}
+#       end
+#     end
+#   end
+# end

data/lib/watchcow/rate.rb

@@ -2,6 +2,12 @@ require 'active_support/core_ext'
 
 module Watchcow
   class Rate
+    KEYS = {
+      'cq' => 'quarter',
+      'nq' => 'next_quarter',
+      'nw' => 'next_week',
+      'cw' => 'this_week'
+    }
     class << self
       def call
         results = []
@@ -9,7 +15,6 @@ module Watchcow
           Watchcow::ApiSymbol.dm_types.each do |t|
             dm_symbol = {symbol: "#{coin}_#{t}"}
             spot_symbol = {symbol: "#{coin}usdt"}
-
             begin
               dm_result = Watchcow::MarketDepth.call(params: dm_symbol, k: :future)
               # puts dm_symbol.dig(:symbol)
@@ -22,7 +27,6 @@ module Watchcow
             days_remain = self.days_remain_of(coin, t)
             dm_first_bid = dm_result.dig('tick', 'bids')[0][0].to_f
             spot_first_bid = spot_result.dig('tick', 'bids')[0][0].to_f
-
             margin_annual = (((dm_first_bid - spot_first_bid) / spot_first_bid) / days_remain * 365 * 100).round(6)
             margin_expect = margin_annual / 365 * days_remain
 
@@ -40,17 +44,22 @@ module Watchcow
         end
         results_cq = results.select{|x| x[:coin].include?('cq')}
         results_nq = results.select{|x| x[:coin].include?('nq')}
+        results_cw = results.select{|x| x[:coin].include?('cw')}
+        results_nw = results.select{|x| x[:coin].include?('nw')}
         {
-          cq_best: results_cq.sort{|x,y| y[:expected_margin] <=> x[:expected_margin]}.first,
-          nq_best: results_nq.sort{|x,y| y[:expected_margin] <=> x[:expected_margin]}.first,
+          cq_list: results_cq.sort{|x,y| y[:expected_margin] <=> x[:expected_margin]},
+          nq_list: results_nq.sort{|x,y| y[:expected_margin] <=> x[:expected_margin]},
+          cw_list: results_cw.sort{|x,y| y[:expected_margin] <=> x[:expected_margin]},
+          nw_list: results_nw.sort{|x,y| y[:expected_margin] <=> x[:expected_margin]}
         }
       end
 
       def days_remain_of symbol, t
         @contract_info ||= Watchcow::ContractInfo.call
         line = @contract_info.dig('data').select do |h|
-          mark = t == 'cq' ? 'quarter' : 'next_quarter'
-          h.dig('symbol') == symbol.upcase && h.dig('contract_type') == mark
+          # mark = t == 'cq' ? 'quarter' : 'next_quarter'
+          # h.dig('symbol') == symbol.upcase && h.dig('contract_type') == mark
+          h.dig('symbol') == symbol.upcase && h.dig('contract_type') == KEYS[t]
         end.first
         (line.dig("delivery_date").to_s.to_date - Time.now.to_date).to_i
       end

data/lib/watchcow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Watchcow
-  VERSION = "0.0.3"
+  VERSION = "0.0.8"
 end

data/watchcow.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   # spec.add_dependency "example-gem", "~> 1.0"
 
   spec.add_dependency "httparty", '~> 0.14', ">= 0.14.0"
-  spec.add_dependency "redis", '~> 3.3', ">= 3.3.5"
-  spec.add_dependency "sidekiq", '~> 5.2', ">= 5.2.9"
+  # spec.add_dependency "redis", '~> 3.3', ">= 3.3.5"
+  # spec.add_dependency "sidekiq", '~> 5.2', ">= 5.2.9"
   spec.add_dependency "pry-rails", "~> 0.3.9"
 
   # For more information and examples about making a new gem, checkout our

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watchcow
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.8
 platform: ruby
 authors:
 - DrinE Liu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -30,46 +30,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.5
-- !ruby/object:Gem::Dependency
-  name: sidekiq
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.9
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +62,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/notification_worker.rb
 - lib/watchcow.rb
 - lib/watchcow/api_symbol.rb
 - lib/watchcow/client.rb
@@ -112,6 +71,9 @@ files:
 - lib/watchcow/rate.rb
 - lib/watchcow/version.rb
 - watchcow-0.0.2.gem
+- watchcow-0.0.3.gem
+- watchcow-0.0.4.gem
+- watchcow-0.0.5.gem
 - watchcow.gemspec
 homepage: https://rubygems.org/gems
 licenses:

data/lib/notification_worker.rb

@@ -1,11 +0,0 @@
-require 'sidekiq'
-require 'watchcow'
-
-class NotificationWorker
-
-  include Sidekiq::Worker
-
-  def perform
-    Watchcow::Client.call
-  end
-end