From e7dddbdcf0c9dfdc5ad0c8b919ee7e1e02eb8bbb Mon Sep 17 00:00:00 2001 From: Brantone Date: Tue, 24 Jan 2017 16:37:40 -0800 Subject: [PATCH 1/4] Bump cookbook version, depedency versions, and repoint Ark --- Berksfile | 2 -- metadata.rb | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Berksfile b/Berksfile index f793a14..2acfa60 100644 --- a/Berksfile +++ b/Berksfile @@ -2,8 +2,6 @@ source 'https://supermarket.chef.io' metadata -cookbook 'ark', git: 'https://github.com/rjaros87/ark', ref: 'seven-zip' # https://github.com/chef-cookbooks/ark/issues/157 - group :integration do cookbook 'android-sdk', path: './' end diff --git a/metadata.rb b/metadata.rb index 08ea6c8..7cd4e2c 100644 --- a/metadata.rb +++ b/metadata.rb @@ -6,13 +6,13 @@ long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) issues_url 'https://github.com/gildegoma/chef-android-sdk/issues' source_url 'https://github.com/gildegoma/chef-android-sdk' -version '0.2.0' +version '0.3.0' -depends 'java', '~> 1.40.4' +depends 'java', '~> 1.42' depends 'ark', '>= 1.1.0' depends 'bash', '~> 0.1.2' depends 'chef-sugar', '>= 3.3.0' -depends 'expect', '~> 2.0.0' +depends 'expect', '~> 2.0' # TODO: maybe put maven into depends section recommends 'maven' # Maven 3.1.1+ is required by android-sdk::maven-rescue recipe From e4b66c555a3e598b87343185e4da4e94444f0ea6 Mon Sep 17 00:00:00 2001 From: Brantone Date: Wed, 25 Jan 2017 03:13:27 -0800 Subject: [PATCH 2/4] Remove mac_os_x group restrictions --- recipes/maven_rescue.rb | 6 +++--- recipes/unix.rb | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/recipes/maven_rescue.rb b/recipes/maven_rescue.rb index 2ecc405..4cd73ed 100644 --- a/recipes/maven_rescue.rb +++ b/recipes/maven_rescue.rb @@ -9,7 +9,7 @@ # directory maven_android_sdk_deployer_home do user node['android-sdk']['owner'] - group node['android-sdk']['group'] unless mac_os_x? + group node['android-sdk']['group'] mode '0755' action :create end @@ -19,7 +19,7 @@ checkout_branch "deploy_#{node['android-sdk']['maven-android-sdk-deployer']['version']}" action :sync user node['android-sdk']['owner'] - group node['android-sdk']['group'] unless mac_os_x? + group node['android-sdk']['group'] end # @@ -35,7 +35,7 @@ execute 'Execute maven-android-sdk-deployer' do command "mvn clean install -Dmaven.repo.local=#{node['android-sdk']['maven-local-repository']} --fail-never -B" user node['android-sdk']['owner'] - group node['android-sdk']['group'] unless mac_os_x? + group node['android-sdk']['group'] cwd maven_android_sdk_deployer_home # FIXME: setting HOME might be required (if $HOME used in node['android-sdk']['maven-local-repository'], diff --git a/recipes/unix.rb b/recipes/unix.rb index 882ce6f..55d8e00 100644 --- a/recipes/unix.rb +++ b/recipes/unix.rb @@ -69,7 +69,7 @@ prefix_root node['android-sdk']['setup_root'] prefix_home node['android-sdk']['setup_root'] owner node['android-sdk']['owner'] - group node['android-sdk']['group'] unless mac_os_x? + group node['android-sdk']['group'] backup node['android-sdk']['backup_archive'] action node['android-sdk']['with_symlink'] ? :install : :put end @@ -86,12 +86,12 @@ execute 'Grant all users to read android files' do command "chmod -R a+r #{android_home}/*" user node['android-sdk']['owner'] - group node['android-sdk']['group'] unless mac_os_x? + group node['android-sdk']['group'] end execute 'Grant all users to execute android tools' do command "chmod -R a+X #{File.join(android_home, 'tools')}/*" user node['android-sdk']['owner'] - group node['android-sdk']['group'] unless mac_os_x? + group node['android-sdk']['group'] end # @@ -102,7 +102,7 @@ source 'android-sdk.sh.erb' mode '0644' owner node['android-sdk']['owner'] - group node['android-sdk']['group'] unless mac_os_x? + group node['android-sdk']['group'] variables( android_home: android_home ) @@ -137,7 +137,7 @@ environment 'ANDROID_HOME' => android_home path [File.join(android_home, 'tools')] user node['android-sdk']['owner'] - group node['android-sdk']['group'] unless mac_os_x? + group node['android-sdk']['group'] # TODO: use --force or not? code <<-EOF spawn #{android_bin} update sdk --no-ui --all --filter #{sdk_component} @@ -170,7 +170,7 @@ cookbook_file File.join(node['android-sdk']['scripts']['path'], android_helper_script) do source android_helper_script owner node['android-sdk']['scripts']['owner'] - group node['android-sdk']['scripts']['group'] unless mac_os_x? + group node['android-sdk']['scripts']['group'] mode '0755' end end @@ -179,7 +179,7 @@ template File.join(node['android-sdk']['scripts']['path'], android_helper_script) do source "#{android_helper_script}.erb" owner node['android-sdk']['scripts']['owner'] - group node['android-sdk']['scripts']['group'] unless mac_os_x? + group node['android-sdk']['scripts']['group'] mode '0755' end end From e284853b265e7fcfea9145b40580e2c33b13aab1 Mon Sep 17 00:00:00 2001 From: Brantone Date: Wed, 25 Jan 2017 13:23:27 -0800 Subject: [PATCH 3/4] Cleanup Rubocop, set group based on platform. --- .rubocop.yml | 3 +++ Gemfile | 10 +++++----- attributes/default.rb | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index a6a2229..08610e7 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -8,3 +8,6 @@ AllCops: Metrics/LineLength: Max: 150 + +Metrics/BlockLength: + Max: 30 diff --git a/Gemfile b/Gemfile index 65319dc..24dd044 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,14 @@ source 'https://rubygems.org' -gem 'rake' -gem 'tailor' +gem 'berkshelf', '~> 4.3' +gem 'chef', '~> 12.11' gem 'chefspec', '~> 4.7' gem 'foodcritic', '>= 5.0.0' -gem 'chef', '~> 12.11' +gem 'rake' gem 'rubocop' -gem 'berkshelf', '~> 4.3' +gem 'tailor' group :integration do - gem 'test-kitchen', '~> 1.10' gem 'kitchen-vagrant', '~> 0.20.0' + gem 'test-kitchen', '~> 1.10' end diff --git a/attributes/default.rb b/attributes/default.rb index 11cbf00..b6da8dc 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,6 +1,6 @@ default['android-sdk']['name'] = 'android-sdk' default['android-sdk']['owner'] = 'root' -default['android-sdk']['group'] = 'root' +default['android-sdk']['group'] = platform_family?('mac_os_x') ? 'wheel' : 'root' default['android-sdk']['backup_archive'] = false # The number of backups to be kept in /var/chef/backup. To prevent backups set to false. default['android-sdk']['setup_root'] = nil # ark defaults (/usr/local) is used if this attribute is not defined default['android-sdk']['with_symlink'] = true # use ark's :install action when true; use ark's :put action when false From d0e378c4e3e3b14dce9ed10ca3e72fa6b207eec5 Mon Sep 17 00:00:00 2001 From: Radoslaw Jaros Date: Thu, 2 Feb 2017 09:53:32 +0100 Subject: [PATCH 4/4] Update dna.json --- test/support/dna.json | 1 - 1 file changed, 1 deletion(-) diff --git a/test/support/dna.json b/test/support/dna.json index 9106ca5..8532a54 100644 --- a/test/support/dna.json +++ b/test/support/dna.json @@ -1,6 +1,5 @@ { "android-sdk": { - "owner": "travis", "version": "24.4.1", "checksum": { "linux": "e16917ad685c1563ccbc5dd782930ee1a700a1b6a6fd3e44b83ac694650435e9",