droiuby 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66f1b851db7272ef16731e1dbb62d891b3596a30
-  data.tar.gz: e83fb1c37367b7b0f758a34416c417e38057180b
+  metadata.gz: db6154ab45831e35e2dd08e540db6d528d4f39ad
+  data.tar.gz: 6b963f5f8334d787f13ac2fabec2211b7434e88e
 SHA512:
-  metadata.gz: c039489821c83bad6fc91006b43bab08bb51e507bf44bb6cce8516dcca7d2769ed79b516650af91480ff4961511471f700f51f5abf9b92c4db683fe7d2b4627a
-  data.tar.gz: ce55b3bd6ac358fb298e595f594b5a054d57b602a9eeea52b0687ad449f825ebe65602b27cc973d360ced125c958ebe74756b1b9a830400bb7af56f2f82918c8
+  metadata.gz: 445e4037a22975ff5c9cc5f6e89c666f0aa3ededee21f1adf2debc894071d907c5be6af5645d25dd01569bc09b3d94e53a6e3b2ad18b5789d8d503499bb0cc41
+  data.tar.gz: f2363511ba50edc097090ff2a2567991cdc80825caa47d0ba82d9cbbe4647abb5e3f16bfc4d43302e89c7e6a5b61d084a01054980c42c918d0275fb96be8a4a8

data/bin/drby

@@ -23,6 +23,7 @@ options = OptionParser.new do |o|
        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
+       drby new hybrid PROJECT_NAME [options]                  # Create a new hybrid project
        drby pack [PROJECT_NAME] [options]                      # zips and packages an app
        drby standalone [PROJECT_NAME] --package JAVA_PACKAGE   # creates a standalone android project for the current app
             [--name APP_NAME]
@@ -58,7 +59,14 @@ project = Project.new
 
 case command
   when 'new'
-    project_name = ARGV[1]
+    n = 1
+    hybrid_mode = false
+    if ARGV[n] == 'hybrid'
+      n+=1
+      hybrid_mode = true
+    end
+
+    project_name = ARGV[n]
 
     if project_name.blank?
         puts "PROJECT_NAME is required"
@@ -72,7 +80,7 @@ case command
               $app_name
             end
 
-    project.create(project_name, app_name, '')
+    project.create(project_name, app_name, '', hybrid_mode ? 'hybrid' : 'droiuby')
   when 'reload'
     project_name = ARGV[1]
     project.package(project_name, nil, 'true')

data/lib/droiuby/scripts/project.rb

@@ -140,15 +140,24 @@ 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 = nil, output_dir = 'projects')
+  def standalone(name, package_name, title = nil, output_dir = 'projects', repository = nil, branch = nil)
 
     if output_dir.blank?
       output_dir = Dir.pwd
     end
 
-    dest_folder = File.join(output_dir,"#{name}")
+    if package_name == :prompt
+      say("Please enter the Java Package Name to be used for your app (e.g. com.awesome.sample ):")
+      package_name = ask("Package Name: ")
+    end
 
-    Dir.chdir dest_folder
+    dest_folder = nil
+    unless name.nil?
+      dest_folder = File.join(output_dir,"#{name}")
+      Dir.chdir dest_folder
+    else
+      dest_folder = Dir.pwd
+    end
 
     if title.nil?
 
@@ -160,12 +169,19 @@ class Project < Thor
 
     end
 
-    template_repository = ENV['droiuby_template'] || 'https://github.com/jedld/droiuby-template.git'
-    template_directory = File.expand_path('~/.droiuby/android_project_templates')
+    template_repository = ENV['droiuby_template'] || repository || 'https://github.com/jedld/droiuby-template.git'
+    template_directory = File.expand_path("~/.droiuby/android_project_templates.#{branch.nil? ? 'master' : branch}")
 
     unless File.exists?(template_directory)
       say "no cached copy yet. obtaining template project from repository"
-      `git clone --depth 1 #{template_repository} #{template_directory}`
+
+      branch = unless branch.nil?
+        "-b #{branch}"
+      else
+        ""
+      end
+
+      `git clone #{branch} --depth 1 #{template_repository} #{template_directory}`
     else
       say "checking for template updates..."
       Dir.chdir template_directory
