droiuby 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c6ff04f6a5e9cb16a20c96bdbebecda9f3020f7
-  data.tar.gz: ad821125f554248da8b1deef8f152172357e0a78
+  metadata.gz: 66f1b851db7272ef16731e1dbb62d891b3596a30
+  data.tar.gz: e83fb1c37367b7b0f758a34416c417e38057180b
 SHA512:
-  metadata.gz: bf675b9c51881c61d0f929d2e059bcf0972b9c73003abda80397ba95bb4cb192fa25705072efc957cf6fa17f28260ee9942c50da7aa44b07f7793f58edd802ce
-  data.tar.gz: 3eac88fb9fc301bc9b01cff02b2cf788edbe8221fe94602ad1c0d7a3c3dc1c380b6f5137fb270ecb362a9efe00d53fdbf1f03922d1f2e429af96db369ad85828
+  metadata.gz: c039489821c83bad6fc91006b43bab08bb51e507bf44bb6cce8516dcca7d2769ed79b516650af91480ff4961511471f700f51f5abf9b92c4db683fe7d2b4627a
+  data.tar.gz: ce55b3bd6ac358fb298e595f594b5a054d57b602a9eeea52b0687ad449f825ebe65602b27cc973d360ced125c958ebe74756b1b9a830400bb7af56f2f82918c8

data/bin/drby

@@ -10,13 +10,16 @@ require 'json'
 $droiuby_host = ENV['DROIUBY_HOST'] || '10.0.2.2'
 $device_ip = ENV['DROIUBY_DEVICE'] || nil
 $app_name = nil
+$no_project = false
+$show_help = false
+$ant_args = nil
 
 options = OptionParser.new do |o|
   o.banner =
 "Usage: drby autostart true|false INSTANCE_NAME [options] # Set specified instance to start on droiuby launch
        drby console [options]                                  # Launch an interactive console to the target Android Device running Droiuby
        drby framework update  [FOLDER] [options]               # updates the droiuby framework from folder (default src_framework)
-       drby go   [PROJECT_NAME] [options]                      # packages an app and uploads to an Android Device running Droiuby
+       drby go   [PROJECT_NAME] [options] [--no-project]       # packages an app and uploads to an Android Device running Droiuby
        drby list [options]                                     # Lists the app instances running on the phone
        drby live [PROJECT_NAME] [options]                      # runs a web instance of the app and tells Droiuby to load it.
        drby new PROJECT_NAME [options]                         # Create a new project
@@ -27,12 +30,16 @@ options = OptionParser.new do |o|
        drby switch INSTANCE_NAME [options]                     # Switch to the specified instance
        drby bundle                                             # unzips all gems in vendor/cache for deployment to droiuby\n"
 
+
   o.separator ""
   o.separator "options:"
+  o.on('-X','--ant-args','additional params to pass to ant') { |b| $ant_args = b}
+  o.on('-h','--help','show this help screen') {|b| $show_help = true}
   o.on('-n','--name app_name','The name of the app that appears in the launcher') {|b| $app_name =b }
   o.on('-p','--package java_package','The java package name to use') {|b| $java_package = b}
   o.on('-h','--host HOST_IP','The IP Address of the host computer (for droiuby live mode)') { |b| $droiuby_host = b }
   o.on('-d','--device DEVICE_IP','The IP Address of the Android Device') { |b| $device_ip = b }
+  o.on('-P','--no-project','Tells drby go to ignore the android project if present') {|b| $no_project = true}
   o.parse!
 end
 
@@ -174,7 +181,7 @@ case command
       end
     end
 
-    project.execute(project_name, $device_ip, $droiuby_host)
+    project.execute(project_name, $device_ip, $droiuby_host, $no_project, $ant_args)
   when 'bundle'
     project.bundle
   when 'live'

data/lib/droiuby/scripts/project.rb

@@ -78,15 +78,15 @@ class Project < Thor
   desc "list [DEVICE IP]","List running app instances"
   def list(device_ip = nil)
     device_ip = map_device_ip(device_ip)
-        url_str = "http://#{device_ip}:4000/control?cmd=list"
-        puts url_str
-        uri = URI.parse(url_str)
-        # Shortcut
-        response = Net::HTTP.get_response(uri)
-        result = JSON.parse(response.body)
-        result['list'].split(',').each do |item|
-          puts item
-        end
+    url_str = "http://#{device_ip}:4000/control?cmd=list"
+    puts url_str
+    uri = URI.parse(url_str)
+    # Shortcut
+    response = Net::HTTP.get_response(uri)
+    result = JSON.parse(response.body)
+    result['list'].split(',').each do |item|
+      puts item
+    end
   end
 
   desc "cmd [command] [DEVICE_IP]", "Send command to a Droiuby instance"
