ruboto 0.12.0 → 0.13.0.rc.0

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    ruboto (0.12.0)
+    ruboto (0.13.0.dev)
       main (>= 4.7.2)
+      rake
 
 GEM
   remote: https://rubygems.org/
@@ -15,7 +16,7 @@ GEM
       chronic (>= 0.6.2)
       fattr (>= 2.2.0)
       map (>= 5.1.0)
-    map (6.5.1)
+    map (6.3.0)
     rake (10.0.4)
 
 PLATFORMS
@@ -23,5 +24,4 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rake
   ruboto!

data/Rakefile

@@ -4,7 +4,6 @@ require 'rexml/document'
 require 'ruboto/version'
 require 'ruboto/description'
 require 'ruboto/sdk_versions'
-require 'ruboto/sdk_locations'
 require 'uri'
 require 'net/https'
 
@@ -16,7 +15,6 @@ PLATFORM_CURRENT_RELEASE_APK = File.expand_path('tmp/RubotoCore-release.apk', Fi
 MANIFEST_FILE = 'AndroidManifest.xml'
 GEM_FILE = "ruboto-#{Ruboto::VERSION}.gem"
 GEM_SPEC_FILE = 'ruboto.gemspec'
-EXAMPLE_FILE = File.expand_path("examples/RubotoTestApp_#{Ruboto::VERSION}_tools_r#{Ruboto::SdkLocations::ANDROID_TOOLS_REVISION}.tgz", File.dirname(__FILE__))
 
 CLEAN.include('ruboto-*.gem', 'tmp')
 
@@ -65,9 +63,11 @@ end
 task :reinstall => [:uninstall, :clean, :install]
 
 desc 'Generate an example app'
-task :example => EXAMPLE_FILE
-
-file EXAMPLE_FILE => :install do
+task :example => :install do
+  require 'ruboto/sdk_locations'
+  EXAMPLE_FILE = File.expand_path("examples/RubotoTestApp_#{Ruboto::VERSION}_tools_r#{Ruboto::SdkLocations::ANDROID_TOOLS_REVISION}.tgz", File.dirname(__FILE__))
+  examples_glob = "#{EXAMPLE_FILE.slice(/^.*?_\d+\.\d+\.\d+/)}*"
+  sh "git rm #{examples_glob}" unless Dir[examples_glob].empty?
   puts "Creating example app #{EXAMPLE_FILE}"
   app_name = 'RubotoTestApp'
   Dir.chdir File.dirname(EXAMPLE_FILE) do
@@ -78,6 +78,12 @@ file EXAMPLE_FILE => :install do
   end
 end
 
+class String
+  def wrap(indent = 0)
+    scan(/\S.{0,72}\S(?=\s|$)|\S+/).join("\n" + ' ' * indent)
+  end
+end
+
 desc 'Generate release docs for a given milestone'
 task :release_docs do
   raise "\n    This task requires Ruby 1.9 or newer to parse JSON as YAML.\n\n" if RUBY_VERSION == '1.8.7'
@@ -122,6 +128,7 @@ task :release_docs do
   issues = YAML.load(res.body).sort_by { |i| i['number'] }
   milestone_name = issues[0] ? issues[0]['milestone']['title'] : "No issues for milestone #{milestone}"
   milestone_description = issues[0] ? issues[0]['milestone']['description'] : "No issues for milestone #{milestone}"
+  milestone_description = milestone_description.split("\r\n").map(&:wrap).join("\r\n")
   categories = {'Features' => 'feature', 'Bugfixes' => 'bug', 'Internal' => 'internal', 'Support' => 'support', 'Documentation' => 'documentation', 'Pull requests' => nil, 'Other' => nil}
   grouped_issues = issues.group_by do |i|
     labels = i['labels'].map { |l| l['name'] }
@@ -180,7 +187,7 @@ EOF
   puts
   puts "The Ruboto team is pleased to announce the release of Ruboto #{milestone_name}."
   puts
-  puts Ruboto::DESCRIPTION
+  puts Ruboto::DESCRIPTION.gsub("\n", ' ').wrap
   puts
   puts "New in version #{milestone_name}:\n"
   puts
@@ -188,7 +195,7 @@ EOF
   puts
   (categories.keys & grouped_issues.keys).each do |cat|
     puts "#{cat}:\n\n"
-    grouped_issues[cat].each { |i| puts %Q{* Issue ##{i['number']} #{i['title']}} }
+    grouped_issues[cat].each { |i| puts %Q{* Issue ##{i['number']} #{i['title']}}.wrap(2) }
     puts
   end
   puts "You can find a complete list of issues here:\n\n"
@@ -197,7 +204,8 @@ EOF
   puts <<EOF
 Installation:
 
-To use Ruboto, you need to install a Ruby implementation.  Then do (possibly as root)
+To use Ruboto, you need to install a Ruby implementation.  Then do
+(possibly as root/administrator)
 
     gem install ruboto
     ruboto setup
@@ -218,7 +226,8 @@ To run your project
     cd <project directory>
     rake install start
 
-You can find an introductory tutorial at https://github.com/ruboto/ruboto/wiki
+You can find an introductory tutorial at
+https://github.com/ruboto/ruboto/wiki
 
 If you have any problems or questions, come see us at http://ruboto.org/
 
@@ -312,14 +321,11 @@ end
 
 desc 'Push the gem to RubyGems'
 task :release => [:clean, :gem] do
-  #output = `git status --porcelain`
-  #raise "Workspace not clean!\n#{output}" unless output.empty?
+  output = `git status --porcelain`
+  raise "Workspace not clean!\n#{output}" unless output.empty?
   sh "git tag #{Ruboto::VERSION}"
   sh 'git push --tags'
   sh "gem push #{GEM_FILE}"
-
-  examples_glob = "#{EXAMPLE_FILE.slice(/^.*?_\d+\.\d+\.\d+/)}*"
-  sh "git rm #{examples_glob}" unless Dir[examples_glob].empty?
   Rake::Task[:example].invoke
   sh "git add #{EXAMPLE_FILE}"
   sh "git commit -m '* Added example app for Ruboto #{Ruboto::VERSION} tools r#{Ruboto::SdkLocations::ANDROID_TOOLS_REVISION}' \"#{examples_glob}\""

data/assets/rakelib/ruboto.rake

@@ -15,42 +15,50 @@ if `#{ANT_CMD} -version` !~ /version (\d+)\.(\d+)\.(\d+)/ || $1.to_i < 1 || ($1.
   exit 1
 end
 
+#
+# OS independent "which"
+# From: http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
+#
+def which(cmd)
+  exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+  ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+    exts.each do |ext|
+      exe = File.join(path, "#{cmd}#{ext}")
+      return exe if File.executable? exe
+    end
+  end
+  nil
+end
+
 adb_version_str = `adb version`
 (puts 'Android SDK platform tools not in PATH (adb command not found).'; exit 1) unless $? == 0
 (puts "Unrecognized adb version: #$1"; exit 1) unless adb_version_str =~ /Android Debug Bridge version (\d+\.\d+\.\d+)/
 (puts "adb version 1.0.31 or later required.  Version found: #$1"; exit 1) unless Gem::Version.new($1) >= Gem::Version.new('1.0.31')
-unless ENV['ANDROID_HOME']
-  unless ON_WINDOWS
-    begin
-      adb_path = `which adb`
-      ENV['ANDROID_HOME'] = File.dirname(File.dirname(adb_path)) if $? == 0
-    rescue Errno::ENOENT
-      puts "Unable to detect adb location: #$!"
-    end
-  end
+if ENV['ANDROID_HOME'].nil? && (adb_path = which('adb'))
+  ENV['ANDROID_HOME'] = File.dirname(File.dirname(adb_path))
 end
 (puts 'You need to set the ANDROID_HOME environment variable.'; exit 1) unless ENV['ANDROID_HOME']
 
-# FIXME(uwe):  On windows the file is called dx.bat
-dx_filename = File.join(ENV['ANDROID_HOME'], 'platform-tools', ON_WINDOWS ? 'dx.bat' : 'dx')
-unless File.exists? dx_filename
-  puts 'You need to install the Android SDK Platform-tools!'
+# FIXME(uwe): Simplify when we stop supporting Android SDK < 22: Don't look in pltform-tools for dx
+dx_filename = Dir[File.join(ENV['ANDROID_HOME'], '{build-tools/*,platform-tools}', ON_WINDOWS ? 'dx.bat' : 'dx')][-1]
+# EMXIF
+
+unless dx_filename
+  puts 'You need to install the Android SDK Build-tools!'
   exit 1
 end
 new_dx_content = File.read(dx_filename).dup
 
-# FIXME(uwe): Set Xmx on windows bat script:
-# set defaultXmx=-Xmx1024M
-
-xmx_pattern = /^defaultMx="-Xmx(\d+)(M|m|G|g|T|t)"/
-MINIMUM_DX_HEAP_SIZE = 2048
+xmx_pattern = ON_WINDOWS ? /^set defaultXmx=-Xmx(\d+)(M|m|G|g|T|t)/ : /^defaultMx="-Xmx(\d+)(M|m|G|g|T|t)"/
+MINIMUM_DX_HEAP_SIZE = 1536
 if new_dx_content =~ xmx_pattern &&
     ($1.to_i * 1024 ** {'M' => 2, 'G' => 3, 'T' => 4}[$2.upcase]) < MINIMUM_DX_HEAP_SIZE*1024**2
   puts "Increasing max heap space from #$1#$2 to #{MINIMUM_DX_HEAP_SIZE}M in #{dx_filename}"
-  new_dx_content.sub!(xmx_pattern, %Q{defaultMx="-Xmx#{MINIMUM_DX_HEAP_SIZE}M"})
+  new_xmx_value = ON_WINDOWS ? %Q{set defaultXmx=-Xmx#{MINIMUM_DX_HEAP_SIZE}M} : %Q{defaultMx="-Xmx#{MINIMUM_DX_HEAP_SIZE}M"}
+  new_dx_content.sub!(xmx_pattern, new_xmx_value)
 
   # FIXME(uwe): For travis debugging  Remove when travis is stable.
-  new_dx_content.sub!(/^exec/, "free\necho Virtual:\nps -e -ovsize=,args= | sort -b -k1,1n | tail -n10\necho RSS:\nps -e -orss=,args= | sort -b -k1,1n | tail -n10\necho $javaOpts\necho $@\nexec") if RbConfig::CONFIG['host_os'] =~ /linux/
+  new_dx_content.sub!(/^exec/, "free\ncat /proc/meminfo\necho Virtual:\nps -e -ovsize=,args= | sort -b -k1,1n | tail -n10\necho RSS:\nps -e -orss=,args= | sort -b -k1,1n | tail -n10\necho $javaOpts\necho $@\njava -XX:+PrintFlagsFinal -version | grep InitialHeapSize\nexec") if RbConfig::CONFIG['host_os'] =~ /linux/
   # EMXIF
 
   File.open(dx_filename, 'w') { |f| f << new_dx_content } rescue puts "\n!!! Unable to increase dx heap size !!!\n\n"
@@ -504,31 +512,10 @@ def package_installed?(test = false)
   package_name = "#{package}#{'.tests' if test}"
   loop do
     path_line = `adb shell pm path #{package_name}`.chomp
-
-    # FIXME(uwe): Debug travis CI.  Remove when Travis CI is OK.
-    puts '*' * 80
-    puts 'Output from pm path'
-    puts '*' * 80
-    puts $?.inspect
-    puts '*' * 80
-    puts path_line
-    puts '*' * 80
-    # EMXIF
-
     return nil if $? == 0 && path_line.empty?
     break if $? == 0 && path_line =~ /^package:(.*)$/
-
-    # FIXME(uwe): Debug travis CI.  Remove when Travis CI is OK.
-    puts '*' * 80
-    puts 'Unexpected output from pm path'
-    puts '*' * 80
-    puts path_line
-    puts '*' * 80
-    # EMXIF
-
     sleep 0.5
   end
-
   path = $1
   o = `adb shell ls -l #{path}`.chomp
   raise "Unexpected ls output: #{o}" if o !~ APK_FILE_REGEXP
@@ -567,7 +554,11 @@ def build_apk(t, release)
   if release
     sh "#{ANT_CMD} release"
   else
+
+    # FIXME(uwe): For travis debugging  Remove when travis is stable.
     sh 'free' if RbConfig::CONFIG['host_os'] =~ /linux/
+    # EMXIF
+
     sh "#{ANT_CMD} debug"
   end
   true
@@ -674,15 +665,14 @@ end
 
 def start_emulator(sdk_level)
   STDOUT.sync = true
-  # FIXME(uwe):  Use RBConfig instead
-  if `uname -m`.chomp == 'x86_64'
+  if RbConfig::CONFIG['host_cpu'] == 'x86_64'
     emulator_cmd = 'emulator64-arm'
   else
     emulator_cmd = 'emulator-arm'
   end
 
   emulator_opts = '-partition-size 256'
-  if ENV['DISPLAY'].nil?
+  if !ON_WINDOWS && ENV['DISPLAY'].nil?
     emulator_opts << ' -no-window -no-audio'
   end
 
@@ -690,10 +680,12 @@ def start_emulator(sdk_level)
   new_snapshot = false
 
   if `adb devices` =~ /emulator-5554/
-    t = Net::Telnet.new('Host' => 'localhost', 'Port' => 5554, 'Prompt' => /^OK/)
+    t = Net::Telnet.new('Host' => 'localhost', 'Port' => 5554, 'Prompt' => /^OK\n/)
+    t.waitfor(/^OK\n/)
     output = ''
     t.cmd('avd name') { |c| output << c }
-    if output =~ /OK\n(.*)\nOK/
+    t.close
+    if output =~ /(.*)\nOK\n/
       running_avd_name = $1
       if running_avd_name == avd_name
         puts "Emulator #{avd_name} is already running."
@@ -702,8 +694,10 @@ def start_emulator(sdk_level)
         puts "Emulator #{running_avd_name} is running."
       end
     else
-      puts 'No emulator is running.'
+      raise "Unexpected response from emulator: #{output.inspect}"
     end
+  else
+    puts 'No emulator is running.'
   end
 
   loop do
@@ -739,17 +733,22 @@ def start_emulator(sdk_level)
 
     unless File.exists? "#{ENV['HOME']}/.android/avd/#{avd_name}.avd"
       puts "Creating AVD #{avd_name}"
+      puts `echo n | android create avd -a -n #{avd_name} -t android-#{sdk_level} #{abi_opt} -c 64M -s HVGA`
+      if $? != 0
+        puts 'Failed to create AVD.'
+        exit 3
+      end
+      avd_config_file_name = "#{ENV['HOME']}/.android/avd/#{avd_name}.avd/config.ini"
+      old_avd_config = File.read(avd_config_file_name)
       heap_size = (File.read('AndroidManifest.xml') =~ /largeHeap/) ? 256 : 48
-      # FIXME(uwe):  Use Ruby instead.
-      # FIXME(uwe):  Only change the heap size to be larger.
-      # `sed -i.bak -e "s/vm.heapSize=[0-9]*/vm.heapSize=#{heap_size}/" #{ENV['ANDROID_HOME']}/platforms/*/*/*/hardware.ini`
-      `echo n | android create avd -a -n #{avd_name} -t android-#{sdk_level} #{abi_opt} -c 64M -s HVGA`
-      `sed -i.bak -e "s/vm.heapSize=[0-9]*/vm.heapSize=#{heap_size}/" #{ENV['HOME']}/.android/avd/#{avd_name}.avd/config.ini`
+      new_avd_config = old_avd_config.gsub(/vm.heapSize=([0-9]*)/){|m| p m ; m.to_i < heap_size ? "vm.heapSize=#{heap_size}" : m}
+      File.write(avd_config_file_name, new_avd_config) if new_avd_config != old_avd_config
       new_snapshot = true
     end
 
     puts 'Start emulator'
-    system "emulator -avd #{avd_name} #{emulator_opts} &"
+    system "emulator -avd #{avd_name} #{emulator_opts} #{'&' unless ON_WINDOWS}"
+    return if ON_WINDOWS
 
     3.times do |i|
       sleep 1
@@ -767,7 +766,7 @@ def start_emulator(sdk_level)
     `killall -0 #{emulator_cmd} 2> /dev/null`
     if $? != 0
       puts 'Unable to start the emulator.  Retrying without loading snapshot.'
-      system "emulator -no-snapshot-load -avd #{avd_name} #{emulator_opts} &"
+      system "emulator -no-snapshot-load -avd #{avd_name} #{emulator_opts} #{'&' unless ON_WINDOWS}"
       10.times do |i|
         `killall -0 #{emulator_cmd} 2> /dev/null`
         if $? == 0

data/lib/ruboto/commands/base.rb

@@ -82,7 +82,7 @@ module Ruboto
                 root = File.expand_path(path)
                 puts "\nGenerating Android app #{name} in #{root}..."
                 system "android create project -n #{name} -t #{target} -p #{path} -k #{package} -a #{activity}"
-                exit $? unless $? == 0
+                exit $?.to_i unless $? == 0
                 unless File.exists? path
                   puts 'Android project was not created'
                   exit_failure!
@@ -362,6 +362,8 @@ module Ruboto
               when 'ruboto' then
                 puts "\nThe 'ruboto update ruboto' command has been deprecated.  Use\n\n    ruboto update app\n\ninstead.\n\n"
                 update_ruboto(params['force'].value) || abort
+              else
+                raise "Unknown update target: #{params['what'].value.inspect}"
               end
             end
           end
@@ -370,8 +372,19 @@ module Ruboto
             require 'ruboto/util/setup'
             include Ruboto::Util::Setup
 
+            option('target', 't') {
+              description 'sets the target Android API level to set up for (example: -t android-16)'
+              argument :required
+              default Ruboto::SdkVersions::DEFAULT_TARGET_SDK
+              arity -1
+            }
+
+            option('yes', 'y') {
+              description 'answer "yes" to all interactive questions.  Will automatically install needed components.'
+            }
+
             def run
-              setup_ruboto
+              setup_ruboto(params['yes'].value, params['target'].values)
             end
           end
 

data/lib/ruboto/sdk_locations.rb

@@ -1,12 +1,14 @@
 require 'pathname'
+require 'ruboto/util/setup'
 
 module Ruboto
   module SdkLocations
+    extend Ruboto::Util::Setup
     if ENV['ANDROID_HOME']
       ANDROID_HOME = ENV['ANDROID_HOME']
     else
-      adb_location = `#{RUBY_PLATFORM =~ /mingw|mswin/ ? 'where' : 'which'} adb`.chomp
-      if adb_location.empty?
+      adb_location = which('adb')
+      unless adb_location
         raise 'Unable to locate the "adb" command.  Either set the ANDROID_HOME environment variable or add the location of the "adb" command to your path.'
       end
       ANDROID_HOME = File.dirname(File.dirname(Pathname.new(adb_location).realpath))

data/lib/ruboto/util/setup.rb

@@ -1,32 +1,41 @@
+require 'pty'
 require 'ruboto/sdk_versions'
 
 module Ruboto
   module Util
     module Setup
-      include Ruboto::SdkVersions
-      # Todo: Find a way to look this up
-      ANDROID_SDK_VERSION = '21.1'
+      REPOSITORY_BASE = 'https://dl-ssl.google.com/android/repository'
+      REPOSITORY_URL = "#{REPOSITORY_BASE}/repository-8.xml"
 
       #########################################
       #
       # Core Set up Method
       #
 
-      def setup_ruboto
-        check = check_all
+      def setup_ruboto(accept_all, api_levels = [SdkVersions::DEFAULT_TARGET_SDK])
+        @platform_sdk_loc = {}
+        api_levels = [read_project_api_level, *api_levels].compact.uniq
+        install_all(accept_all, api_levels) unless check_all(api_levels)
+        config_path(accept_all)
+      end
 
-        if not check and RbConfig::CONFIG['host_os'] == /^windows(.*)/
-          puts "\nWe can't directly install Android on Windows."
-          puts 'If you would like to contribute to the setup for Windows,'
-          puts 'please file an issue at https://github.com/ruboto/ruboto/issues'
-          puts
-          return
+      #
+      # OS independent "which"
+      # From: http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
+      #
+      def which(cmd)
+        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+          exts.each do |ext|
+            exe = File.join(path, "#{cmd}#{ext}")
+            return exe if File.executable? exe
+          end
         end
-
-        install_all if not check
-        config_path
+        nil
       end
 
+      private
+
       #########################################
       #
       # Utility Methods
@@ -54,13 +63,12 @@ module Ruboto
         end
       end
 
-      def api_level
+      def read_project_api_level
         begin
           return $1 if File.read('project.properties') =~ /target=(.*)/
         rescue
           # ignored
         end
-        DEFAULT_TARGET_SDK
       end
 
       def path_setup_file
@@ -78,19 +86,17 @@ module Ruboto
         end
       end
 
-      #
-      # OS independent "which"
-      # From: http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
-      #
-      def which(cmd)
-        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-          exts.each { |ext|
-            exe = File.join(path, "#{cmd}#{ext}")
-            return exe if File.executable? exe
-          }
-        end
-        nil
+      def get_tools_version(type="tool")
+        require 'rexml/document'
+        require 'open-uri'
+
+        doc = REXML::Document.new(open(REPOSITORY_URL))
+        version = doc.root.elements["sdk:#{type}/sdk:revision/sdk:major"].text
+        minor = doc.root.elements["sdk:#{type}/sdk:revision/sdk:minor"]
+        micro = doc.root.elements["sdk:#{type}/sdk:revision/sdk:micro"]
+        version += ".#{minor.text}" if minor
+        version += ".#{micro.text}" if micro
+        version
       end
 
       #########################################
@@ -98,55 +104,69 @@ module Ruboto
       # Check Methods
       #
 
-      def check_all
+      def check_all(api_levels)
+        @existing_paths = []
         @missing_paths = []
 
-        @java_loc = check_for('java', 'Java')
+        @java_loc = check_for('java', 'Java runtime')
         @javac_loc = check_for('javac', 'Java Compiler')
         @ant_loc = check_for('ant', 'Apache ANT')
-        @android_loc = check_for('android', 'Android Package Installer',
-                                 File.join(File.expand_path('~'), android_package_directory, 'tools', 'android'))
-        @emulator_loc = check_for('emulator', 'Android Emulator')
+        check_for_android_sdk
+        check_for_emulator
+        check_for_platform_tools
+        check_for_build_tools
+        api_levels.each { |api_level| check_for_android_platform(api_level) }
+
+        puts
+        ok = @java_loc && @javac_loc && @ant_loc && @android_loc && @emulator_loc && @adb_loc && @dx_loc && @platform_sdk_loc.all? { |_, path| !path.nil? }
+        puts "    #{ok ? '*** Ruboto setup is OK! ***' : '!!! Ruboto setup is NOT OK !!!'}\n\n"
+        ok
+      end
+
+      def check_for_emulator
+        @emulator_loc = check_for('emulator', 'Android Emulator',
+                                  File.join(File.expand_path('~'), android_package_directory, 'tools', 'emulator'))
+      end
+
+      def check_for_platform_tools
         @adb_loc = check_for('adb', 'Android SDK Command adb',
                              File.join(File.expand_path('~'), android_package_directory, 'platform-tools', 'adb'))
-        @dx_loc = check_for('dx', 'Android SDK Command dx')
-        check_for_android_platform
+      end
 
-        puts
-        if @java_loc && @javac_loc && @adb_loc && @dx_loc && @emulator_loc && @platform_sdk_loc
-          puts "    *** Ruboto setup is OK! ***\n\n"
-          true
-        else
-          puts "    !!! Ruboto setup is NOT OK !!!\n\n"
-          false
-        end
+      def check_for_build_tools
+        @dx_loc = check_for('dx', 'Android SDK Command dx',
+                            Dir[File.join(File.expand_path('~'), android_package_directory, 'build-tools', '*', 'dx')][-1])
+      end
+
+      def check_for_android_sdk
+        @android_loc = check_for('android', 'Android Package Installer',
+                                 File.join(File.expand_path('~'), android_package_directory, 'tools', 'android'))
       end
 
       def check_for(cmd, pretty_name=nil, alt_dir=nil)
         rv = which(cmd)
         rv = nil if rv.nil? or rv.empty?
 
-        if rv.nil? and alt_dir and File.exists?(alt_dir)
+        if rv
+          @existing_paths << File.dirname(rv)
+        elsif alt_dir and File.exists?(alt_dir)
           rv = alt_dir
           ENV['PATH'] = "#{File.dirname(rv)}:#{ENV['PATH']}"
           @missing_paths << "#{File.dirname(rv)}"
         end
 
-        puts "#{pretty_name || cmd}: " + (rv ? "Found at #{rv}" : 'Not found')
+        puts "#{'%-25s' % (pretty_name || cmd)}: #{(rv ? 'Found' : 'Not found')}"
         rv
       end
 
-      def check_for_android_platform
+      def check_for_android_platform(api_level)
         begin
-          @platform_sdk_loc = File.expand_path "#{@dx_loc}/../../platforms/#{api_level}"
-          if File.exists? @platform_sdk_loc
-            puts "Android platform SDK: Found at #{@platform_sdk_loc}"
-          else
-            puts 'Android platform SDK: Not found'
-            @platform_sdk_loc = nil
-          end
+          @platform_sdk_loc[api_level] = File.expand_path "#{@android_loc}/../../platforms/#{api_level}"
+          found = File.exists? @platform_sdk_loc[api_level]
+          @platform_sdk_loc[api_level] = nil unless found
+          puts "#{'%-25s' % "Platform SDK #{api_level}"}: #{(found ? 'Found' : 'Not found')}"
         rescue
-          @platform_sdk_loc = nil
+          @platform_sdk_loc[api_level] = nil
         end
       end
 
@@ -155,14 +175,19 @@ module Ruboto
       # Install Methods
       #
 
-      def install_all
-        install_java
-        install_android
-        install_adb
-        install_platform
+      def install_all(accept_all, api_levels)
+        install_java(accept_all) unless @java_loc && @javac_loc
+        install_ant(accept_all) unless @ant_loc
+        install_android_sdk(accept_all) unless @android_loc
+        install_android_tools(accept_all) unless @dx_loc && @adb_loc && @emulator_loc # build-tools, platform-tools and tools
+        if @android_loc
+          api_levels.each do |api_level|
+            install_platform(accept_all, api_level) unless @platform_sdk_loc[api_level]
+          end
+        end
       end
 
-      def install_java
+      def install_java(accept_all)
         case RbConfig::CONFIG['host_os']
         when /^darwin(.*)/
         when /^linux(.*)/
@@ -175,23 +200,105 @@ module Ruboto
           #    exit /b 1
           #)
 
-          java_installer_file_name = 'jdk-7-windows-x64.exe'
-          require 'net/http'
-          require 'net/https'
-          resp = nil
-          @cookies = ['gpw_e24=http%3A%2F%2Fwww.oracle.com']
-          puts 'Downloading...'
-          Net::HTTP.start('download.oracle.com') do |http|
-            resp, _ = http.get("/otn-pub/java/jdk/7/#{java_installer_file_name}", cookie_header)
-            resp.body
+          puts 'Java JDK was not found.'
+          unless accept_all
+            print 'Would you like to download and install it? (Y/n): '
+            a = STDIN.gets.chomp.upcase
+          end
+          if accept_all || a == 'Y' || a.empty?
+            java_installer_file_name = 'jdk-7-windows-x64.exe'
+            require 'net/http'
+            require 'net/https'
+            resp = nil
+            @cookies = %w(gpw_e24=http%3A%2F%2Fwww.oracle.com)
+            puts 'Downloading...'
+            Net::HTTP.start('download.oracle.com') do |http|
+              resp, _ = http.get("/otn-pub/java/jdk/7/#{java_installer_file_name}", cookie_header)
+              resp.body
+            end
+            resp = process_response(resp)
+            open(java_installer_file_name, 'wb') { |file| file.write(resp.body) }
+            puts "Installing #{java_installer_file_name}..."
+            system java_installer_file_name
+            raise "Unexpected exit code while installing Java: #{$?}" unless $? == 0
+            FileUtils.rm_f java_installer_file_name
+          else
+            puts
+            puts 'You can download and install the Java JDK manually from'
+            puts 'http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html'
+            puts
+          end
+          unless check_for('javac')
+            ENV['JAVA_HOME'] = 'c:\\Program Files\\Java\\jdk1.7.0'
+            if Dir.exists?(ENV['JAVA_HOME'])
+              @javac_loc = "#{ENV['JAVA_HOME'].gsub('\\', '/')}/bin/javac"
+              puts "Setting the JAVA_HOME environment variable to #{ENV['JAVA_HOME']}"
+              system %Q{setx JAVA_HOME "#{ENV['JAVA_HOME']}"}
+              @missing_paths << "#{File.dirname(@javac_loc)}"
+            end
+          end
+        else
+          raise "Unknown host os: #{RbConfig::CONFIG['host_os']}"
+        end
+      end
+
+      def install_ant(accept_all)
+        case RbConfig::CONFIG['host_os']
+        when /^darwin(.*)/
+        when /^linux(.*)/
+        when /^mswin32|windows(.*)/
+          # FIXME(uwe):  Detect and warn if we are not "elevated" with adminstrator rights.
+          #set IS_ELEVATED=0
+          #whoami /groups | findstr /b /c:"Mandatory Label\High Mandatory Level" | findstr /c:"Enabled group" > nul: && set IS_ELEVATED=1
+          #if %IS_ELEVATED%==0 (
+          #    echo You must run the command prompt as administrator to install.
+          #    exit /b 1
+          #)
+
+          puts 'Apache ANT was not found.'
+          unless accept_all
+            print 'Would you like to download and install it? (Y/n): '
+            a = STDIN.gets.chomp.upcase
+          end
+          if accept_all || a == 'Y' || a.empty?
+            Dir.chdir Dir.home do
+              ant_package_file_name = 'apache-ant-1.9.0-bin.tar.gz'
+              require 'net/http'
+              require 'net/https'
+              puts 'Downloading...'
+              Net::HTTP.start('apache.vianett.no') do |http|
+                resp, _ = http.get("/ant/binaries/#{ant_package_file_name}")
+                open(ant_package_file_name, 'wb') { |file| file.write(resp.body) }
+              end
+              puts "Installing #{ant_package_file_name}..."
+              require 'rubygems/package'
+              require 'zlib'
+              Gem::Package::TarReader.new(Zlib::GzipReader.open(ant_package_file_name)).each do |entry|
+                puts entry.full_name
+                if entry.directory?
+                  FileUtils.mkdir_p entry.full_name
+                elsif entry.file?
+                  FileUtils.mkdir_p File.dirname(entry.full_name)
+                  File.open(entry.full_name, 'wb') { |f| f << entry.read }
+                end
+              end
+              FileUtils.rm_f ant_package_file_name
+            end
+          else
+            puts
+            puts 'You can download and install Apache ANT manually from'
+            puts 'http://ant.apache.org/bindownload.cgi'
+            puts
+          end
+          unless check_for('ant')
+            ENV['ANT_HOME'] = File.expand_path(File.join('~', 'apache-ant-1.9.0')).gsub('/', '\\')
+            if Dir.exists?(ENV['ANT_HOME'])
+              @ant_loc = "#{ENV['ANT_HOME'].gsub('\\', '/')}/bin/ant"
+              puts "Setting the ANT_HOME environment variable to #{ENV['ANT_HOME']}"
+              system %Q{setx ANT_HOME "#{ENV['ANT_HOME']}"}
+              @missing_paths << "#{File.dirname(@ant_loc)}"
+            end
           end
-          resp = process_response(resp)
-          open(java_installer_file_name, 'wb') { |file| file.write(resp.body) }
-          puts "Installing #{java_installer_file_name}..."
-          system java_installer_file_name
-          raise "Unexpected exit code while installing Java: #{$?}" unless $? == 0
-          FileUtils.rm_f java_installer_file_name
-          return
         else
           raise "Unknown host os: #{RbConfig::CONFIG['host_os']}"
         end
@@ -201,7 +308,6 @@ module Ruboto
         return {} if @cookies.empty?
         {'Cookie' => @cookies.join(';')}
       end
-      private :cookie_header
 
       def store_cookie(response)
         return unless response['set-cookie']
@@ -217,7 +323,6 @@ module Ruboto
         end
         @cookies.uniq!
       end
-      private :store_cookie
 
       def process_response(response)
         store_cookie(response)
@@ -243,23 +348,24 @@ module Ruboto
         end
         response
       end
-      private :process_response
 
-      def install_android
+      def install_android_sdk(accept_all)
         unless @android_loc
           puts 'Android package installer not found.'
-          print 'Would you like to download and install it? (Y/n): '
-          a = STDIN.gets.chomp.upcase
-          if a == 'Y' || a.empty?
+          unless accept_all
+            print 'Would you like to download and install it? (Y/n): '
+            a = STDIN.gets.chomp.upcase
+          end
+          if accept_all || a == 'Y' || a.empty?
             Dir.chdir File.expand_path('~/') do
               case RbConfig::CONFIG['host_os']
               when /^darwin(.*)/
-                asdk_file_name = "android-sdk_r#{ANDROID_SDK_VERSION}-#{android_package_os_id}.zip"
+                asdk_file_name = "android-sdk_r#{get_tools_version}-#{android_package_os_id}.zip"
                 system "wget http://dl.google.com/android/#{asdk_file_name}"
-                system "unzip #{asdk_file_name}"
+                system "unzip #{'-o ' if accept_all}#{asdk_file_name}"
                 system "rm #{asdk_file_name}"
               when /^linux(.*)/
-                asdk_file_name = "android-sdk_r#{ANDROID_SDK_VERSION}-#{android_package_os_id}.tgz"
+                asdk_file_name = "android-sdk_r#{get_tools_version}-#{android_package_os_id}.tgz"
                 system "wget http://dl.google.com/android/#{asdk_file_name}"
                 system "tar -xzf #{asdk_file_name}"
                 system "rm #{asdk_file_name}"
@@ -272,7 +378,7 @@ module Ruboto
                 #    exit /b 1
                 #)
 
-                asdk_file_name = "installer_r#{ANDROID_SDK_VERSION}-#{android_package_os_id}.exe"
+                asdk_file_name = "installer_r#{get_tools_version}-#{android_package_os_id}.exe"
                 require 'net/http'
                 Net::HTTP.start('dl.google.com') do |http|
                   puts 'Downloading...'
@@ -288,36 +394,72 @@ module Ruboto
                 raise "Unknown host os: #{RbConfig::CONFIG['host_os']}"
               end
             end
-            @android_loc = File.join(File.expand_path('~'), android_package_directory, 'tools', 'android')
-            ENV['PATH'] = "#{File.dirname(@android_loc)}:#{ENV['PATH']}"
+          end
+          check_for_android_sdk
+          unless @android_loc
+            ENV['ANDROID_HOME'] = @android_loc.gsub(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR)
+            puts "Setting the ANDROID_HOME environment variable to #{ENV['ANDROID_HOME']}"
+            system %Q{setx ANDROID_HOME "#{ENV['ANDROID_HOME']}"}
             @missing_paths << "#{File.dirname(@android_loc)}"
           end
         end
       end
 
-      def install_adb
-        if @android_loc and not @adb_loc
-          puts 'Android command adb not found.'
-          print 'Would you like to download and install it? (Y/n): '
-          a = STDIN.gets.chomp.upcase
-          if a == 'Y' || a.empty?
-            system 'android update sdk --no-ui --filter tool,platform-tool'
-            @adb_loc = File.join(File.expand_path('~'), android_package_directory, 'platform-tools', 'adb')
-            ENV['PATH'] = "#{File.dirname(@adb_loc)}:#{ENV['PATH']}"
-            @missing_paths << "#{File.dirname(@adb_loc)}"
+      def install_android_tools(accept_all)
+        if @android_loc and (@dx_loc.nil? || @adb_loc.nil? || @emulator_loc.nil?)
+          puts 'Android tools not found.'
+          unless accept_all
+            print 'Would you like to download and install it? (Y/n): '
+            a = STDIN.gets.chomp.upcase
+          end
+          if accept_all || a == 'Y' || a.empty?
+            update_cmd = "android --silent update sdk --no-ui --filter build-tools-#{get_tools_version('build-tool')},platform-tool,tool --force"
+            update_sdk(update_cmd, accept_all)
+            check_for_build_tools
+            check_for_platform_tools
+            check_for_emulator
           end
         end
       end
 
-      def install_platform
-        if @android_loc and not @platform_sdk_loc
-          puts "Android platform SDK for #{api_level} not found."
+      def install_platform(accept_all, api_level)
+        puts "Android platform SDK for #{api_level} not found."
+        unless accept_all
           print 'Would you like to download and install it? (Y/n): '
           a = STDIN.gets.chomp.upcase
-          if a == 'Y' || a.empty?
-            system "android update sdk --no-ui --filter #{api_level},sysimg-#{api_level.slice(/\d+$/)} --all"
-            @platform_sdk_loc = File.expand_path "#{@dx_loc}/../../platforms/#{api_level}"
+        end
+        if accept_all || a == 'Y' || a.empty?
+          update_cmd = "android --silent update sdk --no-ui --filter #{api_level},sysimg-#{api_level.slice(/\d+$/)} --all"
+          update_sdk(update_cmd, accept_all)
+          check_for_android_platform(api_level)
+        end
+      end
+
+      def update_sdk(update_cmd, accept_all)
+        if accept_all
+          begin
+            PTY.spawn(update_cmd) do |stdin, stdout, pid|
+              begin
+                output = ''
+                question_pattern = /.*Do you accept the license '[a-z-]+-[0-9a-f]{8}' \[y\/n\]: /m
+                STDOUT.sync = true
+                stdin.each_char do |text|
+                  print text
+                  output << text
+                  if output =~ question_pattern
+                    stdout.puts 'y'
+                    output.sub! question_pattern, ''
+                  end
+                end
+              rescue Errno::EIO
+                # This probably just means that the process has finished giving output.
+              end
+            end
+          rescue PTY::ChildExited
+            puts 'The child process exited!'
           end
+        else
+          system update_cmd
         end
       end
 
@@ -326,32 +468,53 @@ module Ruboto
       # Path Config Method
       #
 
-      def config_path
+      def config_path(accept_all)
         unless @missing_paths.empty?
           if RbConfig::CONFIG['host_os'] =~ /^mswin32|windows(.*)/
             puts "\nYou are missing some paths.  Execute these lines to add them:\n\n"
             @missing_paths.each do |path|
               puts %Q{    set PATH="#{path.gsub '/', '\\'};%PATH%"}
             end
-            system %Q{setx PATH "%PATH%;#{@missing_paths.map{|path| path.gsub '/', '\\'}.join(';')}"}
+            system %Q{setx PATH "%PATH%;#{@missing_paths.map { |path| path.gsub '/', '\\' }.join(';')}"}
           else
             puts "\nYou are missing some paths.  Execute these lines to add them:\n\n"
             @missing_paths.each do |path|
               puts %Q{    export PATH="#{path}:$PATH"}
             end
-            print "\nWould you like to append these lines to your configuration script? (Y/n): "
-            a = STDIN.gets.chomp.upcase
-            if a == 'Y' || a.empty?
-              print "What script do you use to configure your PATH? (#{path_setup_file}): "
-              a = STDIN.gets.chomp.downcase
-
-              File.open(File.expand_path("~/#{a.empty? ? path_setup_file : a}"), 'a') do |f|
-                f.puts "\n# BEGIN Ruboto PATH setup"
-                @missing_paths.each { |path| f.puts %Q{export PATH="#{path}:$PATH"} }
-                f.puts '# END Ruboto PATH setup'
-                f.puts
+            puts
+            unless accept_all
+              print "\nWould you like to append these lines to your configuration script? (Y/n): "
+              a = STDIN.gets.chomp.upcase
+            end
+            if accept_all || a == 'Y' || a.empty?
+              unless accept_all
+                print "What script do you use to configure your PATH? (#{path_setup_file}): "
+                a = STDIN.gets.chomp.downcase
+              end
+              rubotorc = '~/.rubotorc'
+              File.open(File.expand_path(rubotorc), 'w') do |f|
+                (@existing_paths + @missing_paths - %w(/usr/bin)).uniq.sort.each do |path|
+                  f << %Q{PATH="#{path}:$PATH"\n}
+                end
               end
-              puts 'Path updated. Please close your command window and reopen.'
+              config_file_name = File.expand_path("~/#{a.nil? || a.empty? ? path_setup_file : a}")
+              old_config = File.read(config_file_name)
+              new_config = old_config.dup
+
+              # FIXME(uwe): Remove for Ruboto > 0.13.0
+              new_config.gsub! /\n*# BEGIN Ruboto PATH setup\n.*?\n# END Ruboto PATH setup\n*/m, ''
+              # EMXIF
+
+              new_config.gsub! /\n*# BEGIN Ruboto setup\n.*?\n# END Ruboto setup\n*/m, ''
+              new_config << "\n\n# BEGIN Ruboto setup\n"
+              new_config << "source #{rubotorc}\n"
+              new_config << "# END Ruboto setup\n\n"
+              File.open(config_file_name, 'wb') { |f| f << new_config }
+              puts "Updated #{config_file_name} to load the #{rubotorc} config file."
+              puts 'Please close your command window and reopen, or run'
+              puts
+              puts "    source #{rubotorc}"
+              puts
             end
           end
         end

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '0.12.0'
+  VERSION = '0.13.0.rc.0'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ruboto
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0.rc.0
+  prerelease: 7
 platform: ruby
 authors:
 - Daniel Jackoway
@@ -11,41 +12,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.7.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |
-  Ruboto (JRuby on Android) is a platform for developing full stand-alone apps for
+description: ! 'Ruboto (JRuby on Android) is a platform for developing full stand-alone
+  apps for
+
   Android using the Ruby language and libraries.  It includes support libraries
+
   and generators for creating projects, classes, tests, and more.  The complete
+
   APIs of Android, Java, and Ruby are available to you using the Ruby language.
+
+'
 email: ruboto@googlegroups.com
 executables:
 - ruboto
@@ -55,19 +65,15 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.md
 - Rakefile
-- assets/.DS_Store
-- assets/.gitignore
-- assets/Rakefile
+- README.md
 - assets/libs/dx.jar
+- assets/Rakefile
 - assets/rakelib/ruboto.rake
-- assets/res/.DS_Store
+- assets/res/drawable/get_ruboto_core.png
 - assets/res/drawable-hdpi/ic_launcher.png
 - assets/res/drawable-ldpi/ic_launcher.png
 - assets/res/drawable-mdpi/ic_launcher.png
-- assets/res/drawable/.DS_Store
-- assets/res/drawable/get_ruboto_core.png
 - assets/res/layout/get_ruboto_core.xml
 - assets/samples/sample_activity.rb
 - assets/samples/sample_activity_test.rb
@@ -81,9 +87,6 @@ files:
 - assets/src/InheritingBroadcastReceiver.java
 - assets/src/InheritingClass.java
 - assets/src/InheritingService.java
-- assets/src/RubotoActivity.java
-- assets/src/RubotoBroadcastReceiver.java
-- assets/src/RubotoService.java
 - assets/src/org/ruboto/EntryPointActivity.java
 - assets/src/org/ruboto/JRubyAdapter.java
 - assets/src/org/ruboto/Log.java
@@ -103,12 +106,18 @@ files:
 - assets/src/ruboto/util/stack.rb
 - assets/src/ruboto/util/toast.rb
 - assets/src/ruboto/widget.rb
+- assets/src/RubotoActivity.java
+- assets/src/RubotoBroadcastReceiver.java
+- assets/src/RubotoService.java
 - assets/test/src/test_helper.rb
+- assets/.DS_Store
+- assets/.gitignore
+- assets/res/.DS_Store
+- assets/res/drawable/.DS_Store
 - bin/ruboto
 - lib/DalvikProxyClassFactory.java
 - lib/DexClient.java
 - lib/java_class_gen/android_api.xml
-- lib/ruboto.rb
 - lib/ruboto/api.rb
 - lib/ruboto/commands/base.rb
 - lib/ruboto/core_ext/array.rb
@@ -129,6 +138,7 @@ files:
 - lib/ruboto/util/verify.rb
 - lib/ruboto/util/xml_element.rb
 - lib/ruboto/version.rb
+- lib/ruboto.rb
 - test/activity/call_super_activity.rb
 - test/activity/call_super_activity_test.rb
 - test/activity/dir_and_file_activity.rb
@@ -177,25 +187,26 @@ files:
 homepage: http://ruboto.org/
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: ruboto/ruboto
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A platform for developing apps using JRuby on Android.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e168f6e2a533fb4ab7c97406bed3abc55d9b2f8a
-  data.tar.gz: 617d03520fe138e398425e6e959524f98def6900
-SHA512:
-  metadata.gz: c61a80b14c92eb6fa98ef657928b8ba720cbde9dbd5a2c5b1d00926b0ea2be3d1809a62fb105f9f38ea261a6cfc9100bb5b8f7540e0410e7854f652ffe985fc5
-  data.tar.gz: 221be24b4f6ede0f49c4d6c9f05dfddd022b3a82d966998f94fb66800e0aec36ae2b0403959bede0b51d972df4b5bd9f36fded23e41a23f0296574185f482756