droiuby 0.1.3 → 0.1.4

data/bin/drby

@@ -19,6 +19,7 @@ options = OptionParser.new do |o|
        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 reload                                       # uploads and then reload the current app
        drby switch INSTANCE_NAME [options]               # Switch to the specified instance
        drby bundle                                       # unzips all gems in vendor/cache for deployment to droiuby\n"
 
@@ -52,11 +53,18 @@ case command
         exit(1)
     end
     project.create(project_name,'')
+  when 'reload'
+    project_name = ARGV[1]
+    project.package(project_name, nil, true)
+    project.upload(project_name, $device_ip, nil, false, false)
+    project.reload($device_ip)
   when 'console'
     puts "droiuby console"
     while buf = Readline.readline("droiuby >  ", true)
 
-      if buf=='refresh!'
+      Readline::HISTORY.pop if /^\s*$/ =~ buf
+
+      if ( buf=='refresh!' || buf=='reload!')
         project.reload($device_ip)
         next
       end
@@ -75,7 +83,6 @@ case command
       puts res['result']
     end
   when 'list'
-    project = Project.new
     project.list($device_ip)
   when 'switch'
     instance_name = nil

data/lib/droiuby/project.rb

@@ -189,10 +189,10 @@ class Project < Thor
     trap("INT"){ server.shutdown }
     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', framework = false)
+  def upload(name, device_ip, source_dir = 'projects', framework = false, run = true)
 
     source_dir = if name.blank? || framework
       Dir.pwd
@@ -218,7 +218,7 @@ class Project < Thor
       
       params = {                                          
         "name" => name,
-        "run" => "true",
+        "run" => run ? 'true' : 'false',
         "file" => UploadIO.new(zip, "application/zip", src_package,"content-disposition" => "form-data; name=\"file\"; filename=\"#{File.basename(src_package)}\"\r\n")}
       
         

metadata

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