@@ -218,6 +218,9 @@ class Project < Thor
     template File.join('ruby','index.xml.erb'), File.join(dest_folder,"app","views","index.xml")
     template File.join('ruby','application.css.erb'), File.join(dest_folder,"app","views","styles","application.css")
     template File.join('ruby','index.rb.erb'), File.join(dest_folder,"app","activities","index.rb")
+    template File.join('ruby','index_spec.rb.erb'), File.join(dest_folder,"spec","activities","index_spec.rb")
+    template File.join('ruby','spec_helper.rb.erb'), File.join(dest_folder,"spec","spec_helper.rb")
+
     empty_directory File.join(dest_folder,"lib")
     say "running bundle install"
     Dir.chdir dest_folder
@@ -358,8 +361,8 @@ class Project < Thor
     upload 'framework', device_ip, File.join(Dir.pwd,"framework_src"), true
   end
 
-  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')
+  desc "execute NAME DEVICE_IP [WORKSPACE_DIR] [IGNORE_PROJECT] [ANT_ARGS]","package and execute a droiuby application to target device running droiuby client"
+  def execute(name, device_ip, source_dir = 'projects', ignore_project = false, ant_args = nil)
 
     package name, source_dir, "true"
 
@@ -373,7 +376,7 @@ class Project < Thor
     project_directory = File.join(src_dir,'project')
 
     say "exsits? #{project_directory}"
-    if File.exists? project_directory
+    if !ignore_project && File.exists?(project_directory)
       say "Android Project exists. Building debug project instead ..."
       Dir.chdir(project_directory)
       doc = Nokogiri.XML(File.read('AndroidManifest.xml'))
@@ -390,7 +393,11 @@ class Project < Thor
         `adb shell am start  -S --activity-clear-top --activity-brought-to-front -n #{package_name}/.StartupActivity`
       else
         say "No device connected. will just build the project"
-        puts `ant debug`
+        if ant_args.nil?
+          puts `ant debug`
+        else
+          puts `ant #{ant_args}`
+        end
       end
     else
       upload name, device_ip, source_dir

data/lib/droiuby/scripts/templates/ruby/Gemfile.erb

@@ -1,3 +1,5 @@
 source 'http://rubygems.org'
 
-gem 'droiuby'
+gem 'droiuby'
+gem 'rspec'
+gem 'rr'

data/lib/droiuby/scripts/templates/ruby/index_spec.rb.erb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Index do
+
+  context "#on_create" do
+
+    before do
+      @instance = described_class.new
+    end
+
+    it "sets up the activity" do
+      @instance.on_create
+    end
+  end
+
+end

data/lib/droiuby/scripts/templates/ruby/spec_helper.rb.erb

@@ -0,0 +1,13 @@
+require 'droiuby/spec/helper'
+
+ENV["DROIUBY_ENV"] ||= 'test'
+
+RSpec.configure do |config|
+  # ## Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  config.mock_with :rr
+end

data/lib/droiuby/spec/helper.rb

@@ -0,0 +1,61 @@
+$:.unshift Dir.pwd
+
+require File.join(File.dirname(__FILE__),'loader')
+$autoload_path << File.join('app','activities')
+
+
+#Droiuby Mock Framework class
+class DroiubyFramework
+
+  def before_activity_setup
+    fname = "#{File.dirname(__FILE__)}/../bootstrap.rb"
+    @bootstrap = @bootstrap || File.read(fname)
+    eval(@bootstrap, TOPLEVEL_BINDING, fname, __LINE__)
+  end
+
+  def preload
+    fname = "#{File.dirname(__FILE__)}/preload.rb"
+    @preload = @preload || File.read(fname)
+    eval(@preload, TOPLEVEL_BINDING, fname, __LINE__)
+  end
+
+  def on_click(view)
+  end
+
+  def script(controller, refresh = false)
+    klass = controller.camelize.constantize
+    instance = klass.new
+
+    skip_content_view = if instance.respond_to? :before_content_render
+      instance.before_content_render unless refresh
+    end
+
+    set_content_view unless skip_content_view
+
+    instance.on_create
+    instance
+  end
+
+  def resolve_view(name, node)
+    name_parts = name.split('#')
+
+    klass_str = if name_parts.size > 1
+      "#{name_parts[0].camelize}::#{name_parts[1].camelize}"
+    else
+      name.camelize
+    end
+
+    puts klass_str
+    klass = klass_str.constantize
+
+    instance = klass.new(_current_activity)
+    if instance.class < ViewWrapper
+      instance.native
+    else
+      instance._proxy_class([Java::android.content.Context.java_class], [_current_activity])
+    end
+  end
+
+end
+
+$framework = DroiubyFramework.new

data/lib/droiuby/spec/loader.rb

@@ -0,0 +1,17 @@
+require 'droiuby/support/utils'
+require 'droiuby/support/fixnum'
+require 'droiuby/support/autoload'
+require 'droiuby/wrappers/collection/view_array'
+require 'droiuby/wrappers/proxy_builder/interface_builder'
+require 'droiuby/wrappers/listeners/auto_wrap'
+require 'droiuby/wrappers/listeners/on_web_console_ready_listener'
+require 'droiuby/support/string'
+require 'droiuby/support/thread'
+require 'droiuby/support/object'
+require 'droiuby/support/to_query'
+require 'droiuby/support/asset'
+require 'droiuby/wrappers/java_helpers/java_method_helper'
+require 'droiuby/wrappers/java_helpers/view_helper'
+require 'droiuby/plugins/plugins'
+require 'droiuby/application'
+require 'droiuby/android'

data/lib/droiuby/spec/mock_objects/droiuby_app.rb

@@ -0,0 +1,11 @@
+class DroiubyApp
+
+  def initialize(working_directory = nil)
+    @working_directory = working_directory
+  end
+
+  def getWorkingDirectory
+    @working_directory
+  end
+  
+end

data/lib/droiuby/spec/mock_objects/system_wrapper.rb

@@ -0,0 +1,5 @@
+module Droiuby
+  class SystemWrapper
+        
+  end
+end

data/lib/droiuby/support/asset.rb

@@ -2,46 +2,51 @@ class BitmapDrawableWrapper
   def initialize(drawable)
     @native = drawable
   end
-  
+
   def native
     @native
   end
-  
+
   def to_bitmap
     @native.getBitmap
   end
-  
+
   def height
     @native.getIntrinsicHeight
   end
-  
+
   def width
     @native.getIntrinsicWidth
   end
 end
 
 class AssetHandler
-  
-  def initialize(url)
+
+  def initialize(url, asset_type)
     @url = url
+    @asset_type = case asset_type
+      when :image
+        Java::com.droiuby.client.core.utils.Utils::ASSET_TYPE_IMAGE
+      end
+
   end
-  
-  def self.download(url)
-    AssetHandler.new(url)
+
+  def self.download(url, asset_type = :image)
+    AssetHandler.new(url, asset_type)
   end
-  
+
   def start
     async.perform {
       result = BitmapDrawableWrapper.new(Java::com.droiuby.client.core.utils.Utils.loadAppAssetRuby(_execution_bundle, _current_app, _current_activity,
-      @url, Java::com.droiuby.client.core.utils.Utils::ASSET_TYPE_IMAGE, Java::com.droiuby.client.core.utils.Utils::HTTP_GET))
+      @url, @asset_type, Java::com.droiuby.client.core.utils.Utils::HTTP_GET))
       result
     }.done { |result|
       @block.call(result)
     }.start
   end
-  
+
   def done(&block)
     @block = block
     self
   end
-end
+end

data/lib/droiuby/support/autoload.rb

@@ -1,22 +1,21 @@
 $autoload_path = [nil,File.join('droiuby','wrappers')]
 
-
 module MissingHandler
   def const_missing(name)
     @looked_for ||= {}
     str_name = name.to_s
     raise "Class not found: #{name}" if @looked_for[str_name] == :missing
-    
-    
+
+
     name_parts = name.to_s.split('::').collect { |n| n.underscore }
-    
-    
+
+
     $autoload_path.each do |path|
-      path_array = unless path.nil? 
+      path_array = unless path.nil?
         [path] + name_parts
       else
         name_parts
-      end 
+      end
       require_path = File.join(*path_array)
 
       begin
@@ -25,9 +24,9 @@ module MissingHandler
         return klass if klass
       rescue LoadError=>e
       end
-      
+
     end
-    
+
     @looked_for[str_name] = :missing
 
     raise "Class not found: #{name}"
@@ -38,7 +37,7 @@ end
 class Object
   class << self
     alias :const_missing_old :const_missing
-    
+
     include MissingHandler
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: droiuby
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Joseph Emmanuel Dayo
@@ -117,6 +117,12 @@ files:
 - lib/droiuby/scripts/templates/ruby/gitignore.erb
 - lib/droiuby/scripts/templates/ruby/index.rb.erb
 - lib/droiuby/scripts/templates/ruby/index.xml.erb
+- lib/droiuby/scripts/templates/ruby/index_spec.rb.erb
+- lib/droiuby/scripts/templates/ruby/spec_helper.rb.erb
+- lib/droiuby/spec/helper.rb
+- lib/droiuby/spec/loader.rb
+- lib/droiuby/spec/mock_objects/droiuby_app.rb
+- lib/droiuby/spec/mock_objects/system_wrapper.rb
 - lib/droiuby/support/asset.rb
 - lib/droiuby/support/autoload.rb
 - lib/droiuby/support/fixnum.rb