diff options
-rw-r--r-- | Gemfile.lock | 25 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
-rw-r--r-- | lib/chef/provider/package/yum.rb | 6 | ||||
-rw-r--r-- | lib/chef/version.rb | 2 |
5 files changed, 14 insertions, 23 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ef17beea6f..4b2dfbf23c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,9 +18,9 @@ GIT PATH remote: . specs: - chef (12.10.38) + chef (12.10.39) bundler (>= 1.10) - chef-config (= 12.10.38) + chef-config (= 12.10.39) chef-zero (~> 4.5) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -45,9 +45,9 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (12.10.38-universal-mingw32) + chef (12.10.39-universal-mingw32) bundler (>= 1.10) - chef-config (= 12.10.38) + chef-config (= 12.10.39) chef-zero (~> 4.5) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -87,7 +87,7 @@ PATH PATH remote: chef-config specs: - chef-config (12.10.38) + chef-config (12.10.39) fuzzyurl (~> 0.8.0) mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) @@ -145,8 +145,6 @@ GEM chef (>= 11.14) fauxhai (~> 3.2) rspec (~> 3.0) - childprocess (0.5.9) - ffi (~> 1.0, >= 1.0.11) coderay (1.1.1) colorize (0.7.7) compat_resource (12.9.1) @@ -183,14 +181,10 @@ GEM hashie (>= 3.4) multi_json (>= 1.7.5, < 2.0) oauth2 - github_changelog_generator (1.12.0) - bundler (>= 1.7) + github_changelog_generator (1.12.1) colorize (~> 0.7) github_api (~> 0.12) - overcommit (>= 0.31) rake (>= 10.0) - rspec (>= 3.2) - rubocop (>= 0.31) gssapi (1.2.0) ffi (>= 1.0.1) gyoku (1.3.1) @@ -281,9 +275,6 @@ GEM plist (~> 3.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) - overcommit (0.33.0) - childprocess (~> 0.5.8) - iniparse (~> 1.4) parser (2.3.1.0) ast (~> 2.2) plist (3.2.0) @@ -339,7 +330,7 @@ GEM ruby-progressbar (1.8.0) ruby-shadow (2.5.0) rubyntlm (0.6.0) - rufus-lru (1.0.5) + rufus-lru (1.1.0) sawyer (0.7.0) addressable (>= 2.3.5, < 2.5) faraday (~> 0.8, < 0.10) @@ -392,7 +383,7 @@ GEM ffi windows-api (0.4.4) win32-api (>= 1.4.5) - winrm (1.8.0) + winrm (1.8.1) builder (>= 2.1.2) gssapi (~> 1.2) gyoku (~> 1.0) @@ -1 +1 @@ -12.10.38
\ No newline at end of file +12.10.39
\ No newline at end of file diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index bc61383c37..344374a5dd 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -21,7 +21,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.10.38" + VERSION = "12.10.39" end # diff --git a/lib/chef/provider/package/yum.rb b/lib/chef/provider/package/yum.rb index dfd32fde55..64f1b2043c 100644 --- a/lib/chef/provider/package/yum.rb +++ b/lib/chef/provider/package/yum.rb @@ -46,7 +46,7 @@ class Chef lead = 0 tail = evr.size - if evr =~ %r{^([\d]+):} + if %r{^([\d]+):}.match(evr) # rubocop:disable Performance/RedundantMatch epoch = $1.to_i lead = $1.length + 1 elsif evr[0].ord == ":".ord @@ -54,7 +54,7 @@ class Chef lead = 1 end - if evr =~ %r{:?.*-(.*)$} + if %r{:?.*-(.*)$}.match(evr) # rubocop:disable Performance/RedundantMatch release = $1 tail = evr.length - release.length - lead - 1 @@ -443,7 +443,7 @@ class Chef # "mtr >= 2:0.71-3.0" # "mta" def self.parse(string) - if string =~ %r{^(\S+)\s+(>|>=|=|==|<=|<)\s+(\S+)$} + if %r{^(\S+)\s+(>|>=|=|==|<=|<)\s+(\S+)$}.match(string) # rubocop:disable Performance/RedundantMatch name = $1 if $2 == "=" flag = :== diff --git a/lib/chef/version.rb b/lib/chef/version.rb index b0c626a7aa..2c759adeb7 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -21,7 +21,7 @@ class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.10.38" + VERSION = "12.10.39" end # |