watchcow 0.0.4 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05b9a33fd36329da19cd035e61cedb67d0a8c9a63ce9a8e998a30bdcea23c9c9
-  data.tar.gz: 516806f9ca4e6126af51d61b4a840e9dfebe8db6b1e0a44cd6aec0c05730ed3f
+  metadata.gz: 6080cdde2570128036d8101431ed88182bea35c5020553350846b5967bc36333
+  data.tar.gz: e391557868cc31f20e3c0e5861320bdb9cd1820fe088a53b74e3ad326248aa4c
 SHA512:
-  metadata.gz: 57a3f624f1a633f42800cb2213250263e90fe3baf8f8a6a44cd1dd3da0969e78af2d7caa6248fbb543ec898baa4b4c5e22dfc0fcd27f002af51525a379e6b919
-  data.tar.gz: 56955671e47731937449fb358616c0742ffae81ca3b6b81ee468731be7a02194290973a35e44de818834a556b051e0b58263a41b79420ae619fe98820c5c57c0
+  metadata.gz: 613bb077941b9e46c84fd3eb54a67a2931419f4322235df80d24ef618ba9cc1d29ccbac1648ac6b96831476f2ed25e0cc48674a7c1c06fac1516d6ad43ab9da7
+  data.tar.gz: 9782590eafd22f4c783a405bb1389fdd88b2c1f5492f1159dda56bff5fe4fa9c2986f957a9620dc598a117a562b805525b24f3cdd6dcb0d2d0db03c6d43dd8fd

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 = "<p style='font-size: 46px;'>#{coin}</p><p style='font-size: 46px;'>#{best_margin}</p><p style='font-size: 46px;'>#{days_remained}</p><p style='font-size: 46px;'>#{expected_margin}</p><p style='font-size: 46px;'>#{real_margin}</p>"
-          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 = "<p style='font-size: 46px;'>#{coin}</p><p style='font-size: 46px;'>#{best_margin}</p><p style='font-size: 46px;'>#{days_remained}</p><p style='font-size: 46px;'>#{expected_margin}</p><p style='font-size: 46px;'>#{real_margin}</p>"
-          puts nq_string
-          puts "---"
-          Watchcow::Output.call("#{cq_string}---<br>---#{nq_string}")
-          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
 
@@ -34,23 +38,30 @@ module Watchcow
               days: days_remain,
               expected_margin: margin_expect,
               real_margin_expected: real_margin_expect
+              dm_first_bid: dm_first_bid,
+              spot_first_bid: spot_first_bid
             }
             results.push(result)
           end
         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.4"
+  VERSION = "0.0.9"
 end

data/watchcow.gemspec

@@ -29,10 +29,10 @@ 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
   # guide at: https://bundler.io/guides/creating_gem.html
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watchcow
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.9
 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,11 @@ 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-0.0.6.gem
+- watchcow-0.0.7.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