trades 0.1.3 → 0.2

data/lib/trades.rb

@@ -1,10 +1,10 @@
 require 'rubygems'
 require 'socket'
 require 'json'
+require 'colored'
 
 class Trades
   def initialize(args = [])
-<<<<<<< HEAD
     begin
       puts "Connecting..."
       @socket      = TCPSocket.open("bitcoincharts.com", 27007)
@@ -25,18 +25,6 @@ class Trades
   end
   
   def loop
-=======
-    @socket    = TCPSocket.open("bitcoincharts.com", 27007)
-    
-    # Convert the exchange names to lowercase
-    args.collect do |exchange|
-      exchange.downcase
-    end
-    
-    #     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
         j = JSON.parse(data.strip.tr("\x00", '')) # Delete all \x00 weirdness
@@ -46,7 +34,6 @@ class Trades
           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)
@@ -64,10 +51,6 @@ class Trades
           
           
           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.3
+  version: "0.2"
 platform: ruby
 authors: 
 - Waxjar
@@ -24,6 +24,17 @@ dependencies:
         version: 1.5.3
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: colored
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.2"
+  type: :runtime
+  version_requirements: *id002
 description: Displays the trades that Bitcoincharts monitors nicely
 email: 
 executables: