zold 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1fe0556c59991b4873cb362661f1219a802045a
-  data.tar.gz: 9161e7ea2aaf095a0aef9786976e4945374eecae
+  metadata.gz: 7c40986afca66ce8e25fa3d5f541d08f86f1a8d7
+  data.tar.gz: f298fd1349836b966c67737f0be441d64d9f2d1f
 SHA512:
-  metadata.gz: 4c64ca5bcc066626a4284f1c7d2a862bf4cac4c0f2e47a1389d41627514f5f3a41051461c3a0d22bc65a443579af6db10884573d10dabc1422dd845e8ee85628
-  data.tar.gz: 4f84a775746b409d45e2c36f7c67afe9a8b6696ab8ba78a7afafa0e29c7aa265ad465d9563a9bce18a4dc0f5daf2e5018771a98a29bd3d3454c9aa6e0180ad70
+  metadata.gz: 5dccd8983578baaa765f8dcb05ec8db7bb6ea5682c05061a8f5419599494383a9ed8b83aa6097c433e0bcff01ca6bdd17d7d01e3c7c5190696849728510c8c5e
+  data.tar.gz: f42970b98d36f24bd10b3d249830f8b08b718b96e6a63ab4192b47ca08b299677f6095efce74df6efa61f98db1392dd085e55869f556e3c81bdd6b233e43c7b6

data/lib/zold/copies.rb

@@ -44,7 +44,7 @@ module Zold
       list = load
       list.reject! { |s| s[:time] < Time.now - 24 * 60 * 60 }
       save(list)
-      Dir.new(@dir).select { |f| f =~ /[0-9]+/ }.each do |f|
+      Dir.new(@dir).select { |f| f =~ /^[0-9]+$/ }.each do |f|
         File.delete(File.join(@dir, f)) if list.find { |s| s[:name] == f }.nil?
       end
     end
@@ -66,7 +66,7 @@ module Zold
       target = list.find { |s| File.read(File.join(@dir, s[:name])) == content }
       if target.nil?
         max = Dir.new(@dir)
-          .select { |f| f =~ /[0-9]+/ }
+          .select { |f| f =~ /^[0-9]+$/ }
           .map(&:to_i)
           .max
         max = 0 if max.nil?

data/lib/zold/id.rb

@@ -29,7 +29,7 @@ module Zold
       if id.nil?
         @id = rand(2**32..2**64 - 1)
       else
-        raise "Invalid wallet ID '#{id}'" unless id =~ /[0-9a-fA-F]{16}/
+        raise "Invalid wallet ID '#{id}'" unless id =~ /^[0-9a-fA-F]{16}$/
         @id = Integer("0x#{id}", 16)
       end
     end

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.9.8'.freeze
+  VERSION = '0.9.9'.freeze
 end

data/lib/zold/wallet.rb

@@ -57,13 +57,13 @@ module Zold
 
     def network
       n = lines[0].strip
-      raise "Invalid network name '#{n}'" unless n =~ /[a-z]{4,16}/
+      raise "Invalid network name '#{n}'" unless n =~ /^[a-z]{4,16}$/
       n
     end
 
     def version
       v = lines[1].strip
-      raise "Invalid version name '#{v}'" unless v =~ /[0-9]+(\.[0-9]+){1,2}/
+      raise "Invalid version name '#{v}'" unless v =~ /^[0-9]+(\.[0-9]+){1,2}$/
       v
     end
 
@@ -77,7 +77,7 @@ module Zold
 
     def init(id, pubkey, overwrite: false, network: 'test')
       raise "File '#{@file}' already exists" if File.exist?(@file) && !overwrite
-      raise "Invalid network name '#{network}'" unless network =~ /[a-z]{4,16}/
+      raise "Invalid network name '#{network}'" unless network =~ /^[a-z]{4,16}$/
       File.write(@file, "#{network}\n#{VERSION}\n#{id}\n#{pubkey.to_pub}\n\n")
     end
 

data/lib/zold/wallets.rb

@@ -50,7 +50,7 @@ module Zold
         file = File.join(@dir, f)
         File.file?(file) &&
           !File.directory?(file) &&
-          f =~ /[0-9a-fA-F]{16}/ &&
+          f =~ /^[0-9a-fA-F]{16}$/ &&
           Id.new(f).to_s == f
       end
     end

data/test/fake_home.rb

@@ -28,6 +28,7 @@ require_relative '../lib/zold/key'
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 class FakeHome
+  attr_reader :dir
   def initialize(dir = Dir.pwd)
     @dir = dir
   end

data/test/test_wallet.rb

@@ -19,7 +19,6 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
-require 'tmpdir'
 require_relative 'fake_home'
 require_relative '../lib/zold/key'
 require_relative '../lib/zold/id'

data/test/test_wallets.rb

@@ -19,7 +19,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
-require 'tmpdir'
+require_relative 'fake_home'
 require_relative '../lib/zold/key'
 require_relative '../lib/zold/id'
 require_relative '../lib/zold/wallets'
@@ -31,23 +31,23 @@ require_relative '../lib/zold/amount'
 # License:: MIT
 class TestWallets < Minitest::Test
   def test_adds_wallet
-    Dir.mktmpdir 'test' do |dir|
-      wallets = Zold::Wallets.new(dir)
+    FakeHome.new.run do |home|
+      wallets = home.wallets
       id = Zold::Id.new
       wallet = wallets.find(id)
       wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      assert(wallets.all.count == 1, "#{wallets.all.count} is not equal to 1")
+      assert_equal(1, wallets.all.count)
     end
   end
 
-  def test_lists_wallets
-    Dir.mktmpdir 'z1' do |dir|
-      wallets = Zold::Wallets.new(dir)
-      FileUtils.touch(File.join(dir, 'hello'))
+  def test_lists_wallets_and_ignores_garbage
+    FakeHome.new.run do |home|
+      wallets = home.wallets
+      FileUtils.touch(File.join(home.dir, '0xaaaaaaaaaaaaaaaaaaahello'))
       id = Zold::Id.new
       wallet = wallets.find(id)
       wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      assert(wallets.all.count == 1, "#{wallets.all.count} is not equal to 1")
+      assert_equal(1, wallets.all.count)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-27 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby