droiuby 0.0.8 → 0.0.9

data/bin/drby

@@ -1,23 +1,102 @@
 #!/usr/bin/env ruby
 
+
 require "droiuby"
+require 'optparse'
+require 'ripper'
+require "readline"
+
+$droiuby_host = ENV['DROIUBY_HOST'] || '10.0.2.2'
+$device_ip = ENV['DROIUBY_DEVICE'] || 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 gopack [PROJECT_NAME] [options]              # 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 
+       drby pack [PROJECT_NAME] [options]                # zips and packages an app
+       drby switch INSTANCE_NAME [options]               # Switch to the specified instance\n"
+
+  o.separator ""
+  o.separator "options:"
+  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.parse!
+end
 
 command = ARGV[0]
 
+def valid_statement?(stmt)
+  begin
+    catch(:x) { eval("throw :x; #{stmt}") }
+  rescue SyntaxError=>e
+    return false
+  end
+  return true
+end
+
 case command
   when 'new'
-    if ARGV.size < 2
-      puts "Create a new droiuby app"
-      puts "usage: "
-      puts "drby new [project name]"
-      exit(1)
-    end  
     project_name = ARGV[1]
+
+    if project_name.blank?
+        puts "PROJECT_NAME is required"
+        puts "Usage: drby new PROJECT_NAME [options]"
+        exit(1)
+    end
+
     project = Project.new
     project.create(project_name,'')
+  when 'console'
+    puts "droiuby console"
+    project = Project.new
+    while buf = Readline.readline("> ", true)
+
+      exit(1) if buf=='exit' || buf=='quit'
+
+      begin
+          while !Ripper.sexp(buf) || !valid_statement?(buf)
+              buf = buf + "\n" + Readline.readline("?> ", true) + "\n"
+          end
+      rescue Interrupt
+        puts "\n"
+        next
+      end
+      res = JSON.parse(project.command(buf, $device_ip))
+      puts res['result']
+    end
+  when 'list'
+    project = Project.new
+    project.list($device_ip)
+  when 'switch'
+    instance_name = nil
+    unless ARGV[1].blank?
+      instance_name  = ARGV[1]
+    else
+      puts "instance name required."
+      puts 'To get a list of instances you may:'
+      puts "drby list"
+      puts "     "
+      puts "Usage: drby switch INSTANCE_NAME"
+      exit(1)
+    end
+    project = Project.new
+    project.switch(instance_name, $device_ip)
+  when 'autostart' 
+    switch = ARGV[1]
+    if switch.blank?
+      puts "Usage: drby autostart true|false [NAMESPACE] [options]"
+      exit(1)
+    end
+    project = Project.new
+    project.autostart(switch, ARGV[2], $device_ip) 
   when 'pack'
     project_name = nil
-    if ARGV.size == 2
+    unless ARGV[1].blank?
       project_name = ARGV[1]
     else
       if !File.exists?('config.droiuby')
@@ -35,46 +114,22 @@ case command
     end
   when 'gopack'
     project_name = nil
-    if ARGV.size == 3
+
+    unless ARGV[1].blank?
       project_name = ARGV[1]
-      device_ip = ARGV[2]
-    elsif ARGV.size == 2
-      device_ip = ARGV[1]
-    elsif ARGV.size == 1
-      device_ip = nil
-    else
-      puts "zips and uploads app to device"
-      puts "usage: "
-      puts "drby gopack [device IP] "
-      puts "drby gopack [folder] [device IP]"
-      exit(1)
     end
     
-    
     project = Project.new
-    droiuby_host = ENV['DROIUBY_HOST'] || '10.0.2.2'
-    project.execute(project_name, device_ip, droiuby_host) 
+    project.execute(project_name, $device_ip, $droiuby_host) 
   when 'live'
     project_name = nil
-    if ARGV.size == 3
+
+    if ARGV[1]
       project_name = ARGV[1]
-      device_ip = ARGV[2]
-    elsif ARGV.size == 2
-      device_ip = ARGV[1]
-    elsif ARGV.size == 1
-      device_ip = nil
-    else
-      puts "starts a live web server and point droiuby to it"
-      puts "usage: "
-      puts "drby live [device IP]"
-      puts "drby live [folder] [device IP]"
-      exit(1)
     end
+
     project = Project.new
