ruboto 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 541c9b2e7673b6da8fc43a3534f5f2fcc2d8c718
-  data.tar.gz: 86da6d0da33706109710b734f42ed4da1abd019e
+  metadata.gz: 57638eee95f5a2cba9bf8c77af5a68250c23c7bb
+  data.tar.gz: 9ed24085fa7c14979aa4a5e8582608753f0323c0
 SHA512:
-  metadata.gz: 14ce1aac618874c8d9a99588065a767027419546a9a399b870ccfe8e80007aeff10b412c59e35950da1337d0abe83f78c4771115f948858b2c7ab1e79510d73d
-  data.tar.gz: cd2279a27b6cbf5206dafc6f3f0314e32917f79a236db532159cf1c54e73293e29456828660665124a75aefc772f7381f09758f76921454eb0a8bf6554a94b74
+  metadata.gz: 13dbc48f6712b77210a2403e9e6bd69f381ec5a3a9a9d840e114b9e326f8e56a2ad3acf23e5ab0196884b9eea87a97969b06c76ac71c6007c50d1d30436655dd
+  data.tar.gz: 741ede8a69755af779acceadc5957b7d165f0441bd3d3b1b216b6ccc923828b847c935843e283d101431ebf81aed4734c06c3e19440018e213ef659e6bdad3cd

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    ruboto (1.0.1)
-      main (~> 5.0)
+    ruboto (1.0.2)
+      main (~> 5.2.0)
       rake (~> 10.0)
       rubyzip (~> 1.0)
 

data/README.md

