lowered-expectations 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5598c5def9d9ab355cb246c5c80823c222c3209d
-  data.tar.gz: 9c5c91fa08a995dc767d295ae281e9dc8cbcb3ae
+  metadata.gz: 2fd98bbb73967a109a601bfead6bcbe8f3431646
+  data.tar.gz: cc882dfd03ebec15f64e7b1ad7e50d7d1e12c353
 SHA512:
-  metadata.gz: 05321eb404425a6ce9858a6b11e4f8b0db99abad15a5aca106c6d181a26de3d83357c82ebb6c7a63e01d8bbaa7f3047c73e16bdfa1808b99e9caa031f2922536
-  data.tar.gz: e29aa87ce0365b2f6312a085a3ccbb08d1741cc38a6cac94293046d920ce9879d8c970cf777332096573f049a391e665e73cc5d11af55cf172bcf0e76830e6d5
+  metadata.gz: 8546cbb024fa93345bf7a258368dc957184ef4cce5ea02730c87a804a64ff1dd3bf316402831b094409b52c2b25af59d377033a82134252a67363971ae02d72b
+  data.tar.gz: 1cace52623498e077b6ac55c6d5980d7e886d3b73e151c5b81e88dda708f2557e517729d514b64768d170a46ba3ef7a2bc41371137d4ae61336ac9f3ba9f299b

data/.rubocop.yml

@@ -29,7 +29,7 @@ DeprecatedClassMethods:
 
 # Offense count: 19
 # Cop supports --auto-correct.
-DeprecatedHashMethods:
+Style/PreferredHashMethods:
   Enabled: false
 
 Documentation:
@@ -145,10 +145,10 @@ StringLiterals:
   - double_quotes
 
 # disabling a bunch of style linters
-Lint/BlockAlignment:
+Layout/BlockAlignment:
   Enabled: false
 
-Lint/EndAlignment:
+Layout/EndAlignment:
   Enabled: false
 
 Lint/Loop:
@@ -158,19 +158,22 @@ Lint/Void:
   Exclude:
     - dashboard/spec/**/*
 
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   Enabled: false
 
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Enabled: false
 
-Style/AlignArray:
+Layout/AlignArray:
   Enabled: false
 
-Style/AlignHash:
+Layout/AlignHash:
   Enabled: false
 
-Style/AlignParameters:
+Layout/AlignParameters:
+  Enabled: false
+
+Metrics/BlockLength:
   Enabled: false
 
 Metrics/BlockNesting:
@@ -179,7 +182,7 @@ Metrics/BlockNesting:
 Style/BracesAroundHashParameters:
   Enabled: false
 
-Style/CaseIndentation:
+Layout/CaseIndentation:
   Enabled: false
 
 Style/CollectionMethods:
@@ -188,25 +191,25 @@ Style/CollectionMethods:
 Style/CommentAnnotation:
   Enabled: false
 
-Style/CommentIndentation:
+Layout/CommentIndentation:
   Enabled: false
 
 Style/DefWithParentheses:
   Enabled: false
 
-Style/DotPosition:
+Layout/DotPosition:
   Enabled: false
 
 Style/EachWithObject:
   Enabled: false
 
-Style/EmptyLineBetweenDefs:
+Layout/EmptyLineBetweenDefs:
   Enabled: false
 
-Style/EmptyLines:
+Layout/EmptyLines:
   Enabled: false
 
-Style/EmptyLinesAroundAccessModifier:
+Layout/EmptyLinesAroundAccessModifier:
   Enabled: false
 
 Style/FrozenStringLiteralComment:
@@ -221,7 +224,7 @@ Style/HashSyntax:
 Style/IfUnlessModifier:
   Enabled: false
 
-Style/IndentationWidth:
+Layout/IndentationWidth:
   Enabled: false
 
 Style/Lambda:
@@ -230,7 +233,7 @@ Style/Lambda:
 Style/MultilineBlockChain:
   Enabled: false
 
-Style/MethodCallParentheses:
+Style/MethodCallWithoutArgsParentheses:
   Enabled: false
 
 Style/MultilineIfThen:
@@ -245,7 +248,7 @@ Style/MultilineTernaryOperator:
 Style/NilComparison:
   Enabled: false
 
-Style/PredicateName:
+Naming/PredicateName:
   Enabled: false
 
 Style/RaiseArgs:
@@ -263,22 +266,19 @@ Style/RegexpLiteral:
 Style/SingleLineMethods:
   Enabled: false
 
-Style/SpaceAfterComma:
+Layout/SpaceAfterComma:
   Enabled: false
 
-Style/SpaceAfterNot:
+Layout/SpaceAfterNot:
   Enabled: false
 
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: false
 
-Style/SpaceInsideBrackets:
+Layout/SpaceInsideParens:
   Enabled: false
 
-Style/SpaceInsideParens:
-  Enabled: false
-
-Style/TrailingBlankLines:
+Layout/TrailingBlankLines:
   Enabled: false
 
 Style/TrivialAccessors:
@@ -290,6 +290,14 @@ Style/WhileUntilDo:
 Style/WhileUntilModifier:
   Enabled: false
 
+Layout/IndentHeredoc:
+  Enabled: false
+
+Layout/ClosingHeredocIndentation:
+  Enabled: false
+
+Naming/HeredocDelimiterNaming:
+  Enabled: false
 
 # Things that are off but we should turn on eventually
 

data/.travis.yml

@@ -1,6 +1,10 @@
 language: ruby
 rvm:
-- 2.0.0
-- 2.1.1
-- 2.2.0
+- 2.0
+- 2.1
+- 2.2
+- 2.3
+- 2.4
+- 2.5
+- 2.6
 - ruby-head

data/Gemfile

@@ -7,6 +7,6 @@ group :development, :test do
   gem "rake", "~> 10.4"
   gem "rspec", "~> 3.0"
   gem "rspec-mocks", "~> 3.0"
-  gem "rubocop", "~> 0.36"
+  gem "rubocop", "~> 0.49"
   gem "rubygems-tasks", "~> 0.2"
 end

data/README.md

@@ -33,10 +33,6 @@ The following errors can be raised when using this Gem:
 
 I'm using Travis CI to build and test on every push to the public github repository. You can find the Travis CI page for this project here: https://travis-ci.org/ianchesal/loweredexpectations/
 
-### Branching in Git
-
-I'm using [git-flow](http://nvie.com/posts/a-successful-git-branching-model/) for development in git via github. I've loved the branching model git-flow proposed from day one and the addon to git makes it very intuitive and easy to follow. I generally don't push my `feature/*` branches to the public repository; I do keep `development` and `master` up to date here though.
-
 ### TODO Work
 
 Please see [TODO.md](TODO.md) for the short list of big things I thought worth writing down.

data/RELEASENOTES.md

@@ -1,5 +1,12 @@
 # lowered-expectations Release Notes
 
+## 1.0.2
+
+* Updated rubocop library to cover CVE-2017-8418
+* Updated everything else while I was at it
+* Fixed everything that broke because of the updates
+* Updated Travis configuration to ensure we test against every 2.x release of ruby
+
 ## 1.0.1
 
 * Move development dependencies out of the gemspec into the gemfile.

data/Rakefile

@@ -1,3 +1,3 @@
-# Encoding: utf-8
 Dir.glob('tasks/**/*.rake').each(&method(:import))
+
 task :default => [:lint, 'test:spec']

data/lib/lowered/expectations.rb

@@ -1,11 +1,10 @@
-# Encoding: utf-8
 require 'rubygems/dependency'
 require 'open3'
 require 'shellwords'
 require 'pty'
 
 class LoweredExpectations
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 
   class VersionPatternError < StandardError
   end
