From 019100cc68918e26f07be776d8c14f405844dc44 Mon Sep 17 00:00:00 2001 From: Govind Gupta Date: Mon, 26 Aug 2019 19:04:34 +0530 Subject: [PATCH 1/8] Update resource parameters for Chef 14 --- resources/server.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/server.rb b/resources/server.rb index 9e1175e..9feeb77 100644 --- a/resources/server.rb +++ b/resources/server.rb @@ -58,9 +58,9 @@ package_cache_dir = Chef::FileCache.create_cache_path('package') package 'ProGet' do # ~FC009 action :install - source proget_url(install_sql_express, package_version) + source proget_url(new_resource.install_sql_express, new_resource.package_version) checksum new_resource.checksum if new_resource.checksum - remote_file_attributes name: ::File.join(package_cache_dir, "proget-#{package_version}.exe") + remote_file_attributes name: ::File.join(package_cache_dir, "proget-#{new_resource.package_version}.exe") version new_resource.version installer_type :custom options args.join(' ') From 63b6c3016b05f36aaf6f575a5dab2e11791ed989 Mon Sep 17 00:00:00 2001 From: Govind Gupta Date: Mon, 26 Aug 2019 19:06:44 +0530 Subject: [PATCH 2/8] Update resource parameters for Chef 14 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index ca0c9eb..c3f4b7b 100644 --- a/metadata.rb +++ b/metadata.rb @@ -7,7 +7,7 @@ long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) source_url 'https://github.com/cvent/proget-cookbook' issues_url 'https://github.com/cvent/proget-cookbook/issues' -version '0.2.0' +version '0.2.1' supports 'windows' From 217c09ac6ad3037db7d3855d345935a2c4bfda5d Mon Sep 17 00:00:00 2001 From: Govind Gupta Date: Mon, 26 Aug 2019 19:20:04 +0530 Subject: [PATCH 3/8] Update resource parameters for Chef 14 --- metadata.rb | 2 +- resources/server.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.rb b/metadata.rb index c3f4b7b..d34a7aa 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: true +# frozen_string_literal: true ~FC066 ~FC069 ~FC078 name 'proget' maintainer 'Morley, Jonathan' maintainer_email 'JMorley@cvent.com' diff --git a/resources/server.rb b/resources/server.rb index 9feeb77..da34a37 100644 --- a/resources/server.rb +++ b/resources/server.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -property :name, String, name_property: true +property :name, String, name_property: true # ~FC108 property :version, String, required: true property :package_version, String, default: lazy { strip_patch_version(version) } property :checksum, String From 8c307a7bf7617eb9094667449fefe87aedf96472 Mon Sep 17 00:00:00 2001 From: Govind Gupta Date: Mon, 26 Aug 2019 19:40:54 +0530 Subject: [PATCH 4/8] Update metadata to fix foodcritic issues --- metadata.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index d34a7aa..f2eeaba 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: true ~FC066 ~FC069 ~FC078 +# frozen_string_literal: true ~FC078 name 'proget' maintainer 'Morley, Jonathan' maintainer_email 'JMorley@cvent.com' @@ -13,3 +13,6 @@ depends 'iis' depends 'windows' + +chef_version '>= 12.6.0' if respond_to?(:chef_version) +license 'All Rights Reserved' \ No newline at end of file From a0d8f4d8c04a8430df93fb8f28f61eb9aeecb51f Mon Sep 17 00:00:00 2001 From: Govind Gupta Date: Mon, 26 Aug 2019 19:43:10 +0530 Subject: [PATCH 5/8] Update metadata to fix foodcritic issues --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index f2eeaba..584e8a6 100644 --- a/metadata.rb +++ b/metadata.rb @@ -15,4 +15,4 @@ depends 'windows' chef_version '>= 12.6.0' if respond_to?(:chef_version) -license 'All Rights Reserved' \ No newline at end of file +license 'All Rights Reserved' From 422f01923e8e36cff7514f94e142e182361c1bac Mon Sep 17 00:00:00 2001 From: Govind Gupta Date: Mon, 26 Aug 2019 21:52:58 +0530 Subject: [PATCH 6/8] Update metadata to fix foodcritic issues --- metadata.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.rb b/metadata.rb index 584e8a6..a84ee89 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: true ~FC078 +# frozen_string_literal: true name 'proget' maintainer 'Morley, Jonathan' maintainer_email 'JMorley@cvent.com' @@ -15,4 +15,4 @@ depends 'windows' chef_version '>= 12.6.0' if respond_to?(:chef_version) -license 'All Rights Reserved' +license LICENSE From 8e37dec9d99695b7f3dc59950525f0537a8a184c Mon Sep 17 00:00:00 2001 From: Govind Gupta Date: Tue, 27 Aug 2019 17:34:37 +0530 Subject: [PATCH 7/8] Update metadata to fix foodcritic issues --- resources/server.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/server.rb b/resources/server.rb index da34a37..f78bfa4 100644 --- a/resources/server.rb +++ b/resources/server.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -property :name, String, name_property: true # ~FC108 +property :resource_name, String, name_property: true property :version, String, required: true property :package_version, String, default: lazy { strip_patch_version(version) } property :checksum, String @@ -64,17 +64,17 @@ version new_resource.version installer_type :custom options args.join(' ') - notifies :run, "ruby_block[#{new_resource.name} install failure]", :immediately - notifies :run, "ruby_block[wait for #{new_resource.name}]", :immediately + notifies :run, "ruby_block[#{new_resource.resource_name} install failure]", :immediately + notifies :run, "ruby_block[wait for #{new_resource.resource_name}]", :immediately end if args - ruby_block "#{new_resource.name} install failure" do + ruby_block "#{new_resource.resource_name} install failure" do action :nothing block { raise 'Installation of Proget failed' } not_if { current_version == new_resource.version } end - ruby_block "wait for #{new_resource.name}" do + ruby_block "wait for #{new_resource.resource_name}" do action :nothing block do require 'net/http' @@ -88,7 +88,7 @@ end until test_server.call - Chef::Log.info "Waiting for #{new_resource.name} to be up" + Chef::Log.info "Waiting for #{new_resource.resource_name} to be up" sleep 2 end end From 1fc3765f70289a724ac29a876e9561e294825f25 Mon Sep 17 00:00:00 2001 From: Govind Gupta Date: Tue, 27 Aug 2019 17:37:40 +0530 Subject: [PATCH 8/8] Update metadata to fix foodcritic issues --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index a84ee89..2919969 100644 --- a/metadata.rb +++ b/metadata.rb @@ -15,4 +15,4 @@ depends 'windows' chef_version '>= 12.6.0' if respond_to?(:chef_version) -license LICENSE +license 'Apache-2.0'