android-sdk-installer 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f656e032c4d07ee26c4e5ef56c28b6652c93d36e
-  data.tar.gz: a3e55863486002d1fd308b0208dfbacc68c2b892
+  metadata.gz: 1f5d87a5a604492d69f91929b62b0503dc607ca7
+  data.tar.gz: 4cca1af8013343f49bf9ed8609cbf442972abc98
 SHA512:
-  metadata.gz: 5ba1729a3f71db078bb106f9b87dfd12d707d7f193f8e16d723aa174bfaf3fadc1ef5b3f4b91852f560e21d437da3eaacfbd779b0b3080cad7b4888ee18c2758
-  data.tar.gz: 34beb0fd5e6b7a41f91805449f054d367853d72c968e13e3aae1b802995267aa3c4bc1201c775ad10393c757148c923b6e604c0d2af1372dac391a9436528776
+  metadata.gz: 32d95334a68b81625f7ae32a054ab8bf1cc914cd4b1bfca2b198f237fbef324f012ec3bd3e202f19fc8b1fb9b87f81cb50de887e10096c74731cb53118724aed
+  data.tar.gz: 3151b64ea06f0572bc918789d779bddfe91459063de320fd218850c7e34148ad0cf57076929f5d8e38a1a95a96f7e2fa15ef4842085bfbcf29b40fb219d18608

data/lib/android-sdk-installer.rb

@@ -1,4 +1,4 @@
-require 'yaml'
+require 'psych'
 require 'logger'
 
 module AndroidInstaller
@@ -6,23 +6,42 @@ module AndroidInstaller
   # noinspection RubyClassVariableUsageInspection
   class Installer
 
+    KEY_SDK_TOOLS = '{ANDROID_SDK_TOOLS}'
+    KEY_PLATFORM = '{PLATFORM}'
+    SDK_URL = 'https://dl.google.com'
+    SDK_PATH = '/android/repository/sdk-tools-' + KEY_PLATFORM + '-' + KEY_SDK_TOOLS + '.zip'
+    CONFIG_FILE = 'android-sdk-installer.yml'
+
     def initialize
       @@logger = Logger.new(STDOUT)
       @@logger.level = Logger::WARN
     end
 
+    def install_command_line_sdk(platform, version)
+      sdk_path = SDK_PATH
+      sdk_path[KEY_SDK_TOOLS] = version
+      sdk_path[KEY_PLATFORM] = platform
+      url = SDK_URL + sdk_path
+      @@logger.debug('Downloading version ' + version + ' for platform ' + platform + ' with url ' + url)
+      `wget --quiet --output-document=android-sdk.zip #{url}`
+      # TODO: error out here if file not found
+      unless File.file?('android-sdk.zip')
+        puts "\nAndroid SDK not found at url #{url}. Make sure you have the right values in your #{CONFIG_FILE}\n"
+        exit(1)
+      end
+      @@logger.debug('Unzipping android-sdk.zip')
+      `unzip -q android-sdk.zip -d $PWD/android-sdk`
+      `rm android-sdk.zip`
+      `export ANDROID_HOME=$PWD/android-sdk`
+    end
+
     def install
-      # Why is it formatted like this?
-      key_sdk_tools = '{ANDROID_SDK_TOOLS}'
-      key_platform = '{PLATFORM}'
-      sdk_url = 'https://dl.google.com'
-      sdk_path = '/android/repository/sdk-tools-' + key_platform + '-' + key_sdk_tools + '.zip'
       # Validation
-      unless File.file?('android-sdk-installer.yml')
-        puts "\nNo config file found. You need a file called `android-sdk-installer.yml` with the configuration. See the README for details\n\n"
-        exit(1)
+      if File.file?('android-sdk.zip')
+        config = Psych.load_file CONFIG_FILE
+      else
+        config = Psych.load("foo: true\nbar: false")
       end
-      config = YAML.load_file('android-sdk-installer.yml')
       version = '3859397'
       if config.has_key?('version')
         version = config['version']
@@ -36,23 +55,30 @@ module AndroidInstaller
       if config.has_key?('platform')
         platform = config['platform']
       end
-      sdk_path[key_sdk_tools] = version
-      sdk_path[key_platform] = platform
-      @@logger.debug('Downloading version ' + version + ' for platform ' + platform + ' with url ' + sdk_url + sdk_path)
-      `wget --quiet --output-document=android-sdk.zip #{sdk_url + sdk_path}`
-      # TODO: error out here if file not found
-      @@logger.debug('Unzipping android-sdk.zip')
-      `unzip -q android-sdk.zip -d $PWD/android-sdk`
-      `rm android-sdk.zip`
-      `export ANDROID_HOME=$PWD/android-sdk`
+
+      ignore_existing = false
+      if config.has_key?('ignore_existing')
+        ignore_existing = config['ignore_existing']
+        @@logger.debug("Ignore existing set to #{ignore_existing}")
+      end
+
+      should_install = ENV['ANDROID_HOME'].nil? || ignore_existing
+      if should_install
+        install_command_line_sdk(platform, version)
+      else
+        @@logger.debug('ANDROID_HOME already set. Skipping command line tools install')
+      end
+
       components = config['components']
-      components.each do |component|
-        @@logger.debug('Installing component ' + component)
-        output = `echo y | $ANDROID_HOME/tools/bin/sdkmanager "#{component}"`
-        @@logger.debug(output)
-        if output.include? 'Warning'
-          puts "\nError installing component " + component + "\n"
-          puts output
+      if components != nil
+        components.each do |component|
+          @@logger.debug('Installing component ' + component)
+          output = `echo y | $ANDROID_HOME/tools/bin/sdkmanager "#{component}"`
+          @@logger.debug(output)
+          if output.include? 'Warning'
+            puts "\nError installing component " + component + "\n"
+            puts output
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: android-sdk-installer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Commit 451