ruboto 1.4.1 → 1.5.0

data/lib/ruboto/util/setup.rb

@@ -7,8 +7,8 @@ module Ruboto
       include Ruboto::Util::Verify
       REPOSITORY_BASE = 'http://dl-ssl.google.com/android/repository'
       REPOSITORY_URL = "#{REPOSITORY_BASE}/repository-10.xml"
-      SDK_DOWNLOAD_PAGE = 'http://developer.android.com/sdk/index.html?hl=sk'
       ADDONS_URL = "#{REPOSITORY_BASE}/extras/intel/addon.xml"
+      SDK_DOWNLOAD_PAGE = 'https://developer.android.com/studio/index.html'
 
       RUBOTO_GEM_ROOT = File.expand_path '../../../..', __FILE__
       WINDOWS_ELEVATE_CMD = "#{RUBOTO_GEM_ROOT}/bin/elevate_32.exe -c -w"
@@ -110,23 +110,27 @@ module Ruboto
         end
       end
 
-      def get_tools_version(type='tool', repo_url = REPOSITORY_URL)
+      def get_tools_version(type='tool', repo_url = REPOSITORY_URL, host_os = nil)
         require 'rexml/document'
         require 'open-uri'
 
         doc = REXML::Document.new(open(repo_url))
-        doc.root.elements.to_a("sdk:#{type}/sdk:revision").map do |t|
-          major = t.elements['sdk:major']
-          minor = t.elements['sdk:minor']
-          micro = t.elements['sdk:micro']
-          prev = t.elements['sdk:preview']
+        doc.root.elements.to_a("sdk:#{type}").map do |t|
+          r = t.elements['sdk:revision']
+          major = r.elements['sdk:major']
+          minor = r.elements['sdk:minor']
+          micro = r.elements['sdk:micro']
+          prev = r.elements['sdk:preview']
           next if prev
+          url = t.elements['sdk:archives/sdk:archive/sdk:url'].text
+          pkg_host_os = t.elements['sdk:archives/sdk:archive/sdk:host-os'].text
+          next if host_os && pkg_host_os != host_os
           version = major.text
           version += ".#{minor.text}" if minor
           version += ".#{micro.text}" if micro
           version += "_rc#{prev.text}" if prev
-          version
-        end.compact.sort_by { |v| Gem::Version.new(v.gsub('_', '.')) }.last
+          [version, url]
+        end.compact.sort_by { |v| Gem::Version.new(v[0].gsub('_', '.')) }.last
       end
 
       def get_android_sdk_version
@@ -613,7 +617,7 @@ module Ruboto
           end
           if accept_all || a == 'Y' || a.empty?
             android_cmd = windows? ? 'android.bat' : 'android'
-            update_cmd = "#{android_cmd} --silent update sdk --no-ui --filter build-tools-#{get_tools_version('build-tool')},extra-intel-Hardware_Accelerated_Execution_Manager,platform-tool,tool"
+            update_cmd = "#{android_cmd} --silent update sdk --no-ui --filter build-tools-#{get_tools_version('build-tool')},extra-intel-Hardware_Accelerated_Execution_Manager,platform-tool,tool -a"
             update_sdk(update_cmd, accept_all)
             check_for_build_tools
             check_for_platform_tools
@@ -624,27 +628,21 @@ module Ruboto
       end
 
       def get_new_haxm_filename
-        version = get_tools_version('extra', ADDONS_URL)
-        zip_version = version.gsub(/\./, '_')
-        haxm_file_name = ''
-
         case android_package_os_id
-        when MAC_OS_X
-          haxm_file_name = "haxm-macosx_v#{zip_version}.zip"
-        when WINDOWS
-          haxm_file_name = "haxm-windows_v#{zip_version}.zip"
+        when MAC_OS_X, WINDOWS
+          version, file_name = get_tools_version('extra', ADDONS_URL, android_package_os_id)
         when LINUX
           puts 'HAXM installation on Linux is not supported, yet.'
-          version = ''
+          file_name = version = ''
         else
           raise "Unknown host os: #{RbConfig::CONFIG['host_os']}"
         end
-        return haxm_file_name, version
+
+        return file_name, version
       end
 
       def download_haxm(accept_all, haxm_file_name)