@@ -1,3 +1,5 @@
+[![Code Climate](https://codeclimate.com/github/ruboto/ruboto.png)](https://codeclimate.com/github/ruboto/ruboto)
+
 Ruboto - JRuby On Android
 =========================
 

data/RELEASE_CANDICATE_DOC.md

@@ -1,10 +1,11 @@
-Subject: [ANN] Ruboto 1.0.1 release candidate
+Subject: [ANN] Ruboto 1.0.2 release candidate
 
 Hi all!
 
-The Ruboto 1.0.1 release candidate is now available.
+The Ruboto 1.0.2 release candidate is now available.
 
-This release focuses on bug fixes and documentation.
+This releases updates to JRuby 1.7.10 and improves installation with
+automated setup of Apache ANT on Windows and Linux.
 
 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.0.1 released!
+Subject: [ANN] Ruboto 1.0.2 released!
 
-The Ruboto team is pleased to announce the release of Ruboto 1.0.1.
+The Ruboto team is pleased to announce the release of Ruboto 1.0.2.
 
 Ruboto (JRuby on Android) is a platform for developing full stand-alone
 apps for Android using the Ruby language and libraries.  It includes
@@ -8,63 +8,37 @@ 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.0.1:
+New in version 1.0.2:
 
-This release focuses on bug fixes and documentation.
+This releases updates to JRuby 1.7.10 and improves installation with
+automated setup of Apache ANT on Windows and Linux.
 
 Features:
 
-* Issue #546 Better stack traces using "jruby.rewrite.java.trace" = "true"
-* Issue #548 Allow using snapshot versions of jruby-jars
+* Issue #447 Use "ruboto setup" to flag and install ant
+* Issue #564 Update to JRuby 1.7.10
 
 Bugfixes:
 
-* Issue #505 Trigger rebuild of the package if non-ruby source has changed
-  in the "src" directory
-* Issue #507 Undefined method `__ruby_object' when implementing a Java
-  interface
-* Issue #537 Generated BroadcastReceiver has incorrect number of argument
-  for Log.e
-* Issue #541 Gem errors with activerecord-jdbc-sqlite3
-* Issue #545 JRuby use of javax.annotation.processing breaks use of ARJDBC
-* Issue #554 Better error message when trying to run an emulator for a
-  target that is not installed
-* Issue #556 "ruboto emulator" ignores HAXM installation on Windows
+* Issue #525 Quick Start : "Unfortunately, Browser has stopped"
+* Issue #565 Odd behaviour when changing orientation with Fragments
+* Issue #575 Gemfile.lock contains references to gems that are not part
+  of the dependencies
 
 Documentation:
 
-* Issue #532 Environment setup for windows
-* Issue #538 Complete the "What is Ruboto?" WIKI article
-* Issue #553 The number of stars for the Ruboto project has disappeared
-  from the ruboto.org front page
-* Issue #560 Add a tutorial for detecting incoming phone calls
-
-Support:
-
-* Issue #480 Could not locate Gemfile
-* Issue #549 How can I view output?
-* Issue #551 rake install start problem on windows
-* Issue #552 Problem with rake install start on windows
-* Issue #555 Ruboto command not found after installation
+* Issue #568 Error with tutorial on "Example: Open a web page"
 
 Community:
 
-* Issue #531 How can I help?
-
-Pull requests:
-
-* Issue #550 Fix Log import
-
-Internal:
-
-* Issue #513 Refactor to generate special
-  onCreate/onDestroy/onBind/onStartCommand instead of hard coding
-* Issue #559 Remove redundant script file reference in
-  InheritingBroadcastReceiver
+* Issue #533 How can I help? (di3z )
+* Issue #562 How can I help? (lucasallan)
+* Issue #563 How can I help? (pedroandrade)
+* Issue #572 How can I help? (iamrahulroy)
 
 You can find a complete list of issues here:
 
-* https://github.com/ruboto/ruboto/issues?state=closed&milestone=31
+* https://github.com/ruboto/ruboto/issues?state=closed&milestone=27
 
 
 Installation:

data/Rakefile

@@ -22,7 +22,8 @@ MANIFEST_FILE = 'AndroidManifest.xml'
 GEM_FILE = "ruboto-#{Ruboto::VERSION}.gem"
 GEM_SPEC_FILE = 'ruboto.gemspec'
 README_FILE = 'README.md'
-BLOG_DIR = "#{File.dirname PROJECT_DIR}/ruboto.github.com/_posts"
+WEB_DIR = "#{File.dirname PROJECT_DIR}/ruboto.github.com"
+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"
 RELEASE_CANDIDATE_DOC = 'RELEASE_CANDICATE_DOC.md'
@@ -104,7 +105,8 @@ end
 
 class String
   def wrap(indent = 0)
-    scan(/\S.{0,72}\S(?=\s|$)|\S+/).join("\n" + ' ' * indent)
+    line_length = 72-indent
+    scan(/\S.{0,#{line_length}}\S(?=\s|$)|\S+/).join("\n" + ' ' * indent)
   end
 end
 
@@ -232,7 +234,7 @@ New in version #{milestone_name}:
 
 #{(categories.keys & grouped_issues.keys).map do |cat|
   "#{cat}:\n
-#{grouped_issues[cat].map { |i| %Q{* Issue ##{i['number']} #{i['title']}}.wrap(2) }.join("\n")}
+#{grouped_issues[cat].map { |i| %Q{* Issue ##{i['number']} #{i['title'].gsub('`', "'")}}.wrap(2) }.join("\n")}
 "
 end.join("\n")}
 You can find a complete list of issues here:
@@ -290,7 +292,7 @@ layout: post
 category: news
 ---
 EOF
-    Dir.chdir BLOG_DIR do
+    Dir.chdir WEB_DIR do
       output = `git status --porcelain`
       old_blog_posts = Dir[RELEASE_BLOG_GLOB] - [RELEASE_BLOG]
       sh "git rm -f #{old_blog_posts.join(' ')}" unless old_blog_posts.empty?
@@ -372,7 +374,7 @@ desc 'Push the gem to RubyGems'
 task :release => [:clean, README_FILE, :release_docs, :gem] do
   output = `git status --porcelain`
   raise "Workspace not clean!\n#{output}" unless output.empty?
-  Dir.chdir BLOG_DIR do
+  Dir.chdir WEB_DIR do
     output = `git status --porcelain`
     raise "Web workspace not clean!\n#{output}" unless output.empty?
     sh "git add -f #{RELEASE_BLOG}"

data/assets/.gitignore

@@ -1,7 +1,8 @@
 .bundle
 .DS_Store
 .idea
+adb_logcat.log
 bin
 gen
-tmp
 local.properties
+tmp

data/assets/rakelib/ruboto.rake

@@ -54,23 +54,23 @@ unless DX_FILENAME
   exit 1
 end
 
-def manifest;
+def manifest
   @manifest ||= REXML::Document.new(File.read(MANIFEST_FILE))
 end
 
-def package;
+def package
   manifest.root.attribute('package')
 end
 
-def build_project_name;
+def build_project_name
   @build_project_name ||= REXML::Document.new(File.read('build.xml')).elements['project'].attribute(:name).value
 end
 
-def scripts_path;
+def scripts_path
   @sdcard_path ||= "/mnt/sdcard/Android/data/#{package}/files/scripts"
 end
 
-def app_files_path;
+def app_files_path
   @app_files_path ||= "/data/data/#{package}/files"
 end
 
@@ -364,7 +364,7 @@ file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
   next unless File.exists? GEM_FILE
   puts "Generating #{BUNDLE_JAR}"
   require 'bundler'
-  # Issue #547 https://github.com/ruboto/ruboto/issues/547
+  # FIXME(uwe): Issue #547 https://github.com/ruboto/ruboto/issues/547
   if true || Gem::Version.new(Bundler::VERSION) <= Gem::Version.new('1.5.0')
     require 'bundler/vendored_thor'
 
@@ -494,7 +494,7 @@ Java::arjdbc.jdbc.AdapterJavaService.new.basicLoad(JRuby.runtime)
             # ODOT
 
             # FIXME(uwe): Extract files with case sensitive names for ARJDBC 1.2.7-1.3.x
-            puts `jar xf #{jar} arjdbc/mssql/MSSQLRubyJdbcConnection.class arjdbc/sqlite3/SQLite3RubyJdbcConnection.class`
+            puts `jar xf #{jar} arjdbc/postgresql/PostgreSQLRubyJdbcConnection.class arjdbc/mssql/MSSQLRubyJdbcConnection.class arjdbc/sqlite3/SQLite3RubyJdbcConnection.class`
             # EMXIF
 
           elsif jar =~ /shared\/jopenssl.jar$/

data/assets/src/org/ruboto/JRubyAdapter.java

@@ -146,6 +146,7 @@ public class JRubyAdapter {
             System.setProperty("jruby.thread.pooling", "true");
 
             // Uncomment these to debug/profile Ruby source loading
+            // Analyse the output: grep "LoadService:   <-" | cut -f5 -d- | cut -c2- | cut -f1 -dm | awk '{total = total + $1}END{print total}'
             // System.setProperty("jruby.debug.loadService", "true");
             // System.setProperty("jruby.debug.loadService.timing", "true");
 

data/lib/ruboto/util/setup.rb

@@ -32,7 +32,7 @@ module Ruboto
         ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
           exts.each do |ext|
             exe = File.join(path, "#{cmd}#{ext}")
-            if File.executable? exe
+            if File.executable?(exe) and not File.directory?(exe)
               exe.gsub!('\\', '/') if windows?
               return exe
             end
@@ -79,6 +79,16 @@ module Ruboto
         File.join File.expand_path('~'), windows? ? 'AppData/Local/Android/android-sdk' : "android-sdk-#{android_package_os_id}"
       end
 
+      def package_installer
+        case android_package_os_id
+        when LINUX
+          which('apt-get') or which('yum')
+        else
+          ## Error
+          nil
+        end
+      end
+
       def path_setup_file
         case android_package_os_id
         when MAC_OS_X
@@ -103,16 +113,14 @@ module Ruboto
           major = t.elements['sdk:major']
           minor = t.elements['sdk:minor']
           micro = t.elements['sdk:micro']
+          prev = t.elements['sdk:preview']
+          next if prev
           version = major.text
           version += ".#{minor.text}" if minor
           version += ".#{micro.text}" if micro
+          version += "_rc#{prev.text}" if prev
           version
-        end.sort_by { |v| Gem::Version.new(v) }.last
-
-        # FIXME(uwe): Temporary fix for bug in build-tools 19.0.0
-        return '18.1.1' if type == 'build-tool' && version == '19.0.0'
-        # EMXIF
-
+        end.compact.sort_by { |v| Gem::Version.new(v.gsub('_', '.')) }.last
         version
       end
 
@@ -241,10 +249,38 @@ module Ruboto
         check_all(api_levels)
       end
 
+      def install_package(accept_all, package_name, pretty_name)
+        case android_package_os_id
+        when LINUX
+          puts "#{pretty_name} was not found."
+          installer = package_installer
+          if installer
+	          unless accept_all
+	            print 'Would you like to and install it? (Y/n): '
+	            a = STDIN.gets.chomp.upcase
+	          end
+	          if accept_all || a == 'Y' || a.empty?
+	            puts "sudo #{installer} install -y #{package_name}"
+	            `sudo #{installer} install -y #{package_name}`
+	          else
+	            puts
+	            puts 'You can install #{pretty_name} manually by:'
+	            puts "sudo #{installer} install #{package_name}"
+	            puts
+	          end
+          else
+            puts "Package installer not found. You'll need to install #{pretty_name} manually."
+          end
+        else
+          raise "Unknown host os for package install: #{RbConfig::CONFIG['host_os']}"
+        end
+      end
+
       def install_java(accept_all)
         case android_package_os_id
         when MAC_OS_X
         when LINUX
+          install_package(accept_all, 'default-jdk', 'Default Java Development Kit')
         when WINDOWS
           # FIXME(uwe):  Detect and warn if we are not "elevated" with adminstrator rights.
           #set IS_ELEVATED=0
@@ -300,6 +336,7 @@ module Ruboto
         case android_package_os_id
         when MAC_OS_X
         when LINUX
+          install_package(accept_all, 'ant', 'Apache ANT')
         when WINDOWS
           # FIXME(uwe):  Detect and warn if we are not "elevated" with adminstrator rights.
           #set IS_ELEVATED=0

data/lib/ruboto/util/update.rb

@@ -462,6 +462,7 @@ module Ruboto
                     # 'org/jruby/runtime/invokedynamic', # Should be excluded
                     # 'org/jruby/runtime/opto',              # What is this?
                     # 'org/jruby/runtime/opto/OptoFactory*', # What is this?
+                    'org/jruby/truffle',
                     'org/yecht',
                 ]
               elsif gem_version >= Gem::Version.new('1.7.5')

data/lib/ruboto/util/xml_element.rb

@@ -225,7 +225,7 @@ module Ruboto
 
       def activity_super_guard(class_name, method_name)
         if class_name == 'RubotoActivity' && method_name == 'onCreate'
-          "if (preOnCreate(#{parameters.map { |i| i[0] }.join(', ')})) #{super_return};"
+          "if (preOnCreate(#{parameters.map { |i| i[0] }.join(', ')})) #{super_return};\n"
         end
       end
 

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

data/test/arjdbc_test.rb

@@ -1,9 +1,9 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
 
 # FIXME(uwe):  Remove check when we stop supporting Android < 4.0.3
-if RubotoTest::ANDROID_OS >= 15 || RubotoTest::RUBOTO_PLATFORM != 'STANDALONE'
+if RubotoTest::ANDROID_OS >= 15
 
-class SqldroidTest < Test::Unit::TestCase
+class ArjdbcTest < Test::Unit::TestCase
   def setup
     generate_app :bundle => [['activerecord', '<4.0.0'], 'activerecord-jdbcsqlite3-adapter', :sqldroid]
   end
@@ -12,7 +12,7 @@ class SqldroidTest < Test::Unit::TestCase
     cleanup_app
   end
 
-  def test_sqldroid
+  def test_arjdbc
     Dir.chdir APP_DIR do
       File.open('src/ruboto_test_app_activity.rb', 'w'){|f| f << <<EOF}
 require 'ruboto/widget'
@@ -80,9 +80,7 @@ class RubotoTestAppActivity
       ActiveRecord::Base.connection.execute "INSERT INTO companions VALUES (8, 'Aragorn')"
       ActiveRecord::Base.connection.execute "INSERT INTO companions VALUES (9, 'Boromir')"
       companions = ActiveRecord::Base.connection.execute "SELECT name FROM companions"
-      run_on_ui_thread do
-        @adapter.add_all companions
-      end
+      run_on_ui_thread { @adapter.add_all companions }
     end
   end
 end

data/test/ruboto_gen_test.rb

@@ -61,8 +61,9 @@ class RubotoGenTest < Test::Unit::TestCase
   # APK was  8766.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.6
   # APK was  8781.6KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.8
   # APK was  8789.6KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.9
+  # APK was  8791.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.10
   # APK was  6689.5KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 9000.dev
-  # APK was  6962.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 9000.dev
+  # APK was  7012.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 9000.dev
   def test_new_apk_size_is_within_limits
     apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / 1024
     version = "  PLATFORM: #{RUBOTO_PLATFORM}"
@@ -74,7 +75,8 @@ class RubotoGenTest < Test::Unit::TestCase
           '1.7.6' => 8800.0,
           '1.7.8' => 8800.0,
           '1.7.9' => 8800.0,
-          '9000.dev' => 7000.0,
+          '1.7.10' => 8800.0,
+          '9000.dev' => 7100.0,
       }[JRUBY_JARS_VERSION.to_s] || 0.0
       version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboto
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Daniel Jackoway
@@ -11,48 +11,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: |
@@ -218,17 +218,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ruboto/ruboto
-rubygems_version: 2.0.6
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A platform for developing apps using JRuby on Android.