mpex 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72e8bc083ff85a07ca6c3196ce6a4f07061e1b3f
-  data.tar.gz: 1f1e0bcd7ff4bbe9be52d98848008d9ed31ce9ae
+  metadata.gz: 75ca9aee6159266cfd7cc27d8fe3612f96a569cb
+  data.tar.gz: ffadf1b2a0830efc46e6977fbded6ef9759379d9
 SHA512:
-  metadata.gz: 3dfd156f30219fdb74f0464790b0b75854ba65c89c92b52644cb8b8ce776da3eda5d30c453ecb174650d80d92e02f45d0d63a4f6287ecb2f2cc711712430b54e
-  data.tar.gz: b10ee61363289b05e13153ce040a8650432e8d3e31a66eff0367113ff62c0a2d7f87c32bf2fc6baba05cba8e989706c0f8cced2fd5a3d0cfe1fec60542ca82cd
+  metadata.gz: e7eb0911853927001842f53116f37c87c069d1f5054a02f0f4816934b3eca87d849f98fb5a8ccae06c609b36876fd31b5214d367a78aac2f5f10e1998cd337ea
+  data.tar.gz: 207037af4b69b56ad8cd536d1ebe06bd0cdd26e392062ce036d7ae2152a5e590ddaccd8832beba7ec4326486068b1e7a68980f6580da83cb8f561f1c5af38492

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mpex (0.4.2)
+    mpex (0.4.6)
       cri (~> 2.2)
       gpgme
       highline
@@ -27,6 +27,7 @@ GEM
     highline (1.6.15)
     json (1.7.6)
     net-yail (1.6.1)
+    rake (10.0.3)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
 
@@ -36,4 +37,5 @@ PLATFORMS
 DEPENDENCIES
   cucumber
   mpex!
+  rake
   rspec-expectations

data/README.md

@@ -1,8 +1,8 @@
-# Commandline Client for MPEx
+# MPEx.rb: a commandline client for MPEx
 
 ## About
 
-Commandline client for [MPEx](http://mpex.co), a Bitcoin security exchange. Make sure to carefully read its [FAQ](http://mpex.co/faq.html) before using it.
+MPEx.rb is a commandline client for [MPEx](http://mpex.co), a Bitcoin security exchange. Make sure to carefully read its [FAQ](http://mpex.co/faq.html) before using it.
 
 ## Install
 

data/Rakefile

@@ -2,6 +2,9 @@ require "bundler/gem_tasks"
 require 'cucumber'
 require 'cucumber/rake/task'
 
+desc "Build and Test"
+task :default => [:build, :test]
+
 Cucumber::Rake::Task.new(:test) do |t|
   t.cucumber_opts = "features --format pretty"
 end

data/lib/mpex.rb

@@ -1,4 +1,5 @@
 require "mpex/version"
+require "mpex/http"
 require "mpex/mpex"
 require "mpex/converter"
 

data/lib/mpex/cli.rb

@@ -185,6 +185,20 @@ end
   end
 end
 
+@cmd.define_command do
+  name 'proxies'
+  usage 'proxies [options]'
+  summary 'list active MPEx proxies; only works when connected to IRC'
+
+  run do |opts, args|
+    mpex = Mpex::Mpex.new
+    mpex.list_proxies do |proxies|
+      puts proxies
+      puts "To use a proxy, edit ~/.mpex/config.yaml and restart mpex cli"
+    end
+  end
+end
+
 def self.run(args)
   @cmd.run(ARGV)
 end

data/lib/mpex/http.rb

@@ -0,0 +1,41 @@
+require 'open-uri'
+require 'net/http'
+
+module Mpex
+  class Http
+
+    def self.post_form(url, params)
+      begin
+        res = Net::HTTP.post_form(mpex_uri(url), params)
+        return res.body.to_s
+      rescue Exception => ex
+        suggest_proxies
+        raise ex
+      end
+    end
+
+    def self.get(url, url_extension="")
+      begin
+        uri = mpex_uri(url).merge(url_extension)
+        return Net::HTTP.get(uri)
+      rescue Exception => ex
+        suggest_proxies
+        raise ex
+      end
+    end
+
+    private
+    def self.suggest_proxies
+      puts "----------"
+      say("<%= color('MPEx proxy maybe not reachable.', :red) %>")
+      puts "Try a different one or IRC bots.\nType 'irc' to connect to IRC."
+      puts "When you're connected you can use mpex via irc bots or find out about alternative proxies via 'proxies'"
+      puts "----------"
+    end
+
+    def self.mpex_uri(url)
+      URI.parse(url).merge("/")
+    end
+
+  end
+end

data/lib/mpex/irc.rb

@@ -90,6 +90,26 @@ module Mpex
       }
     end
 
+    def list_proxies(&block)
+      @irc.msg MPEXBOT, '$proxies'
+
+      status = Timeout::timeout(TIMEOUT) {
+        yield wait_for_mpexbot_plain_message
+      }
+    end
+
+    def wait_for_mpexbot_plain_message
+      while true
+        if @last_message
+          answer = @last_message[:message]
+          if answer
+            @last_message = nil
+            return answer
+          end
+        end
+      end
+    end
+
     def wait_for_mpexbot_message
       while true
         if @last_message

data/lib/mpex/mpex.rb

@@ -1,6 +1,4 @@
 require 'fileutils'
-require 'open-uri'
-require 'net/http'
 require 'json'
 require 'yaml'
 require 'highline/import'
@@ -68,8 +66,8 @@ module Mpex
           end
         end
       else
-        res = Net::HTTP.post_form(mpex_uri(opts[:url]), { 'msg' => "#{encrypted_msg}" })
-        yield handle_answer(res.body, opts)
+        res = Http.post_form(opts[:url], { 'msg' => "#{encrypted_msg}" })
+        yield handle_answer(res, opts)
       end
     end
 
@@ -82,10 +80,6 @@ module Mpex
       verified_response.to_s
     end
 
-    def mpex_uri(url)
-      URI.parse(url).merge("/")
-    end
-
     def validate_mpsic(mpsic)
       if mpsic.match(/^\w\./)
         return mpsic
@@ -126,8 +120,8 @@ module Mpex
           vwaps = JSON.parse(resp)
         end
       else
-        vwap_url = mpex_uri(url).merge("/mpex-vwap.php")
-        vwaps = JSON.parse(Net::HTTP.get(vwap_url))
+        vwaps_raw = Http.get(url, "/mpex-vwap.php")
+        vwaps = JSON.parse(vwaps_raw)
       end
       yield vwaps
     end
@@ -140,8 +134,7 @@ module Mpex
         end
       else
         opts = verify_opts_present(opts, [ :url ])
-        orderbook_url = mpex_uri(opts[:url]).merge("/mpex-mktdepth.php")
-        orderbook_res = Net::HTTP.get(orderbook_url)
+        orderbook_res = Http.get(opts[:url], "/mpex-mktdepth.php")
         orderbook_res = orderbook_res.start_with?("JurovP") ? orderbook_res.match(/JurovP\((.+)\)/)[1] : orderbook_res
         orderbook = JSON.parse(orderbook_res)
       end
@@ -156,6 +149,16 @@ module Mpex
       end
     end
 
+    def list_proxies(&block)
+      if $IRC_LEAK && $IRC_LEAK.connected?
+        $IRC_LEAK.list_proxies do |proxies|
+          yield proxies
+        end
+      else
+        puts "This command only works when connected to irc. Type 'irc' to connect."
+      end
+    end
+
     def portfolio(opts, stat, &block)
 
       return unless stat

data/lib/mpex/version.rb

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

data/mpex.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Fa Wuxi"]
   s.email       = [""]
   s.homepage    = "https://github.com/fawuxi/mpex"
-  s.summary     = %q{Commandline Client for MPEx}
-  s.description = %q{Commandline client for "MPEx":http://mpex.co a Bitcoin security exchange. Make sure to carefully read its "FAQ":http://mpex.co/faq.html before using it.}
+  s.summary     = %q{MPEx.rb: a commandline client for MPEx}
+  s.description = %q{MPEx.rb is a commandline client for "MPEx":http://mpex.co a Bitcoin security exchange. Make sure to carefully read its "FAQ":http://mpex.co/faq.html before using it.}
 
   s.files         = Dir['[A-Z]*'] + Dir['{bin,lib,tasks,test}/**/*'] + [ 'mpex.gemspec' ]
   s.extra_rdoc_files = ['README.md']
@@ -23,11 +23,12 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "gpgme"
   s.add_runtime_dependency "net-yail"
 
+  s.add_development_dependency "rake"
   s.add_development_dependency "cucumber"
   s.add_development_dependency "rspec-expectations"
 
   s.post_install_message = %q{------------------------------------------------------------------------------
-run "mpex help" for usage information
+run "mpex help" for usage information; or "mpex -i" to start interactive
 ------------------------------------------------------------------------------
 }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mpex
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Fa Wuxi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -108,8 +122,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Commandline client for "MPEx":http://mpex.co a Bitcoin security exchange.
-  Make sure to carefully read its "FAQ":http://mpex.co/faq.html before using it.
+description: MPEx.rb is a commandline client for "MPEx":http://mpex.co a Bitcoin security
+  exchange. Make sure to carefully read its "FAQ":http://mpex.co/faq.html before using
+  it.
 email:
 - ''
 executables:
@@ -126,6 +141,7 @@ files:
 - bin/mpex
 - lib/mpex/cli.rb
 - lib/mpex/converter.rb
+- lib/mpex/http.rb
 - lib/mpex/interactive.rb
 - lib/mpex/irc.rb
 - lib/mpex/mpex.rb
@@ -137,7 +153,7 @@ licenses: []
 metadata: {}
 post_install_message: |
   ------------------------------------------------------------------------------
-  run "mpex help" for usage information
+  run "mpex help" for usage information; or "mpex -i" to start interactive
   ------------------------------------------------------------------------------
 rdoc_options:
 - --main
@@ -159,5 +175,5 @@ rubyforge_project:
 rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
-summary: Commandline Client for MPEx
+summary: 'MPEx.rb: a commandline client for MPEx'
 test_files: []