-        uri = 'https://software.intel.com/sites/default/files/managed/dd/21'
-        download_third_party(haxm_file_name, uri)
+        download_third_party(haxm_file_name, ADDONS_URL)
         unzip(accept_all, "#{android_haxm_directory}/#{haxm_file_name}", "#{android_haxm_directory}")
         FileUtils.rm_f "#{android_haxm_directory}/#{haxm_file_name}"
       end
@@ -791,7 +789,7 @@ module Ruboto
 
               old_config = File.read(config_file_name)
               new_config = old_config.dup
-              new_config.gsub! /\n*# BEGIN Ruboto setup\n.*?\n# END Ruboto setup\n*/m, ''
+              new_config.gsub! /\n*# BEGIN Ruboto setup\n.*?\n# END Ruboto setup\n*/m, "\n\n"
               new_config << "\n\n# BEGIN Ruboto setup\n"
               new_config << "source #{rubotorc}\n"
               new_config << "# END Ruboto setup\n\n"

data/lib/ruboto/util/update.rb

@@ -217,7 +217,7 @@ module Ruboto
 
       def install_jruby_jars_gem(jruby_jars_version = ENV['JRUBY_JARS_VERSION'])
         if jruby_jars_version
-          version_requirement = " -v '#{jruby_jars_version}'"
+          version_requirement = %{ -v "#{jruby_jars_version}"}
         end
         `gem query -i -n jruby-jars#{version_requirement}`
         unless $? == 0
@@ -341,45 +341,31 @@ module Ruboto
 
       def update_manifest(min_sdk, target, force = false)
         log_action("\nAdding RubotoActivity, RubotoDialog, RubotoService, and SDK versions to the manifest") do
-          # FIXME(uwe):  Remove the special case 'L' when Android L is released.
-          if target == 'L'
-            min_sdk = 'L'
+          sdk_element = verify_manifest.elements['uses-sdk']
+          if project_api_level
+            min_sdk ||= project_api_level
+            target ||= project_api_level
+          elsif sdk_element
+            min_sdk ||= sdk_element.attributes['android:minSdkVersion']
+            target ||= sdk_element.attributes['android:targetSdkVersion']
           else
-            sdk_element = verify_manifest.elements['uses-sdk']
-            if project_api_level
-              min_sdk ||= project_api_level
-              target ||= project_api_level
-            elsif sdk_element
-              min_sdk ||= sdk_element.attributes['android:minSdkVersion']
-              target ||= sdk_element.attributes['android:targetSdkVersion']
-            else
-              min_sdk ||= MINIMUM_SUPPORTED_SDK_LEVEL
-              target ||= MINIMUM_SUPPORTED_SDK_LEVEL
-            end
+            min_sdk ||= MINIMUM_SUPPORTED_SDK_LEVEL
+            target ||= MINIMUM_SUPPORTED_SDK_LEVEL
+          end
 
-            # FIXME(uwe): Remove the L special case when Android L has been released
-            if min_sdk == 'L'
-              puts "Android L detected."
-            elsif min_sdk.to_i < MINIMUM_SUPPORTED_SDK_LEVEL
-              min_sdk = MINIMUM_SUPPORTED_SDK_LEVEL
-            end
+          if min_sdk.to_i < MINIMUM_SUPPORTED_SDK_LEVEL
+            min_sdk = MINIMUM_SUPPORTED_SDK_LEVEL
+          end
 
-            if target.to_i < MINIMUM_SUPPORTED_SDK_LEVEL
-              target = MINIMUM_SUPPORTED_SDK_LEVEL
-            end
+          if target.to_i < MINIMUM_SUPPORTED_SDK_LEVEL
+            target = MINIMUM_SUPPORTED_SDK_LEVEL
           end
-          # EMXIF
 
           app_element = verify_manifest.elements['application']
           app_element.attributes['android:icon'] ||= '@drawable/ic_launcher'
 
