ruboto-core 0.4.0 → 0.4.1.rc.4

data/Gemfile.lock

@@ -4,7 +4,7 @@ GEM
     arrayfields (4.7.4)
     chronic (0.6.2)
     fattr (2.2.0)
-    jruby-jars (1.6.3)
+    jruby-jars (1.6.4)
     main (4.7.3)
       arrayfields (~> 4.7.4)
       chronic (~> 0.6.2)

data/Rakefile

@@ -1,9 +1,12 @@
 require 'rexml/document'
+require 'lib/ruboto/version'
 
 PLATFORM_PROJECT = File.expand_path('tmp/RubotoCore', File.dirname(__FILE__))
 PLATFORM_DEBUG_APK = "#{PLATFORM_PROJECT}/bin/RubotoCore-debug.apk"
 PLATFORM_RELEASE_APK = "#{PLATFORM_PROJECT}/bin/RubotoCore-release.apk"
 MANIFEST_FILE = "AndroidManifest.xml"
+GEM_FILE = "ruboto-core-#{Ruboto::VERSION}.gem"
+GEM_SPEC_FILE = 'ruboto-core.gemspec'
 
 # FIXME(uwe):  Remove when we stop supporting JRuby 1.5.6
 if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')
@@ -20,12 +23,18 @@ ON_JRUBY_JARS_1_5_6 = JRUBY_JARS_VERSION == Gem::Version.new('1.5.6')
 task :default => :gem
 
 desc "Generate a gem"
-task :gem do
-  `gem build ruboto-core.gemspec`
+task :gem => GEM_FILE
+
+file GEM_FILE => GEM_SPEC_FILE do
+  puts "Generating #{GEM_FILE}"
+  `gem build #{GEM_SPEC_FILE}`
 end
 
 desc "Push the gem to RubyGems"
-task :release do
+task :release => :gem do
+  output = `git status --porcelain`
+  raise "Workspace not clean!\n#{output}" unless output.empty?
+  sh "git tag #{Ruboto::VERSION}"
   sh "gem push #{Dir['ruboto-core-*.gem'][-1]}"
 end
 
@@ -50,12 +59,13 @@ namespace :platform do
     sh "ruby -rubygems -I#{File.expand_path('lib', File.dirname(__FILE__))} bin/ruboto gen app --package org.ruboto.core --name RubotoCore --with-jruby #{'--with-psych' unless ON_JRUBY_JARS_1_5_6} --path #{PLATFORM_PROJECT}"
     Dir.chdir(PLATFORM_PROJECT) do
       manifest = REXML::Document.new(File.read(MANIFEST_FILE))
-      manifest.root.attributes['android:versionCode'] = '2'
-      manifest.root.attributes['android:versionName'] = '0.4.1'
+      manifest.root.attributes['android:versionCode'] = '405'
+      manifest.root.attributes['android:versionName'] = '0.4.5'
       manifest.root.attributes['android:installLocation'] = 'auto' # or 'preferExternal' ?
       manifest.root.elements['uses-sdk'].attributes['android:targetSdkVersion'] = '8'
       File.open(MANIFEST_FILE, 'w') { |f| manifest.document.write(f, 4) }
       File.open('default.properties', 'w'){|f| f << "target=android-8\n"}
+      File.open('Gemfile.apk', 'w'){|f| f << "source :rubygems\n\ngem 'activerecord-jdbc-adapter'\n"}
       keystore_file = File.expand_path('~/android_market.keystore')
       if File.exists?(keystore_file)
         File.open('local.properties', 'a'){|f| f << "key.store=#{keystore_file}\nkey.alias=android_market\n"}

data/assets/Rakefile

@@ -9,6 +9,7 @@ def app_files_path() @app_files_path ||= "/data/data/#{package}/files" end
 require 'rake/clean'
 require 'rexml/document'
 
