mpex 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75ca9aee6159266cfd7cc27d8fe3612f96a569cb
-  data.tar.gz: ffadf1b2a0830efc46e6977fbded6ef9759379d9
+  metadata.gz: 658fe66b10c2a22bcfa1eada43373cad3bd62f74
+  data.tar.gz: a99ab6a7c1cfcd058f4e4f6430c651286d8ea6d6
 SHA512:
-  metadata.gz: e7eb0911853927001842f53116f37c87c069d1f5054a02f0f4816934b3eca87d849f98fb5a8ccae06c609b36876fd31b5214d367a78aac2f5f10e1998cd337ea
-  data.tar.gz: 207037af4b69b56ad8cd536d1ebe06bd0cdd26e392062ce036d7ae2152a5e590ddaccd8832beba7ec4326486068b1e7a68980f6580da83cb8f561f1c5af38492
+  metadata.gz: cdfbe7c29b3622eb97223f26847b7ac06d1a012b7e9e91c5c2eb207287d3b2ea7463e75b96dc21c01a74ca955cba3d665fc5931c370e07af382e760fe47a31f1
+  data.tar.gz: 25cba8ee8577f4b39a51a0629467ff3f635e3e0f2c5b9f24f2561ce6ba860fe43ed86d4dd5a62f4992ba9ba652e0efaa87b9e80b6f08aabc2200f98974a16671

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mpex (0.4.6)
+    mpex (0.5.0)
       cri (~> 2.2)
       gpgme
       highline

data/lib/mpex/cli.rb

@@ -161,10 +161,25 @@ end
   end
 end
 
+@cmd.define_command do
+  name 'portfolio'
+  usage 'portfolio [options]'
+  summary ""
+
+  run do |opts, args|
+    mpex = Mpex::Mpex.new
+    mpex.send_plain('STATJSON', opts) do |stat|
+      mpex.portfolio(opts, JSON.parse(stat)) do |portfolio|
+        puts portfolio
+      end if stat
+    end
+  end
+end
+
 @cmd.define_command do
   name 'orderbook'
   usage 'orderbook [options]'
-  summary "show mpex orderbook"
+  summary "show MPEx orderbook"
 
   run do |opts, args|
     mpex = Mpex::Mpex.new

data/lib/mpex/irc.rb

@@ -48,6 +48,7 @@ module Mpex
     def send_encrypted(message, &block)
       res = Net::HTTP.post_form(URI.parse("http://dpaste.com/api/v1/"), { 'content' => "#{message}" })
       dpaste_url = res['Location']
+      puts "[IRC] Messaging #{ASSBOT}: !mp  #{dpaste_url}"
       @irc.msg(ASSBOT, "!mp " + dpaste_url)
 
       status = Timeout::timeout(TIMEOUT) {
@@ -60,6 +61,7 @@ module Mpex
         if @last_message
           answer = handle_assbot_incoming(@last_message[:message])
           if answer
+            puts "[IRC] #{ASSBOT} answered: #{@last_message[:message]}"
             @last_message = nil
             return answer
           end
@@ -75,6 +77,7 @@ module Mpex
     end
 
     def vwap(&block)
+      puts "[IRC] Messaging #{MPEXBOT}: $vwap"
       @irc.msg MPEXBOT, '$vwap'
 
       status = Timeout::timeout(TIMEOUT) {
@@ -83,6 +86,7 @@ module Mpex
     end
 
     def depth(&block)
+      puts "[IRC] Messaging #{MPEXBOT}: $depth"
       @irc.msg MPEXBOT, '$depth'
 
       status = Timeout::timeout(TIMEOUT) {
@@ -91,6 +95,7 @@ module Mpex
     end
 
     def list_proxies(&block)
+      puts "[IRC] Messaging #{MPEXBOT}: $proxies"
       @irc.msg MPEXBOT, '$proxies'
 
       status = Timeout::timeout(TIMEOUT) {
@@ -103,6 +108,7 @@ module Mpex
         if @last_message
           answer = @last_message[:message]
           if answer
+            puts "[IRC] #{MPEXBOT} answered: #{@last_message[:message]}"
             @last_message = nil
             return answer
           end
@@ -115,6 +121,7 @@ module Mpex
         if @last_message
           answer = handle_mpexbot_incoming(@last_message[:message])
           if answer
+            puts "[IRC] #{MPEXBOT} answered: #{@last_message[:message]}"
             @last_message = nil
             return answer
           end
@@ -123,10 +130,12 @@ module Mpex
     end
 
     def handle_mpexbot_incoming(msg)
-      if msg.start_with?("http://pastebin.com")
+      if msg.match(/http:\/\/pastebin\.com\/\d+/)
         id = URI.parse(msg).path[1..-1]
         uri = URI.parse("http://pastebin.com/raw.php?i=" + id)
         return Net::HTTP.get(uri)
+      elsif msg.start_with?("http://pastebin.com/raw.php")
+        return Net::HTTP.get(URI.parse(msg))
       end
     end
 

data/lib/mpex/mpex.rb

@@ -114,12 +114,14 @@ module Mpex
       orders_value
     end
 
-    def fetch_mpex_vwaps(url, &block)
+    def fetch_mpex_vwaps(url=nil, opts=nil, &block)
+      vwaps = ""
       if $IRC_LEAK && $IRC_LEAK.connected?
         $IRC_LEAK.vwap do |resp|
           vwaps = JSON.parse(resp)
         end
       else
+        url = url ? url : verify_opts_present(opts, [ :url ])[:url]
         vwaps_raw = Http.get(url, "/mpex-vwap.php")
         vwaps = JSON.parse(vwaps_raw)
       end
@@ -173,13 +175,26 @@ module Mpex
         vwap_valuation = holdings_value + orders_vwap_sum(stat, vwaps)
 
         portfolio = <<-PORTFOLIO
-          Your optimistic valuation: #{Converter.satoshi_to_btc(optimistic_value)}"
-          VWAP valuation: #{Converter.satoshi_to_btc(vwap_valuation)}
+Holdings:
+#{holdings_formatted(stat)}
+Totals:
+  Your optimistic valuation: #{Converter.satoshi_to_btc(optimistic_value)}"
+  VWAP valuation: #{Converter.satoshi_to_btc(vwap_valuation)}
         PORTFOLIO
         yield portfolio
       end
     end
 
+    def holdings_formatted(stat)
+      holdings = ""
+      stat["Holdings"].each do |h|
+        mpsic = h.keys.first
+        amount = mpsic == "CxBTC" ? Converter.satoshi_to_btc(h[h.keys.first]) : h[h.keys.first]
+        holdings = holdings + "  #{mpsic}: #{amount}\n" unless h.keys.first == "md5Checksum"
+      end
+      holdings
+    end
+
     def holdings_avg_value(stat, vwaps)
       # TODO improve!
       holdings_value = stat["Holdings"].map do |h|
@@ -188,7 +203,9 @@ module Mpex
         elsif h["S.MPOE"]
           h["S.MPOE"].to_i*vwaps["S.MPOE"]["1d"]["avg"].to_i
         elsif h["S.DICE"]
-          h["S.DICE"].to_i*vwaps["S.DICE"]["1d"]["avg"].to_i
+          h["S.DICE"].to_i*vwaps["S.BBET"]["1d"]["avg"].to_i
+        elsif h["S.BBET"]
+          h["S.BBET"].to_i*vwaps["S.BBET"]["1d"]["avg"].to_i
         else
           0
         end

data/lib/mpex/version.rb

@@ -1,3 +1,3 @@
 module Mpex
-  VERSION = "0.4.6"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mpex
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Fa Wuxi