From 96f92536f7c322ca853603ea2322afd98fafdee5 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 20:08:34 -0700 Subject: [PATCH 01/29] switched source download to git --- .gitignore | 1 + attributes/default.rb | 2 +- recipes/install.rb | 23 ++++++++++++++++------- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 82d1b5c..f608a68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +.idea/ .kitchen/ .kitchen.local.yml diff --git a/attributes/default.rb b/attributes/default.rb index cb87847..ffeab8f 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,7 +1,7 @@ default[:s3fs_fuse][:s3_url] = 'https://s3.amazonaws.com' default[:s3fs_fuse][:s3_key] = '' default[:s3fs_fuse][:s3_secret] = '' -default[:s3fs_fuse][:version] = '1.61' +default[:s3fs_fuse][:version] = '1.79' default[:s3fs_fuse][:no_upload] = false default[:s3fs_fuse][:mounts] = [] default[:s3fs_fuse][:bluepill] = false diff --git a/recipes/install.rb b/recipes/install.rb index 86b4dfb..f10ca8f 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -44,19 +44,28 @@ package prereq_name end -s3fs_version = node[:s3fs_fuse][:version] -source_url = "http://s3fs.googlecode.com/files/s3fs-#{s3fs_version}.tar.gz" +# s3fs_version = node[:s3fs_fuse][:version] +# source_url = "http://s3fs.googlecode.com/files/s3fs-#{s3fs_version}.tar.gz" +# +# remote_file "/tmp/s3fs-#{s3fs_version}.tar.gz" do +# source source_url +# action :create_if_missing +# end -remote_file "/tmp/s3fs-#{s3fs_version}.tar.gz" do - source source_url - action :create_if_missing +git 's3fs-fuse_github' do + repository 'https://github.com/s3fs-fuse/s3fs-fuse.git' + revision node[:s3fs_fuse][:version] + destination '/tmp' + retries 3 + timeout 60 + action :sync end bash "compile_and_install_s3fs" do cwd '/tmp' code <<-EOH - tar -xzf s3fs-#{s3fs_version}.tar.gz - cd s3fs-#{s3fs_version} + # tar -xzf s3fs-#{s3fs_version}.tar.gz + cd s3fs-fuse #{'export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/lib64/pkgconfig' if node.platform_family == 'rhel'} ./configure --prefix=/usr/local make && make install From 6da6d95bead1d9b44b22cb60583a022c8895445c Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 20:10:51 -0700 Subject: [PATCH 02/29] switched source download to git --- Gemfile.lock | 65 ++++++++++++++++++++++++++++++++++++++++++++++ recipes/install.rb | 1 - 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index dd64512..1d931d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,6 +21,35 @@ GEM plist (~> 3.1.0) pry (~> 0.9) rest-client (>= 1.0.4, <= 1.6.7) + chef (11.16.2-x86-mingw32) + chef-zero (~> 2.1, >= 2.1.4) + diff-lcs (~> 1.2, >= 1.2.4) + erubis (~> 2.7) + ffi (~> 1.9) + ffi-yajl (~> 1.0) + highline (~> 1.6, >= 1.6.9) + mime-types (~> 1.16) + mixlib-authentication (~> 1.3) + mixlib-cli (~> 1.4) + mixlib-config (~> 2.0) + mixlib-log (~> 1.3) + mixlib-shellout (~> 1.4) + net-ssh (~> 2.6) + net-ssh-multi (~> 1.1) + ohai (~> 7.4) + plist (~> 3.1.0) + pry (~> 0.9) + rest-client (>= 1.0.4, <= 1.6.7) + win32-api (= 1.5.1) + win32-dir (= 0.4.5) + win32-event (= 0.6.1) + win32-mmap (= 0.4.0) + win32-mutex (= 0.4.1) + win32-process (= 0.7.3) + win32-service (= 0.8.2) + windows-api (= 0.4.2) + windows-pr (= 1.2.2) + wmi-lite (~> 1.0) chef-zero (2.2) hashie (~> 2.0) json @@ -39,6 +68,7 @@ GEM net-ssh ohai ffi (1.9.5) + ffi (1.9.5-x86-mingw32) ffi-yajl (1.1.0) ffi (~> 1.5) libyajl2 (~> 1.0) @@ -53,6 +83,8 @@ GEM formatador (0.2.5) gherkin (2.12.2) multi_json (~> 1.3) + gherkin (2.12.2-x86-mingw32) + multi_json (~> 1.3) guard (2.6.1) formatador (>= 0.2.4) listen (~> 2.7) @@ -68,6 +100,7 @@ GEM hashie (2.1.2) highline (1.6.21) hitimes (1.2.2) + hitimes (1.2.2-x86-mingw32) ipaddress (0.8.0) json (1.8.1) kitchen-docker (1.5.0) @@ -97,6 +130,9 @@ GEM mixlib-config (2.1.0) mixlib-log (1.6.0) mixlib-shellout (1.4.0) + mixlib-shellout (1.4.0-x86-mingw32) + win32-process (~> 0.7.1) + windows-pr (~> 1.2.2) multi_json (1.10.1) net-scp (1.2.1) net-ssh (>= 2.6.5) @@ -108,6 +144,8 @@ GEM net-ssh-gateway (>= 1.2.0) nokogiri (1.6.3.1) mini_portile (= 0.6.0) + nokogiri (1.6.3.1-x86-mingw32) + mini_portile (= 0.6.0) ohai (7.4.0) ffi (~> 1.9) ffi-yajl (~> 1.0) @@ -125,6 +163,11 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) + pry (0.10.1-x86-mingw32) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + win32console (~> 1.3) rack (1.5.2) rake (10.3.2) rb-fsevent (0.9.4) @@ -165,11 +208,33 @@ GEM hitimes treetop (1.5.3) polyglot (~> 0.3) + win32-api (1.5.1-x86-mingw32) + win32-dir (0.4.5) + ffi (>= 1.0.0) + win32-event (0.6.1) + win32-ipc (>= 0.6.0) + win32-ipc (0.6.6) + ffi + win32-mmap (0.4.0) + ffi + win32-mutex (0.4.1) + win32-ipc (>= 0.6.0) + win32-process (0.7.3) + ffi (>= 1.0.0) + win32-service (0.8.2) + ffi + win32console (1.3.2-x86-mingw32) + windows-api (0.4.2) + win32-api (>= 1.4.5) + windows-pr (1.2.2) + win32-api (>= 1.4.5) + windows-api (>= 0.3.0) wmi-lite (1.0.0) yajl-ruby (1.2.1) PLATFORMS ruby + x86-mingw32 DEPENDENCIES chefspec diff --git a/recipes/install.rb b/recipes/install.rb index f10ca8f..6fdabdb 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -64,7 +64,6 @@ bash "compile_and_install_s3fs" do cwd '/tmp' code <<-EOH - # tar -xzf s3fs-#{s3fs_version}.tar.gz cd s3fs-fuse #{'export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/lib64/pkgconfig' if node.platform_family == 'rhel'} ./configure --prefix=/usr/local From 9a3e223fca6efd7b2d4875ae4dc1ccc410277c8b Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 20:11:35 -0700 Subject: [PATCH 03/29] switched source download to git --- recipes/install.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/install.rb b/recipes/install.rb index 6fdabdb..32960d9 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -44,7 +44,7 @@ package prereq_name end -# s3fs_version = node[:s3fs_fuse][:version] +s3fs_version = node[:s3fs_fuse][:version] # source_url = "http://s3fs.googlecode.com/files/s3fs-#{s3fs_version}.tar.gz" # # remote_file "/tmp/s3fs-#{s3fs_version}.tar.gz" do @@ -54,7 +54,7 @@ git 's3fs-fuse_github' do repository 'https://github.com/s3fs-fuse/s3fs-fuse.git' - revision node[:s3fs_fuse][:version] + revision s3fs_version destination '/tmp' retries 3 timeout 60 From f2d5041ddea630f83cf5798e0d32fe812fab1e6f Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 20:14:16 -0700 Subject: [PATCH 04/29] switched source download to git --- attributes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index ffeab8f..94a8e43 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,7 +1,7 @@ default[:s3fs_fuse][:s3_url] = 'https://s3.amazonaws.com' default[:s3fs_fuse][:s3_key] = '' default[:s3fs_fuse][:s3_secret] = '' -default[:s3fs_fuse][:version] = '1.79' +default[:s3fs_fuse][:version] = 'v1.79' default[:s3fs_fuse][:no_upload] = false default[:s3fs_fuse][:mounts] = [] default[:s3fs_fuse][:bluepill] = false From 92da2f58814859e1b06b735fc4a939d2910e0b16 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 20:18:30 -0700 Subject: [PATCH 05/29] switched source download to git --- attributes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index 94a8e43..ffeab8f 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,7 +1,7 @@ default[:s3fs_fuse][:s3_url] = 'https://s3.amazonaws.com' default[:s3fs_fuse][:s3_key] = '' default[:s3fs_fuse][:s3_secret] = '' -default[:s3fs_fuse][:version] = 'v1.79' +default[:s3fs_fuse][:version] = '1.79' default[:s3fs_fuse][:no_upload] = false default[:s3fs_fuse][:mounts] = [] default[:s3fs_fuse][:bluepill] = false From 2f68b84f38574068304b8b98518f1d28623614ad Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 20:30:52 -0700 Subject: [PATCH 06/29] switched source download to git --- recipes/install.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/install.rb b/recipes/install.rb index 32960d9..2469ce5 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -54,7 +54,7 @@ git 's3fs-fuse_github' do repository 'https://github.com/s3fs-fuse/s3fs-fuse.git' - revision s3fs_version + revision "refs/tags/v#{s3fs_version}" destination '/tmp' retries 3 timeout 60 From 36f8bcc5033dca78a5a8f438864c1b9a06339c13 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 20:36:52 -0700 Subject: [PATCH 07/29] switched source download to git --- recipes/install.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/install.rb b/recipes/install.rb index 2469ce5..72c7339 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -54,7 +54,7 @@ git 's3fs-fuse_github' do repository 'https://github.com/s3fs-fuse/s3fs-fuse.git' - revision "refs/tags/v#{s3fs_version}" + revision "tags/v#{s3fs_version}" destination '/tmp' retries 3 timeout 60 From e6dff7f169e70afed637f7f476f14a8ee8a4d514 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 20:43:22 -0700 Subject: [PATCH 08/29] switched source download to git --- recipes/install.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/install.rb b/recipes/install.rb index 72c7339..aa5c0f0 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -53,8 +53,8 @@ # end git 's3fs-fuse_github' do - repository 'https://github.com/s3fs-fuse/s3fs-fuse.git' - revision "tags/v#{s3fs_version}" + repository 'git@github.com:s3fs-fuse/s3fs-fuse.git' + revision "v#{s3fs_version}" destination '/tmp' retries 3 timeout 60 From 091959e0c791cdddd4861505eebe520c4ace8f1a Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 20:48:02 -0700 Subject: [PATCH 09/29] switched source download to git --- recipes/install.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/install.rb b/recipes/install.rb index aa5c0f0..630da54 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -44,7 +44,8 @@ package prereq_name end -s3fs_version = node[:s3fs_fuse][:version] + +s3fs_version = node[:s3fs_fuse][:version].tr('^A-Za-z','') # source_url = "http://s3fs.googlecode.com/files/s3fs-#{s3fs_version}.tar.gz" # # remote_file "/tmp/s3fs-#{s3fs_version}.tar.gz" do @@ -53,8 +54,8 @@ # end git 's3fs-fuse_github' do - repository 'git@github.com:s3fs-fuse/s3fs-fuse.git' - revision "v#{s3fs_version}" + repository 'git://github.com/s3fs-fuse/s3fs-fuse.git' + revision node[:s3fs_fuse][:version] destination '/tmp' retries 3 timeout 60 From 7f0aa76a7aace94ab77afb29ef08a2d560230eac Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 20:51:39 -0700 Subject: [PATCH 10/29] switched source download to git --- attributes/default.rb | 2 +- recipes/install.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index ffeab8f..94a8e43 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,7 +1,7 @@ default[:s3fs_fuse][:s3_url] = 'https://s3.amazonaws.com' default[:s3fs_fuse][:s3_key] = '' default[:s3fs_fuse][:s3_secret] = '' -default[:s3fs_fuse][:version] = '1.79' +default[:s3fs_fuse][:version] = 'v1.79' default[:s3fs_fuse][:no_upload] = false default[:s3fs_fuse][:mounts] = [] default[:s3fs_fuse][:bluepill] = false diff --git a/recipes/install.rb b/recipes/install.rb index 630da54..13ac230 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -45,7 +45,7 @@ end -s3fs_version = node[:s3fs_fuse][:version].tr('^A-Za-z','') +s3fs_numeric_version = node[:s3fs_fuse][:version].tr('^A-Za-z','') # source_url = "http://s3fs.googlecode.com/files/s3fs-#{s3fs_version}.tar.gz" # # remote_file "/tmp/s3fs-#{s3fs_version}.tar.gz" do @@ -72,7 +72,7 @@ EOH not_if do begin - %x{s3fs --version}.to_s.split("\n").first.to_s.split.last == s3fs_version.to_s + %x{s3fs --version}.to_s.split("\n").first.to_s.split.last == s3fs_numeric_version.to_s rescue Errno::ENOENT false end From 5314785519d18f91cc81cec004ddd2c6ea67a97c Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 20:58:30 -0700 Subject: [PATCH 11/29] switched source download to git --- recipes/install.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/install.rb b/recipes/install.rb index 13ac230..e818629 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -53,10 +53,9 @@ # action :create_if_missing # end -git 's3fs-fuse_github' do - repository 'git://github.com/s3fs-fuse/s3fs-fuse.git' +git '/tmp/s3fs-fuse' do + repository 'git@github.com:s3fs-fuse/s3fs-fuse.git' revision node[:s3fs_fuse][:version] - destination '/tmp' retries 3 timeout 60 action :sync From 1a37c79fc0fb1769fd0eac601529400e88b61b0e Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 21:12:34 -0700 Subject: [PATCH 12/29] switched source download to git --- recipes/install.rb | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/recipes/install.rb b/recipes/install.rb index e818629..96fed00 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -44,27 +44,21 @@ package prereq_name end - +s3fs_version = node[:s3fs_fuse][:version] s3fs_numeric_version = node[:s3fs_fuse][:version].tr('^A-Za-z','') -# source_url = "http://s3fs.googlecode.com/files/s3fs-#{s3fs_version}.tar.gz" -# -# remote_file "/tmp/s3fs-#{s3fs_version}.tar.gz" do -# source source_url -# action :create_if_missing -# end -git '/tmp/s3fs-fuse' do - repository 'git@github.com:s3fs-fuse/s3fs-fuse.git' - revision node[:s3fs_fuse][:version] - retries 3 - timeout 60 - action :sync +source_url = "https://github.com/s3fs-fuse/s3fs-fuse/tarball/tags/#{s3fs_version}" + +remote_file "/tmp/s3fs-#{s3fs_version}.tar.gz" do + source source_url + action :create_if_missing end bash "compile_and_install_s3fs" do cwd '/tmp' code <<-EOH - cd s3fs-fuse + tar -xzf s3fs-#{s3fs_version}.tar.gz + cd s3fs-#{s3fs_version} #{'export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/lib64/pkgconfig' if node.platform_family == 'rhel'} ./configure --prefix=/usr/local make && make install From 3abef54a7100690f81d806a57b57c424d76adcc4 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 21:14:16 -0700 Subject: [PATCH 13/29] switched source download to git --- recipes/install.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/install.rb b/recipes/install.rb index 96fed00..b42015e 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -47,7 +47,12 @@ s3fs_version = node[:s3fs_fuse][:version] s3fs_numeric_version = node[:s3fs_fuse][:version].tr('^A-Za-z','') -source_url = "https://github.com/s3fs-fuse/s3fs-fuse/tarball/tags/#{s3fs_version}" +if s3fs_numeric_version.to_f >= 1.74 + source_url = "https://github.com/s3fs-fuse/s3fs-fuse/tarball/tags/#{s3fs_version}" +else + source_url = "http://s3fs.googlecode.com/files/s3fs-#{s3fs_version}.tar.gz" +end + remote_file "/tmp/s3fs-#{s3fs_version}.tar.gz" do source source_url From 46d67108e11b256b8a86b6f371b0aec60147f3a0 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 21:16:44 -0700 Subject: [PATCH 14/29] switched source download to git --- recipes/install.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/install.rb b/recipes/install.rb index b42015e..a92349a 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -62,7 +62,7 @@ bash "compile_and_install_s3fs" do cwd '/tmp' code <<-EOH - tar -xzf s3fs-#{s3fs_version}.tar.gz + tar -xzf s3fs-#{s3fs_version}.tar.gz -C s3fs-#{s3fs_version} --strip-components 1 cd s3fs-#{s3fs_version} #{'export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/lib64/pkgconfig' if node.platform_family == 'rhel'} ./configure --prefix=/usr/local From ff970b964d237371b368f4142369e31c8cefa6f5 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 21:19:59 -0700 Subject: [PATCH 15/29] switched source download to git --- recipes/install.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/install.rb b/recipes/install.rb index a92349a..6fbf88d 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -62,6 +62,7 @@ bash "compile_and_install_s3fs" do cwd '/tmp' code <<-EOH + mkdir s3fs-#{s3fs_version} tar -xzf s3fs-#{s3fs_version}.tar.gz -C s3fs-#{s3fs_version} --strip-components 1 cd s3fs-#{s3fs_version} #{'export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/lib64/pkgconfig' if node.platform_family == 'rhel'} From 9555c046adca4089424de4508cfad6483f97515e Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 21:28:13 -0700 Subject: [PATCH 16/29] switched source download to git --- recipes/install.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/recipes/install.rb b/recipes/install.rb index 6fbf88d..f4a295f 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -44,17 +44,19 @@ package prereq_name end -s3fs_version = node[:s3fs_fuse][:version] +s3fs_git_tag = node[:s3fs_fuse][:version] s3fs_numeric_version = node[:s3fs_fuse][:version].tr('^A-Za-z','') +puts s3fs_numeric_version.to_f.to_s + if s3fs_numeric_version.to_f >= 1.74 - source_url = "https://github.com/s3fs-fuse/s3fs-fuse/tarball/tags/#{s3fs_version}" + source_url = "https://github.com/s3fs-fuse/s3fs-fuse/tarball/tags/#{s3fs_git_tag}" else - source_url = "http://s3fs.googlecode.com/files/s3fs-#{s3fs_version}.tar.gz" + source_url = "http://s3fs.googlecode.com/files/s3fs-#{s3fs_git_tag}.tar.gz" end -remote_file "/tmp/s3fs-#{s3fs_version}.tar.gz" do +remote_file "/tmp/s3fs-#{s3fs_git_tag}.tar.gz" do source source_url action :create_if_missing end @@ -62,9 +64,9 @@ bash "compile_and_install_s3fs" do cwd '/tmp' code <<-EOH - mkdir s3fs-#{s3fs_version} - tar -xzf s3fs-#{s3fs_version}.tar.gz -C s3fs-#{s3fs_version} --strip-components 1 - cd s3fs-#{s3fs_version} + mkdir s3fs-#{s3fs_git_tag} + tar -xzf s3fs-#{s3fs_git_tag}.tar.gz -C s3fs-#{s3fs_git_tag} --strip-components 1 + cd s3fs-#{s3fs_git_tag} #{'export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/lib64/pkgconfig' if node.platform_family == 'rhel'} ./configure --prefix=/usr/local make && make install From b817e778196e6e5b5b00a42173cf6d98dd77d719 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 21:31:02 -0700 Subject: [PATCH 17/29] switched source download to git --- recipes/install.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/install.rb b/recipes/install.rb index f4a295f..ddb8e8f 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -45,7 +45,7 @@ end s3fs_git_tag = node[:s3fs_fuse][:version] -s3fs_numeric_version = node[:s3fs_fuse][:version].tr('^A-Za-z','') +s3fs_numeric_version = node[:s3fs_fuse][:version].tr('^0-9','') puts s3fs_numeric_version.to_f.to_s From d3f7e33711377e5c1ec4b5d5fd4c1a855f53fe8d Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 21:33:32 -0700 Subject: [PATCH 18/29] switched source download to git --- recipes/install.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/install.rb b/recipes/install.rb index ddb8e8f..9d77760 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -45,7 +45,7 @@ end s3fs_git_tag = node[:s3fs_fuse][:version] -s3fs_numeric_version = node[:s3fs_fuse][:version].tr('^0-9','') +s3fs_numeric_version = node[:s3fs_fuse][:version].tr('^0-9.','') puts s3fs_numeric_version.to_f.to_s From bf51c017850490310fb6806fbd37d73dc89912c5 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 21:37:58 -0700 Subject: [PATCH 19/29] switched source download to git --- recipes/install.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/install.rb b/recipes/install.rb index 9d77760..b43b735 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -61,10 +61,15 @@ action :create_if_missing end +directory "/tmp/s3fs-#{s3fs_git_tag}" do + mode 0755 + action :create +end + + bash "compile_and_install_s3fs" do cwd '/tmp' code <<-EOH - mkdir s3fs-#{s3fs_git_tag} tar -xzf s3fs-#{s3fs_git_tag}.tar.gz -C s3fs-#{s3fs_git_tag} --strip-components 1 cd s3fs-#{s3fs_git_tag} #{'export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/lib64/pkgconfig' if node.platform_family == 'rhel'} From ca5e99d157abe8be09ded9de46aaf804532be209 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 21:42:58 -0700 Subject: [PATCH 20/29] switched source download to git --- recipes/install.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/install.rb b/recipes/install.rb index b43b735..a980e4f 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -73,6 +73,7 @@ tar -xzf s3fs-#{s3fs_git_tag}.tar.gz -C s3fs-#{s3fs_git_tag} --strip-components 1 cd s3fs-#{s3fs_git_tag} #{'export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/lib64/pkgconfig' if node.platform_family == 'rhel'} + ./autogen.sh ./configure --prefix=/usr/local make && make install EOH From 0e3ff4d97a2d474635749cd98c1d74bc6a36a29b Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 21:45:18 -0700 Subject: [PATCH 21/29] switched source download to git --- recipes/install.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/install.rb b/recipes/install.rb index a980e4f..582f43b 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -44,12 +44,12 @@ package prereq_name end -s3fs_git_tag = node[:s3fs_fuse][:version] -s3fs_numeric_version = node[:s3fs_fuse][:version].tr('^0-9.','') +s3fs_git_tag = node[:s3fs_fuse][:version] +s3fs_version = node[:s3fs_fuse][:version].tr('^0-9.','') -puts s3fs_numeric_version.to_f.to_s +puts s3fs_version.to_f.to_s -if s3fs_numeric_version.to_f >= 1.74 +if s3fs_version.to_f >= 1.74 source_url = "https://github.com/s3fs-fuse/s3fs-fuse/tarball/tags/#{s3fs_git_tag}" else source_url = "http://s3fs.googlecode.com/files/s3fs-#{s3fs_git_tag}.tar.gz" @@ -79,7 +79,7 @@ EOH not_if do begin - %x{s3fs --version}.to_s.split("\n").first.to_s.split.last == s3fs_numeric_version.to_s + %x{s3fs --version}.to_s.split("\n").first.to_s.split.last == s3fs_version.to_s rescue Errno::ENOENT false end From 0f0408e2c4b5d46ef49ff4f7241878405959924b Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 21:46:49 -0700 Subject: [PATCH 22/29] switched source download to git --- recipes/install.rb | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/recipes/install.rb b/recipes/install.rb index 582f43b..f6b2c2c 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -69,14 +69,24 @@ bash "compile_and_install_s3fs" do cwd '/tmp' - code <<-EOH - tar -xzf s3fs-#{s3fs_git_tag}.tar.gz -C s3fs-#{s3fs_git_tag} --strip-components 1 - cd s3fs-#{s3fs_git_tag} + if s3fs_version.to_f >= 1.74 + code <<-EOH + tar -xzf s3fs-#{s3fs_git_tag}.tar.gz -C s3fs-#{s3fs_git_tag} --strip-components 1 + cd s3fs-#{s3fs_git_tag} #{'export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/lib64/pkgconfig' if node.platform_family == 'rhel'} - ./autogen.sh - ./configure --prefix=/usr/local - make && make install - EOH + ./autogen.sh + ./configure --prefix=/usr/local + make && make install + EOH + else + code <<-EOH + tar -xzf s3fs-#{s3fs_git_tag}.tar.gz -C s3fs-#{s3fs_git_tag} --strip-components 1 + cd s3fs-#{s3fs_git_tag} + #{'export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/lib64/pkgconfig' if node.platform_family == 'rhel'} + ./configure --prefix=/usr/local + make && make install + EOH + end not_if do begin %x{s3fs --version}.to_s.split("\n").first.to_s.split.last == s3fs_version.to_s From 64acb740472b7159c070180d5fdcb6c2991e77c6 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 21:52:26 -0700 Subject: [PATCH 23/29] readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 7c32d7b..b597143 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ Usage ```ruby override_attributes( 's3fs-fuse' => { + :version => 'v1.79' :s3_key => 'key', :s3_secret => 'secret', :mounts => [ @@ -23,6 +24,8 @@ Multiple buckets can be mounted (which is why the `:mounts` attribute is an Arra of Hashes). Bluepill monitoring is optional and the maxmemory allows bluepill to kill off and remount any s3 mounts that misbehave. +It uses the github tags from https://github.com/s3fs-fuse/s3fs-fuse + Note: Bluepill should be considered for any s3fs built bucket that has large number of entries within directories. Running an `ls` on these directories will cause the mount's memory to balloon. Bluepill will happily watch for this (ballooning memory) From 888989a70cc0d1bfda3bdc07238c39a9542f2518 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 21:56:32 -0700 Subject: [PATCH 24/29] readme --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b597143..c9528d5 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Usage ```ruby override_attributes( - 's3fs-fuse' => { + 's3fs_fuse' => { :version => 'v1.79' :s3_key => 'key', :s3_secret => 'secret', @@ -24,7 +24,8 @@ Multiple buckets can be mounted (which is why the `:mounts` attribute is an Arra of Hashes). Bluepill monitoring is optional and the maxmemory allows bluepill to kill off and remount any s3 mounts that misbehave. -It uses the github tags from https://github.com/s3fs-fuse/s3fs-fuse +The value of node[:s3fs_fuse][:version] will download the specific tag from +https://github.com/s3fs-fuse/s3fs-fuse for versions 1.74 and greater. Note: Bluepill should be considered for any s3fs built bucket that has large number of entries within directories. Running an `ls` on these directories will cause the From 97c2156d331d2f61e6c72fb88cca3c9e24f63627 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 21:59:10 -0700 Subject: [PATCH 25/29] readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c9528d5..128976e 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ Multiple buckets can be mounted (which is why the `:mounts` attribute is an Arra of Hashes). Bluepill monitoring is optional and the maxmemory allows bluepill to kill off and remount any s3 mounts that misbehave. -The value of node[:s3fs_fuse][:version] will download the specific tag from -https://github.com/s3fs-fuse/s3fs-fuse for versions 1.74 and greater. +The value of node[:s3fs_fuse][:version] will attempt to download the specific tag +from the [s3fs-fuse github](https://github.com/s3fs-fuse/s3fs-fuse) for versions 1.74 and greater. Note: Bluepill should be considered for any s3fs built bucket that has large number of entries within directories. Running an `ls` on these directories will cause the From 73344c0be632bcfe5a73349d7c1f405b94e20846 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 22:00:47 -0700 Subject: [PATCH 26/29] readme --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 128976e..3ccd1ee 100644 --- a/README.md +++ b/README.md @@ -19,15 +19,16 @@ override_attributes( :maxmemory => 50 } ) +``` -Multiple buckets can be mounted (which is why the `:mounts` attribute is an Array +Multiple buckets can be mounted (which is why the ```:mounts``` attribute is an Array of Hashes). Bluepill monitoring is optional and the maxmemory allows bluepill to kill off and remount any s3 mounts that misbehave. -The value of node[:s3fs_fuse][:version] will attempt to download the specific tag +The value of ```node[:s3fs_fuse][:version]``` will attempt to download the specific tag from the [s3fs-fuse github](https://github.com/s3fs-fuse/s3fs-fuse) for versions 1.74 and greater. Note: Bluepill should be considered for any s3fs built bucket that has large number -of entries within directories. Running an `ls` on these directories will cause the +of entries within directories. Running an ```ls``` on these directories will cause the mount's memory to balloon. Bluepill will happily watch for this (ballooning memory) and remount the bucket. From debdc854d49855ed04116d9686d2b3002bf71a14 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 22:02:08 -0700 Subject: [PATCH 27/29] readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3ccd1ee..2e02a40 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ Usage ```ruby override_attributes( 's3fs_fuse' => { - :version => 'v1.79' :s3_key => 'key', :s3_secret => 'secret', + :version => 'v1.79' :mounts => [ {:bucket => 'my-bucket', :path => '/mount/path', :tmp_store => '/tmp/cache'} ], @@ -25,7 +25,7 @@ Multiple buckets can be mounted (which is why the ```:mounts``` attribute is an of Hashes). Bluepill monitoring is optional and the maxmemory allows bluepill to kill off and remount any s3 mounts that misbehave. -The value of ```node[:s3fs_fuse][:version]``` will attempt to download the specific tag +The value of ```node[:s3fs_fuse][:version]``` will be used to download the specific tag from the [s3fs-fuse github](https://github.com/s3fs-fuse/s3fs-fuse) for versions 1.74 and greater. Note: Bluepill should be considered for any s3fs built bucket that has large number From 01a3774d04be31045ff2c708a4bc225231324c2b Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 22:07:22 -0700 Subject: [PATCH 28/29] set autogen version correctly --- recipes/install.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/install.rb b/recipes/install.rb index f6b2c2c..497e6d8 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -69,11 +69,11 @@ bash "compile_and_install_s3fs" do cwd '/tmp' - if s3fs_version.to_f >= 1.74 + if s3fs_version.to_f >= 1.75 # Added ./autogen.sh here according to docs code <<-EOH tar -xzf s3fs-#{s3fs_git_tag}.tar.gz -C s3fs-#{s3fs_git_tag} --strip-components 1 cd s3fs-#{s3fs_git_tag} - #{'export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/lib64/pkgconfig' if node.platform_family == 'rhel'} + #{'export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/lib64/pkgconfig' if node.platform_family == 'rhel'} ./autogen.sh ./configure --prefix=/usr/local make && make install From 9aca2f95490b4621a25690184859fa4e71544980 Mon Sep 17 00:00:00 2001 From: Ray Janoka Date: Mon, 14 Dec 2015 22:12:10 -0700 Subject: [PATCH 29/29] nvm --- recipes/install.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/install.rb b/recipes/install.rb index 497e6d8..9f8d1f6 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -69,7 +69,7 @@ bash "compile_and_install_s3fs" do cwd '/tmp' - if s3fs_version.to_f >= 1.75 # Added ./autogen.sh here according to docs + if s3fs_version.to_f >= 1.74 # Added ./autogen.sh code <<-EOH tar -xzf s3fs-#{s3fs_git_tag}.tar.gz -C s3fs-#{s3fs_git_tag} --strip-components 1 cd s3fs-#{s3fs_git_tag}