+PROJECT_DIR        = Dir.getwd
 UPDATE_MARKER_FILE = File.expand_path(File.join('tmp', 'LAST_UPDATE'), File.dirname(__FILE__))
 BUNDLE_JAR         = File.expand_path 'libs/bundle.jar'
 BUNDLE_PATH        = File.expand_path 'tmp/bundle'
@@ -16,12 +17,14 @@ MANIFEST_FILE      = File.expand_path 'AndroidManifest.xml'
 RUBOTO_CONFIG_FILE = File.expand_path 'ruboto.yml'
 GEM_FILE           = File.expand_path('Gemfile.apk')
 GEM_LOCK_FILE      = File.expand_path('Gemfile.apk.lock')
+RELEASE_APK_FILE   = File.expand_path "bin/#{build_project_name}-release.apk"
 APK_FILE           = File.expand_path "bin/#{build_project_name}-debug.apk"
 TEST_APK_FILE      = File.expand_path "test/bin/#{build_project_name}Test-debug.apk"
 JRUBY_JARS         = Dir[File.expand_path 'libs/jruby-*.jar']
 RESOURCE_FILES     = Dir[File.expand_path 'res/**/*']
 JAVA_SOURCE_FILES  = Dir[File.expand_path 'src/**/*.java']
 RUBY_SOURCE_FILES  = Dir[File.expand_path 'src/**/*.rb']
+APK_DEPENDENCIES   = [MANIFEST_FILE, RUBOTO_CONFIG_FILE, BUNDLE_JAR] + JRUBY_JARS + JAVA_SOURCE_FILES + RESOURCE_FILES + RUBY_SOURCE_FILES
 
 CLEAN.include('tmp', 'bin')
 
@@ -50,7 +53,7 @@ task :debug => APK_FILE
 namespace :debug do
   desc 'build debug package if compiled files have changed'
   task :quick => [MANIFEST_FILE, RUBOTO_CONFIG_FILE, BUNDLE_JAR] + JRUBY_JARS + JAVA_SOURCE_FILES + RESOURCE_FILES do |t|
-    build_apk(t)
+    build_apk(t, false)
   end
 end
 
@@ -69,8 +72,10 @@ namespace :install do
   end
 end
 
-task :release do
-  sh 'ant release'
+task :release => RELEASE_APK_FILE
+
+file RELEASE_APK_FILE => APK_DEPENDENCIES do |t|
+  build_apk(t, true)
 end
 
 task :tag => :release do
@@ -102,11 +107,11 @@ task :emulator do
 end
 
 task :start do
-  `adb shell am start -a android.intent.action.MAIN -n #{package}/.#{main_activity}`
+  start_app
 end
 
 task :stop do
-  `adb shell ps | grep #{package} | awk '{print $2}' | xargs adb shell kill`
+  raise "Unable to stop app.  Only available on emulator." unless stop_app
 end
 
 desc 'Restart the application'
@@ -119,31 +124,26 @@ end
 file MANIFEST_FILE
 file RUBOTO_CONFIG_FILE
 
-file APK_FILE => [MANIFEST_FILE, RUBOTO_CONFIG_FILE, BUNDLE_JAR] + JRUBY_JARS + JAVA_SOURCE_FILES + RESOURCE_FILES + RUBY_SOURCE_FILES do |t|
-  build_apk(t)
+file APK_FILE => APK_DEPENDENCIES do |t|
+  build_apk(t, false)
 end
 
 desc 'Copy scripts to emulator or device'
 task :update_scripts => ['install:quick'] do
-  `adb shell mkdir -p #{scripts_path}` if !device_path_exists?(scripts_path)
-  puts "Pushing files to apk public file area."
-  last_update = File.exists?(UPDATE_MARKER_FILE) ? Time.parse(File.read(UPDATE_MARKER_FILE)) : Time.parse('1970-01-01T00:00:00')
-  # TODO(uwe): Use `adb sync src` instead?
-  Dir.chdir('src') do
-    Dir["**/*.rb"].each do |script_file|
-      next if File.directory? script_file
-      next if File.mtime(script_file) < last_update
-      next if script_file =~ /~$/
-      print "#{script_file}: "; $stdout.flush
-      `adb push #{script_file} #{scripts_path}/#{script_file}`
-    end
-  end
-  mark_update
+  update_scripts
 end
 
 namespace :update_scripts do
   desc 'Copy scripts to emulator and restart the app'