-    droiuby_host = ENV['DROIUBY_HOST'] || '10.0.2.2'
-    project.live(project_name, device_ip, droiuby_host, '')
+    project.live(project_name, $device_ip, $droiuby_host, '')
   else
-    puts "invalid command"
-    puts "Should be:"
-    puts "    drby [new|live|gopack|pack]"
+    puts options
 end

data/lib/droiuby/project.rb

@@ -14,17 +14,24 @@ class Project < Thor
 
   source_root File.join(File.dirname(__FILE__), 'templates')
 
+  no_commands {
+    def map_device_ip(device_ip)
+      if device_ip.nil?
+        device_ip = '127.0.0.1'
+        begin
+        `adb forward tcp:4000 tcp:4000`
+        rescue Exception=>e
+          puts e.inspect
+        end
+      end
+      device_ip
+    end
+  }
+  
   desc "launch device IP [URL]","Tell droiuby to connect to app hosted at URL"
   def launch(device_ip, url)
     
-    if device_ip.nil?
-      device_ip = '127.0.0.1'
-      begin
-      `adb forward tcp:4000 tcp:4000`
-      rescue Exception=>e
-        puts e.inspect
-      end
-    end
+    device_ip = map_device_ip(device_ip)
     
     url_str = "http://#{device_ip}:4000/control?cmd=launch&url=#{CGI::escape(url)}"
     puts "loading application at url #{url}"
@@ -36,6 +43,60 @@ class Project < Thor
     Net::HTTP.get_print(uri)
   end
 
+  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
+  end
+  
+  desc "cmd [command] [DEVICE_IP]", "Send command to a Droiuby instance"
+  def command(command_line, device_ip=nil)
+    device_ip = map_device_ip(device_ip)
+    url_str = "http://#{device_ip}:4000/console?cmd=#{CGI::escape(command_line)}"
+    uri = URI.parse(url_str)
+    # Shortcut
+    response = Net::HTTP.get_response(uri)
+    response.body
+  end  
+  
+  desc "switch [name] [DEVICE IP]","switch to target app instance identified by name"
+  def switch(name, device_ip = nil)
+    device_ip = map_device_ip(device_ip)
+    url_str = "http://#{device_ip}:4000/control?cmd=switch&name=#{CGI::escape(name)}"
+    puts url_str
+    uri = URI.parse(url_str)
+    # Shortcut
+    response = Net::HTTP.get_response(uri)
+    # Will print response.body
+    response = Net::HTTP.get_print(uri)
+  end
+  
+  desc "autostart MODE [NAME] [DEVICE IP]","set current app to load on startup"
+  def autostart(mode = 'on', name = nil, device_ip = nil)
+    device_ip = map_device_ip(device_ip)
+    url_str = if mode == 'on'
+      "http://#{device_ip}:4000/control?cmd=autostart#{!name.nil? ? "&name=#{CGI::escape(name)}" : ''}"
+    else
+      "http://#{device_ip}:4000/control?cmd=clearautostart"
+    end
+        
+    puts url_str
+    uri = URI.parse(url_str)
+    # Shortcut
+    response = Net::HTTP.get_response(uri)
+    # Will print response.body
+    Net::HTTP.get_print(uri)
+    
+  end
+  
   desc "create NAME [WORKSPACE_DIR]","create a new droiuby project with NAME"
 
   def create(name, output_dir = 'projects')
@@ -86,14 +147,7 @@ class Project < Thor
       File.join(source_dir_args, name)
     end
     
-    if device_ip.nil?
-      device_ip = '127.0.0.1'
-      begin
-      `adb forward tcp:4000 tcp:4000`
-      rescue Exception=>e
-        puts e.inspect
-      end
-    end
+    device_ip = map_device_ip(device_ip)
     
     port = 2000
 
@@ -125,14 +179,7 @@ class Project < Thor
       File.join(source_dir, name)
     end
 
-    if device_ip.nil?
-      device_ip = '127.0.0.1'
-      begin
-      `adb forward tcp:4000 tcp:4000`
-      rescue Exception=>e
-        puts e.inspect
-      end
-    end
+    device_ip = map_device_ip(device_ip)
     
     src_package = if framework
       File.join(source_dir,'framework_src','build',"#{name}.zip") 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: droiuby
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake