ruboto 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 722d788ed8cf384285ca9fda8e6d810dbb8f53d8
-  data.tar.gz: b9c965d06f1ad9e654c7dfdc812091eb9cbfa730
+  metadata.gz: eefe7332986dc64b5915c9fc4367bf166324078e
+  data.tar.gz: c4b630fd7f08490b9257aba82144191704e4f787
 SHA512:
-  metadata.gz: 87fafecf9b75f9f5693b0a1bc89ea745abd400c4f51dccce0e0bebd1952768323f6a9bd425ff2a38b8eab30d89befa372af1ecadcd6d0e47f1e39553007bf010
-  data.tar.gz: 8b70573fda9f044cdbe0ee8e3ae77219be65de682094be742bb65269db9d170d9df040d5526c0226e1812e9f665ba82a1abb399ff70adfa8b3d706c25153b9d2
+  metadata.gz: 6835a4b69fd82d7203855d09ef2234ef64e6d4b71ec820d1491058a72ae63a26ef36790f77e6d47753e34c4a367b11b82f51c2fd64598aa75701619fc3d5a6bb
+  data.tar.gz: 4465007909cc76805c7801c088639ae1ce3567743c653c80c8ef3341cd05804e32147ec9d8632eb43d3648fa922aac378777c155ba33476740c711a99833019c

data/CONTRIBUTING.md

@@ -1,10 +1,19 @@
 Contributing
 ============
 
-Want to contribute? Great! Meet us in #ruboto on irc.freenode.net, fork the
-project and start coding!
+Want to contribute? Great!  We look forward to what you can do.
+ 
+## Communication
+
+Meet us in #ruboto on irc.freenode.net or on [https://gitter.im/ruboto/ruboto]
+or on the Google Group.
+
+## How to contribute
+
+Fork the project and start coding!  :)
+
+    "But I don't understand it well enough to contribute by forking the project!"
 
-"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.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruboto (1.6.0)
+    ruboto (1.6.1)
       main (~> 5.2)
       net-telnet (~> 0.1.1)
       rake (>= 11.3, < 13)
@@ -29,7 +29,7 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rake (12.0.0)
-    rubyzip (1.2.0)
+    rubyzip (1.2.1)
     slop (3.6.0)
 
 PLATFORMS
@@ -40,4 +40,4 @@ DEPENDENCIES
   ruboto!
 
 BUNDLED WITH
-   1.13.6
+   1.13.7

data/README.md

@@ -1,6 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/ruboto.svg)](http://badge.fury.io/rb/ruboto)
 [![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)
+[![Gitter chat](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg)](https://gitter.im/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>
 

data/RELEASE_CANDICATE_DOC.md

@@ -1,11 +1,10 @@
-Subject: [ANN] Ruboto 1.6.0 release candidate
+Subject: [ANN] Ruboto 1.6.1 release candidate
 
 Hi all!
 
-The Ruboto 1.6.0 release candidate is now available.
+The Ruboto 1.6.1 release candidate is now available.
 
-In this release we add support for Android 7.0 and 7.1 "Nougat" and update
-the Android SDK to level 25.
+This is a maintenance release following changes in the Android tooling.
 
 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.6.0 released!
+Subject: [ANN] Ruboto 1.6.1 released!
 
-The Ruboto team is pleased to announce the release of Ruboto 1.6.0.
+The Ruboto team is pleased to announce the release of Ruboto 1.6.1.
 
 Ruboto (JRuby on Android) is a platform for developing full stand-alone
 apps for Android using the Ruby language and libraries.  It includes
@@ -8,47 +8,27 @@ 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.6.0:
+New in version 1.6.1:
 
-In this release we add support for Android 7.0 and 7.1 "Nougat" and update
-the Android SDK to level 25.
-
-API Changes:
-
-* Issue #816 Set default api level for new apps to 19 (Android 4.4
-  KitKat)
-* Issue #821 Update to Android SDK Tools 25
-* Issue #826 Rename 'assert_matches' to 'assert_match' for Minitest
-  compatibility
+This is a maintenance release following changes in the Android tooling.
 
 Features:
 
-* Issue #815 Add support for Android 7 Nougat
-* Issue #817 Add support for Android 7.1
-* Issue #819 Add support for concurrent-ruby gem
-* Issue #820 Reload scripts with large stack during 'rake boing'
+* Issue #836 Add JRuby jars to new projects by default
 
 Bugfixes:
 
-* Issue #813 ArgumentError creating new emulator image (AVD)
-* Issue #818 Error when creating a new emulator image for an app with
-  empty ruboto.yml
-
-Support:
-
-* Issue #809 [Solved] JRuby 1.7.22 and Crosswalk issue (multidex)
-  Verification error in java.io.File[]
-  org.jruby.util.JRubyFile.listRoots()
-* Issue #822 How well does Ruboto work with Shoes 4?
+* Issue #806 Ruboto setup fails: get_android_sdk_version
+* Issue #811 Package installer error
+* Issue #824 undefined method '[]' for nil:NilClass (NoMethodError)
 
 Internal:
 
-* Issue #828 More test parts (donv)
-* Issue #829 Use the new authenticated protocol to manage emulators
+* Issue #827 Assume multi-dex on first build
 
 You can find a complete list of issues here:
 
-* https://github.com/ruboto/ruboto/issues?state=closed&milestone=42
+* https://github.com/ruboto/ruboto/issues?state=closed&milestone=43
 
 
 Installation:

data/assets/rakelib/ruboto.rake

@@ -664,9 +664,7 @@ file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
 
     # Override RUBY_ENGINE (we can bundle from MRI for JRuby)
     Gem.platforms = [Gem::Platform::RUBY, Gem::Platform.new("universal-dalvik-#{sdk_level}"), Gem::Platform.new('universal-java')]
-    ENV['GEM_HOME'] = BUNDLE_PATH
-    ENV['GEM_PATH'] = BUNDLE_PATH
-    Gem.paths = BUNDLE_PATH
+    Gem.paths = {'GEM_HOME' => BUNDLE_PATH, 'GEM_PATH' => BUNDLE_PATH}
     Gem.refresh
     old_verbose, $VERBOSE = $VERBOSE, nil
     begin

data/lib/ruboto/commands/base.rb

@@ -90,6 +90,7 @@ module Ruboto
                 target = params['target'].value
                 min_sdk = params['min-sdk'].value || target
                 with_jruby = params['with-jruby'].value
+                with_jruby = '1.7.25' unless with_jruby.is_a?(Gem::Version)
                 ruby_version = params['ruby-version'].value
                 force = params['force'].value
 
@@ -143,6 +144,7 @@ module Ruboto
                   log_action('Generating the default Activity and script') do
                     generate_inheriting_file 'Activity', activity, package
                   end
+                  FileUtils.touch 'bin/classes2.dex'
                 end
 
                 puts "\nHello, #{name}\n"

data/lib/ruboto/util/setup.rb

@@ -78,7 +78,14 @@ module Ruboto
 
       def android_package_directory
         return ENV['ANDROID_HOME'] if ENV['ANDROID_HOME']
-        File.join File.expand_path('~'), windows? ? 'AppData/Local/Android/android-sdk' : "android-sdk-#{android_package_os_id}"
+        user_dir = if windows?
+          'AppData/Local/Android/android-sdk'
+        elsif File.exist? "android-sdk-#{android_package_os_id}"
+          "android-sdk-#{android_package_os_id}"
+        else
+          "android-sdk"
+        end
+        File.join File.expand_path('~'), user_dir
       end
 
       def android_haxm_directory
@@ -139,25 +146,9 @@ module Ruboto
 
         # Get's the Page to Scrape
         page_content = Net::HTTP.get(URI.parse(SDK_DOWNLOAD_PAGE))
-
-        case android_package_os_id
-        when MAC_OS_X
-          regex = '(\>android-sdk.*macosx.zip)'
-        when LINUX
-          regex = '(\>android-sdk.*.tgz)'
-        when WINDOWS
-          regex = '(\>installer_.*.exe)'
-        else
-          raise "Unknown host os: #{android_package_os_id}"
-        end
-
-        link = page_content.scan(/#{regex}/)
-        raise "SDK link cannot be found on download page: #{SDK_DOWNLOAD_PAGE}" if link.nil?
-
-        version = link.to_s.match(/r(\d+.)?(\d+.)?(\d+)/)[0]
-        raise "SDK version cannot be determined from download page: #{SDK_DOWNLOAD_PAGE}" if version.nil?
-
-        version.delete! 'r'
+        links = page_content.scan(/>tools_r(\d+\.\d+\.\d+)-#{android_package_os_id}.zip</)
+        raise "SDK link cannot be found on download page: #{SDK_DOWNLOAD_PAGE}" if links.empty?
+        links[0][0]
       end
 
       #########################################
@@ -529,35 +520,12 @@ module Ruboto
           end
           if accept_all || a == 'Y' || a.empty?
             Dir.chdir File.expand_path('~/') do
-              case android_package_os_id
-              when MAC_OS_X
-                asdk_file_name = "android-sdk_r#{get_android_sdk_version}-#{android_package_os_id}.zip"
+              FileUtils.mkdir_p android_package_directory
+              Dir.chdir android_package_directory do
+                asdk_file_name = "tools_r#{get_android_sdk_version}-#{android_package_os_id}.zip"
                 download(asdk_file_name)
                 unzip(accept_all, asdk_file_name)
                 FileUtils.rm_f asdk_file_name
-              when LINUX
-                asdk_file_name = "android-sdk_r#{get_android_sdk_version}-#{android_package_os_id}.tgz"
-                download asdk_file_name
-                system "tar -xzf #{asdk_file_name}"
-                FileUtils.rm_f asdk_file_name
-              when 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
-                #)
-
-                asdk_file_name = "installer_r#{get_android_sdk_version}-#{android_package_os_id}.exe"
-                download(asdk_file_name)
-                puts "Installing #{asdk_file_name}..."
-                system "#{WINDOWS_ELEVATE_CMD} #{asdk_file_name}"
-                raise "Unexpected exit code while installing the Android SDK: #{$?.exitstatus}" unless $? == 0
-                FileUtils.rm_f asdk_file_name
-                return
-              else
-                raise "Unknown host os: #{RbConfig::CONFIG['host_os']}"
               end
             end
           end
@@ -589,19 +557,21 @@ module Ruboto
             print "Downloading #{filename}: #{body.length / 1024**2}MB/#{length / 1024**2}MB #{(body.length * 100) / length}%\r"
           end
         end
+        puts
         File.open(filename, 'wb') { |f| f << body }
       end
 
 
-      def download(asdk_file_name)
-        print "Downloading #{asdk_file_name}: \r"
-        uri = URI("http://dl.google.com/android/#{asdk_file_name}")
-        process_download(asdk_file_name, uri)
+      def download(file_name)
+        print "Downloading #{file_name}: \r"
+        uri = URI("https://dl.google.com/android/repository/#{file_name}")
+        process_download(file_name, uri)
       end
 
 
       def unzip(accept_all, asdk_file_name, extract_to='.')
         require 'zip'
+        puts "Unzipping #{asdk_file_name.inspect}"
         Zip::File.open(asdk_file_name) do |zipfile|
           zipfile.each do |f|
             f.restore_permissions = true

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboto
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Daniel Jackoway
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -111,14 +111,12 @@ 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
@@ -279,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruboto/ruboto
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A platform for developing apps using JRuby on Android.