@@ -22,6 +21,7 @@ class LoweredExpectations
   def self.expect(executable, version, vopt: '--version', vpattern: '(\d+\.\d+\.\d+)')
     vstring = run! which(executable), vopt, quiet: true
     vmatch = /#{vpattern}/.match(vstring)
+    raise(VersionPatternError.new("unable to match #{vpattern} in version output #{vstring} from #{executable}")) unless vmatch
     verify_version(vmatch[0], version) || raise(VersionPatternError.new("unable to match #{vpattern} in version output #{vstring} from #{executable}"))
   end
 
@@ -59,7 +59,7 @@ class LoweredExpectations
         Process.wait(pid)
       end
     end
-    raise CommandExecutionError.new(stderr) unless status == 0
+    raise CommandExecutionError.new(stderr) unless status.zero?
     stdout
   end
   private_class_method :run!

data/lowered-expectations.gemspec

@@ -1,13 +1,10 @@
-# Encoding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'lowered/expectations'
 
 Gem::Specification.new do |spec|
   spec.name          = "lowered-expectations"
   spec.version       = LoweredExpectations::VERSION
-  # For deploying alpha versions via Travis CI
-  spec.version       = "#{spec.version}-alpha-#{ENV['TRAVIS_BUILD_NUMBER']}" if ENV['TRAVIS']
   spec.authors       = ["Ian Chesal", "Derek Tamsen"]
   spec.email         = ["ian.chesal@gmail.com"]
   spec.summary       = 'A library for testing versions of command line tools.'
@@ -20,7 +17,7 @@ enforce a major version but allow any minor version above a certain value for a
 tool. If you use Gemfile's the syntax should look pretty familiary to you.
 END
   spec.homepage      = "https://github.com/ianchesal/loweredexpectations"
-  spec.license       = "Apache 2.0"
+  spec.license       = "Apache-2.0"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/spec/integration/lowered/expectations_integration_spec.rb

@@ -9,11 +9,11 @@ RSpec.describe LoweredExpectations do
     end
 
     it 'raises an error when the version pattern cannot be found in executable output' do
-      expect{LoweredExpectations.expect(tool, "~> 0.1", vpattern: 'notvalid')}.to raise_error
+      expect{LoweredExpectations.expect(tool, "~> 0.1", vpattern: 'notvalid')}.to raise_error(LoweredExpectations::VersionPatternError)
     end
 
     it 'raises an error when the version of the tool does not meet expectations' do
-      expect{LoweredExpectations.expect(tool, "~> 1000.0")}.to raise_error
+      expect{LoweredExpectations.expect(tool, "~> 1000.0")}.to raise_error(LoweredExpectations::IncompatibleVersionError)
     end
   end
 

data/spec/lowered/expectations_spec.rb

@@ -19,26 +19,26 @@ Features: AsynchDNS GSS-Negotiate IPv6 Largefile NTLM NTLM_WB SSL lib"
 
     it 'raises an error when the executable does not exist' do
       expect(LoweredExpectations).to receive(:which).once.with(tool).and_raise(LoweredExpectations::MissingExecutableError)
-      expect{LoweredExpectations.expect(tool, "~> 0.1")}.to raise_error
+      expect{LoweredExpectations.expect(tool, "~> 0.1")}.to raise_error(LoweredExpectations::MissingExecutableError)
     end
 
     it 'raises an error when the version cannot be extracted from executable' do
       expect(LoweredExpectations).to receive(:which).once.with(tool).and_return(tool)
       expect(LoweredExpectations).to receive(:run!).once.and_raise(LoweredExpectations::CommandExecutionError)
-      expect{LoweredExpectations.expect(tool, "~> 0.1")}.to raise_error
+      expect{LoweredExpectations.expect(tool, "~> 0.1")}.to raise_error(LoweredExpectations::CommandExecutionError)
     end
 
     it 'raises an error when the version pattern cannot be found in executable output' do
       expect(LoweredExpectations).to receive(:which).once.with(tool).and_return(tool)
       expect(LoweredExpectations).to receive(:run!).once.and_return(curl_version)
-      expect{LoweredExpectations.expect(tool, "~> 0.1", vpattern: 'notvalid')}.to raise_error
+      expect{LoweredExpectations.expect(tool, "~> 0.1", vpattern: 'notvalid')}.to raise_error(LoweredExpectations::VersionPatternError)
     end
 
     it 'raises an error when the version of the tool does not meet expectations' do
       expect(LoweredExpectations).to receive(:which).once.with(tool).and_return(tool)
       expect(LoweredExpectations).to receive(:run!).once.and_return(curl_version)
       expect(LoweredExpectations).to receive(:verify_version).once.with(version, "~> 0.1").and_raise(LoweredExpectations::IncompatibleVersionError)
-      expect{LoweredExpectations.expect(tool, "~> 0.1")}.to raise_error
+      expect{LoweredExpectations.expect(tool, "~> 0.1")}.to raise_error(LoweredExpectations::IncompatibleVersionError)
     end
   end
 
@@ -63,12 +63,12 @@ Features: AsynchDNS GSS-Negotiate IPv6 Largefile NTLM NTLM_WB SSL lib"
     end
 
     it 'raise an error when the version string does not match the version pattern' do
-      expect{LoweredExpectations.verify_version version, '~> 0.2'}.to        raise_error
-      expect{LoweredExpectations.verify_version version, '~> 1'}.to          raise_error
-      expect{LoweredExpectations.verify_version version, '> 0.1.3'}.to       raise_error
-      expect{LoweredExpectations.verify_version version, '< 0'}.to           raise_error
-      expect{LoweredExpectations.verify_version version, '> 1'}.to           raise_error
-      expect{LoweredExpectations.verify_version version, "!= #{version}"}.to raise_error
+      expect{LoweredExpectations.verify_version version, '~> 0.2'}.to        raise_error(LoweredExpectations::IncompatibleVersionError)
+      expect{LoweredExpectations.verify_version version, '~> 1'}.to          raise_error(LoweredExpectations::IncompatibleVersionError)
+      expect{LoweredExpectations.verify_version version, '> 0.1.3'}.to       raise_error(LoweredExpectations::IncompatibleVersionError)
+      expect{LoweredExpectations.verify_version version, '< 0'}.to           raise_error(LoweredExpectations::IncompatibleVersionError)
+      expect{LoweredExpectations.verify_version version, '> 1'}.to           raise_error(LoweredExpectations::IncompatibleVersionError)
+      expect{LoweredExpectations.verify_version version, "!= #{version}"}.to raise_error(LoweredExpectations::IncompatibleVersionError)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-# Encoding: utf-8
 # Copyright 2015 Ian Chesal
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");

data/tasks/clean.rake

@@ -1,3 +1,3 @@
-# Encoding: utf-8
 require 'rake/clean'
+
 CLEAN.add FileList['lowered-expectations-*.gem']

data/tasks/rspec.rake

@@ -1,5 +1,5 @@
-# Encoding: utf-8
 require 'rspec/core/rake_task'
+
 namespace :test do
   RSpec::Core::RakeTask.new(:spec) do |t|
     t.pattern = Dir['spec/**/*_spec.rb'].reject{ |f| f['/integration'] }

data/tasks/rubocop.rake

@@ -1,3 +1,3 @@
-# Encoding: utf-8
 require 'rubocop/rake_task'
+
 RuboCop::RakeTask.new(:lint)

data/tasks/rubygems.rake

@@ -1,3 +1,3 @@
-# Encoding: utf-8
 require 'rubygems/tasks'
+
 Gem::Tasks.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lowered-expectations
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ian Chesal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies: []
 description: |
   A Ruby gem that lets you test for the presence of command line tools and ensure
@@ -46,7 +46,7 @@ files:
 - tasks/rubygems.rake
 homepage: https://github.com/ianchesal/loweredexpectations
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A library for testing versions of command line tools.