-          # FIXME(uwe): Simplify when we stop supporting Android 2.3.x
-          # FIXME(uwe): Simplify when Android L is released
-          if min_sdk == 'L' || min_sdk.to_i >= 11
-            app_element.attributes['android:hardwareAccelerated'] ||= 'true'
-            app_element.attributes['android:largeHeap'] ||= 'true'
-          end
-          # EMXIF
+          app_element.attributes['android:hardwareAccelerated'] ||= 'true'
+          app_element.attributes['android:largeHeap'] ||= 'true'
 
           unless app_element.elements["activity[@android:name='org.ruboto.RubotoActivity']"]
             app_element.add_element 'activity', {'android:name' => 'org.ruboto.RubotoActivity', 'android:exported' => 'false'}

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '1.4.1'
+  VERSION = '1.5.0'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

data/test/app_test_methods.rb

@@ -15,10 +15,13 @@ module AppTestMethods
       # FIXME(uwe):  We should try using YAML as well
       assert_code 'YamlLoads', "require 'yaml'" unless has_stupid_crash
 
-      assert_code 'ReadSourceFile', 'File.read(__FILE__)'
-      # noinspection RubyExpressionInStringInspection
-      assert_code 'DirListsFilesInApk', 'Dir["#{File.dirname(__FILE__)}/*"].each{|f| raise "File #{f.inspect} not found" unless File.exists?(f)}'
-      assert_code('RepeatRubotoImportWidget', 'ruboto_import_widget :TextView ; ruboto_import_widget :TextView') unless has_stupid_crash
+      # FIXME(uwe):  Remove condition when we stop testing api level <= 15 or JRuby <= 1.7.13
+      unless ANDROID_OS <= 15 && ON_LINUX && JRUBY_JARS_VERSION <= Gem::Version.new('1.7.13')
+        assert_code 'ReadSourceFile', 'File.read(__FILE__)'
+        # noinspection RubyExpressionInStringInspection
+        assert_code 'DirListsFilesInApk', 'Dir["#{File.dirname(__FILE__)}/*"].each{|f| raise "File #{f.inspect} not found" unless File.exists?(f)}'
+        assert_code('RepeatRubotoImportWidget', 'ruboto_import_widget :TextView ; ruboto_import_widget :TextView') unless has_stupid_crash
+      end
     end
     run_activity_tests('activity')
   end
@@ -39,26 +42,31 @@ module AppTestMethods
   def run_activity_tests(activity_dir)
     Dir[File.expand_path("#{activity_dir}/*", File.dirname(__FILE__))].each do |file|
       # FIXME(uwe):  Remove when we stop testing JRuby 1.7.24 or api level 19
-      next if file =~ /rss/ && JRUBY_JARS_VERSION <= Gem::Version.new('1.7.24') &&
-          (RUBOTO_PLATFORM == 'STANDALONE' || RUBOTO_PLATFORM == 'CURRENT') && ANDROID_OS == 19
+      next if file =~ /rss|ssl/ && JRUBY_JARS_VERSION <= Gem::Version.new('1.7.25') &&
+          ANDROID_OS == 19 && ON_LINUX
       # EMXIF
 
-      # FIXME(uwe):  Remove when we stop testing api level < 16
+      # FIXME(uwe):  Remove when we stop testing api level <= 15
       # FIXME(uwe):  Remove when we release RubotoCore with SSL included
-      next if file =~ /ssl/ && (ANDROID_OS < 16 ||
-          RUBOTO_PLATFORM == 'CURRENT' || RUBOTO_PLATFORM == 'FROM_GEM' ||
-          JRUBY_JARS_VERSION < Gem::Version.new('1.7.13') ||
-          JRUBY_JARS_VERSION < Gem::Version.new('9.0.0.0.SNAPSHOT')) # FIXME(uwe): JRuby 9K should contain the SSLSocket fix.
+      # FIXME(uwe):  Remove when we stop testing JRuby <= 1.7.13
+      next if file =~ /ssl/ && (ANDROID_OS <= 15 ||
+          JRUBY_JARS_VERSION <= Gem::Version.new('1.7.13') ||
+          RUBOTO_PLATFORM == 'CURRENT' || RUBOTO_PLATFORM == 'FROM_GEM'
+      )
       # EMXIF
 
-      # FIXME(uwe):  Remove when we stop testing JRuby < 1.7.4.dev
-      next if file =~ /dir_and_file/ && (RUBOTO_PLATFORM == 'CURRENT' || JRUBY_JARS_VERSION < Gem::Version.new('1.7.4.dev'))
+      # FIXME(uwe):  Remove when we stop testing JRuby <= 1.7.13
+      next if file =~ /dir_and_file/ && JRUBY_JARS_VERSION <= Gem::Version.new('1.7.13')
       # EMXIF
 
-      # FIXME(uwe):  Remove when we stop testing api level < 11
-      next if file =~ /fragment/ && ANDROID_OS < 11
+      # FIXME(uwe):  Remove when we stop testing JRuby <= 1.7.13
+      next if file =~ /read_source_file/ && JRUBY_JARS_VERSION <= Gem::Version.new('1.7.13')
       # EMXIF
 
+      # FIXME(uwe):  Remove when we stop testing JRuby <= 1.7.13
+            next if file =~ /button|fragment|json|margins|navigation|no_on_create|padding|psych|rss|spinner|stack|startup_exception|subclass/ &&
+                ANDROID_OS <= 15 && JRUBY_JARS_VERSION <= Gem::Version.new('1.7.13') && ON_LINUX
+
       # FIXME(uwe):  Weird total app crash when running these tests together
       # FIXME(uwe):  Remove when we stop testing api level <= 15
       next if file =~ /button|fragment|margins|navigation|psych|rss|spinner|startup_exception|subclass/ && has_stupid_crash

data/test/arjdbc_test.rb

@@ -3,7 +3,7 @@ require_relative 'test_helper'
 class ArjdbcTest < Minitest::Test
   def setup
     generate_app bundle: [
-        [:activerecord, '<4.2.0'],
+        [:activerecord, '~>4.2.5'],
         :'activerecord-jdbc-adapter',
         :sqldroid,
     ]

data/test/rake_test.rb

@@ -1,4 +1,5 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
+require_relative '../assets/rakelib/ruboto.device'
 
 class RakeTest < Minitest::Test
   def setup
@@ -20,8 +21,6 @@ class RakeTest < Minitest::Test
       s2 = File.read(test_filename)
       s2.gsub!(/What hath Matz wrought\?/, 'This text was changed by script!')
       File.open(test_filename, 'w') { |f| f << s2 }
-
-      apk_timestamp = File.mtime("bin/#{APP_NAME}-debug.apk")
     end
     run_app_tests
 
@@ -29,29 +28,34 @@ class RakeTest < Minitest::Test
     # assert_equal apk_timestamp, File.mtime("bin/#{APP_NAME}-debug.apk"), 'APK should not have been rebuilt'
     # EMXIF
 