-  task :restart => [:stop, :update_scripts, :start]
+  task :restart => APK_DEPENDENCIES do |t|
+    if stop_app
+      update_scripts
+    else
+      build_apk(t, false)
+      install_apk
+    end
+    start_app
+  end
 end
 
 task :test => :uninstall do
@@ -168,51 +168,49 @@ file GEM_FILE
 file GEM_LOCK_FILE
 
 desc 'Generate bundle jar from Gemfile'
+task :bundle => BUNDLE_JAR
+
 file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
   next unless File.exists? GEM_FILE
   puts "Generating #{BUNDLE_JAR}"
 
   FileUtils.mkdir_p BUNDLE_PATH
   sh "bundle install --gemfile #{GEM_FILE} --path=#{BUNDLE_PATH}"
+  gem_path = Dir["#{BUNDLE_PATH}/*ruby/1.8/gems"][0]
 
-  # FIXME(uwe):  Should not be necessary.  ARJDBC should not offer the same files as AR.
+  if package != 'org.ruboto.core' && JRUBY_JARS.none? { |f| File.exists? f }
+    Dir.chdir gem_path do
+      Dir['activerecord-jdbc-adapter-*'].each do |g|
+        puts "Removing #{g} gem since it is included in the RubotoCore platform apk."
+        FileUtils.rm_rf g
+      end
+    end
+  end
 
-  Dir.chdir "#{BUNDLE_PATH}/ruby/1.8/gems" do
+  # Remove duplicate files
+  Dir.chdir gem_path do
     scanned_files = []
+    source_files = RUBY_SOURCE_FILES.map{|f| f.gsub("#{PROJECT_DIR}/src/", '')}
     Dir["*/lib/**/*"].each do |f|
+      next if File.directory? f
       raise "Malformed file name" unless f =~ %r{^(.*?)/lib/(.*)$}
       gem_name, lib_file = $1, $2
-      if existing_file = scanned_files.find{|sf| sf =~ %r{(.*?)/lib/#{lib_file}}}
-        puts "Removing duplicate of file #{lib_file} in gem #{gem_name}"
+      if scanned_files.find{|sf| sf =~ %r{(.*?)/lib/#{lib_file}}}
+        puts "Removing duplicate file #{lib_file} in gem #{gem_name}"
         puts "Already present in gem #{$1}"
+        FileUtils.rm f
+      elsif source_files.include? lib_file
+        puts "Removing duplicate file #{lib_file} in gem #{gem_name}"
+        puts "Already present in project source src/#{lib_file}"
+        FileUtils.rm f
+      else
+        scanned_files << f
       end
     end
   end
 
-  # FIXME(uwe):  Remove when directory listing in apk subdirectories work.
-  # FIXME(uwe):  http://jira.codehaus.org/browse/JRUBY-5775
-  Dir["#{BUNDLE_PATH}/ruby/1.8/gems/activesupport-*/lib/active_support/core_ext.rb"].each do |faulty_file|
-    faulty_code = <<-'EOF'
-Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.each do |path|
-  require "active_support/core_ext/#{File.basename(path, '.rb')}"
-end
-    EOF
-    replace_faulty_code(faulty_file, faulty_code)
-  end
-
-  Dir["#{BUNDLE_PATH}/ruby/1.8/gems/activemodel-*/lib/active_model/validations.rb"].each do |faulty_file|
-    faulty_code = <<-EOF
-Dir[File.dirname(__FILE__) + "/validations/*.rb"].sort.each do |path|
-  filename = File.basename(path)
-  require "active_model/validations/\#{filename}"
-end
-    EOF
-    replace_faulty_code(faulty_file, faulty_code)
-  end
-  # FIXME end
-
   # Expand JARs
-  Dir.chdir "#{BUNDLE_PATH}/ruby/1.8/gems" do
+  Dir.chdir gem_path do
     Dir['*'].each do |gem_lib|
       Dir.chdir "#{gem_lib}/lib" do
         Dir['**/*.jar'].each do |jar|
@@ -239,12 +237,10 @@ Java::arjdbc.jdbc.AdapterJavaService.new.basicLoad(JRuby.runtime)
 
 
   FileUtils.rm_f BUNDLE_JAR
-  Dir["#{BUNDLE_PATH}/ruby/1.8/gems/*"].each_with_index do |gem_dir, i|
+  Dir["#{gem_path}/*"].each_with_index do |gem_dir, i|
     `jar #{i == 0 ? 'c' : 'u'}f #{BUNDLE_JAR} -C #{gem_dir}/lib .`
   end
   FileUtils.rm_rf BUNDLE_PATH
-
-  Rake::Task['install'].invoke
 end
 
 # Methods
@@ -314,7 +310,7 @@ def replace_faulty_code(faulty_file, faulty_code)
   end
 end
 
-def build_apk(t)
+def build_apk(t, release)
   if File.exist?(APK_FILE)
     changed_prereqs = t.prerequisites.select do |p|
       File.file?(p) && !Dir[p].empty? && Dir[p].map{|f| File.mtime(f)}.max > File.mtime(APK_FILE)
@@ -323,7 +319,11 @@ def build_apk(t)
     changed_prereqs.each{|f| puts "#{f} changed."}
     puts "Forcing rebuild of #{APK_FILE}."
   end
-  sh 'ant debug'
+  if release
+    sh 'ant release'
+  else
+    sh 'ant debug'
+  end
 end
 
 def install_apk
@@ -347,3 +347,29 @@ def uninstall_apk
     exit $?
   end
 end
+
+def update_scripts
+  `adb shell mkdir -p #{scripts_path}` if !device_path_exists?(scripts_path)
+  puts "Pushing files to apk public file area."
+  last_update = File.exists?(UPDATE_MARKER_FILE) ? Time.parse(File.read(UPDATE_MARKER_FILE)) : Time.parse('1970-01-01T00:00:00')
+  # TODO(uwe): Use `adb sync src` instead?
+  Dir.chdir('src') do
+    Dir["**/*.rb"].each do |script_file|
+      next if File.directory? script_file
+      next if File.mtime(script_file) < last_update
+      next if script_file =~ /~$/
+      print "#{script_file}: "; $stdout.flush
+      `adb push #{script_file} #{scripts_path}/#{script_file}`
+    end
+  end
+  mark_update
+end
+
+def start_app
+  `adb shell am start -a android.intent.action.MAIN -n #{package}/.#{main_activity}`
+end
+
+def stop_app
+  output = `adb shell ps | grep #{package} | awk '{print $2}' | xargs adb shell kill`
+  return output !~ /Operation not permitted/
+end

data/assets/src/InheritingActivity.java

@@ -1,5 +1,6 @@
 package THE_PACKAGE;
 
+import java.io.File;
 import java.io.IOException;
 
 import org.ruboto.Script;
@@ -138,6 +139,9 @@ public class InheritingActivity extends org.ruboto.RubotoActivity {
         }).start();
     }
 
+	private static final String RUBOTO_APK = "RubotoCore-release.apk";
+	private static final String RUBOTO_URL = "https://github.com/downloads/ruboto/ruboto-core/" + RUBOTO_APK;
+
     // Called when buton is pressed.
     public void getRubotoCore(View view) {
         try {
@@ -145,7 +149,9 @@ public class InheritingActivity extends org.ruboto.RubotoActivity {
         } catch (android.content.ActivityNotFoundException anfe) {
             try {
                 TextView textView = (TextView) findViewById(Class.forName(getPackageName() + ".R$id").getField("text").getInt(null));
-                textView.setText("Could not find the Android Market App.  You will have to install Ruboto Core manually.  Bummer!");
+                Intent intent = new Intent(android.content.Intent.ACTION_VIEW, Uri.parse(RUBOTO_URL));
+                intent.setDataAndType(Uri.fromFile(new File(getCacheDir(), RUBOTO_APK)), "application/vnd.android.package-archive");
+                startActivity(intent);
             } catch (Exception e) {}
         }
     }

data/lib/ruboto/commands/base.rb

@@ -325,7 +325,7 @@ module Ruboto
             argument("what") {
               required
               validate {|i| %w(jruby app ruboto).include?(i)}
-              description "What do you want to update: 'jruby', 'app', or 'ruboto'"
+              description "What do you want to update: 'app', 'jruby', or 'ruboto'"
             }
 
             option("force") {
@@ -339,8 +339,6 @@ module Ruboto
 
             def run
               case params['what'].value
-              when "jruby" then
-                update_jruby(params['force'].value, params['with-psych'].value) || abort
               when "app" then
                 force = params['force'].value
                 update_test force
@@ -352,6 +350,9 @@ module Ruboto
                 update_build_xml
                 update_manifest nil, nil, force
                 update_core_classes "exclude"
+                update_bundle
+              when "jruby" then
+                update_jruby(params['force'].value, params['with-psych'].value) || abort
               when "ruboto" then
                 update_ruboto(params['force'].value) || abort
               end

data/lib/ruboto/util/update.rb

@@ -139,7 +139,7 @@ EOF
         # FIXME(uwe):  Remove when we stop supporting upgrades from ruboto-core 0.3.3 and older
         old_scripts_dir = 'assets/scripts'
         if File.exists? old_scripts_dir
-          FileUtils.mv Dir["#{old_scripts_dir}/**/*"], SCRIPTS_DIR
+          FileUtils.mv Dir["#{old_scripts_dir}/*"], SCRIPTS_DIR
           FileUtils.rm_rf old_scripts_dir
         end
         # FIXME end
@@ -377,6 +377,13 @@ EOF
         File.open('build.xml', 'w'){|f| f << ant_script}
       end
 
+      def update_bundle
+        if File.exist?('Gemfile.apk') && File.exists?('libs/bundle.jar')
+          FileUtils.rm 'libs/bundle.jar'
+          system 'rake bundle'
+        end
+      end
+
     end
   end
 end

data/lib/ruboto/version.rb

@@ -1,3 +1,3 @@
 module Ruboto
-  VERSION = '0.4.0'
+  VERSION = '0.4.1.rc.4'
 end

data/test/activity/stack_activity_test.rb

@@ -14,7 +14,6 @@ test('stack depth') do |activity|
   os_offset = {13 => 1}[android.os.Build::VERSION::SDK_INT].to_i
   jruby_offset = {
       '1.5.6'     => [-2, -5, -6, -8],
-      '1.7.0.dev' => [ 0,  2,  5,  5],
   }[org.jruby.runtime.Constants::VERSION] || [0,0,0,0]
   version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, JRuby: #{org.jruby.runtime.Constants::VERSION}"
   assert_equal 44 + os_offset + jruby_offset[0], activity.find_view_by_id(42).text.to_i, version_message

data/test/app_test_methods.rb

@@ -11,6 +11,7 @@ module AppTestMethods
     end
 
     assert_code 'ReadSourceFile', "File.read(__FILE__)"
+    assert_code 'DirListsFilesInApk', 'Dir["#{File.dirname(__FILE__)}/*"].each{|f| raise "File #{f.inspect} not found" unless File.exists?(f)}'
 
     Dir[File.expand_path('activity/*_test.rb', File.dirname(__FILE__))].each do |test_src|
       snake_name = test_src.chomp('_test.rb')

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ruboto-core
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
+  hash: 15424085
+  prerelease: 6
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  - rc
+  - 4
+  version: 0.4.1.rc.4
 platform: ruby
 authors: 
 - Daniel Jackoway
@@ -18,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-19 00:00:00 Z
+date: 2011-10-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main
@@ -138,12 +140,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: ruboto-core