android-sdk-installer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e65b649a3300a1e933e02c7e34ea1ceb93ed3509
-  data.tar.gz: f5d6bb98320506339ec3047f03721b0710cbefe4
+  metadata.gz: f656e032c4d07ee26c4e5ef56c28b6652c93d36e
+  data.tar.gz: a3e55863486002d1fd308b0208dfbacc68c2b892
 SHA512:
-  metadata.gz: df2cbea855f46c8e0b0eb1c065fd33d5e0baf9b1abbd7dd3de08b03c28276e9c8f06d431b120bcb01e27b8a24fc283700f12fde566ec0c9057d11e8778583a76
-  data.tar.gz: d50bbaafd0848bcfa1c4152a6396660398fa1a462106c55716ac8a37ee51b19828c326c903f1ade4e98c2c8708c3fad168e44a7ed8ec497e3d7eb7ba02157b04
+  metadata.gz: 5ba1729a3f71db078bb106f9b87dfd12d707d7f193f8e16d723aa174bfaf3fadc1ef5b3f4b91852f560e21d437da3eaacfbd779b0b3080cad7b4888ee18c2758
+  data.tar.gz: 34beb0fd5e6b7a41f91805449f054d367853d72c968e13e3aae1b802995267aa3c4bc1201c775ad10393c757148c923b6e604c0d2af1372dac391a9436528776

data/bin/android-sdk-installer

@@ -1,6 +1,6 @@
-#!/usr/bin/env ruby
-
-require 'android-sdk-installer'
-
-installer = AndroidInstaller::Installer.new
-installer.install
+#!/usr/bin/env ruby
+
+require 'android-sdk-installer'
+
+installer = AndroidInstaller::Installer.new
+installer.install

data/lib/android-sdk-installer.rb

@@ -1,55 +1,60 @@
-require 'yaml'
-require 'logger'
-
-module AndroidInstaller
-  # Installs components for building Android projects
-  # noinspection RubyClassVariableUsageInspection
-  class Installer
-
-    def initialize
-      @@logger = Logger.new(STDOUT)
-      @@logger.level = Logger::WARN
-    end
-
-    def install
-      key_sdk_tools = '{ANDROID_SDK_TOOLS}'
-      key_platform = '{PLATFORM}'
-      sdk_url = 'https://dl.google.com'
-      sdk_path = '/android/repository/tools_r' + key_sdk_tools + '-' + key_platform + '.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)
-      end
-      config = YAML.load_file('android-sdk-installer.yml')
-      unless config.has_key?('version')
-        puts "\nError in config file! Build file must contain a `version` string.\n\n"
-        exit(1)
-      end
-      if config['debug']
-        @@logger.level = Logger::DEBUG
-        @@logger.debug('We are in debug mode')
-      end
-      version = config['version']
-      platform = config['platform']
-      sdk_path[key_sdk_tools] = version
-      sdk_path[key_platform] = platform
-      @@logger.debug('Installing version ' + version + ' for platform ' + platform + ' with url ' + sdk_url + sdk_path)
-      exec('wget --quiet --output-document=android-sdk.zip ' + sdk_url + sdk_path)
-      exec('unzip -q android-sdk.zip -d android-sdk')
-      exec('rm android-sdk.zip')
-      exec('export ANDROID_HOME=$PWD/android-sdk')
-      components = config['components']
-      components.each {|component|
-        @@logger.debug('Installing component ' + component)
-        output = exec('echo y | $ANDROID_HOME/tools/bin/sdkmanager ' + component)
-        @@logger.debug(output)
-        puts output
-        if output.include? 'Warning'
-          puts "\nError installing component " + component + "\n"
-          puts output
-        end
-      }
-    end
-  end
-end
+require 'yaml'
+require 'logger'
+
+module AndroidInstaller
+  # Installs components for building Android projects
+  # noinspection RubyClassVariableUsageInspection
+  class Installer
+
+    def initialize
+      @@logger = Logger.new(STDOUT)
+      @@logger.level = Logger::WARN
+    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)
+      end
+      config = YAML.load_file('android-sdk-installer.yml')
+      version = '3859397'
+      if config.has_key?('version')
+        version = config['version']
+      end
+      if config['debug']
+        @@logger.level = Logger::DEBUG
+        @@logger.debug('We are in debug mode')
+      end
+
+      platform = 'linux'
+      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`
+      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
+        end
+      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.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Commit 451
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Android SDK installer