universa 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff86a735f983f4cb94e6ca82be229c8c47749d975483fe52d11972a8664853d8
-  data.tar.gz: f1625ae689ba6bd1ff017c2a3926e16e3b6efcc71f90f7896b60ccce19839413
+  metadata.gz: f1f8f12f908c49ce5756071ab22a00025ebc80e302a88dbb19d791a2a2ee0af7
+  data.tar.gz: 0ebfdd822d9e54dff53e5476e14d0efb0efdc19eeecb0ccea7ac2b084f4e9871
 SHA512:
-  metadata.gz: fd4b45a562f5340511e659fb1019642599b74d431cdb5c8277a168e014ac1c085518798232d6c156de43377a3bdb3eec819ff935518bd107aef65726515f60db
-  data.tar.gz: 00a4544555433540ca9317ee4ce3bb7a090c649b5489809b364e79a36d784d4905f2af5b42534ade5b79b809ba19fe1d98a63ea784aff4cb19bf0aeb3af514ca
+  metadata.gz: 87571212aa8c01d333209a63a0d0357210a794990e9de3461849e6e7e4cca80bcdbcf94fcd026172c18e209018ce2ed2d97d2c384c67c9a8a6a5c4eefc1246f5
+  data.tar.gz: a01b21eea03a9512c36e06f59ca104bbc08a9df01fd1f4bf9bb47ecf2d0b8a4cf36c095afdd3db62fa1d7588e46541f880ed99a650d0f89a0d5b670b27a9ab35

data/exe/universa

@@ -2,8 +2,9 @@
 
 require "universa"
 
+puts "This tool is not uet available, sorry"
 
-puts "Checking prerequisites"
+# puts "Checking prerequisites"
 
-puts "Found UMI version: #{Universa::UMI.new.version}"
+# puts "Found UMI version: #{Universa::UMI.new.version}"
 

data/exe/utool

@@ -0,0 +1,86 @@
+#!/usr/bin/env ruby
+
+
+begin
+  $:.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
+  require 'universa'
+rescue LoadError => e
+  require 'universa'
+end
+
+require 'optparse'
+
+include Universa
+
+options = OpenStruct.new
+options.key_path = "~/.universa/test_access.private.unikey"
+options.key_password = nil
+
+opt_parser = OptionParser.new {|opts|
+  opts.banner = "Universa Node tool #{Universa::VERSION}"
+  opts.separator ""
+
+  opts.on("-k", "--key KEY_FILE",
+          "load the access key from the specified file. By default, looks in", "#{options.key_path}") do |file_name|
+    options.key_path = File.expand_path(file_name)
+  end
+
+  opts.on("-n", "--node name", "node to connect, without protocol, e.g. 'node-7-com.universa.io'") do |node|
+    options.node = node
+  end
+
+  opts.separator ""
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+
+  opts.on_tail("-v", "--version", "Show versions") do
+    puts "UNodeTool version: #{Universa::VERSION}"
+    puts "UMI version      : #{Service.umi.version}"
+    exit
+  end
+}
+
+def seconds_to_hms seconds
+  mm, ss = seconds.divmod(60)
+  hh, mm = mm.divmod(60)
+  "%d:%02d:%02d" % [hh, mm, ss]
+end
+
+
+opt_parser.parse!
+
+begin
+  node = options.node or raise "please specify node name with --node"
+  key = PrivateKey.from_packed(
+      open(File.expand_path options.key_path, 'rb').read,
+      password: options.key_password
+  ) rescue nil
+  raise "failed to load private key from #{options.key_path}" unless key
+  conn = Client.new(key)[node]
+  stats = conn.execute("getStats", showDays: 60)
+
+  puts
+  puts "--------------- UNIVERSA NODE ##{stats.nodeNumber} (#{conn.name}) REPORT : -------------------------"
+  puts
+  puts "Server uptime (since last restart): #{seconds_to_hms stats.uptime} (#{stats.uptime}\")"
+  puts "Active ledger records             : #{stats.ledgerSize}"
+  puts "Software version                  : #{stats.coreVersion}"
+  puts
+  stats.payments.each_slice(4) {|pss|
+    puts pss.map {|pdata| "#{pdata.date}: %4dU" % pdata.units}.join("\t")
+  }
+
+rescue RuntimeError
+  puts $!.message
+  puts "Try --help fo see usage information"
+rescue
+  p $!.class.name
+  $stderr.puts "Excetion: #{$!.message}"
+  $stderr.puts $!.backtrace.join("\n")
+  puts "\n\ntry --help"
+end
+
+
+# key = PrivateKey.from_packed

data/lib/universa/client.rb

@@ -70,6 +70,9 @@ module Universa
       @nodes.sample(count)
     end
 
+    def [] name
+      @nodes.find {|x| x.url =~ /#{name}/}
+    end
 
     private
 
@@ -143,6 +146,13 @@ module Universa
     def < other
       rate < other.rate
     end
+
+    def name
+      @name ||= begin
+        url =~ /^https{0,1}:\/\/([^:]*)/
+        $1
+      end
+    end
   end
 
 
@@ -211,6 +221,22 @@ module Universa
       connection.command name.to_s, *kwargs.to_a.flatten
     end
 
+    # def stats days=0
+    #   connection.getStats(days.to_i)
+    # end
+
+    def url
+      @node_info.url
+    end
+
+    def name
+      @node_info.name
+    end
+
+    def number
+      @node_info.number
+    end
+
     def to_s
       "Conn<#{@node_info.url}>"
     end
@@ -223,11 +249,13 @@ module Universa
 
     def connection
       @connection ||= retry_with_timeout(15, 3) {
-        Service.umi.instantiate "com.icodici.universa.node2.network.Client",
-                                @node_info.url,
-                                @client.private_key,
-                                nil,
-                                false
+        conn = Service.umi.instantiate("com.icodici.universa.node2.network.Client",
+                                       @node_info.url,
+                                       @client.private_key,
+                                       nil,
+                                       false)
+                   .getClient(@node_info.number - 1)
+        conn
       }
     end
 

data/lib/universa/version.rb

@@ -1,4 +1,4 @@
 module Universa
   # Current gem version
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universa
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-02 00:00:00.000000000 Z
+date: 2018-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: farcall
@@ -113,6 +113,7 @@ email:
 - real.sergeych@gmail.com
 executables:
 - universa
+- utool
 extensions: []
 extra_rdoc_files: []
 files:
@@ -152,6 +153,7 @@ files:
 - bin/umi/lib/org.typelevel.macro-compat_2.12-1.1.1.jar
 - bin/umi/lib/org.yaml.snakeyaml-1.18.jar
 - exe/universa
+- exe/utool
 - lib/universa.rb
 - lib/universa/binder.rb
 - lib/universa/chain_store.rb