blackbox 4.0.3 → 4.0.4

data/lib/blackbox.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'blackbox/version'
 require 'blackbox/crypto'
 require 'blackbox/string'

data/lib/blackbox/crypto.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'openssl'
 require 'base64'
 require 'chronic_duration'
@@ -41,7 +42,7 @@ module BB
         cipher.key = key
         if iv.nil?
           iv_len = ciphertext.slice!(0).unpack('C')[0]
-          cipher.iv = ciphertext.slice!(0..iv_len - 1) unless 0 == iv_len
+          cipher.iv = ciphertext.slice!(0..iv_len - 1) unless iv_len == 0
         else
           cipher.iv = iv
         end
@@ -127,9 +128,7 @@ module BB
           valid_until, op, *args = body.split("\x00")
           valid_until = valid_until.unpack('l<')[0]
           expired = Time.now.to_i > valid_until
-          if expired && !force
-            raise ArgumentError, "Token expired at #{Time.at(valid_until)} (#{ChronicDuration.output(Time.now.to_i - valid_until)} ago)"
-          end
+          raise ArgumentError, "Token expired at #{Time.at(valid_until)} (#{ChronicDuration.output(Time.now.to_i - valid_until)} ago)" if expired && !force
           { valid_until: valid_until,
             op: op,
             args: args,

data/lib/blackbox/gem.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'versionomy'
 module BB
   # Gem utilities.
@@ -59,7 +60,7 @@ module BB
         last_check_at = nil
         begin
           last_check_at = File.stat(statefile_path).mtime
-        rescue
+        rescue StandardError
           last_check_at = Time.at(0)
         end
 

data/lib/blackbox/hash.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module BB
   # Hash utilities.
   module Hash

data/lib/blackbox/number.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 require 'blackbox/hash'
 
 module BB
   # String utilities.
   module Number
     class << self
-      STORAGE_UNITS = %w(byte k M G T P E Z Y).freeze
+      STORAGE_UNITS = %w[byte k M G T P E Z Y].freeze
 
       ##
       # Formats the bytes in +number+ into a more understandable representation
@@ -46,7 +47,7 @@ module BB
       def to_human_size(number, args = {})
         begin
            Float(number)
-         rescue
+         rescue StandardError
            return nil
          end
 
@@ -77,7 +78,7 @@ module BB
                                               delimiter: delimiter).sub(/(#{escaped_separator})(\d*[1-9])?0+\z/, '\1\2').sub(/#{escaped_separator}\z/, '')
             storage_units_format.gsub(/%n/, formatted_number).gsub(/%u/, unit)
           end
-        rescue
+        rescue StandardError
           number
         end
       end
@@ -112,7 +113,7 @@ module BB
       def with_precision(number, args)
         begin
            Float(number)
-         rescue
+         rescue StandardError
            return nil
          end
 
@@ -127,7 +128,7 @@ module BB
           with_delimiter("%01.#{precision}f" % rounded_number,
                          separator: separator,
                          delimiter: delimiter)
-        rescue
+        rescue StandardError
           number
         end
       end
@@ -160,7 +161,7 @@ module BB
       def with_delimiter(number, args = {})
         begin
            Float(number)
-         rescue
+         rescue StandardError
            return nil
          end
         options = BB::Hash.symbolize_keys(args)
@@ -172,7 +173,7 @@ module BB
           parts = number.to_s.split('.')
           parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
           parts.join(separator)
-        rescue
+        rescue StandardError
           number
         end
       end

data/lib/blackbox/string.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module BB
   # String utilities.
   module String

data/lib/blackbox/unix.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
+
 require 'lolcat/lol'
-require 'thread'
 require 'open3'
 require 'pty'
 require 'rainbow/ext/string'
@@ -48,7 +48,7 @@ module BB
               i = 0
               loop do
                 break if @minispin_last_char_at == :end
-                if 0.23 > Time.now - @minispin_last_char_at || @minispin_disable
+                if Time.now - @minispin_last_char_at < 0.23 || @minispin_disable
                   sleep 0.1
                   next
                 end
@@ -91,10 +91,10 @@ module BB
               @tspin = nil
             end
           else
-            opts[:spinner].call(true) if opts[:spinner]
+            opts[:spinner]&.call(true)
             output, status = Open3.capture2e(line)
-            opts[:spinner].call(false) if opts[:spinner]
-            color = (status.exitstatus == 0) ? :green : :red
+            opts[:spinner]&.call(false)
+            color = status.exitstatus == 0 ? :green : :red
             if status.exitstatus != 0 || !opts[:quiet]
               puts "\n> ".color(color) + line.color(:black).bright
               puts output

data/lib/blackbox/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module BB
-  VERSION = '4.0.3'
+  VERSION = '4.0.4'
 end

data/spec/blackbox_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'blackbox/version'
 

data/spec/crypto_spec.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'blackbox/crypto'
 require 'base64'
 
-OPENSSL_CIPHERS = %w(aes-128-cbc aes-128-ecb aes-192-cbc aes-192-ecb aes-256-cbc) +
-                  %w(aes-256-ecb bf bf-cbc bf-cfb) +
-                  %w(bf-ecb bf-ofb cast cast-cbc cast5-cbc) +
-                  %w(cast5-cfb cast5-ecb cast5-ofb des des-cbc) +
-                  %w(des-cfb des-ecb des-ede des-ede-cbc des-ede-cfb) +
-                  %w(des-ede-ofb des-ede3 des-ede3-cbc des-ede3-cfb des-ede3-ofb) +
-                  %w(des-ofb des3 desx rc2 rc2-40-cbc) +
-                  %w(rc2-64-cbc rc2-cbc rc2-cfb rc2-ecb rc2-ofb) +
-                  %w(rc4 rc4-40)
+OPENSSL_CIPHERS = %w[aes-128-cbc aes-128-ecb aes-192-cbc aes-192-ecb aes-256-cbc] +
+                  %w[aes-256-ecb bf bf-cbc bf-cfb] +
+                  %w[bf-ecb bf-ofb cast cast-cbc cast5-cbc] +
+                  %w[cast5-cfb cast5-ecb cast5-ofb des des-cbc] +
+                  %w[des-cfb des-ecb des-ede des-ede-cbc des-ede-cfb] +
+                  %w[des-ede-ofb des-ede3 des-ede3-cbc des-ede3-cfb des-ede3-ofb] +
+                  %w[des-ofb des3 desx rc2 rc2-40-cbc] +
+                  %w[rc2-64-cbc rc2-cbc rc2-cfb rc2-ecb rc2-ofb] +
+                  %w[rc4 rc4-40]
 
 CIPHER_KEY_IV_SIZE = {
   'aes-128-cbc': [16, 16],
@@ -65,9 +66,9 @@ TEST_TEXT_LONG = '[LONG_TEST]' * 8192
 describe BB::Crypto do
   OPENSSL_CIPHERS.each do |cipher|
     describe cipher.to_s do
-      [[:encrypt, :decrypt],
-       [:encrypt_base64, :decrypt_base64],
-       [:encrypt_urlsafe_base64, :decrypt_urlsafe_base64]].each do |e|
+      [%i[encrypt decrypt],
+       %i[encrypt_base64 decrypt_base64],
+       %i[encrypt_urlsafe_base64 decrypt_urlsafe_base64]].each do |e|
         m_enc, m_dec = e
         describe "#{m_enc}, #{m_dec}" do
           it 'can decrypt what it encrypted (short string, random iv)' do
@@ -144,7 +145,7 @@ describe BB::Crypto do
     it 'decodes all elements of token payload as Strings' do
       v = subject.class.parse(subject.class.create('foo', ['a', 2, :c], 5, test_key), test_key)
       expect(v[:op]).to eq('foo')
-      expect(v[:args]).to eq(%w(a 2 c))
+      expect(v[:args]).to eq(%w[a 2 c])
       expect(v[:expired]).to eq(false)
     end
 

data/spec/gem_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'timecop'
 require 'blackbox/gem'
@@ -44,7 +45,6 @@ describe BB::Gem do
         expect(retval).to include(
           next_check_for_update: Time.parse('2015-10-22 00:00'),
           gem_latest_version: :unknown
-
         )
       end
     end

data/spec/hash_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'blackbox/hash'
 

data/spec/number_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'blackbox/number'
 

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 require 'simplecov'
 SimpleCov.start do
   add_filter '/spec/'
 end
 
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)

data/spec/string_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'blackbox/string'
 

data/spec/unix_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'blackbox/unix'
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: blackbox
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Moe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2018-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bump
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fuubar
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,61 +165,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gem_update_checker
+  name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.10.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.10.6
 - !ruby/object:Gem::Dependency
-  name: lolcat
+  name: gem_update_checker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 90.8.8
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 90.8.8
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: lolcat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 90.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 90.8.8
 - !ruby/object:Gem::Dependency
-  name: chronic_duration
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.6
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.6
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: versionomy
   requirement: !ruby/object:Gem::Requirement
@@ -380,7 +380,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Various little helpers
@@ -393,4 +393,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/string_spec.rb
 - spec/unix_spec.rb
-has_rdoc: