bitstatus 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a82a1125e1a0cde29e8c8616c34c85a5eb352ec6
-  data.tar.gz: ac16c3b9d35eb2c5911bf065087f9274da0f2be1
+  metadata.gz: 0a2beda0435909a4104f4a78ba9cb3a9307a7183
+  data.tar.gz: a0455bc7028d92c3e3581201b607e22e6129ffbe
 SHA512:
-  metadata.gz: 17d0bf8872c2a8819efe0e64064acb883c7afa7533ac42049dbfbb3d769de383122ee232020641912af242ad03844a0e3927006a20c50773edf404bb55ce2a11
-  data.tar.gz: 74ed019675d545ffdf6ac04ed679eddcd6609adb42807a4b5b738e2c7ed8bf0e66c7203dcd2634ab795d7ae90051fc2be31d2d4bec22d4083c94a3e5b08403ee
+  metadata.gz: ca169e1e4dbaa4b62dde0ff655ef750518fb3a7800bd37a8a6b340484ce13d23c79e8d79db49cba2fa556d7c5151ace5841f5ec760f65dd73ce57fdfe5692fd4
+  data.tar.gz: 78265f941372659ea74ad62ba9ea5881862274c91bf8496075bd76b873602b08a0856ddbc84d670b567048688b0b3fb95e77d295872043780593f437be98572a

data/bin/bitstatus

@@ -7,6 +7,7 @@ require 'rufus-scheduler'
 require 'trollop'
 require 'colorize'
 require 'httparty'
+require 'macaddr'
 
 
   	opts = Trollop::options do
@@ -15,49 +16,64 @@ require 'httparty'
   	end
 
 
-	scheduler = Rufus::Scheduler.new
+	check_key = "http://localhost:4000/api/check/api/#{opts.api}"
+    response_check_key = HTTParty.get(check_key)
+    @key_response = JSON.parse(response_check_key.body)
 
-	scheduler.every(opts.refresh) do
-	  
-		begin
+    if @key_response['status'] == '200'
 
-			host = '127.0.0.1'
-			port = 4028
-			
-			socket = TCPSocket.open host, port
-			socket.puts "{\"command\":\"devs\"}\n"
-			resp = socket.readline
-			socket.close
-			
-			response = JSON.parse(resp.strip)
+    	unique_one = Mac.addr
+    	
+    	puts '[INFO]'.colorize(:blue) + ' API key is valid :)'
 
-			if response['DEVS'].nil?
-				puts '[WARNING]'.colorize(:yellow) + ' We are connected but no data is provided.'
-			else
+		scheduler = Rufus::Scheduler.new
+
+		scheduler.every(opts.refresh) do
+		  
+			begin
+
+				host = '127.0.0.1'
+				port = 4028
 				
-				response['DEVS'].each do |device|
+				socket = TCPSocket.open host, port
+				socket.puts "{\"command\":\"devs\"}\n"
+				resp = socket.readline
+				socket.close
+				
+				response = JSON.parse(resp.strip)
 
-					send_stat = "http://162.243.221.29/?api=#{opts.api}&name=#{device['Name']}&speed=#{device['MHS 5s'].to_f}&status=#{device['Status']}&temperature=#{device['Temperature']}&accepted=#{device['Accepted']}&rejected=#{device['Rejected']}&difficulty=#{device['Difficulty Accepted']}"
-            		response_send_stat = HTTParty.get(send_stat)
-            		@stats_response = JSON.parse(response_send_stat.body)
+				if response['DEVS'].nil?
+					puts '[WARNING]'.colorize(:yellow) + ' We are connected but no data is provided.'
+				else
+					
+					response['DEVS'].each do |device|
 
-            		if @stats_response['status']['blink'] == '200'
-            			puts '['.colorize(:green) + device['Name'].colorize(:green) + ']'.colorize(:green) + ' data saved.'
-            		else
-            		 	puts '['.colorize(:yellow) + device['Name'].colorize(:yellow) + ']'.colorize(:yellow) + ' data was not saved.'
-            		end
+						unique_two = [device['Name'], device['ID']].join
 
-				end
+						send_stat = "http://192.168.1.100:4000/api/save/?api=#{opts.api}&unique_one=#{unique_one}&unique_two=#{unique_two}&name=#{device['Name']}&speed=#{device['MHS 5s'].to_f}&status=#{device['Status']}&temperature=#{device['Temperature']}&accepted=#{device['Accepted']}&rejected=#{device['Rejected']}&difficulty=#{device['Difficulty Accepted']}"
+	            		response_send_stat = HTTParty.get(send_stat)
+	            		@stats_response = JSON.parse(response_send_stat.body)
 
-			end
+	            		if @stats_response['status'] == '200'
+	            			puts '['.colorize(:green) + device['Name'].colorize(:green) + ']'.colorize(:green) + ' data saved.'
+	            		else
+	            		 	puts '['.colorize(:yellow) + device['Name'].colorize(:yellow) + ']'.colorize(:yellow) + ' data was not saved.'
+	            		end
+
+					end
+
+				end
 
-		rescue Errno::ECONNREFUSED
-    		puts '[ERROR]'.colorize(:red) + ' Did you forget to start cgminer with --api-listen'
-  		end
+			rescue Errno::ECONNREFUSED
+	    		puts '[ERROR]'.colorize(:red) + ' Did you forget to start cgminer with --api-listen'
+	  		end
 
-	end
+		end
 
-	scheduler.join
+		scheduler.join
+    else
+    	puts '[ERROR]'.colorize(:red) + ' It seems like the API key is wrong :('
+    end
 
 
 

data/bitstatus.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "trollop"
   spec.add_dependency "colorize"
   spec.add_dependency "httparty"
+  spec.add_dependency "macaddr"
 end

data/lib/bitstatus/version.rb

@@ -1,3 +1,3 @@
 module Bitstatus
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitstatus
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Dan Vera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: macaddr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Now zerp it.
 email:
 - dan@yovu.co
@@ -131,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Data agent for Bitblock.