From 5c0696af82d3b3d702703273dbee3058de8ffe6a Mon Sep 17 00:00:00 2001 From: Kyle McGovern Date: Fri, 19 Aug 2016 17:20:55 -0500 Subject: [PATCH] fix 1.2.0 no implicit conversion of nil to string. fixes #123 --- Gemfile | 5 +++++ libraries/omnitrucker.rb | 6 +++--- metadata.rb | 2 +- recipes/downloader.rb | 1 + spec/default_spec.rb | 12 ++++++++++++ spec/spec_helper.rb | 2 ++ 6 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 spec/default_spec.rb create mode 100644 spec/spec_helper.rb diff --git a/Gemfile b/Gemfile index d914365..940ac5d 100644 --- a/Gemfile +++ b/Gemfile @@ -10,3 +10,8 @@ gem 'tomlrb' gem 'rake' gem 'stove' gem 'community_cookbook_releaser' +gem 'chefspec' +gem 'berkshelf' +gem 'test-kitchen' +gem 'foodcritic' +gem 'cookstyle' diff --git a/libraries/omnitrucker.rb b/libraries/omnitrucker.rb index f5e3100..7af7fac 100644 --- a/libraries/omnitrucker.rb +++ b/libraries/omnitrucker.rb @@ -26,9 +26,9 @@ module OmnibusTrucker class << self URL_MAP = { - p: 'platform', pv: 'platform_version', m: 'machine', - v: 'version', prerelease: 'prerelease', - nightlies: 'nightlies' + p: :platform, pv: :platform_version, m: :machine, + v: :version, prerelease: :prerelease, + nightlies: :nightlies }.freeze unless defined?(URL_MAP) def build_url(*opts) diff --git a/metadata.rb b/metadata.rb index 3c0ab22..16a9eea 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license 'Apache 2.0' description 'Chef omnibus package updater and installer' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '1.2.0' +version '1.2.1' %w(redhat centos amazon scientific oracle debian ubuntu mac_os_x solaris windows).each do |os| supports os diff --git a/recipes/downloader.rb b/recipes/downloader.rb index 0bb11f4..16f897e 100644 --- a/recipes/downloader.rb +++ b/recipes/downloader.rb @@ -30,6 +30,7 @@ prerelease: node['omnibus_updater']['preview'] ), node ) + raise 'Did not find path' if remote_path.nil? end if remote_path diff --git a/spec/default_spec.rb b/spec/default_spec.rb new file mode 100644 index 0000000..ba9c44d --- /dev/null +++ b/spec/default_spec.rb @@ -0,0 +1,12 @@ +require 'spec_helper' + +describe 'omnibus_updater::default' do + let(:chef_run) do + ChefSpec::ServerRunner.new(platform: 'redhat', version: '7.0') do |node, server| + end.converge(described_recipe) + end + + it 'should complie without any errors' do + expect { chef_run }.to_not raise_error + end +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb new file mode 100644 index 0000000..1dd5126 --- /dev/null +++ b/spec/spec_helper.rb @@ -0,0 +1,2 @@ +require 'chefspec' +require 'chefspec/berkshelf'