droiuby 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e18345aa04cb95e4b637645460c23caaa436bf05
-  data.tar.gz: 9d06d878aaf9d0e7792d55c0ef1b006cd0b57420
+  metadata.gz: bab67e67fe3e51fa4f03a12293bb911ac0dd4280
+  data.tar.gz: 4418988873fea81764e4aa2c53d3cb78f4061fc8
 SHA512:
-  metadata.gz: 39dea7d3bd65ecac0cf8e76d1dc3e60b0691097ff3e773cc8ff3e55e46f1b54304315160293b22893fbee6bbc088124a67333fbe2e6b99b56a8938e185c2ea02
-  data.tar.gz: 9f67339a8b060c0158570056cab9929ed8256c997b073d414f40bd04ef0d366b830e04dc96c8ac451c6b91bab9bac623877903343d2088d731ff0ed669895afd
+  metadata.gz: 6d470183f2a1ae762b1fdc99ec2585433c75980616f14e38b16322ad9d49d83a00469e69a9a847b7006ad7d92f76b71b6306c13c31c8cd660d9f061016ec3d94
+  data.tar.gz: 56466890df504619298624b92b0afb7da6a518eafd9fc349cc952cfed6e70b3bf94510534d2d9a79b1bf099323df2a9ec3eb5855c55293e3f3b41ab16ff9af5a

data/bin/drby

@@ -57,7 +57,14 @@ case command
         puts "Usage: drby new PROJECT_NAME [options]"
         exit(1)
     end
-    project.create(project_name,'')
+    
+    app_name = if $app_name.nil?
+              :prompt
+            else
+              $app_name
+            end
+
+    project.create(project_name, app_name, '')
   when 'reload'
     project_name = ARGV[1]
     project.package(project_name, nil, 'true')

data/lib/droiuby/scripts/project.rb

@@ -27,6 +27,26 @@ class Project < Thor
       end
       device_ip
     end
+
+    def ignore_path?(fpath)
+        [/^build/, /^project/, /^vendor\/cache/, /^vendor\/(.*)\/tasks/,
+          /^vendor\/(.*)\/ext/, /^vendor\/(.*)\/test/, /^vendor\/(.*)\/port/,
+          /^vendor\/(.*)\/bin/].each do |r|
+          return true if fpath.match(r)
+        end
+        return false
+    end
+
+    def get_connected_devices
+      begin
+        output = `adb devices`
+        lines = output.split("\n")
+        lines.shift 1
+        lines.reject { |line| line.strip.empty? }.collect { |line| line.split(' ').first }
+      rescue Errno::ENOENT => e
+        []
+      end
+    end
   }
 
 
@@ -171,10 +191,17 @@ class Project < Thor
   end
 
 
-  desc "create NAME [WORKSPACE_DIR]","create a new droiuby project with NAME"
+  desc "create PROJECT_NAME [APP_NAME] [WORKSPACE_DIR]","create a new droiuby project with NAME"
 
-  def create(name, output_dir = 'projects')
+  def create(name, app_name = :prompt, output_dir = 'projects')
     @name = name
+    if app_name.nil?
+      @app_name = app_name
+    elsif app_name == :prompt
+      say("Please enter the display name for your app (Used for app launcher and Title):")
+      @app_name = ask("Display Name: ")
+    end
+
     @description = name
     @launcher_icon = ''
     @base_url = ''
@@ -356,11 +383,15 @@ class Project < Thor
         package_name = element['package']
       end
 
-      `ant debug install`
-
-      say "Starting activity #{package_name}"
-      
-      `adb shell am start -W -S --activity-clear-top --activity-brought-to-front -n #{package_name}/.StartupActivity`
+      say "running ant debug install"
+      if !get_connected_devices.empty?
+        puts `ant debug install`
+        say "Starting activity #{package_name}"
+        `adb shell am start  -S --activity-clear-top --activity-brought-to-front -n #{package_name}/.StartupActivity`
+      else
+        say "No device connected. will just build the project"
+        puts `ant debug`
+      end
     else
       upload name, device_ip, source_dir
     end
@@ -408,8 +439,7 @@ class Project < Thor
       FileUtils.rm archive, :force=>true
 
       Zip::File.open(archive, Zip::File::CREATE) do |zipfile|
-        Dir.glob("**{,/*/**}/*.*").reject{ |f| f==archive ||
-            f.match(/^build/) || f.match(/^project/) }.uniq.each do |file|
+        Dir.glob("**{,/*/**}/*.*").reject{ |f| f==archive || ignore_path?(f) }.uniq.each do |file|
           say_status 'adding', file
           begin
             zipfile.add(file, file)

data/lib/droiuby/scripts/templates/ruby/config.droiuby.erb

@@ -1,5 +1,5 @@
 <app_descriptor>
-    <name><%= @name %></name>
+    <name><%= @app_name %></name>
     <description><%= @description %></description>
     <launcher_icon><%= @launcher_icon %></launcher_icon>
     <base_url><%= @base_url%></base_url>
@@ -9,4 +9,4 @@
     	<resource name="lib" type="lib"/>
     	<resource name="vendor" type="vendor"/>
     </assets>
-</app_descriptor>
+</app_descriptor>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droiuby
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Joseph Emmanuel Dayo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake