ruboto 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04f53460885c0bb561a901a29c3e9b91a2110fc4
-  data.tar.gz: e0cf0b0f70589da752f91b35331ac47cb761d334
+  metadata.gz: 43fc738a51f8ba87d63a71d6c03d1447aec6d18e
+  data.tar.gz: c7bd31a0ef13ceac40d6f615bb5a0778d7be6e41
 SHA512:
-  metadata.gz: d8025d008cc28e62365dc4668065b5d4feddbb710a9fc836b24610069a42eb3a20653ec55d711619c043e3fb4d1385f9e5c268999c91f4b4fd03b9c5d70a2733
-  data.tar.gz: d04a199b80a4e09444b9efede9333fcb5871aa7751f7fe361eb6d5e78b4e7aa13b8206a8e8a942593aff3379c36954abf21bbe751ae7cef0f3985ed09be7dbf6
+  metadata.gz: 7fdfa5f49fca5364727e1d11d32110c24920a3ecd9f5c9d1bde869e6208da4efde2c7ba8b8ad98111fbad3eb844e29b8f72bb6890d5af5961bff29fe66785ef0
+  data.tar.gz: 125ad2e435f8d0f9cb9a8dca47a88106efba9b58d39368f40e36727169ed47456adb9d13f00475e00a6ade494a02a489418b4feec6ee68fe37ec142257dfa998

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruboto (1.2.0)
+    ruboto (1.3.0.dev)
       main (~> 5.2)
       rake (~> 10.0)
       rubyzip (~> 1.0)
@@ -21,16 +21,18 @@ GEM
       pry (>= 0.9)
     map (6.5.5)
     method_source (0.8.2)
+    minitest (5.5.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.3.2)
-    rubyzip (1.1.6)
+    rake (10.4.2)
+    rubyzip (1.1.7)
     slop (3.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  minitest (~> 5.5)
   ruboto!

data/README.md

@@ -45,7 +45,7 @@ Before you can use Ruboto, you need the following tools installed:
 Ruboto offers a setup command to help you with the component installation and
 configuration:
 
-    $ ruboto setup
+    $ ruboto setup -y
 
 * Generate an [Emulator](http://developer.android.com/guide/developing/tools/emulator.html)
   image unless you want to develop using your phone.

data/RELEASE_CANDICATE_DOC.md

@@ -1,12 +1,29 @@
-Subject: [ANN] Ruboto 1.2.0 release candidate
+Subject: [ANN] Ruboto 1.3.0 release candidate
 
 Hi all!
 
-The Ruboto 1.2.0 release candidate is now available.
+The Ruboto 1.3.0 release candidate is now available.
 
-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".
+It's been a long time since the last release.  We have had some problems
+getting the test matrix green at https://travis-ci.org/ruboto/ruboto and
+as there are still some combinations failing, we need help to fix them.
+If you have experience debugging on Android, please contribute.
+
+In the meantime, we have added support for JRuby up to 1.7.19 and Android
+up to 5.1.  There are still some bugs to sort out, but we are getting
+there  :)  Testing with JRuby 9000 has begun, but is currently failing.
+
+A new feature is the running of "src/environment.rb" if it is present
+right after JRuby initialization.  This enables loading of gems and code
+common across activities, broadcast receivers, and services.
+
+Use of Bundler has improved to allow gems that duplicate files in Ruby
+Stdlib like JSON, and allow local gems using the "path" option in the
+Gemfile.  Support for ActiveRecord has been updated to 4.1.
+
+Finally we have updated the homepage and wiki with a few changes.
+
+Thanks to all who have contributed!
 
 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.2.0 released!
+Subject: [ANN] Ruboto 1.3.0 released!
 
-The Ruboto team is pleased to announce the release of Ruboto 1.2.0.
+The Ruboto team is pleased to announce the release of Ruboto 1.3.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,45 +8,77 @@ 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.2.0:
+New in version 1.3.0:
 
-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".
+It's been a long time since the last release.  We have had some problems
+getting the test matrix green at https://travis-ci.org/ruboto/ruboto and
+as there are still some combinations failing, we need help to fix them.
+If you have experience debugging on Android, please contribute.
+
+In the meantime, we have added support for JRuby up to 1.7.19 and Android
+up to 5.1.  There are still some bugs to sort out, but we are getting
+there  :)  Testing with JRuby 9000 has begun, but is currently failing.
+
+A new feature is the running of "src/environment.rb" if it is present
+right after JRuby initialization.  This enables loading of gems and code
+common across activities, broadcast receivers, and services.
+
+Use of Bundler has improved to allow gems that duplicate files in Ruby
+Stdlib like JSON, and allow local gems using the "path" option in the
+Gemfile.  Support for ActiveRecord has been updated to 4.1.
+
+Finally we have updated the homepage and wiki with a few changes.
+
+Thanks to all who have contributed!
+
+API Changes:
+
+* Issue #689 Add support for Android 5 Lollipop
+* Issue #690 Update to JRuby 1.7.19
 
 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
+* Issue #647 Run environment.rb after JRuby initialization
+* Issue #696 Add support for local gems
+* Issue #699 Add support for ActiveRecord 4 and the thread_safe gem
+* Issue #701 Add support for ActiveRecord 4.1
 
 Bugfixes:
 
-* 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
+* Issue #627 Fix HTTPS access to GitHub
+* Issue #678 Update setup.rb (sardaukar)
+* Issue #679 Fix for finding the Platform SDK on OS X when using
+  homebrew
+* Issue #681 Warning after ruboto setup
+* Issue #700 Allow non-utf8 output in "rake log"
+* Issue #702 Exception running "ruboto setup -t 19 -y" on OS X 10.10
+* Issue #706 Avoid duplicate files in bundle vs stdlib
+* Issue #707 Choose the latest build-tools in "ruboto setup"
+
+Documentation:
+
+* Issue #676 Modification to Wiki for Mac OS Guide
+* Issue #677 Ruboto Main Page - misinformation?
 
 Support:
 
-* Issue #573 How can I load Ruboto Core Dynamically in Runtime?
+* Issue #590 Cannot open apk in emulator
+* Issue #680 Android SDK Command dx   : Not found
+* Issue #682 ruboto gen app only works if sdk api level 15 installed
+
+Community:
+
+* Issue #578 How can I help? (jaunesarmiento)
+* Issue #581 How can I help? (bobquest33)
 
-Rejected:
+Internal:
 
-* Issue #646 Make ANT quiet by default, enabling verbose and trace
-  output with the -v and -t rake options
+* Issue #709 Remove swap manipulation and sudo (BanzaiMan)
+* Issue #711 Test JRuby 1.7.20.dev, 1.7.19, 1.7.15, and 1.7.13. (donv)
 
 You can find a complete list of issues here:
 
-* https://github.com/ruboto/ruboto/issues?state=closed&milestone=35
+* https://github.com/ruboto/ruboto/issues?state=closed&milestone=36
 
 
 Installation:

data/Rakefile

@@ -11,9 +11,10 @@ require 'net/http'
 require 'net/https'
 require 'openssl'
 require 'yaml'
+require_relative 'assets/rakelib/ruboto.device'
 
-PROJECT_DIR = File.expand_path(File.dirname(__FILE__))
 PLATFORM_PROJECT = File.expand_path('tmp/RubotoCore', File.dirname(__FILE__))
+PLATFORM_PACKAGE = 'org.ruboto.core'
 PLATFORM_DEBUG_APK = "#{PLATFORM_PROJECT}/bin/RubotoCore-debug.apk"
 PLATFORM_DEBUG_APK_BAK = "#{PLATFORM_PROJECT}/bin/RubotoCore-debug.apk.bak"
 PLATFORM_RELEASE_APK = "#{PLATFORM_PROJECT}/bin/RubotoCore-release.apk"
@@ -22,7 +23,7 @@ MANIFEST_FILE = 'AndroidManifest.xml'
 GEM_FILE = "ruboto-#{Ruboto::VERSION}.gem"
 GEM_SPEC_FILE = 'ruboto.gemspec'
 README_FILE = 'README.md'
-WEB_DIR = "#{File.dirname PROJECT_DIR}/ruboto.github.com"
+WEB_DIR = File.expand_path('../ruboto.github.com', File.dirname(__FILE__))
 BLOG_DIR = '_posts'
 RELEASE_BLOG = "#{BLOG_DIR}/#{Date.today}-Ruboto-#{Ruboto::VERSION}-release-doc.md"
 RELEASE_BLOG_GLOB = "#{BLOG_DIR}/*-Ruboto-#{Ruboto::VERSION}-release-doc.md"
@@ -118,16 +119,6 @@ end
 desc 'Generate release docs for a given milestone'
 
 def get_github_issues
-  puts 'GitHub login:'
-  begin
-    require 'rubygems'
-    require 'highline/import'
-    user = ask('login   : ') { |q| q.echo = true }
-    pass = ask('password: ') { |q| q.echo = '*' }
-  rescue Exception
-    print 'user name: '; user = STDIN.gets.chomp
-    print ' password: '; pass = STDIN.gets.chomp
-  end
   host = 'api.github.com'
   base_uri = "https://#{host}/repos/ruboto/ruboto"
   https = Net::HTTP.new(host, 443)
@@ -136,7 +127,6 @@ def get_github_issues
 
   milestone_uri = URI("#{base_uri}/milestones")
   req = Net::HTTP::Get.new(milestone_uri.request_uri)
-  req.basic_auth(user, pass)
   res = https.start { |http| http.request(req) }
   milestones = YAML.load(res.body).sort_by { |i| Date.parse(i['due_on']) }
   milestone_entry = milestones.find { |m| m['title'] == Ruboto::VERSION.chomp('.dev') }
@@ -145,18 +135,17 @@ def get_github_issues
 
     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) }
   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")
+  milestone_description = milestone_description.split("\r\n").map(&:wrap).join("\n")
   categories = {
-      'Features' => 'feature', 'Bugfixes' => 'bug',
-      'Performance' => 'performance', 'Documentation' => 'documentation',
-      'Support' => 'support', 'Community' => 'community',
-      'Pull requests' => nil, 'Internal' => 'internal',
-      'Rejected' => 'rejected', 'Other' => nil
+      'API Changes' => 'API change', 'Features' => 'feature',
+      'Bugfixes' => 'bug', 'Performance' => 'performance',
+      'Documentation' => 'documentation', 'Support' => 'support',
+      'Community' => 'community', 'Pull requests' => nil,
+      'Internal' => 'internal', 'Rejected' => 'rejected', 'Other' => nil
   }
   grouped_issues = issues.group_by do |i|
     labels = i['labels'].map { |l| l['name'] }
@@ -492,8 +481,8 @@ namespace :platform do
   end
 
   desc 'Install the current RubotoCore platform release apk'
-  task :current => PLATFORM_CURRENT_RELEASE_APK do
-    install_apk
+  task current: PLATFORM_CURRENT_RELEASE_APK do
+    install_apk PLATFORM_PACKAGE, PLATFORM_CURRENT_RELEASE_APK
   end
 
   desc 'Install the Ruboto Core platform debug apk'
@@ -505,126 +494,7 @@ namespace :platform do
 
   desc 'Uninstall the Ruboto Core platform debug apk'
   task :uninstall do
