watchcow 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9be8072f67eb62cbc4b7cf1ba09f62d336121edd4190cf0cf8c90c5a72bda52
-  data.tar.gz: ff1d7c9ec0a90d00f591a097240192b2b971e6dbece3e8fea816a313f15551ae
+  metadata.gz: 99751f179eb4c15e3b19d81e778b8fb6c3c99e5582fb51ce0130aaa8ab436b8d
+  data.tar.gz: d78b9d8c59613ca84e186c5a2ff783fb68817fb32ec0aa2ff727a88b213f346a
 SHA512:
-  metadata.gz: 2f16346c204fe851b6d09c42c69e6fe38fb4a98bf29f2ba877650d17f72f6f477dbdd0d8732715b3a9d8488a44cc14a4e5cc353c88fd36a874641375391dcd8c
-  data.tar.gz: 8fd9836528fc159891f4889b964b5a5bfb3eeca1ed490fc62c5f2d9b0ce04fa6d928bb0a47ceda1745f2b6e580bd4aacf937a619650e37d5134534c2abf2e9e9
+  metadata.gz: 75ef29d231100e343af3879050df3945dafe1e30fab0a5dd9d5e998e4595144e963264d87585c238fb0916198d942f984612b01e610645f5da67c63ef33b2302
+  data.tar.gz: 18f09893ef9c952b124f79f119379c0a16bcb86b2b60e9a022b2ac0f61c49a202ddcf4f28ce6ba1743e824e8988171befbfb23640504f16aa5073896444ea8fd

data/.gitignore

@@ -6,6 +6,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-
+/lib/cow.rb
 # rspec failure tracking
 .rspec_status

data/lib/watchcow/client.rb

@@ -38,17 +38,15 @@ module Watchcow
         best_cw = cw.first
         best_nw = nw.first
         text = [best_nq, best_cq, best_nw, best_cw].each do |x|
-          t =
-            <<-CONTENT
-              #{x.dig('coin')}
-              remained: #{x.dig('days')}
-              annual margin: #{x.dig('margin')}%
-              expected margin: #{x.dig('expected_margin')}%
-              landed margin: #{x.dig('real_margin_expected')}%
-              first dm bid: #{x.dig('dm_first_bid')}
-              first spot bid: #{x.dig('spot_first_bid')}
-              
-            CONTENT
+        t =
+          <<-CONTENT
+            #{x.dig('coin')}, #{x.dig('days')} days left
+            annual margin: #{x.dig('margin')}%
+            landed margin: #{x.dig('real_margin_expected')}%
+            dm bid: #{x.dig('dm_first_bid')}, spot bid: #{x.dig('spot_first_bid')}
+            ---
+
+          CONTENT
           puts t
         end
       end

data/lib/watchcow/rate.rb

@@ -21,18 +21,18 @@ module Watchcow
               # puts dm_symbol.dig(:symbol)
               spot_result = Watchcow::MarketDepth.call(params: spot_symbol, k: :spot)
               # puts spot_symbol.dig(:symbol)
+              dm_result = JSON.parse dm_result
+              days_remain = self.days_remain_of(coin, t)
             rescue
               redo
             end
-            dm_result = JSON.parse dm_result
-            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
 
             real_margin_expect = (1.0 / spot_first_bid - 1.0 / dm_first_bid) * spot_first_bid * 100
-
             result = {
               coin: "#{coin}_#{t}",
               margin: margin_annual,
@@ -60,11 +60,10 @@ module Watchcow
       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
           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
+        contract_time = "#{line.dig("delivery_date").to_date.to_s} 16:00".in_time_zone('Asia/Chongqing').to_time
+        ((contract_time - Time.now.to_time) / 1.hours) / 24
       end
     end
   end

data/lib/watchcow/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watchcow
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.9
 platform: ruby
 authors:
 - DrinE Liu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty