bitflyer-cli 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d792bae85c516c5a7261b17d75f8909c3c71a709
-  data.tar.gz: 9f0701681f4a4f0226f5a31d7ba5fc5b26d4a0d7
+  metadata.gz: 361b2441ac3dd18926a9058a98ba0c873ac4b121
+  data.tar.gz: 84f1630b3e802554db67297d6f43503b789c362d
 SHA512:
-  metadata.gz: 7f64ddb6fb092ad324ae520058ed9506363d29189069db095e154fb39f207d86869b4cf892cef53baedace99c3a557824d61272d9fa026b3af08269dd8bec0ac
-  data.tar.gz: 66439eaee46eb3ace89ddb23ba10de5c9d8cf4c4097e6edac534783695a6fb5bc29e06a42ce89d3cbbbbb0d3974dfdd2e1d71cd9c9bf6739131fe87999a55adb
+  metadata.gz: 2de2c18dc14311034f603ebf5680128ddca0e66f302807305cdef612fa957c0a55ec9421345a447e0efcd203f4de5331832be4e13276b80733cff33f9adbdf8a
+  data.tar.gz: ba346a5b99a94c78416ee4e504a1ed6806edcf8e45aa433c06953d77576bc474c01b65c6a6071caa644c523ff9065f102a6db89081fbc0da73f9348d205b9395

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bitflyer-cli (0.1.2)
+    bitflyer-cli (0.2.0)
       bitflyer (~> 0.1.0)
       colorize (~> 0.8.1)
       thor (~> 0.19.4)

data/bitflyer-cli.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'bitflyer-cli'
-  spec.version       = '0.1.2'
+  spec.version       = '0.2.0'
   spec.authors       = ['Yuji Ueki']
   spec.email         = ['unhappychoice@gmail.com']
 

data/lib/bitflyer/cli.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'bitflyer/cli/command/cancel_all_command'
 require 'bitflyer/cli/command/counter_trade_command'
 require 'bitflyer/cli/command/summary_command'
 require 'bitflyer/cli/command/order_by_best_command'
@@ -21,5 +22,10 @@ module Bitflyer
     def counter_trade
       CounterTradeCommand.new.run
     end
+
+    desc 'cancel_all', 'cancel all of orders'
+    def cancel_all
+      CancelAllCommand.new.run
+    end
   end
 end

data/lib/bitflyer/cli/authorization.rb

@@ -0,0 +1,9 @@
+module Authorization
+  def api_key
+    ENV['BITFLYER_API_KEY'] || puts('environment variable BITFLYER_API_KEY is not set')
+  end
+
+  def api_secret
+    ENV['BITFLYER_API_SECRET'] || puts('environment variable BITFLYER_API_SECRET is not set')
+  end
+end

data/lib/bitflyer/cli/command/cancel_all_command.rb

@@ -0,0 +1,9 @@
+require 'bitflyer/cli/has_http_client'
+
+class CancelAllCommand
+  include HasHTTPClient
+
+  def run
+    http_private_client.cancel_all_child_orders(product_code: 'FX_BTC_JPY')
+  end
+end

data/lib/bitflyer/cli/command/counter_trade_command.rb

@@ -1,15 +1,13 @@
-require 'bitflyer'
+require 'bitflyer/cli/has_http_client'
 
 class CounterTradeCommand
-  def initialize
-    @http_client = Bitflyer.http_private_client(api_key, api_secret)
-  end
+  include HasHTTPClient
 
   def run
-    position = Position.new(@http_client.positions)
+    position = Position.new(http_private_client.positions)
     size = position.size.abs
     type = position.size > 0 ? 'SELL' : 'BUY'
