droiuby 0.0.1 → 0.0.2

data/lib/droiuby/project.rb

@@ -14,7 +14,7 @@ class Project < Thor
 
   include Thor::Actions
 
-  source_root 'templates'
+  source_root File.join(File.dirname(__FILE__), 'templates')
 
   desc "launch device IP [URL]","Tell droiuby to connect to app hosted at URL"
   def launch(device_ip, url)
@@ -35,7 +35,11 @@ class Project < Thor
     @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")
@@ -48,18 +52,31 @@ class Project < Thor
   desc "package NAME [WORKSPACE_DIR] [true|false]","package a project"
 
   def package(name, source_dir = 'projects', force = "false")
-    src_folder = File.join(source_dir,"#{name}")
+    src_folder = if name.blank?
+          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, source_dir)
-    require 'webrick'
-    include WEBrick
+  def live(name, device_ip, 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 = source_dir_args.blank? ? '' : File.join(source_dir_args, name)
+    
+    src_dir = if name.blank?
+      Dir.pwd
+    else
+      File.join(source_dir_args, name)
+    end
+    
     port = 2000
 
     ready = false
@@ -67,11 +84,12 @@ class Project < Thor
     Thread.new do
       while !ready
       end
-      `adb shell am start -W -S --activity-clear-top --activity-brought-to-front -n com.droiuby.client/.CanvasActivity`
+      `adb shell am start -W -S --activity-clear-top --activity-brought-to-front -n com.droiuby.application/.CanvasActivity`
       launch(device_ip, "http://#{host_name_args}:#{port}/config.droiuby")
     end
 
     puts "Starting server: http://#{host_name_args}:#{port}"
+    puts "Document root #{src_dir}"
     server = HTTPServer.new(:Port=>port,:DocumentRoot=> src_dir,:StartCallback => Proc.new {
       ready = true
     })
@@ -82,11 +100,24 @@ class Project < Thor
 
   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')
-    src_package = File.join(source_dir,name,'build',"#{name}.zip")
+    
+    source_dir = if name.blank?
+      Dir.pwd
+    else
+      File.join(source_dir, name)
+    end   
+    
+    src_package = unless 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 to #{url_str} -> #{uri.host}:#{uri.port}"
+    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,
@@ -94,6 +125,8 @@ class Project < Thor
                                            "file" => UploadIO.new(zip, "application/zip", src_package,"content-disposition" => "form-data; name=\"file\"; filename=\"#{File.basename(src_package)}\"\r\n")
 
       retries = 0
+      res = nil
+      
       while (retries < 3)
         sleep 1 + retries
         begin
@@ -106,13 +139,17 @@ class Project < Thor
           next
         end
       end
+      
+      if res && res.code == "200"
 
-
-      if res.code == "200"
         say_status 'upload', src_package
       else
-        say 'upload failed.'
-        say res.body
+        if res
+          say_status 'upload','res.body', :red
+        else
+          say_status 'upload',"upload failed. cannot connect to #{url_str}", :red 
+        end
+        
       end
 
     end
@@ -120,7 +157,7 @@ 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')
-    `adb shell am start -W -S --activity-clear-top --activity-brought-to-front -n com.droiuby.client/.CanvasActivity`
+    `adb shell am start -W -S --activity-clear-top --activity-brought-to-front -n com.droiuby.application/.CanvasActivity`
     package name, source_dir, "true"
     upload name, device_ip, source_dir
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: droiuby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -27,22 +27,6 @@ dependencies:
     none: false
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    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