ruboto 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c5388b2c49b07f2a24e6ff47ddbfc1bdf3d3c32
-  data.tar.gz: 5e403bbd0d6595fcfa3a331219ab11c78f8038e1
+  metadata.gz: 5cf1877943572ab84d12119768dd14f3f78974f0
+  data.tar.gz: 2ae6f50b354303637f7b7cd5274f74de10648182
 SHA512:
-  metadata.gz: af308b2ecd2ace0e15375505db4cc4c67ef466952a64bfe761e784dcf5b3ad4a41546418cf2c1e0745a5dfb74c81f74cd36a24177bc44da3ce49429687886b23
-  data.tar.gz: e90f2a78ea73193a1bfb24ee6436921ecf6c393947d3bd4d2d17fc9fec39067da4d335dcebd5082e3f09c8aa1326aceefb4b33e7269b242b50eb9dd0f77adf06
+  metadata.gz: 34824bba9512f51cd583fd61e51e018b636d24a12ed39923d128b2f45ddb6c86aaa5e3fdd1a3ccb5511a459e6f9bb19973279e8be2233a87a4da67a416c46a9e
+  data.tar.gz: ef88fdcd111e94f71a4c88509b98c7e5bbdb342a736350539b1b5cff4bf3b7f8cf2c30a5d5c0eddd265f9249e1522c9d87aee2e2f22e0aa487d6bde6a5da94c4

data/CONTRIBUTING.md

@@ -0,0 +1,28 @@
+Contributing
+============
+
+Want to contribute? Great! Meet us in #ruboto on irc.freenode.net, fork the
+project and start coding!
+
+"But I don't understand it well enough to contribute by forking the project!"
+That's fine. Equally helpful:
+
+* Use Ruboto and tell us how it could be better.
+  Report [issues](http://github.com/ruboto/ruboto/issues).
+* Browse http://ruboto.org/ and the documentation, and let us know how to make
+  it better.
+* As you gain wisdom, contribute it to
+  [the wiki](http://github.com/ruboto/ruboto/wiki).
+* When you gain enough wisdom, reconsider whether you could fork the project.
+
+If contributing code to the project, please run the existing tests and add tests
+for your changes.  You run the tests using rake:
+
+    $ rake test
+
+We have set up a matrix test that tests multiple configuations on the emulator:
+
+    $ ./matrix_tests.sh
+
+All branches and pull requests on GitHub are also tested on
+[https://travis-ci.org/ruboto/ruboto](https://travis-ci.org/ruboto/ruboto).

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    ruboto (1.4.1.dev)
+    ruboto (1.5.0.dev)
       main (~> 5.2)
-      rake (~> 10.0)
+      net-telnet (~> 0.1.1)
+      rake (~> 11.3)
       rubyzip (~> 1.0)
 
 GEM
@@ -11,23 +12,24 @@ GEM
   specs:
     arrayfields (4.9.2)
     chronic (0.10.2)
-    coderay (1.1.0)
-    fattr (2.2.2)
+    coderay (1.1.1)
+    fattr (2.3.0)
     main (5.3.2)
       arrayfields (>= 4.7.4)
       chronic (>= 0.6.2)
       fattr (>= 2.2.0)
       map (>= 5.1.0)
       pry (>= 0.9)
-    map (6.5.5)
+    map (6.6.0)
     method_source (0.8.2)
-    minitest (5.8.3)
-    pry (0.10.3)
+    minitest (5.8.4)
+    net-telnet (0.1.1)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.4.2)
-    rubyzip (1.1.7)
+    rake (11.3.0)
+    rubyzip (1.2.0)
     slop (3.6.0)
 
 PLATFORMS
@@ -38,4 +40,4 @@ DEPENDENCIES
   ruboto!
 
 BUNDLED WITH
-   1.10.6
+   1.13.6

data/README.md

@@ -2,6 +2,8 @@
 [![Build Status](https://travis-ci.org/ruboto/ruboto.svg?branch=master)](https://travis-ci.org/ruboto/ruboto)
 [![Code Climate](https://codeclimate.com/github/ruboto/ruboto.svg)](https://codeclimate.com/github/ruboto/ruboto)
 
+<a href="https://gratipay.com/ruboto/" class="rich-diff-level-one"><img src="https://camo.githubusercontent.com/dcd1e367172f3fa649a334e1ee6fb334f16ed8d8/68747470733a2f2f63646e2e7261776769742e636f6d2f67726174697061792f67726174697061792d62616467652f322e782e782f646973742f67726174697061792e706e67" alt="Support via Gratipay" data-canonical-src="https://cdn.rawgit.com/gratipay/gratipay-badge/2.x.x/dist/gratipay.png" align="right" style="max-width:100%;"></a>
+
 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
@@ -288,30 +290,7 @@ You can run the tests for your app using ant or rake:
 Contributing
 ------------
 
-Want to contribute? Great! Meet us in #ruboto on irc.freenode.net, fork the
-project and start coding!
-
-"But I don't understand it well enough to contribute by forking the project!"
-That's fine. Equally helpful:
-
-* Use Ruboto and tell us how it could be better.
-* Browse http://ruboto.org/ and the documentation, and let us know how to make
-  it better.
-* As you gain wisdom, contribute it to
-  [the wiki](http://github.com/ruboto/ruboto/wiki/)
-* When you gain enough wisdom, reconsider whether you could fork the project.
-
-If contributing code to the project, please run the existing tests and add tests
-for your changes.  You run the tests using rake:
-
-    $ rake test
-
-We have set up a matrix test that tests multiple configuations on the emulator:
-
-    $ ./matrix_tests.sh
-
-All branches and pull requests on GitHub are also tested on
-[https://travis-ci.org/ruboto/ruboto](https://travis-ci.org/ruboto/ruboto).
+See [CONTRIBUTING.md](CONTRIBUTING.md)
 
 Getting Help
 ------------

data/RELEASE_CANDICATE_DOC.md

@@ -1,10 +1,11 @@
-Subject: [ANN] Ruboto 1.4.1 release candidate
+Subject: [ANN] Ruboto 1.5.0 release candidate
 
 Hi all!
 
-The Ruboto 1.4.1 release candidate is now available.
+The Ruboto 1.5.0 release candidate is now available.
 
-Bugfixes for the 1.4.0 release.
+We now have properly working Ruby SSL and HTTPS!  You need jruby-jars
+1.7.25 and Android 4.4 or better :)
 
 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.4.1 released!
+Subject: [ANN] Ruboto 1.5.0 released!
 
-The Ruboto team is pleased to announce the release of Ruboto 1.4.1.
+The Ruboto team is pleased to announce the release of Ruboto 1.5.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,44 +8,59 @@ 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.4.1:
+New in version 1.5.0:
 
-Bugfixes for the 1.4.0 release.
+We now have properly working Ruby SSL and HTTPS!  You need jruby-jars
+1.7.25 and Android 4.4 or better :)
+
+API Changes:
+
+* Issue #713 Add support for Android 5.1 Lollipop
+* Issue #768 Add support for Android 6.0 Marshmallow
 
 Features:
 
-* Issue #779 Differentiate the default dex heap size for 32-bit systems
-* Issue #780 Update "rake log" to handle output from Android 6.0
-* Issue #782 Do not commit the keystore by default
-* Issue #789 Add support for JRuby 1.7.24
+* Issue #791 Update RubotoCore to ActiveRecord 4.2
+* Issue #792 Set emulator name in ruboto.yml
+* Issue #795 Set emulator device name in ruboto.yml
+* Issue #797 Set emulator skin name in ruboto.yml
+* Issue #798 ruboto.yml emulator config (donv)
+* Issue #805 Add support for the new emulator 2.0
 
 Bugfixes:
 
-* Issue #783 Don't report changing emulator properties when they are not
-  actually changed
-* Issue #784 Improve haxm install with/without "-y" and "--upgrade"
-  options (donv)
-* Issue #785 Setup never finds Platform SDK
-* Issue #786 Use $ANDROID_HOME instead of android executable location to
-  find platforms (ahills)
-* Issue #790 Fix "--update" option for "ruboto setup"
+* Issue #726 Any reference to net/https throws LoadError for
+  org/bouncycastle/bcpkix-jdk15on/1.47/bcpkix-jdk15on-1.47
+* Issue #793 Fix OpenSSL
+* Issue #796 Adds a setting in "ruboto.yml" for the desired
+  dex_heap_size (lucasallan)
+* Issue #807 Fix SDK_DOWNLOAD_PAGE link (LucianoPC)
+
+Support:
 
-Performance:
+* Issue #802 java.lang.UnsupportedOperationException: can't load this
+  type of class file
+* Issue #803 (NoMethodError) undefined method 'current' for
+  Java::JavaLang::Thread:Class
 
-* Issue #787 Refresh the benchmark server layout and design
+Community:
 
-Support:
+* Issue #666 Set up donations and sponsoring of the Ruboto project
+
+Pull requests:
 
-* Issue #749 Invalid maximum heap size: -Xmx4096M
-* Issue #761 JDK 7
+* Issue #794 Test ssl (donv)
+* Issue #812 Set ANDROID_EMULATOR_FORCE_32BIT to fix broken build
+  (celeduc)
 
 Internal:
 
-* Issue #773 Release 1.4.1
+* Issue #775 Release 1.5.0
+* Issue #808 Bug fixes (donv)
 
 You can find a complete list of issues here:
 
-* https://github.com/ruboto/ruboto/issues?state=closed&milestone=40
+* https://github.com/ruboto/ruboto/issues?state=closed&milestone=41
 
 
 Installation:

data/Rakefile

@@ -364,10 +364,10 @@ task :release => [:clean, README_FILE, :release_docs, :gem] do
   output = `git status --porcelain`
   raise "Workspace not clean!\n#{output}" unless output.empty?
   Dir.chdir WEB_DIR do
+    sh "git add -f #{RELEASE_BLOG}"
+    `git commit -m "* Added release blog for Ruboto #{Ruboto::VERSION}" -- #{RELEASE_BLOG}`
     output = `git status --porcelain`
     raise "Web workspace not clean!\n#{output}" unless output.empty?
-    sh "git add -f #{RELEASE_BLOG}"
-    `git commit -m "* Added release blog for Ruboto #{Ruboto::VERSION}"`
     sh 'git push'
   end
   sh "git tag #{Ruboto::VERSION}"
@@ -512,11 +512,12 @@ task :get_jruby_jars_snapshots do
   [[master_gem, 'master'], [stable_gem, 'jruby-1_7']].each do |gem, branch|
     print "Downloading #{gem}: \r"
     uri = URI("http://#{download_host}#{download_dir}/snapshots/#{branch}/#{gem}")
-    done = 0
-    body = ''
     Net::HTTP.new(uri.host, uri.port).request_get(uri.path) do |response|
       if response.code == '200'
         length = response['Content-Length'].to_i
+        timestamp = response['Last-Modified'] # Sat, 23 Jan 2016 05:52:03 GMT'
+        body = ''
+        done = 0
         response.read_body do |fragment|
           body << fragment
           done += fragment.length
@@ -525,50 +526,49 @@ task :get_jruby_jars_snapshots do
             print "Downloading #{gem}: #{done / 1024}/#{length / 1024}KB #{progress}%\r"
           end
         end
+        unless body.empty?
+          File.write(gem, body)
+          FileUtils.touch gem, mtime: Time.parse(timestamp)
+        end
         puts
       else
         raise "Unexpected HTTP response code: #{response.code.inspect}"
       end
     end
-    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 = 4
+  test_parts = 3
   matrix = ''
   allow_failures = ''
 
   # FIXME(uwe):  JRuby 1.7.13 works for Nettbuss.  Keep for 2016.
   # FIXME(uwe):  Test all of these that work
   [
-      ['CURRENT', [nil]],
-      ['FROM_GEM', [:MASTER, :STABLE]],
-      ['STANDALONE', [:MASTER, :STABLE, '1.7.24', '1.7.13']],
+      # ['CURRENT', [nil]],                # Running standalone is the most important way now
+      # ['FROM_GEM', [:MASTER, :STABLE]], # Running standalone is the most important way now
+      ['STANDALONE', [:MASTER, :STABLE, '1.7.25', '1.7.13']],
   ].each do |platform, versions|
     versions.each do |v|
       # FIXME(uwe):  Test the newest and most common api levels
-      # FIXME(uwe):  Nettbuss uses api level 15.  Keep for 2016.
+      # FIXME(uwe):  Nettbuss uses api level 15.  Keep for 2017.
       # FIXME(uwe):  https://github.com/ruboto/ruboto/issues/426
-      [23, 22, 21, 19, 17, 16, 15].each do |api|
+      [23, 22, 21, 19, 17, 15].each do |api|
         (1..test_parts).each do |n|
           line = "    - ANDROID_TARGET=#{api} RUBOTO_PLATFORM=#{platform.ljust(10)} TEST_PART=#{n}of#{test_parts}#{" JRUBY_JARS_VERSION=#{v}" if v}\n"
 
-          next if v == :MASTER # FIXME(uwe):  Remove when master branch is green.
           next if api == 23 # FIXME(uwe):  Remove when Android 6.0 is green.  Unable to start emulator on travis.
           next if api == 22 # FIXME(uwe):  Remove when Android 5.1 is green.  Must use slow ARM emulator due to missing HAXM.
           next if api == 22 && platform == 'STANDALONE' && v == :STABLE # FIXME(uwe):  Remove when Android 5.1 is green.  Must use slow ARM emulator due to missing HAXM.
           next if api == 21 # FIXME(uwe):  Remove when Android 5.0 is green.
           next if api == 17 # FIXME(uwe):  Remove when Android 4.2 is green.
-          next if api == 16 # FIXME(uwe):  Remove when Android 4.1 is green.
 
-          if platform == 'FROM_GEM' || # FIXME(uwe): Remove when new RubotoCore is green.
-              (v == :STABLE && (platform != 'STANDALONE' || api != 15)) || # FIXME(uwe):  Remove when 1.7 branch is green.
-              v == '1.7.13' || # FIXME(uwe):  Remove when 1.7.13 is green.
-              false
-            allow_failures << line.gsub('-', '- env:')
+          if v == :MASTER || v == :STABLE
+            # allow_failures << line.gsub('-', '- env:')
+            next
           end
           matrix << line
         end

data/Vagrantfile

@@ -35,6 +35,7 @@ Vagrant.configure(2) do |config|
       su - vagrant -c 'curl -sSL https://get.rvm.io | bash -s stable --ruby'
       su - vagrant -c 'mkdir -p ruboto'
       su - vagrant -c 'rsync -acPuv --exclude adb_logcat.log --exclude /tmp /vagrant/* ruboto/'
+      sudo apt-get -y autoremove
     SHELL
   end
 

data/assets/rakelib/ruboto.device.rb

@@ -29,8 +29,19 @@ def package_installed?(package_name, apk_file)
       installed_timestamp >= File.mtime(apk_file))
 end
 
+# the scripts path is different on different Android versions and devices...
 def scripts_path(package)
-  @sdcard_path ||= "/mnt/sdcard/Android/data/#{package}/files/scripts"
+  external_storage = `adb shell 'echo $EXTERNAL_STORAGE'`.chomp
+  app_data_path = "#{external_storage}/Android/data/#{package}"
+  if external_storage.empty?
+    puts "external storage not found: #{app_data_path.inspect}"
+    app_data_path = `adb shell run-as #{package} pwd`
+    if app_data_path =~ /Permission denied/
+      puts "internal storage not found: #{app_data_path.inspect}"
+      app_data_path = "/mnt/sdcard/Android/data/#{package}"
+    end
+  end
+  "#{app_data_path}/files/scripts"
 end
 
 def mark_update(time = Time.now)
@@ -75,7 +86,7 @@ def install_apk(package, apk_file)
     output = nil
     install_retry_count = 0
     begin
-      timeout install_timeout do
+      Timeout.timeout install_timeout do
         output = `adb install -r "#{apk_file}" 2>&1`
       end
     rescue Timeout::Error
@@ -108,7 +119,7 @@ def install_apk(package, apk_file)
   output = nil
   install_retry_count = 0
   begin
-    timeout install_timeout do
+    Timeout.timeout install_timeout do
       output = `adb install "#{apk_file}" 2>&1`
     end
   rescue Timeout::Error
@@ -138,22 +149,18 @@ def uninstall_apk(package_name, apk_file)
   end
 end
 
+def make_device_path(package, path)
+  puts `adb shell #{"run-as #{package}" if sdk_level >= 23} mkdir -p #{path}`
+  device_path_exists?(path)
+end
+
 def update_scripts(package)
-  # FIXME(uwe): Simplify when we stop supporting Android 2.3
-  if sdk_level < 15
-    scripts_path(package).split('/').tap do |parts|
-      parts.size.times do |i|
-        path = parts[0..i].join('/')
-        puts(`adb shell mkdir #{path}`) unless device_path_exists?(path)
-      end
-    end
-  else
-    puts(`adb shell mkdir -p #{scripts_path(package)}`) unless device_path_exists?(scripts_path(package))
+  scripts_path = scripts_path(package)
+  if !device_path_exists?(scripts_path) && !make_device_path(package, scripts_path)
+    raise "Unable to create device scripts dir: #{scripts_path}"
   end
-  # EMXIF
-
-  raise "Unable to create device scripts dir: #{scripts_path(package)}" unless device_path_exists?(scripts_path(package))
-  last_update = File.exists?(UPDATE_MARKER_FILE) ? Time.parse(File.read(UPDATE_MARKER_FILE)) : Time.parse('1970-01-01T00:00:00')
+  mark_time = File.exists?(UPDATE_MARKER_FILE) ? File.read(UPDATE_MARKER_FILE) : '1970-01-01T00:00:00'
+  last_update = Time.parse(mark_time)
   Dir.chdir('src') do
     source_files = Dir['**/*.rb']
     changed_files = source_files.select { |f| !File.directory?(f) && File.mtime(f) >= last_update && f !~ /~$/ }
@@ -161,7 +168,7 @@ def update_scripts(package)
       puts 'Pushing files to apk public file area:'
       changed_files.each do |script_file|
         print "#{script_file}: "; $stdout.flush
-        system "adb push #{script_file} #{scripts_path(package)}/#{script_file}"
+        system "adb push #{script_file} #{scripts_path}/#{script_file}"
       end
       mark_update
       return changed_files

data/assets/rakelib/ruboto.rake

@@ -555,18 +555,14 @@ file APK_FILE => APK_DEPENDENCIES do |t|
   build_apk(t, false)
 end
 
-# FIXME(uwe): Simplify when we stop supporting 32-bit development environments
-DEFAULT_MIN_DX_HEAP_SIZE = RbConfig::CONFIG['host_cpu'] =~ /86/ ? 3072 : 4096
-# EMXIF
-MINIMUM_DX_HEAP_SIZE = (ENV['DX_HEAP_SIZE'] && ENV['DX_HEAP_SIZE'].to_i) || DEFAULT_MIN_DX_HEAP_SIZE
 task :patch_dex do
   DX_FILENAMES.each do |dx_filename|
     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)"/
     if new_dx_content =~ xmx_pattern &&
-        ($1.to_i * 1024 ** {M: 2, G: 3, T: 4}[$2.upcase.to_sym]) < MINIMUM_DX_HEAP_SIZE*1024**2
-      puts "Increasing max heap space from #{$1}#{$2} to #{MINIMUM_DX_HEAP_SIZE}M in #{dx_filename}"
-      new_xmx_value = ON_WINDOWS ? %Q{set defaultXmx=-Xmx#{MINIMUM_DX_HEAP_SIZE}M} : %Q{defaultMx="-Xmx#{MINIMUM_DX_HEAP_SIZE}M"}
+        ($1.to_i * 1024 ** {M: 2, G: 3, T: 4}[$2.upcase.to_sym]) < dex_heap_size*1024**2
+      puts "Increasing max heap space from #{$1}#{$2} to #{dex_heap_size}M in #{dx_filename}"
+      new_xmx_value = ON_WINDOWS ? %Q{set defaultXmx=-Xmx#{dex_heap_size}M} : %Q{defaultMx="-Xmx#{dex_heap_size}M"}
       new_dx_content.sub!(xmx_pattern, new_xmx_value)
       File.open(dx_filename, 'w') { |f| f << new_dx_content } rescue puts "\n!!! Unable to increase dx heap size !!!\n\n"
     end
@@ -683,6 +679,7 @@ file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
     old_verbose, $VERBOSE = $VERBOSE, nil
     begin
       Object.const_set('RUBY_ENGINE', 'jruby')
+      Object.const_set('JRUBY_VERSION', '7.7.7') unless defined?(JRUBY_VERSION)
     ensure
       $VERBOSE = old_verbose
     end
@@ -988,7 +985,7 @@ end
 # Triggers reload of updated scripts and restart of the current activity
 def reload_scripts(scripts)
   s = scripts.map { |s| s.gsub(/[&;]/) { |m| "&#{m[0]}" } }.join(';')
-  cmd = %Q{adb shell am broadcast -a android.intent.action.VIEW -e reload '#{s}'}
+  cmd = %Q{adb shell "am broadcast -a android.intent.action.VIEW -e reload '#{s}'"}
   puts cmd
   system cmd
 end
@@ -997,3 +994,16 @@ def stop_app
   output = `adb shell ps | grep #{package} | awk '{print $2}' | xargs adb shell kill`
   output !~ /Operation not permitted/
 end
+
+def dex_heap_size
+  # FIXME(uwe): Simplify when we stop supporting 32-bit development environments
+  default   = RbConfig::CONFIG['host_cpu'] =~ /86/ ? 3072 : 4096
+  heap_size = ruboto_config_file[:dex_heap_size]
+  # EMXIF
+  @heap_size ||= (ENV['DX_HEAP_SIZE'] && ENV['DX_HEAP_SIZE'].to_i) || (heap_size && heap_size.to_i) || default
+end
+
+def ruboto_config_file
+  return {} unless File.exist? RUBOTO_CONFIG_FILE
+  @ruboto_config_file ||= (YAML.load(File.read(RUBOTO_CONFIG_FILE)) || {})
+end