ruboto 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e57b8cc5a38858a5680903fef8481da9866af40
-  data.tar.gz: 17a24cf8930538aeadc4c8e2677e81d4f82fedf8
+  metadata.gz: 04f53460885c0bb561a901a29c3e9b91a2110fc4
+  data.tar.gz: e0cf0b0f70589da752f91b35331ac47cb761d334
 SHA512:
-  metadata.gz: 4f0d41dc5bfaef0a360d6e8d3a0c2f2f32e63bf4684d53f664b5a2dd912a876b4f791e331fc7cf074c14511c0a69544b4a6112318d6f9212101aa194c35a8a35
-  data.tar.gz: 7a35ed6164916ab2027ae5ac2c83f2e214f91c006025e72e2632c6502edb98c0c9138a5bfeb994966fd40e90d545c8771804f46c241e696b523ed7ba9f6fdda1
+  metadata.gz: d8025d008cc28e62365dc4668065b5d4feddbb710a9fc836b24610069a42eb3a20653ec55d711619c043e3fb4d1385f9e5c268999c91f4b4fd03b9c5d70a2733
+  data.tar.gz: d04a199b80a4e09444b9efede9333fcb5871aa7751f7fe361eb6d5e78b4e7aa13b8206a8e8a942593aff3379c36954abf21bbe751ae7cef0f3985ed09be7dbf6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruboto (1.1.2)
+    ruboto (1.2.0)
       main (~> 5.2)
       rake (~> 10.0)
       rubyzip (~> 1.0)
@@ -19,18 +19,17 @@ GEM
       fattr (>= 2.2.0)
       map (>= 5.1.0)
       pry (>= 0.9)
-    map (6.5.4)
+    map (6.5.5)
     method_source (0.8.2)
-    pry (0.10.0)
+    pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rake (10.3.2)
-    rubyzip (1.1.4)
-    slop (3.5.0)
+    rubyzip (1.1.6)
+    slop (3.6.0)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES

data/RELEASE_CANDICATE_DOC.md

@@ -1,10 +1,12 @@
-Subject: [ANN] Ruboto 1.1.2 release candidate
+Subject: [ANN] Ruboto 1.2.0 release candidate
 
 Hi all!
 
-The Ruboto 1.1.2 release candidate is now available.
+The Ruboto 1.2.0 release candidate is now available.
 
-This is a quick release to add support for version 23 of the Android SDK.
+In this release we add support for the Android L preview and the ART
+runtime.  We also specify accessing the "R" class without specifying a
+package to refer to the local package "R" class instead of "android.R".
 
 As always we need your help and feedback to ensure the quality of the release.  Please install the release candidate using
 

data/RELEASE_DOC.md

@@ -1,6 +1,6 @@
-Subject: [ANN] Ruboto 1.1.2 released!
+Subject: [ANN] Ruboto 1.2.0 released!
 
-The Ruboto team is pleased to announce the release of Ruboto 1.1.2.
+The Ruboto team is pleased to announce the release of Ruboto 1.2.0.
 
 Ruboto (JRuby on Android) is a platform for developing full stand-alone
 apps for Android using the Ruby language and libraries.  It includes
@@ -8,24 +8,45 @@ 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.
 
-New in version 1.1.2:
+New in version 1.2.0:
 
-This is a quick release to add support for version 23 of the Android SDK.
+In this release we add support for the Android L preview and the ART
+runtime.  We also specify accessing the "R" class without specifying a
+package to refer to the local package "R" class instead of "android.R".
+
+Features:
+
+* Issue #523 Support for ART
+* Issue #645 Make ::R refer to $package.R instead of android.R
+* Issue #652 Set a layout attribute by name even if it is not a JavaBean
+  attribute (like margins and padding).
+* Issue #654 Access android.R inner classes like android.R.id and
+  android.R.attr directly
+* Issue #656 Add support for Android L developer preview
 
 Bugfixes:
 