-    assert_match %r{^/sdcard/Android/data/#{PACKAGE}/files/scripts$}, `adb shell ls -d /sdcard/Android/data/#{PACKAGE}/files/scripts`.chomp
+    assert_match %r{^#{scripts_path(PACKAGE)}$}, `adb shell ls -d #{scripts_path(PACKAGE)}`.chomp
+  end
+
+  def test_that_apk_is_not_built_if_nothing_has_changed
+    Dir.chdir APP_DIR do
+      apk_timestamp = apk_mtime
+      system 'rake debug'
+      assert apk_timestamp == apk_mtime, 'APK should not have been rebuilt'
+    end
   end
 
   # FIXME(uwe):  This is actually a case where we want to just update the Ruby
   # source file instead of rebuilding the apk.
   def test_that_apk_is_built_if_only_one_ruby_source_file_has_changed
     Dir.chdir APP_DIR do
-      apk_timestamp = File.mtime("bin/#{APP_NAME}-debug.apk")
-      sleep 1
-      FileUtils.touch 'src/ruboto_test_app_activity.rb'
-      sleep 1
+      apk_timestamp = apk_mtime
+      FileUtils.touch 'src/ruboto_test_app_activity.rb', mtime: apk_timestamp + 1
       system 'rake debug'
-      assert apk_timestamp != File.mtime("bin/#{APP_NAME}-debug.apk"),
-          'APK should have been rebuilt'
+      assert apk_timestamp != apk_mtime, 'APK should have been rebuilt'
     end
   end
 
   def test_that_apk_is_built_if_only_one_non_ruby_source_file_has_changed
     Dir.chdir APP_DIR do
-      apk_timestamp = File.mtime("bin/#{APP_NAME}-debug.apk")
-      FileUtils.touch 'src/not_ruby_source.properties'
+      apk_timestamp = apk_mtime
+      FileUtils.touch 'src/not_ruby_source.properties', mtime: apk_timestamp + 1
       system 'rake debug'
-      assert apk_timestamp != File.mtime("bin/#{APP_NAME}-debug.apk"),
+      assert apk_timestamp != apk_mtime,
           'APK should have been rebuilt'
     end
   end
@@ -89,4 +93,10 @@ class RakeTest < Minitest::Test
     system 'adb logcat >> adb_logcat.log&' if File.exists?('adb_logcat.log')
   end
 
+  private
+
+  def apk_mtime
+    File.mtime("bin/#{APP_NAME}-debug.apk")
+  end
+
 end

data/test/ruboto_setup_test.rb

@@ -4,11 +4,6 @@ require 'net/http'
 class RubotoSetupTest < Minitest::Test
   include Ruboto::Util::Setup
 
-  SDK_DOWNLOAD_PAGE = 'http://developer.android.com/sdk/index.html?hl=sk'
-  REPOSITORY_BASE = 'http://dl-ssl.google.com/android/repository'
-  ADDONS_URL = "#{REPOSITORY_BASE}/extras/intel/addon.xml"
-  HAXM_URL = 'https://software.intel.com/sites/default/files/managed/dd/21'
-
   def test_if_sdk_page_still_exists?
     uri = URI.parse(SDK_DOWNLOAD_PAGE)
     res = Net::HTTP.get_response(uri)
@@ -24,9 +19,9 @@ class RubotoSetupTest < Minitest::Test
   def test_if_haxm_download_still_exists?
     filename, version = get_new_haxm_filename
     unless (filename.empty? || version.empty?)
-      uri = URI.parse("#{HAXM_URL}/#{filename}")
+      uri = URI.parse("#{File.dirname(ADDONS_URL)}/#{filename}")
       res = Net::HTTP.get_response(uri)
-      assert_equal 200, res.code.to_i
+      assert_equal 200, res.code.to_i, uri
     end
   end
 

data/test/test_helper.rb

@@ -15,6 +15,8 @@ module RubotoTest
   include Ruboto::SdkLocations
   include Ruboto::Util::Update
 
+  ON_LINUX = RbConfig::CONFIG['host_os'].downcase.include?('linux')
+
   PROJECT_DIR = File.expand_path('..', File.dirname(__FILE__))
   $LOAD_PATH << PROJECT_DIR
 
@@ -92,9 +94,8 @@ module RubotoTest
   # FIXME(uwe): Remove when stupid crash is resolved
   def has_stupid_crash
     require 'rbconfig'
-    ANDROID_OS <= 15 &&
-        JRUBY_JARS_VERSION >= Gem::Version.new('1.7.19') &&
-        RbConfig::CONFIG['host_os'].downcase.include?('linux')
+    ANDROID_OS <= 15 && JRUBY_JARS_VERSION >= Gem::Version.new('1.7.19') &&
+        ON_LINUX
   end
   # EMXIF
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboto
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Daniel Jackoway
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -27,20 +27,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: net-telnet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.3'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -90,12 +105,14 @@ files:
 - Vagrantfile
 - assets/.gitignore
 - assets/Rakefile
+- assets/bin/LAST_UPDATE
 - assets/libs/dx.jar
 - assets/rakelib/ruboto.device.rb
 - assets/rakelib/ruboto.rake
 - assets/rakelib/ruboto.stdlib.rake
 - assets/rakelib/ruboto.stdlib.rb
 - assets/rakelib/ruboto.stdlib.yml
+- assets/res/.DS_Store
 - assets/res/drawable-hdpi/ic_launcher.png
 - assets/res/drawable-ldpi/ic_launcher.png
 - assets/res/drawable-mdpi/ic_launcher.png
@@ -117,6 +134,7 @@ files:
 - assets/src/RubotoActivity.java
 - assets/src/RubotoBroadcastReceiver.java
 - assets/src/RubotoService.java
+- assets/src/org/jruby/ext/openssl/OpenSSL.java
 - assets/src/org/ruboto/DexDex.java
 - assets/src/org/ruboto/EntryPointActivity.java
 - assets/src/org/ruboto/FrameworkHack.java
@@ -255,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruboto/ruboto
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A platform for developing apps using JRuby on Android.