-    uninstall_apk
-  end
-
-  private
-
-  def package
-    '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 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
-      case $1
-      when 'INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES'
-        puts 'Found package signed with different certificate.  Uninstalling it and retrying install.'
-      else
-        puts "'adb install' returned an unknown error: (#$?) #{$1 ? "[#$1}]" : output}."
-        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
-      timeout install_timeout do
-        output = `adb install "#{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:'
-      install_start = Time.now
-      output = `adb install "#{PLATFORM_CURRENT_RELEASE_APK}" 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
-  end
-
-  def uninstall_apk
-    return if package_installed?.nil?
-    puts "Uninstalling package #{package}"
-    system "adb uninstall #{package}"
-    if $? != 0 && package_installed?
-      puts "Uninstall failed exit code #{$?}"
-      exit $?
-    end
-  end
-
-  def package_installed?
-    package_name = package
-    %w( -0 -1 -2).each do |i|
-      path = "/data/app/#{package_name}#{i}.apk"
-      o = `adb shell ls -l #{path}`.chomp
-      if o =~ /^-rw-r--r-- system\s+system\s+(\d+) \d{4}-\d{2}-\d{2} \d{2}:\d{2} #{File.basename(path)}$/
-        apk_file = PLATFORM_CURRENT_RELEASE_APK
-        if !File.exists?(apk_file) || $1.to_i == File.size(apk_file)
-          return true
-        else
-          return false
-        end
-      end
-
-      sdcard_path = "/mnt/asec/#{package_name}#{i}/pkg.apk"
-      o = `adb shell ls -l #{sdcard_path}`.chomp
-      if o =~ /^-r-xr-xr-x system\s+root\s+(\d+) \d{4}-\d{2}-\d{2} \d{2}:\d{2} #{File.basename(sdcard_path)}$/
-        apk_file = PLATFORM_CURRENT_RELEASE_APK
-        if !File.exists?(apk_file) || $1.to_i == File.size(apk_file)
-          return true
-        else
-          return false
-        end
-      end
-    end
-    return nil
+    uninstall_apk(PLATFORM_PACKAGE, PLATFORM_CURRENT_RELEASE_APK)
   end
 
 end
@@ -633,53 +503,88 @@ desc 'Download the latest jruby-jars snapshot'
 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
+  all_gems = index.scan(%r{(jruby-jars-.*?.gem).*?</td>\s*<td.*?</td>\s*<td.*?>\s*(.*?)</td>})
+  current_gems = [all_gems.select{|a| a[1].to_i > 0}.map{|a| a[0]}.
+          uniq.sort_by{|v| Gem::Version.new(v[11..-5])}.last]
+  current_gems << index.scan(/jruby-jars-1\.7\..*?.gem/).uniq.
+      sort_by{|v| Gem::Version.new(v[11..-5])}.last
+  FileUtils.rm_rf Dir['jruby-jars-*.gem']
   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"
+      if response.code == '200'
+        length = response['Content-Length'].to_i
+        response.read_body do |fragment|
+          body << fragment
+          done += fragment.length
+          unless length == 0
+            progress = (done * 100) / length
+            print "Downloading #{gem}: #{done / 1024}/#{length / 1024}KB #{progress}%\r"
+          end
+        end
+        puts
+      else
+        raise "Unexpected HTTP response code: #{response.code.inspect}"
       end
-      puts
     end
-    File.open(gem, 'wb') { |f| f << body }
+    File.open(gem, 'wb') { |f| f << body } unless body.empty?
   end
 end
 
 task '.travis.yml' do
   puts "Regenerating #{'.travis.yml'}"
   source = File.read('.travis.yml')
+  test_parts = 5
   matrix = ''
   allow_failures = ''
+  # FIXME(uwe):  Test the newest api levels
+  # [21, 19, 18, 17, 16, 15].each.with_index do |api, i|
   [19, 17, 16, 15].each.with_index do |api, i|
     n = i
-    [['CURRENT', [nil]], ['FROM_GEM', [:MASTER, :STABLE]], ['STANDALONE', [:MASTER, :STABLE, '1.7.13']]].each do |platform, versions|
+    # FIXME(uwe):  JRuby 1.7.13 works for Nettbuss
+    # FIXME(uwe):  JRuby 1.7.14 has a malformed gem
+    # FIXME(uwe):  JRuby 1.7.15 looks OK!
+    # FIXME(uwe):  JRuby 1.7.16: RaiseException: (ENOENT) No such file or directory - /.gem/jruby/1.9
+    #                            https://github.com/jruby/jruby/issues/2040
+    # FIXME(uwe):  JRuby 1.7.17:  RSS? => RubotoGenTest#test_activity_tests => Native crash
+    # FIXME(uwe):  JRuby 1.7.18:  RSS? => RubotoGenTest#test_activity_tests => Process crashed
+    # FIXME(uwe):  JRuby 1.7.19:  RSS? => RubotoGenTest#test_activity_tests => Native crash
+    # FIXME(uwe):  JRuby 1.7.20:  Fails on RSS and upper case package names
+    # FIXME(uwe):  RubotoCore (CURRENT) is missing thread_safe
+    # FIXME(uwe):  Test all of these that work
+    # [['CURRENT', [nil]], ['FROM_GEM', [:MASTER, :STABLE]], ['STANDALONE', [:MASTER, :STABLE, '1.7.19', '1.7.18', '1.7.17', '1.7.16', '1.7.15', '1.7.13']]].each do |platform, versions|
+    [
+        ['STANDALONE', [
+                *(['1.7.13']*test_parts),
+                *(['1.7.15']*test_parts),
+                *(['1.7.19']*test_parts),
+                *([:STABLE]*test_parts),
+            ]
+        ],
+        # ['FROM_GEM', ['1.7.13', :STABLE, ]],
+        # ['CURRENT', [nil]],
+    ].each do |platform, versions|
       versions.each do |v|
-        n = (n % 5) + 1
-        line = "    - ANDROID_TARGET=#{api} RUBOTO_PLATFORM=#{platform.ljust(10)} TEST_PART=#{n}of5#{" JRUBY_JARS_VERSION=#{v}" if v}\n"
+        n = (n % test_parts) + 1
+        line = "    - ANDROID_TARGET=#{api} RUBOTO_PLATFORM=#{platform.ljust(10)} TEST_PART=#{n}of#{test_parts}#{" 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
+        if v == :MASTER || # FIXME(uwe):  Remove when master branch is green.
+            v == :STABLE || # FIXME(uwe):  Remove when 1.7.20 supports RSS and upper case package names.
+            api == 21 || # FIXME(uwe):  Remove when Android 5 is green.
+            api == 17 || # FIXME(uwe):  Remove when Android 4.2 is green.
+            api == 16 || # FIXME(uwe):  Remove when Android 4.1 is green.
+            api == 15 # FIXME(uwe):  Remove when Android 4.0 is green.
           allow_failures << line.gsub('-', '- env:')
         end
       end
     end
     matrix << "\n"
   end
-  matrix << "    - ANDROID_TARGET=10 RUBOTO_PLATFORM=CURRENT\n"
-  matrix_str = "  matrix:\n#{matrix}\n"
-  allow_failures_str = <<EOF
+  matrix_str = "  matrix:\n#{matrix}"
+  allow_failures_str = <<EOF # FIXME(uwe)
   allow_failures:
     # Current master is failing: https://github.com/jruby/jruby/issues/1741
     # Current JRuby 1.7.x gem is failing.  Why?