-* Issue #636 ruboto setup failing to install Android
-* Issue #637 Fixed match for SDK release versions (daneb)
-* Issue #639 Unit test fix (daneb)
-* Issue #641 Display progress text during linux package installs
+* Issue #643 Stale code in widget.rb lists
+* Issue #648 Service code is broken when trying to use RubotoService
+  directly
+* Issue #667 Ruboto app generation with option --with-jruby 1.7.14 not
+  working properly
+* Issue #671 RubotoService fails to start on Android L
+* Issue #672 Problem with ruboto setup
+* Issue #674 travis build fails with JRuby 1.7.16
+
+Support:
+
+* Issue #573 How can I load Ruboto Core Dynamically in Runtime?
 
-Internal:
+Rejected:
 
-* Issue #633 Release 1.1.2 gem
+* Issue #646 Make ANT quiet by default, enabling verbose and trace
+  output with the -v and -t rake options
 
 You can find a complete list of issues here:
 
-* https://github.com/ruboto/ruboto/issues?state=closed&milestone=34
+* https://github.com/ruboto/ruboto/issues?state=closed&milestone=35
 
 
 Installation:

data/Rakefile

@@ -143,7 +143,7 @@ def get_github_issues
   raise "Milestone for version #{Ruboto::VERSION} not found." unless milestone_entry
   milestone = milestone_entry['number']
 
-  uri = URI("#{base_uri}/issues?milestone=#{milestone}&state=closed&per_page=1000")
+    uri = URI("#{base_uri}/issues?milestone=#{milestone}&state=closed&per_page=1000")
   req = Net::HTTP::Get.new(uri.request_uri)
   req.basic_auth(user, pass)
   res = https.start { |http| http.request(req) }
@@ -233,10 +233,10 @@ New in version #{milestone_name}:
 #{milestone_description}
 
 #{(categories.keys & grouped_issues.keys).map do |cat|
-    "#{cat}:\n
+"#{cat}:\n
 #{grouped_issues[cat].map { |i| %Q{* Issue ##{i['number']} #{i['title'].gsub('`', "'")}#{" (#{i['user']['login']})" if i['pull_request'] && i['pull_request']['html_url']}}.wrap(2) }.join("\n")}
 "
-  end.join("\n")}
+end.join("\n")}
 You can find a complete list of issues here:
 
 * https://github.com/ruboto/ruboto/issues?state=closed&milestone=#{milestone}
@@ -514,16 +514,43 @@ namespace :platform do
     'org.ruboto.core'
   end
 
+  def wait_for_valid_device
+    while `adb shell echo "ping"`.strip != 'ping'
+      `adb kill-server`
+      `adb devices`
+      sleep 5
+    end
+  end
+
   def install_apk
+    wait_for_valid_device
+
     failure_pattern = /^Failure \[(.*)\]/
     success_pattern = /^Success/
+    install_timeout = 300
     case package_installed?
     when true
       puts "Package #{package} already installed."
       return
     when false
-      puts "Package #{package} already installed, but of different size.  Replacing package."
-      output = `adb install -r #{PLATFORM_CURRENT_RELEASE_APK} 2>&1`
+      puts "Package #{package} already installed, but of different size or timestamp.  Replacing package."
+      sh "adb shell date -s #{Time.now.strftime '%Y%m%d.%H%M%S'}"
+      output = nil
+      install_retry_count = 0
+      begin
+        timeout install_timeout do
+          output = `adb install -r "#{PLATFORM_CURRENT_RELEASE_APK}" 2>&1`
+        end
+      rescue Timeout::Error
+        puts "Installing package #{package} timed out."
+        install_retry_count += 1
+        if install_retry_count <= 3
+          puts 'Retrying install...'
+          retry
+        end
+        puts 'Trying one final time to install the package:'
+        output = `adb install -r "#{PLATFORM_CURRENT_RELEASE_APK}" 2>&1`
+      end
       if $? == 0 && output !~ failure_pattern && output =~ success_pattern
         return
       end
@@ -535,26 +562,27 @@ namespace :platform do
         puts "Uninstalling #{package} and retrying install."
       end
       uninstall_apk
+    else
+      # Package not installed.
+      sh "adb shell date -s #{Time.now.strftime '%Y%m%d.%H%M%S'}"
     end
     puts "Installing package #{package}"
+    output = nil
     install_retry_count = 0
     begin
-      output = nil
-      timeout 180 do
-        install_start = Time.now
-        output = `adb install #{PLATFORM_CURRENT_RELEASE_APK} 2>&1`
-        puts "Install took #{(Time.now - install_start).to_i}s."
+      timeout install_timeout do
+        output = `adb install "#{PLATFORM_CURRENT_RELEASE_APK}" 2>&1`
       end
-    rescue TimeoutError
-      puts 'Install of current RubotoCore timed out.'
+    rescue Timeout::Error
+      puts "Installing package #{package} timed out."
       install_retry_count += 1
       if install_retry_count <= 3
-        puts 'Retrying.'
+        puts 'Retrying install...'
         retry
       end
-      puts 'Retrying one final time...'
+      puts 'Trying one final time to install the package:'
       install_start = Time.now
-      output = `adb install #{PLATFORM_CURRENT_RELEASE_APK} 2>&1`
+      output = `adb install "#{PLATFORM_CURRENT_RELEASE_APK}" 2>&1`
       puts "Install took #{(Time.now - install_start).to_i}s."
     end
     puts output
@@ -602,40 +630,62 @@ namespace :platform do
 end
 
 desc 'Download the latest jruby-jars snapshot'
-task :get_jruby_jars_snapshot do
-  current_gem = 'jruby-jars-9000.dev.gem'
-  print "Downloading #{current_gem}: \r"
-  uri = URI("http://ci.jruby.org/snapshots/master/#{current_gem}")
-  done = 0
-  body = ''
-  Net::HTTP.new(uri.host, uri.port).request_get(uri.path) do |response|
-    length = response['Content-Length'].to_i
-    response.read_body do |fragment|
-      body << fragment
-      done += fragment.length
-      progress = (done * 100) / length
-      print "Downloading #{current_gem}: #{done / 1024}/#{length / 1024}KB #{progress}%\r"
+task :get_jruby_jars_snapshots do
+  download_host = 'lafo.ssw.uni-linz.ac.at'
+  index = Net::HTTP.get(download_host, "/graalvm/")
+  current_gems = index.scan(/jruby-jars-.*?.gem/).uniq
+  current_gems.each do |gem|
+    print "Downloading #{gem}: \r"
+    uri = URI("http://#{download_host}/graalvm/#{gem}")
+    done = 0
+    body = ''
+    Net::HTTP.new(uri.host, uri.port).request_get(uri.path) do |response|
+      length = response['Content-Length'].to_i
+      response.read_body do |fragment|
+        body << fragment
+        done += fragment.length
+        progress = (done * 100) / length
+        print "Downloading #{gem}: #{done / 1024}/#{length / 1024}KB #{progress}%\r"
+      end
+      puts
     end
-    puts
+    File.open(gem, 'wb') { |f| f << body }
   end
-  File.open(current_gem, 'wb') { |f| f << body }
 end
 
 task '.travis.yml' do
   puts "Regenerating #{'.travis.yml'}"
   source = File.read('.travis.yml')
   matrix = ''
-  [17, 16, 15].each.with_index do |api, i|
+  allow_failures = ''
+  [19, 17, 16, 15].each.with_index do |api, i|
     n = i
-    [['CURRENT', [nil]],['FROM_GEM', [nil]],['STANDALONE', [nil, '1.7.13', '1.7.12'].rotate(-i)]].each do |platform, versions|
+    [['CURRENT', [nil]], ['FROM_GEM', [:MASTER, :STABLE]], ['STANDALONE', [:MASTER, :STABLE, '1.7.13']]].each do |platform, versions|
       versions.each do |v|
-        n = (n  % 5) + 1
-        matrix << "    - ANDROID_TARGET=#{api} RUBOTO_PLATFORM=#{platform.ljust(10)} TEST_PART=#{n}of5#{" JRUBY_JARS_VERSION=#{v}" if v}\n"
+        n = (n % 5) + 1
+        line = "    - ANDROID_TARGET=#{api} RUBOTO_PLATFORM=#{platform.ljust(10)} TEST_PART=#{n}of5#{" JRUBY_JARS_VERSION=#{v}" if v}\n"
+        matrix << line
+        if (platform == 'STANDALONE' && v == :MASTER) ||
+            # FIXME(uwe):  Remove when master and stable branches are green.
+            v == :MASTER || v == :STABLE ||
+            # FIXME(uwe):  Remove when master and stable branches are green.
+            v == '1.7.16'
+          # EMXiF
+          allow_failures << line.gsub('-', '- env:')
+        end
       end
     end
     matrix << "\n"
   end
   matrix << "    - ANDROID_TARGET=10 RUBOTO_PLATFORM=CURRENT\n"
-  matrix_str = "  matrix:\n#{matrix}\nmatrix:"
-  File.write('.travis.yml', source.sub(/^  matrix:.*?matrix:/m, matrix_str))
+  matrix_str = "  matrix:\n#{matrix}\n"
+  allow_failures_str = <<EOF
+  allow_failures:
+    # Current master is failing: https://github.com/jruby/jruby/issues/1741
+    # Current JRuby 1.7.x gem is failing.  Why?
+#{allow_failures}
+EOF
+  File.write('.travis.yml', source.
+      sub(/^  matrix:.*?(?=^matrix:)/m, matrix_str).
+      sub(/^  allow_failures:.*?(?=^script:)/m, allow_failures_str))
 end

data/assets/rakelib/ruboto.rake

@@ -7,13 +7,19 @@ require 'timeout'
 
 ON_WINDOWS = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw/i)
 
-ANT_CMD = ON_WINDOWS ? 'ant.bat' : 'ant'
+ANT_BINARY = ON_WINDOWS ? 'ant.bat' : 'ant'
+ANT_VERSION_CMD = "#{ANT_BINARY} -version"
 
-if `#{ANT_CMD} -version` !~ /version (\d+)\.(\d+)\.(\d+)/ || $1.to_i < 1 || ($1.to_i == 1 && $2.to_i < 8)
+if (ant_version_output = `#{ANT_VERSION_CMD}`) !~ /version (\d+)\.(\d+)\.(\d+)/ || $1.to_i < 1 || ($1.to_i == 1 && $2.to_i < 8)
+  puts ANT_VERSION_CMD
+  puts ant_version_output
   puts "ANT version 1.8.0 or later required.  Version found: #{$1}.#{$2}.#{$3}"
   exit 1
 end
 
+ANT_CMD = ANT_BINARY.dup
+ANT_CMD << ' -v' if Rake.application.options.trace == true
+
 #
 # OS independent "which"
 # From: http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
@@ -230,8 +236,17 @@ file PROJECT_PROPS_FILE
 file MANIFEST_FILE => PROJECT_PROPS_FILE do
   old_manifest = File.read(MANIFEST_FILE)
   manifest = old_manifest.dup
-  manifest.sub!(/(android:minSdkVersion=').*?(')/) { "#$1#{sdk_level}#$2" }
-  manifest.sub!(/(android:targetSdkVersion=').*?(')/) { "#$1#{sdk_level}#$2" }
+
+  # FIXME(uwe):  Remove 'L' special case when Android L has been released.
+  if sdk_level == 21
+    manifest.sub!(/(android:minSdkVersion=').*?(')/) { "#$1L#$2" }
+    manifest.sub!(/(android:targetSdkVersion=').*?(')/) { "#$1L#$2" }
+  else
+    manifest.sub!(/(android:minSdkVersion=').*?(')/) { "#$1#{sdk_level}#$2" }
+    manifest.sub!(/(android:targetSdkVersion=').*?(')/) { "#$1#{sdk_level}#$2" }
+  end
+  # EMXIF
+
   if manifest != old_manifest
     puts "\nUpdating #{File.basename MANIFEST_FILE} with target from #{File.basename PROJECT_PROPS_FILE}\n\n"
     File.open(MANIFEST_FILE, 'w') { |f| f << manifest }
@@ -540,7 +555,7 @@ file APK_FILE => APK_DEPENDENCIES do |t|
   build_apk(t, false)
 end
 
-MINIMUM_DX_HEAP_SIZE = 2048
+MINIMUM_DX_HEAP_SIZE = 3072
 task :patch_dex do
   new_dx_content = File.read(DX_FILENAME).dup
   xmx_pattern = ON_WINDOWS ? /^set defaultXmx=-Xmx(\d+)(M|m|G|g|T|t)/ : /^defaultMx="-Xmx(\d+)(M|m|G|g|T|t)"/
@@ -612,7 +627,7 @@ namespace :test do
       puts 'Running quick tests'
       install_retry_count = 0
       begin
-        timeout 120 do
+        timeout 300 do
           sh "#{ANT_CMD} instrument install"
         end
       rescue TimeoutError
@@ -640,8 +655,11 @@ file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
   next unless File.exists? GEM_FILE
   puts "Generating #{BUNDLE_JAR}"
   require 'bundler'
-  # FIXME(uwe): Issue #547 https://github.com/ruboto/ruboto/issues/547
-  if true || Gem::Version.new(Bundler::VERSION) <= Gem::Version.new('1.6.3')
+  if false
+    # FIXME(uwe): Issue #547 https://github.com/ruboto/ruboto/issues/547
+    # Bundler.settings[:platform] = Gem::Platform::DALVIK
+    sh "bundle install --gemfile #{GEM_FILE} --path=#{BUNDLE_PATH} --platform=dalvik#{sdk_level}"
+  else
     require 'bundler/vendored_thor'
 
     # Store original RubyGems/Bundler environment
@@ -682,9 +700,6 @@ file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
     Gem.platforms = platforms
     ENV['GEM_HOME'] = env_home
     ENV['GEM_PATH'] = env_path
-  else
-    # Bundler.settings[:platform] = Gem::Platform::DALVIK
-    sh "bundle install --gemfile #{GEM_FILE} --path=#{BUNDLE_PATH} --platform=dalvik#{sdk_level}"
   end
 
   gem_paths = Dir["#{BUNDLE_PATH}/gems"]
@@ -855,7 +870,9 @@ end
 # Methods
 
 def sdk_level
-  File.read(PROJECT_PROPS_FILE).scan(/(?:target=android-)(\d+)/)[0][0].to_i
+  # FIXME(uwe):  Remove special case 'L' when Android L is released.
+  level = File.read(PROJECT_PROPS_FILE).scan(/(?:target=android-)(\d+|L)/)[0][0].to_i
+  level == 0 ? 21 : level
 end
 
 def mark_update(time = Time.now)
@@ -974,7 +991,7 @@ def install_apk
     output = nil
     install_retry_count = 0
     begin
-      timeout 120 do
+      timeout 300 do
         output = `adb install -r "#{APK_FILE}" 2>&1`
       end
     rescue Timeout::Error
@@ -1007,7 +1024,7 @@ def install_apk
   output = nil
   install_retry_count = 0
   begin
-    timeout 120 do
+    timeout 300 do
       output = `adb install "#{APK_FILE}" 2>&1`
     end
   rescue Timeout::Error
@@ -1018,7 +1035,9 @@ def install_apk
       retry
     end
     puts 'Trying one final time to install the package:'
+    install_start = Time.now
     output = `adb install "#{APK_FILE}" 2>&1`
+    puts "Install took #{(Time.now - install_start).to_i}s."
   end
   puts output
   raise "Install failed (#{$?}) #{$1 ? "[#$1}]" : output}" if $? != 0 || output =~ failure_pattern || output !~ success_pattern

data/assets/rakelib/ruboto.stdlib.rake

@@ -166,7 +166,7 @@ def remove_unneeded_parts_of_stdlib
     # Only affects JRuby 1.7.11, 1.7.12, and 9000 (until fixed).
     # FIXME(uwe):  Remove when we stop supporting JRuby 1.7.11 and 1.7.12
     Dir['**/provider.rb'].each do |f|
-      puts "Patching #{f}..."
+      print "patching #{f}..."
       File.write(f, File.read(f).sub(%r{require_relative 'provider/ffi'}, "# require_relative 'provider/ffi'"))
     end
     # EMXIF

data/assets/res/layout/get_ruboto_core.xml

@@ -7,7 +7,6 @@
     android:gravity="center_horizontal|center_vertical"
 >
   <ImageButton
-      android:id="@+id/image"
       android:layout_width="fill_parent"
       android:layout_height="fill_parent"
       android:src="@drawable/get_ruboto_core"
@@ -15,7 +14,7 @@
       android:scaleType="fitCenter"
       android:onClick="getRubotoCore"
   />
-  <TextView android:id="@+id/text"
+  <TextView android:id="@android:id/text1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Welcome to Ruboto!  This is the first Ruboto application installed on this device.  To continue, you need to install the Ruboto Core platform package.  Click on the image above to go to the market and d\