-    response = @http_client.send_child_order(
+    response = http_private_client.send_child_order(
         product_code: 'FX_BTC_JPY',
         child_order_type: 'MARKET',
         side: type,
@@ -21,14 +19,4 @@ class CounterTradeCommand
       puts "Clear position #{type} / #{size}"
     end
   end
-
-  private
-
-  def api_key
-    ENV['BITFLYER_API_KEY']
-  end
-
-  def api_secret
-    ENV['BITFLYER_API_SECRET']
-  end
 end

data/lib/bitflyer/cli/command/order_by_best_command.rb

@@ -1,10 +1,7 @@
-require 'bitflyer'
+require 'bitflyer/cli/has_http_client'
 
 class OrderByBestCommand
-  def initialize
-    @http_public_client = Bitflyer.http_public_client
-    @http_private_client = Bitflyer.http_private_client(api_key, api_secret)
-  end
+  include HasHTTPClient
 
   def run(options)
     amount = options.amount
@@ -15,30 +12,21 @@ class OrderByBestCommand
       return
     end
 
-    ticker = @http_public_client.ticker('FX_BTC_JPY')
+    ticker = http_public_client.ticker('FX_BTC_JPY')
     price = type == 'buy' ? ticker['best_bid'] : ticker['best_ask']
 
-    response = @http_private_client.send_child_order(
+    response = http_private_client.send_child_order(
         product_code: 'FX_BTC_JPY',
         child_order_type: 'LIMIT',
         side: type.upcase,
         price: price,
         size: amount
     )
+
     if response['child_order_acceptance_id'].nil?
       puts 'An error has occurred' + response.to_s
     else
       puts "An order is created #{type} / #{price} / #{amount}"
     end
   end
-
-  private
-
-  def api_key
-    ENV['BITFLYER_API_KEY']
-  end
-
-  def api_secret
-    ENV['BITFLYER_API_SECRET']
-  end
 end

data/lib/bitflyer/cli/command/summary_command.rb

@@ -1,16 +1,18 @@
-require 'bitflyer'
+require 'bitflyer/cli/has_http_client'
+require 'bitflyer/cli/has_realtime_client'
 require 'bitflyer/cli/ext/string'
 require 'bitflyer/cli/model/position'
 
 class SummaryCommand
+  include HasHTTPClient
+  include HasRealtimeClient
+
   BUFFER_SIZE = 30.freeze
 
   def initialize
     @current_price = 0.0
-    @http_clinet = Bitflyer.http_private_client(api_key, api_secret)
-    @realtime_client = Bitflyer.realtime_client
 
-    @realtime_client.executions_fx_btc_jpy = ->(message) {
+    realtime_client.executions_fx_btc_jpy = ->(message) {
       message.each { |m| @current_price = m['price'].to_f }
     }
 
@@ -30,7 +32,7 @@ class SummaryCommand
     while true
       print "\e[3F\e[0J"
       print "Current:  " + @current_price.to_i.to_s.split_by_comma
-      print "\nPosition: " + "#{@position.average} * #{@position.size}".to_s.split_by_comma
+      print "\nPosition: " + "#{@position.average} * #{@position.size.to_f}".to_s.split_by_comma
       print "\nSpread:   " + spread.to_s.split_by_comma.color_with_number(spread)
       print "\nBalance:  " + (@balance + profit).to_s.split_by_comma.ljust(15, ' ') + "(#{profit.to_s.split_by_comma.color_with_number(profit)})"
       sleep 0.1
@@ -39,17 +41,9 @@ class SummaryCommand
 
   private
 
-  def api_key
-    ENV['BITFLYER_API_KEY']
-  end
-
-  def api_secret
-    ENV['BITFLYER_API_SECRET']
-  end
-
   def update_balance
-    @position = Position.new(@http_clinet.positions)
-    @balance = @http_clinet.collateral['collateral'].to_i
+    @position = Position.new(http_private_client.positions)
+    @balance = http_private_client.collateral['collateral'].to_i
   end
 
   def profit

data/lib/bitflyer/cli/has_http_client.rb

@@ -0,0 +1,14 @@
+require 'bitflyer'
+require 'bitflyer/cli/authorization'
+
+module HasHTTPClient
+  include Authorization
+
+  def http_public_client
+    @http_public_client ||= Bitflyer.http_public_client
+  end
+
+  def http_private_client
+    @http_private_client ||= Bitflyer.http_private_client(api_key, api_secret)
+  end
+end

data/lib/bitflyer/cli/has_realtime_client.rb

@@ -0,0 +1,7 @@
+require 'bitflyer'
+
+module HasRealtimeClient
+  def realtime_client
+    @realtime_client ||= Bitflyer.realtime_client
+  end
+end

data/lib/bitflyer/cli/model/position.rb

@@ -1,11 +1,14 @@
+require 'bigdecimal'
+require 'bigdecimal/util'
+
 class Position
   def initialize(positions)
     @positions = positions
   end
 
   def profit(current_price)
-    @positions.inject(0.0) do |sum, position|
-      sum + (current_price - position['price'].to_f) * position['size'].to_f * (position['side'] == 'BUY' ? 1.0 : -1.0)
+    @positions.inject('0'.to_d) do |sum, position|
+      sum + (current_price - position['price'].to_s.to_d) * position['size'].to_s.to_d * coefficient(position)
     end
   end
 
@@ -14,12 +17,16 @@ class Position
   end
 
   def sum
-    @positions.inject(0.0) do |sum, position|
-      sum + position['price'].to_f * position['size'].to_f
-    end
+    @positions.inject('0'.to_d) { |sum, position| sum + position['price'].to_s.to_d * position['size'].to_s.to_d }
   end
 
   def size
-    @positions.inject(0.0) { |sum, position| sum + position['size'].to_f * (position['side'] == 'BUY' ? 1.0 : -1.0) }.round(5)
+    @positions.inject('0'.to_d) { |sum, position| sum + position['size'].to_s.to_d * coefficient(position) }
+  end
+
+  private
+
+  def coefficient(position)
+    position['side'] == 'BUY' ? 1.0 : -1.0
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitflyer-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuji Ueki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2017-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -111,10 +111,14 @@ files:
 - bitflyer-cli.gemspec
 - exe/bitflyer
 - lib/bitflyer/cli.rb
+- lib/bitflyer/cli/authorization.rb
+- lib/bitflyer/cli/command/cancel_all_command.rb
 - lib/bitflyer/cli/command/counter_trade_command.rb
 - lib/bitflyer/cli/command/order_by_best_command.rb
 - lib/bitflyer/cli/command/summary_command.rb
 - lib/bitflyer/cli/ext/string.rb
+- lib/bitflyer/cli/has_http_client.rb
+- lib/bitflyer/cli/has_realtime_client.rb
 - lib/bitflyer/cli/model/position.rb
 homepage: https://github.com/unhappychoice/bitflyer-cli
 licenses: