trades 0.1.2 → 0.1.3

data/bin/trades

@@ -2,7 +2,6 @@
 
 require 'trades'
 
-
 begin
   Trades.new ARGV
 rescue SystemExit, Interrupt

data/lib/trades.rb

@@ -4,6 +4,28 @@ require 'json'
 
 class Trades
   def initialize(args = [])
+<<<<<<< HEAD
+    begin
+      puts "Connecting..."
+      @socket      = TCPSocket.open("bitcoincharts.com", 27007)
+      @exchanges   = []
+      @last_prices = {}
+
+      # Convert the exchange names to lowercase
+      args.each do |x| @exchanges.push(x.downcase) end
+      args.clear
+
+      #     thUSD          | 2011-06-27 23:00:55 | USD      | 17.05  | 0.5    |
+      puts "Exchange       | Date and time       | Currency | Price  | Volume |"
+      
+      self.loop
+    rescue
+      puts "Error: #{$!}"
+    end
+  end
+  
+  def loop
+=======
     @socket    = TCPSocket.open("bitcoincharts.com", 27007)
     
     # Convert the exchange names to lowercase
@@ -14,21 +36,38 @@ class Trades
     #     thUSD          | 2011-06-27 23:00:55 | USD      | 17.05  | 0.5    |
     puts "Exchange       | Date and time       | Currency | Price  | Volume |"
       
+>>>>>>> parent of b9f8509... Added colors to the output
     while data = @socket.gets do
       if data.length > 0
-        begin
-          j = JSON.parse(data.strip.tr("\x00", '')) # Delete all \x00
-        rescue
-          puts "Error: #{$!}\n #{data}"
-        end
+        j = JSON.parse(data.strip.tr("\x00", '')) # Delete all \x00 weirdness
     
-        if args.length == 0 or args.include?(j['symbol'].downcase) then
+        if @exchanges.empty? or @exchanges.include?(j['symbol'].downcase) then
           line  = j['symbol'].ljust(15) + "| "
           line += Time.at(j['timestamp']).strftime("%Y-%m-%d %H:%M:%S").\
           ljust(20)
           line += "| " + j['currency'].ljust(9) + "| "
+<<<<<<< HEAD
+          
+          # Coloring: Compare the current price and the last price
+          current_price = j['price'].round(2)
+          last_price    = @last_prices[j['symbol']].to_f # Its 0 on startup
+          
+          if current_price > last_price then
+            line += current_price.to_s.ljust(7).green
+          elsif current_price < last_price then
+            line += current_price.to_s.ljust(7).red
+          else
+            line += current_price.to_s.ljust(7)
+          end
+          
+          @last_prices[j['symbol']] = current_price
+          
+          
+          line += "| " + j['volume'].round(2).to_s.ljust(7) + "|"
+=======
           line += j['price'].round(2).to_s.ljust(7) + "| "
           line += j['volume'].round(2).to_s.ljust(7) + "|"
+>>>>>>> parent of b9f8509... Added colors to the output
     
           puts line
         end

metadata

@@ -2,7 +2,7 @@
 name: trades
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Waxjar
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 +02:00
+date: 2011-06-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency