itamae-plugin-recipe-android_sdk 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6de6d72f6abd41cd7f31ba8a9a3d6c55726ed8dc
-  data.tar.gz: 8043653af1b397f73cbfecb222027ad01ab51e2e
+  metadata.gz: f2a8968ea9bd9e0e5540a656a0d514d7060a688a
+  data.tar.gz: 19e16c03aded9e4a14caab7083d96c740f5af442
 SHA512:
-  metadata.gz: 1b3c5c4335fd8a61ef24f1c986fbc269bf4dcb1df510178d235b38f547f1545774f6f0ac0477325fa50c92b5835132783ea2963d3c19e0a6bf4764e247dd9dc3
-  data.tar.gz: 4f685ad9ce1a42b7fce88a3f54c5637085e1256b0414c7d914c48114ba060f106045d8fc3b58d835c05f3ffb9a322b0b49bc8ea7f18cf45dea36473d52e858c5
+  metadata.gz: 5ec36ed726d35f3e4b9e53a6e393fb69798813815e5dab2d4c1d3db4b8b6ffdb4aa44efa1c81d40db9b896c187114d47b313c605d7b796758849566db02a393a
+  data.tar.gz: 63d239b9fa313dd2964a0db48cbcae720b647e0dbdd7281cdf1025473710c64dd25ea19a1ba3a74b047073c797cac19113665ae674be8ebc1fcac05d8459dd48

data/README.md

@@ -2,9 +2,9 @@
 
 Require JDK.
 
-## Installation
+[![Gem Version](https://badge.fury.io/rb/itamae-plugin-recipe-android_sdk.svg)](https://badge.fury.io/rb/itamae-plugin-recipe-android_sdk)
 
-※ **Not yet published in 'RubyGems.org'**
+## Installation
 
 Add this line to your application's Gemfile:
 
@@ -45,7 +45,7 @@ include_recipe 'android_sdk::install'
 
 Default install path `/usr/local`, if not set 'install_path'
 
-#### android sdk update
+#### android sdk update with filter
 
 Update Android SDK at like node.json following:
 
@@ -61,6 +61,29 @@ Update Android SDK at like node.json following:
 }
 ```
 
+e.g.
+```
+$ itamae ssh --vagrant --node-json node.json android_sdk.rb
+```
+
+#### android sdk update latest
+
+Install Android SDK and update without filter.
+
+* recipe
+
+```ruby
+include_recipe 'android_sdk::latest'
+```
+
+It is the same with the following command:
+
+```sh
+$ android update sdk -u
+```
+
+※ Caution<br>
+It takes long time :sob:
 
 ## License
 

data/lib/itamae/plugin/recipe/android_sdk/latest.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+node[:sdk] ||= {}
+
+# To disable user specified.
+node[:sdk][:update_list] = nil
+
+# Run install.
+include_recipe 'android_sdk::install'
+
+# Run update sdk latest.
+include_recipe 'android_sdk::update_sdk'

data/lib/itamae/plugin/recipe/android_sdk/update_sdk.rb

@@ -4,6 +4,7 @@ ANDROID_SDK_ROOT = "#{node[:sdk][:install_path]}/#{node[:sdk][:directory]}"
 
 # Interactive android sdk update shell.
 TEMPLATE_SRC_PATH = "#{File.expand_path('../../', __FILE__)}/templates/android-update-sdk.sh.erb"
+TEMPLATE_LATEST_SRC_PATH = "#{File.expand_path('../../', __FILE__)}/templates/android-update-sdk-latest.sh.erb"
 TEMPLATE_DEST_PATH = "#{ANDROID_SDK_ROOT}/tools/android-update-sdk.sh"
 
 case node[:platform]
@@ -13,13 +14,20 @@ else
   package 'expect'
 end
 
+src_path = TEMPLATE_LATEST_SRC_PATH
+update_list = ''
+
+if node[:sdk][:update_list]
+  # Filter by user.
+  src_path = TEMPLATE_SRC_PATH
+  update_list = node[:sdk][:update_list].join(',')
+end
+
 template TEMPLATE_DEST_PATH do
   mode "0755"
-  source TEMPLATE_SRC_PATH
+  source src_path
 end
 
-update_list = node[:sdk][:update_list].join(',')
-
 # Prepare.
 case node[:platform]
 when 'osx', 'darwin'

data/lib/itamae/plugin/recipe/android_sdk/version.rb

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module AndroidSdk
-        VERSION = "0.1.0"
+        VERSION = "0.1.1"
       end
     end
   end

data/lib/itamae/plugin/recipe/templates/android-update-sdk-latest.sh.erb

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+expect -c "
+    set timeout -1
+    spawn <%= "#{node[:sdk][:install_path]}/#{node[:sdk][:directory]}" %>/tools/android update sdk -u
+    expect {
+        \"Do you accept the license\" {
+            send \"y\n\"
+            exp_continue
+        }
+        Downloading {
+            exp_continue
+        }
+        Installing {
+            exp_continue
+        }
+    }
+"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-android_sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - slowhand0309
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-16 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -83,8 +83,10 @@ files:
 - lib/itamae/plugin/recipe/android_sdk.rb
 - lib/itamae/plugin/recipe/android_sdk/dependency.rb
 - lib/itamae/plugin/recipe/android_sdk/install.rb
+- lib/itamae/plugin/recipe/android_sdk/latest.rb
 - lib/itamae/plugin/recipe/android_sdk/update_sdk.rb
 - lib/itamae/plugin/recipe/android_sdk/version.rb
+- lib/itamae/plugin/recipe/templates/android-update-sdk-latest.sh.erb
 - lib/itamae/plugin/recipe/templates/android-update-sdk.sh.erb
 homepage: https://github.com/Slowhand0309/itamae-plugin-recipe-android_sdk
 licenses: