droiuby 0.0.3 → 0.0.4

data/bin/drby

@@ -34,6 +34,8 @@ case command
       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: "
@@ -44,7 +46,8 @@ case command
     
     
     project = Project.new
-    project.execute(project_name, device_ip, ENV['DROIUBY_HOST']) 
+    droiuby_host = ENV['DROIUBY_HOST'] || '10.0.2.2'
+    project.execute(project_name, device_ip, droiuby_host) 
   when 'live'
     project_name = nil
     if ARGV.size == 3
@@ -52,6 +55,8 @@ case command
       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: "
@@ -60,7 +65,8 @@ case command
       exit(1)
     end
     project = Project.new
-    project.live(project_name, device_ip, ENV['DROIUBY_HOST'], '')
+    droiuby_host = ENV['DROIUBY_HOST'] || '10.0.2.2'
+    project.live(project_name, device_ip, droiuby_host, '')
   else
     puts "invalid command"
     puts "Should be:"

data/lib/droiuby/project.rb

@@ -1,12 +1,10 @@
 require 'rubygems'
-
 require 'net/http'
 require 'net/http/post/multipart'
 require 'zip'
 require 'thor'
 require "uri"
 require 'cgi'
-
 require 'active_support/core_ext/object'
 require 'active_support/core_ext/string'
 
@@ -18,6 +16,16 @@ class Project < Thor
 
   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
+    
     url_str = "http://#{device_ip}:4000/control?cmd=launch&url=#{CGI::escape(url)}"
     puts "loading application at url #{url}"
     puts url_str
@@ -29,17 +37,18 @@ class Project < Thor
   end
 
   desc "create NAME [WORKSPACE_DIR]","create a new droiuby project with NAME"
+
   def create(name, output_dir = 'projects')
     @name = name
     @description = name
     @launcher_icon = ''
     @base_url = ''
     @main_xml = 'index.xml'
-    
+
     if output_dir.blank?
       output_dir = Dir.pwd
     end
-    
+
     dest_folder = File.join(output_dir,"#{name}")
     template File.join('ruby','config.droiuby.erb'), File.join(dest_folder,"config.droiuby")
     template File.join('ruby','gitignore.erb'), File.join(dest_folder,".gitignore")
@@ -53,30 +62,39 @@ class Project < Thor
 
   def package(name, source_dir = 'projects', force = "false")
     src_folder = if name.blank?
-          Dir.pwd
-        else
-          File.join(source_dir, name)
-        end
+      Dir.pwd
+    else
+      File.join(source_dir, name)
+    end
     say "compress #{src_folder}"
     compress(src_folder, force)
   end
 
   require 'webrick'
   include WEBrick
-  
+
   desc "live NAME DEVICE_IP [HOST NAME] [SOURCE]", "Allow live editing of apps by starting a web server and pointing droiuby to the local instance"
-  def live(name, device_ip, host_name = nil, source_dir = 'projects')
 
+  def live(name, device_ip = nil, host_name = nil, source_dir = 'projects')
 
     source_dir_args = source_dir ? source_dir : 'projects'
     host_name_args = host_name ? host_name : Socket.gethostname
-    
+
     src_dir = if name.blank?
       Dir.pwd
     else
       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
+    
     port = 2000
 
     ready = false
@@ -97,36 +115,51 @@ class Project < Thor
     server.start
   end
 
-
   desc "upload NAME DEVICE_IP [WORKSPACE_DIR]","uploads a droiuby application to target device running droiuby client"
-  def upload(name, device_ip, source_dir = 'projects')
-    
-    source_dir = if name.blank?
+
+  def upload(name, device_ip, source_dir = 'projects', framework = false)
+
+    source_dir = if name.blank? || framework
       Dir.pwd
     else
       File.join(source_dir, name)
-    end   
+    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
     
-    src_package = unless name.blank?
+    src_package = if framework
+      File.join(source_dir,'framework_src','build',"#{name}.zip") 
+    elsif !name.blank?
       File.join(source_dir,name,'build',"#{name}.zip")
     else
       name = File.basename(source_dir)
       File.join(source_dir,'build',"#{name}.zip")
     end
-     
 
     url_str = "http://#{device_ip}:4000/upload"
     uri = URI.parse(url_str)
     say "uploading #{src_package} to #{url_str} -> #{uri.host}:#{uri.port}"
     File.open(src_package) do |zip|
-      req = Net::HTTP::Post::Multipart.new uri.path,
-                                           "name" => name,
-                                           "run" => "true",
-                                           "file" => UploadIO.new(zip, "application/zip", src_package,"content-disposition" => "form-data; name=\"file\"; filename=\"#{File.basename(src_package)}\"\r\n")
+      
+      params = {                                          
+        "name" => name,
+        "run" => "true",
+        "file" => UploadIO.new(zip, "application/zip", src_package,"content-disposition" => "form-data; name=\"file\"; filename=\"#{File.basename(src_package)}\"\r\n")}
+      
+        
+      params.merge!(framework: 'true') if framework   
+      req = Net::HTTP::Post::Multipart.new uri.path, params
 
       retries = 0
       res = nil
-      
+
       while (retries < 3)
         sleep 1 + retries
         begin
@@ -139,7 +172,7 @@ class Project < Thor
           next
         end
       end
-      
+
       if res && res.code == "200"
 
         say_status 'upload', src_package
@@ -147,15 +180,23 @@ class Project < Thor
         if res
           say_status 'upload','res.body', :red
         else
-          say_status 'upload',"upload failed. cannot connect to #{url_str}", :red 
+          say_status 'upload',"upload failed. cannot connect to #{url_str}", :red
         end
-        
+
       end
 
     end
   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
+  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')
     `adb shell am start -W -S --activity-clear-top --activity-brought-to-front -n com.droiuby.application/.CanvasActivity`
     package name, source_dir, "true"
@@ -164,12 +205,17 @@ class Project < Thor
 
   private
 
-  def compress(path, force = "false")
+  def compress(path, force = "false", archive_name = nil)
     path.sub!(%r[/$],'')
     unless Dir.exists?(File.join(path,'build'))
       Dir.mkdir(File.join(path,'build'))
     end
-    archive = File.join(path,'build',"#{File.basename(path)}.zip")
+    
+    archive_name = File.basename(path) if archive_name.nil?
+    
+    
+    archive = File.join(path,'build',"#{archive_name}.zip")
+    
     if force=='true' || file_collision(archive)
 
       FileUtils.rm archive, :force=>true

metadata

@@ -1,112 +1,112 @@
 --- !ruby/object:Gem::Specification
 name: droiuby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease:
+  version: 0.0.4
+  prerelease: 
 platform: ruby
 authors:
 - Joseph Emmanuel Dayo
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: thor
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: properties-ruby
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :runtime
 description: Android development using ruby
 email: joseph.dayo@gmail.com
 executables:
@@ -116,35 +116,48 @@ extra_rdoc_files: []
 files:
 - lib/droiuby.rb
 - lib/droiuby/project.rb
-- lib/droiuby/templates/ruby/config.droiuby.erb
 - lib/droiuby/templates/ruby/gitignore.erb
+- lib/droiuby/templates/ruby/config.droiuby.erb
+- lib/droiuby/templates/ruby/application.css.erb
 - lib/droiuby/templates/ruby/index.rb.erb
 - lib/droiuby/templates/ruby/index.xml.erb
-- lib/droiuby/templates/ruby/application.css.erb
 - bin/drby
 homepage: http://rubygems.org/gems/droiuby
 licenses:
 - MIT
-post_install_message:
+post_install_message: ! 'Droiuby Gem Installed!
+
+  Post Install work:
+
+  1.Go install the droiuby development app here:
+
+  2. Download the android sdk (http://developer.android.com/sdk/index.html)
+
+  3. Setup your PATH to include <sdk directory>/sdk/platform-tools (make sure adb
+  works)
+
+  4. Attach your android phone to your PC via USB and start rocking!!
+
+'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 1.8.24
-signing_key:
+signing_key: 
 specification_version: 3
 summary: Droiuby GEM
 test_files: []