@@ -178,8 +194,15 @@ class Project < Thor
 
     Dir.chdir File.join(dest_folder,'project')
 
+    say "creating android porject in #{dest_folder}"
     require "#{File.join(dest_folder,'project','init.rb')}"
 
+    dest_folder = if dest_folder.end_with? '/'
+      dest_folder
+    else
+      "#{dest_folder}/"
+    end
+
     archive_name = File.basename(dest_folder.sub!(%r[/$],'')) if archive_name.nil?
 
     init = Init.new
@@ -193,7 +216,7 @@ class Project < Thor
 
   desc "create PROJECT_NAME [APP_NAME] [WORKSPACE_DIR]","create a new droiuby project with NAME"
 
-  def create(name, app_name = :prompt, output_dir = 'projects')
+  def create(name, app_name = :prompt, output_dir = 'projects', type = 'droiuby')
     @name = name
     if app_name.nil?
       @app_name = app_name
@@ -205,7 +228,14 @@ class Project < Thor
     @description = name
     @launcher_icon = ''
     @base_url = ''
-    @main_xml = File.join("app","views","index.xml")
+    if type == 'droiuby'
+      @main_xml = File.join("app","views","index.xml")
+    elsif type == 'hybrid'
+      @main_xml = File.join("app","activities","index.rb")
+    else
+      say_error "Invalid project type specified"
+      exit(1);
+    end
 
     if output_dir.blank?
       output_dir = Dir.pwd
@@ -215,17 +245,31 @@ class Project < Thor
     template File.join('ruby','Gemfile.erb'), File.join(dest_folder,"Gemfile")
     template File.join('ruby','config.droiuby.erb'), File.join(dest_folder,"config.droiuby")
     template File.join('ruby','gitignore.erb'), File.join(dest_folder,".gitignore")
-    template File.join('ruby','index.xml.erb'), File.join(dest_folder,"app","views","index.xml")
+
+    if type == 'droiuby'
+      template File.join('ruby','index.xml.erb'), File.join(dest_folder,"app","views","index.xml")
+    end
+
     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")
+    if type == 'droiuby'
+      template File.join('ruby','index.rb.erb'), File.join(dest_folder,"app","activities","index.rb")
+    elsif type == 'hybrid'
+      template File.join('ruby','index-hybrid.rb.erb'), File.join(dest_folder,"app","activities","index.rb")
+    end
     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
+    if type == 'hybrid'
+      standalone(nil, :prompt, nil,  nil, nil, 'hybrid-mode')
+    end
+
+    say "running bundle install"
     `bundle install`
-    bundle
+
+
   end
 
   desc "package NAME [WORKSPACE_DIR] [true|false]","package a project"

data/lib/droiuby/scripts/templates/ruby/index-hybrid.rb.erb

@@ -0,0 +1,10 @@
+#droiuby ruby script
+class Index < Activity
+  def on_create
+    set_content_view(_R('R.layout.index'))
+  end
+
+  def on_activity_result(request_code, result_code, intent)
+    #callback from starting an activity with result
+  end
+end

data/lib/droiuby/spec/bootstrap.rb

@@ -0,0 +1,6 @@
+def _current_app
+  $mock_environment.current_app
+end
+
+def V(selector = nil)
+end

data/lib/droiuby/spec/helper.rb

@@ -2,13 +2,43 @@ $:.unshift Dir.pwd
 
 require File.join(File.dirname(__FILE__),'loader')
 $autoload_path << File.join('app','activities')
+$working_directory = Dir.pwd
 
+Dir[File.join("#{File.dirname(__FILE__)}",'mock_objects','java_classes',"*.rb")].each {|f| require f}
+Dir[File.join("#{File.dirname(__FILE__)}",'mock_objects',"*.rb")].each {|f| require f}
+
+
+class Java
+
+  class Stubber
+    def RubyContainerPayload
+      MockObjects::JavaClasses::RubyContainerPayload.new
+    end
+  end
+
+  def self.droiuby
+    self
+  end
+
+  def self.client
+    self
+  end
+
+  def self.core
+    Stubber.new
+  end
+
+  def self.com
+    self
+  end
+
+end
 
 #Droiuby Mock Framework class
 class DroiubyFramework
 
   def before_activity_setup
-    fname = "#{File.dirname(__FILE__)}/../bootstrap.rb"
+    fname = "#{File.dirname(__FILE__)}/bootstrap.rb"
     @bootstrap = @bootstrap || File.read(fname)
     eval(@bootstrap, TOPLEVEL_BINDING, fname, __LINE__)
   end
@@ -59,3 +89,23 @@ class DroiubyFramework
 end
 
 $framework = DroiubyFramework.new
+
+def set_mock_environment(environment = nil)
+  puts "new environment"
+  if environment.nil?
+  doc = Nokogiri.XML(File.read('config.droiuby'))
+
+    title = ''
+    params = {}
+    doc.css('app_descriptor').tap do |e|
+      %w[name description base_url main framework].each do |attr|
+        params[attr.to_sym] = e.css(attr).first.content
+      end
+    end
+
+    $mock_environment = MockEnvironment.new(params)
+  else
+    $mock_environment = environment
+  end
+  $mock_environment
+end

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

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

data/lib/droiuby/spec/mock_objects/java_classes/execution_bundle.rb

@@ -0,0 +1,9 @@
+module MockObjects
+  module JavaClasses
+
+    class ExecutionBundle
+
+    end
+
+  end
+end

data/lib/droiuby/spec/mock_objects/java_classes/ruby_container_payload.rb

@@ -0,0 +1,17 @@
+module MockObjects
+  module JavaClasses
+
+    class RubyContainerPayload
+
+      def java_method(method, params)
+        puts "method #{method} : #{params.inspect}"
+      end
+
+      def getExecutionBundle
+        MockObjects::JavaClasses::ExecutionBundle.new
+      end
+
+    end
+
+  end
+end

data/lib/droiuby/spec/mock_objects/java_classes/view.rb

@@ -0,0 +1,10 @@
+module MockObjects
+  module JavaClasses
+
+    class View
+      attr_accessor :id, :tag, :view_type
+
+    end
+
+  end
+end

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

@@ -0,0 +1,36 @@
+class MockEnvironment
+  
+  attr_accessor :current_app, :app_name, :base_url, :main_url
+
+  def initialize(params = {})
+    @current_app = DroiubyApp.new
+    @app_name = params[:app_name] || ''
+    @base_url = params[:base_url] || ''
+    @main_url = params[:main_url] || ''
+    @mock_view_heirarchy = []
+  end
+
+  def before_setup(activity_instance, template)
+    if (activity_instance.kind_of? Activity)
+      $framework.before_activity_setup
+    else
+        doc = Nokogiri.XML(File.read(template))
+
+        doc.css('app_descriptor name').each do |element|
+          title = element.content
+        end
+
+    end
+  end
+
+  def on_create(activity_instance, refresh = false)
+    skip_content_view = if activity_instance.respond_to? :before_content_render
+      activity_instance.before_content_render unless refresh
+    end
+
+    set_content_view unless skip_content_view
+
+    instance.on_create
+    instance
+  end
+end

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

@@ -0,0 +1,6 @@
+class MockTemplateParser
+  def initialize(template_name)
+    @template_name = tempate_name
+    @xml_content = Nokogiri.XML(File.read('config.droiuby'))
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droiuby
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Joseph Emmanuel Dayo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -115,13 +115,20 @@ files:
 - lib/droiuby/scripts/templates/ruby/application.css.erb
 - lib/droiuby/scripts/templates/ruby/config.droiuby.erb
 - lib/droiuby/scripts/templates/ruby/gitignore.erb
+- lib/droiuby/scripts/templates/ruby/index-hybrid.rb.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/bootstrap.rb
 - lib/droiuby/spec/helper.rb
 - lib/droiuby/spec/loader.rb
 - lib/droiuby/spec/mock_objects/droiuby_app.rb
+- lib/droiuby/spec/mock_objects/java_classes/execution_bundle.rb
+- lib/droiuby/spec/mock_objects/java_classes/ruby_container_payload.rb
+- lib/droiuby/spec/mock_objects/java_classes/view.rb
+- lib/droiuby/spec/mock_objects/mock_environment.rb
+- lib/droiuby/spec/mock_objects/mock_template_parser.rb
 - lib/droiuby/spec/mock_objects/system_wrapper.rb
 - lib/droiuby/support/asset.rb
 - lib/droiuby/support/autoload.rb