droiuby 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6506b4b06204fbc630afe6a42d05d3fda2d64b6
-  data.tar.gz: 7a9faafa18306ed4dc4c778087ac94b6ed5d73e1
+  metadata.gz: e18345aa04cb95e4b637645460c23caaa436bf05
+  data.tar.gz: 9d06d878aaf9d0e7792d55c0ef1b006cd0b57420
 SHA512:
-  metadata.gz: 6ce7c14afc2ce0ce0582c350753f06be401a646acc7afc7856527d5e96ffb1bcf0960ffe4616cd9b2140e7e8ee641a80195a60bdbc52b6cf0395591b04f7fb73
-  data.tar.gz: 251fba01154410ee37386a24ebe1ef7c6235e594e132fa3c58d40bc45914a60cd2ae3684cbeab4c0fa1d751d7e915fda8564d4ceef890c698069f60dfab35e4a
+  metadata.gz: 39dea7d3bd65ecac0cf8e76d1dc3e60b0691097ff3e773cc8ff3e55e46f1b54304315160293b22893fbee6bbc088124a67333fbe2e6b99b56a8938e185c2ea02
+  data.tar.gz: 9f67339a8b060c0158570056cab9929ed8256c997b073d414f40bd04ef0d366b830e04dc96c8ac451c6b91bab9bac623877903343d2088d731ff0ed669895afd

data/bin/drby

@@ -116,8 +116,7 @@ case command
       puts '--package [JAVA_PACKAGE] is required.'
       exit(1)
     end
-    project.standalone(project_name, $java_package, $app_name.nil? ? 'HelloWorld'
-        : $app_name,'')
+    project.standalone(project_name, $java_package, $app_name,'')
   when 'switch'
     instance_name = nil
     unless ARGV[1].blank?
@@ -160,6 +159,11 @@ case command
 
     unless ARGV[1].blank?
       project_name = ARGV[1]
+    else
+      if !File.exists?('config.droiuby')
+         puts 'current directory is not a valid droiuby project'
+         exit(1)
+      end
     end
 
     project.execute(project_name, $device_ip, $droiuby_host)

data/lib/droiuby/bootstrap.rb

@@ -57,7 +57,12 @@ def _active_bundles
 end
 
 def _errors
-  _execution_bundle.getScriptErrors.collect { |i| i.to_s }
+  _execution_bundle.getScriptErrors.collect { |e| e.to_s }
+end
+
+def _add_error(error_message)
+  _execution_bundle.addError(error_message)
+  error_message
 end
 
 def _R(attr)
@@ -96,7 +101,7 @@ def render(url, params = {})
   end
 
   new_activity = params[:activity] ? true : false;
-    
+
   async.perform {
     Java::com.droiuby.client.core.DroiubyLauncher.loadPage(_current_activity, _execution_bundle, url, http_method)
   }.done { |result|
@@ -264,4 +269,3 @@ def http_get(url, params = {}, options = {})
 
   Java::com.droiuby.client.core.utils.Utils.load(_current_activity, url_string, _execution_bundle);
 end
-

data/lib/droiuby/scripts/project.rb

@@ -5,6 +5,7 @@ require 'zip'
 require 'thor'
 require "uri"
 require 'cgi'
+require 'nokogiri'
 require 'droiuby/support/object'
 require 'droiuby/support/string'
 
@@ -119,7 +120,7 @@ class Project < Thor
   end
 
   desc "standalone NAME [PACKAGE_NAME]", "create an android project for this app with the specified java package name"
-  def standalone(name, package_name, title = 'HelloWorld', output_dir = 'projects')
+  def standalone(name, package_name, title = nil, output_dir = 'projects')
 
     if output_dir.blank?
       output_dir = Dir.pwd
@@ -127,6 +128,18 @@ class Project < Thor
 
     dest_folder = File.join(output_dir,"#{name}")
 
+    Dir.chdir dest_folder
+
+    if title.nil?
+
+      doc = Nokogiri.XML(File.read('config.droiuby'))
+
+      doc.css('app_descriptor name').each do |element|
+        title = element.content
+      end
+
+    end
+
     template_repository = ENV['droiuby_template'] || 'https://github.com/jedld/droiuby-template.git'
     template_directory = File.expand_path('~/.droiuby/android_project_templates')
 
@@ -198,10 +211,10 @@ class Project < Thor
     archive = compress(src_folder, force)
 
     project_directory = File.join(src_folder,'project')
-    say "Checking if #{project_directory}"
+    say "exsits? #{project_directory}"
     if File.exists? project_directory
       say "Android Project exists. Updating build inside assets ..."
-      copy_file archive, File.join(project_directory,'assets',File.basename(archive))
+      copy_file archive, File.join(project_directory,'assets',File.basename(archive)), force: true
     end
   end
 
@@ -313,7 +326,6 @@ class Project < Thor
   end
 
   desc "framework DEVICE_IP","updates the droiuby framework using code from framework_src"
-
   def framework(device_ip = nil, source_dir = 'framework_src')
     compress(source_dir, "true", "framework")
     upload 'framework', device_ip, File.join(Dir.pwd,"framework_src"), true
@@ -321,8 +333,38 @@ class Project < Thor
 
   desc "execute NAME DEVICE_IP [WORKSPACE_DIR]","package and execute a droiuby application to target device running droiuby client"
   def execute(name, device_ip, source_dir = 'projects')
+
     package name, source_dir, "true"
-    upload name, device_ip, source_dir
+
+    source_dir_args = source_dir ? source_dir : 'projects'
+    src_dir = if name.blank?
+      Dir.pwd
+    else
+      File.join(source_dir_args, name)
+    end
+
+    project_directory = File.join(src_dir,'project')
+
+    say "exsits? #{project_directory}"
+    if File.exists? project_directory
+      say "Android Project exists. Building debug project instead ..."
+      Dir.chdir(project_directory)
+      doc = Nokogiri.XML(File.read('AndroidManifest.xml'))
+
+      package_name = nil
+      doc.css('manifest').each do |element|
+        package_name = element['package']
+      end
+
+      `ant debug install`
+
+      say "Starting activity #{package_name}"
+      
+      `adb shell am start -W -S --activity-clear-top --activity-brought-to-front -n #{package_name}/.StartupActivity`
+    else
+      upload name, device_ip, source_dir
+    end
+
   end
 
   desc "bundle", "unpack all cached gems"

data/lib/droiuby/wrappers/listeners/auto_wrap.rb

@@ -73,10 +73,16 @@ module Droiuby
       def _listener(java_class, package = 'android.view.View' , &block)
         puts "using dexmaker auto wrapper"
         Proc.new { |*args|
-          wrapped_args = args.collect { |a|
-            wrap_native_view(a)
-          }
-          block.call(*wrapped_args)
+          begin
+            wrapped_args = args.collect { |a|
+              wrap_native_view(a)
+            }
+            block.call(*wrapped_args)
+          rescue Exception  => e
+            error_message_str = "#{e.inspect}\n#{e.backtrace.join("\n")}"
+            puts error_message_str
+            _add_error(error_message_str)
+          end
         }
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: droiuby
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Joseph Emmanuel Dayo
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Android app development and rapid prototyping using Ruby
 email: joseph.dayo@gmail.com
 executables: