nanook 0.6.0 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96226472bd51f8f70ef9462fa26ddf6b6f16da85
-  data.tar.gz: 014690cf0466ed78b0aa95a92ad9dd2f15a7581b
+  metadata.gz: 38e4a248c6ea62d44a35964f3f06287cfead6987
+  data.tar.gz: 02eadb7cf364bcadddceec3983af2fce00ff669b
 SHA512:
-  metadata.gz: 5571c48e4ce49a3e75487d7632d51ed4b7b5edc5ccb3aed14e3c7e18f92cd18c582606e2152ea4eb21bca238a077068a48b12db1036a43043d924c29e112fff2
-  data.tar.gz: cf515b77fe27f4cb882a36a04b8c109943388cdcd33db3c34a018f586a7c41f8c0a8dc406a048048dcfad21edde62bbae6e468d0131efa96202990f45eb170f1
+  metadata.gz: 89a7f7be437584c723f121440d4c771805466a1d1447e1368d83a79e39d9048317dbf0f3d83b75121ec664a995ba19f8f331135322564bd146804b408a88d13b
+  data.tar.gz: 41d112321008ed82fb4c4be00cb1fe343c7bc385b25b240d1eb2ca7103fa1fc9496aa4a28548fde665dd239a4df4746e85410b31e609c83ea0379378529501a7

data/.circleci/config.yml

@@ -46,7 +46,7 @@ jobs:
           command: |
             mkdir /tmp/test-results
 
-            bundle exec rspec spec --format progress --out /tmp/test-results/rspec.xml
+            bundle exec rspec spec --format progress --format RspecJunitFormatter --out /tmp/test-results/rspec.xml
 
       # collect reports
       - store_test_results:

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanook (0.6.0)
+    nanook (0.6.3)
       symbolized
 
 GEM
@@ -28,6 +28,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
+    rspec_junit_formatter (0.3.0)
+      rspec-core (>= 2, < 4, != 2.12.0)
     safe_yaml (1.0.4)
     symbolized (0.0.1)
     webmock (3.3.0)
@@ -43,6 +45,7 @@ DEPENDENCIES
   nanook!
   rake (~> 10.0)
   rspec (~> 3.2)
+  rspec_junit_formatter
   webmock (~> 3.3)
 
 BUNDLED WITH

data/README.md

@@ -238,8 +238,12 @@ node.bootstrap(address: "::ffff:138.201.94.249", port: 7075)
 node.frontier_count
 node.peers
 node.representatives
-node.stop
+node.representatives
+node.sync_progress
+node.synced?
 node.version
+
+node.stop
 ```
 
 ### Work peers

data/lib/nanook.rb

@@ -1,21 +1,11 @@
 require 'net/http'
 require 'uri'
 
-require 'nanook/account'
-require 'nanook/block'
-require 'nanook/error'
-require 'nanook/key'
-require 'nanook/node'
-require 'nanook/rpc'
-require 'nanook/util'
-require 'nanook/version'
-require 'nanook/wallet_account'
-require 'nanook/wallet'
-require 'nanook/work_peer'
+Dir[File.dirname(__FILE__) + '/nanook/*.rb'].each {|file| require file }
 
 class Nanook
 
-  def initialize(uri=Nanook::Rpc::DEFAULT_URI, timeout:Nanook::Rpc::DEFAULT_URI)
+  def initialize(uri=Nanook::Rpc::DEFAULT_URI, timeout:Nanook::Rpc::DEFAULT_TIMEOUT)
     @rpc = Nanook::Rpc.new(uri, timeout: timeout)
   end
 

data/lib/nanook/block.rb

@@ -31,18 +31,14 @@ class Nanook
       if allow_unchecked
         # TODO not actually sure what this response looks like when it's not an unchecked block, assuming its blank
         response = rpc(:unchecked_get, :hash)
-        return response unless response[:error] == "Block not found"
+        if response[:error] != "Block not found"
+          return _parse_info_response(response )
+        end
         # Continue on falling backto checked block
       end
 
       response = rpc(:block, :hash)
-
-      # The contents is a stringified JSON
-      if response[:contents]
-        response[:contents] = JSON.parse(response[:contents])
-      end
-
-      response
+      _parse_info_response(response)
     end
 
     def is_valid_work?(work)
@@ -93,5 +89,13 @@ class Nanook
       end
     end
 
+    def _parse_info_response(response)
+      # The contents is a stringified JSON
+      if response[:contents]
+        response[:contents] = JSON.parse(response[:contents])
+      end
+      response
+    end
+
   end
 end

data/lib/nanook/node.rb

@@ -37,6 +37,20 @@ class Nanook
       rpc(:stop)
     end
 
+    def sync_progress
+      response = rpc(:block_count)
+
+      count = response[:count]
+      unchecked = response[:unchecked]
+      total =  count + unchecked
+
+      count.to_f * 100 / total.to_f
+    end
+
+    def synced?
+      rpc(:block_count)[:unchecked] == 0
+    end
+
     def version
       rpc(:version)
     end

data/lib/nanook/rpc.rb

@@ -1,8 +1,6 @@
 require 'json'
 require 'symbolized'
 
-require 'nanook/error'
-
 class Nanook
   class Rpc
 

data/lib/nanook/version.rb

@@ -1,3 +1,3 @@
 class Nanook
-  VERSION = "0.6.0"
+  VERSION = "0.6.3"
 end

data/nanook.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.2"
+  spec.add_development_dependency "rspec_junit_formatter"
   spec.add_development_dependency "webmock", "~> 3.3"
 
   spec.add_dependency "symbolized"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanook
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.3
 platform: ruby
 authors:
 - Luke Duncalfe
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  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: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +104,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt