droiuby 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db6154ab45831e35e2dd08e540db6d528d4f39ad
-  data.tar.gz: 6b963f5f8334d787f13ac2fabec2211b7434e88e
+  metadata.gz: 394d5e9256c5bee153f804042a6d78f0bc30e7f8
+  data.tar.gz: 2c1dc306cf97d112a3f3002280f30c13f25df5e2
 SHA512:
-  metadata.gz: 445e4037a22975ff5c9cc5f6e89c666f0aa3ededee21f1adf2debc894071d907c5be6af5645d25dd01569bc09b3d94e53a6e3b2ad18b5789d8d503499bb0cc41
-  data.tar.gz: f2363511ba50edc097090ff2a2567991cdc80825caa47d0ba82d9cbbe4647abb5e3f16bfc4d43302e89c7e6a5b61d084a01054980c42c918d0275fb96be8a4a8
+  metadata.gz: 827df4df668365a07c06aabd65712b9742eb2e347564f53d3e71fbc3cc98544bda74b25c2aed7d03de47b0c9b261cbb400821f49147ddf072bd81a8fac392201
+  data.tar.gz: a21d9d5dd2c6fe7ea3d28f6b77e3945f6b64edf45109c3a5efc3744b84f7b86b488739df02944a4b1283f91349522e97b1130d859c1d35dd5553c78f369bf803

data/bin/drby

@@ -13,6 +13,7 @@ $app_name = nil
 $no_project = false
 $show_help = false
 $ant_args = nil
+$repo, $branch = nil
 
 options = OptionParser.new do |o|
   o.banner =
@@ -39,7 +40,10 @@ options = OptionParser.new do |o|
   o.on('-n','--name app_name','The name of the app that appears in the launcher') {|b| $app_name =b }
   o.on('-p','--package java_package','The java package name to use') {|b| $java_package = b}
   o.on('-h','--host HOST_IP','The IP Address of the host computer (for droiuby live mode)') { |b| $droiuby_host = b }
+  o.on('-G','--gradle','Create a gradle android project') { |b| $repo = 'https://github.com/jedld/droiuby-template-gradle.git'}
   o.on('-d','--device DEVICE_IP','The IP Address of the Android Device') { |b| $device_ip = b }
+  o.on('-r','--repo repo_git_url','The git repository to use for project templates') { |b| $repo = b }
+  o.on('-b','--branch repo_git_branch','The git branch to use for templates') { |b| $branch = b }
   o.on('-P','--no-project','Tells drby go to ignore the android project if present') {|b| $no_project = true}
   o.parse!
 end
@@ -61,6 +65,12 @@ case command
   when 'new'
     n = 1
     hybrid_mode = false
+    standalone = false
+    if ARGV[n] == 'standalone'
+      n+=1
+      standalone = true
+    end
+
     if ARGV[n] == 'hybrid'
       n+=1
       hybrid_mode = true
@@ -80,7 +90,17 @@ case command
               $app_name
             end
 
-    project.create(project_name, app_name, '', hybrid_mode ? 'hybrid' : 'droiuby')
+    opt = {repository: $repo, branch: $branch}
+    opt[:type] = if hybrid_mode
+      :hybrid
+    elsif standalone
+      :standalone
+    else
+      :droiuby
+    end
+
+    project.project_generator(project_name, app_name, '', opt)
+
   when 'reload'
     project_name = ARGV[1]
     project.package(project_name, nil, 'true')
@@ -139,7 +159,7 @@ case command
       puts '--package [JAVA_PACKAGE] is required.'
       exit(1)
     end
-    project.standalone(project_name, $java_package, $app_name,'')
+    project.standalone(project_name, $java_package, $app_name,'', $repo, $branch)
   when 'switch'
     instance_name = nil
     unless ARGV[1].blank?

data/lib/droiuby/scripts/project.rb

@@ -47,6 +47,148 @@ class Project < Thor
         []
       end
     end
+
+    def project_generator(name, app_name = :prompt, output_dir = 'projects', opt={})
+      @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 = ''
+      if opt[:type] == :droiuby || opt[:type] == :standalone
+        @main_xml = File.join("app","views","index.xml")
+      elsif opt[:type] == :hybrid
+        @main_xml = File.join("app","activities","index.rb")
+      else
+        say :red, "Invalid project type specified #{opt[:type]}"
+        exit(1);
+      end
+
+      if output_dir.blank?
+        output_dir = Dir.pwd
+      end
+
+      dest_folder = File.join(output_dir,"#{name}")
+      template File.join('ruby','Gemfile.erb'), File.join(dest_folder,"Gemfile")
+      template File.join('ruby','config.droiuby.erb'), File.join(dest_folder,"config.droiuby")
+      template File.join('ruby','gitignore.erb'), File.join(dest_folder,".gitignore")
+
+      if opt[:type] == :droiuby
+        template File.join('ruby','index.xml.erb'), File.join(dest_folder,"app","views","index.xml")
+      end
+
+      template File.join('ruby','application.css.erb'), File.join(dest_folder,"app","views","styles","application.css")
+      if opt[:type] == :droiuby
+        template File.join('ruby','index.rb.erb'), File.join(dest_folder,"app","activities","index.rb")
+      elsif opt[:type] == :hybrid
+        template File.join('ruby','index-hybrid.rb.erb'), File.join(dest_folder,"app","activities","index.rb")
+      end
+      template File.join('ruby','index_spec.rb.erb'), File.join(dest_folder,"spec","activities","index_spec.rb")
+      template File.join('ruby','spec_helper.rb.erb'), File.join(dest_folder,"spec","spec_helper.rb")
+
+      empty_directory File.join(dest_folder,"lib")
+
+      Dir.chdir dest_folder
+      if opt[:type] == :hybrid
+        template_generator(nil, :prompt, nil,  nil, {xoptions: {hybrid: true}}.merge(opt))
+      elsif opt[:type] == :standalone
+        template_generator(nil, :prompt, nil,  nil, opt)
+      end
+
+      say "running bundle install"
+      `bundle install`
+    end
+
+    def template_generator(name, package_name, title = nil, output_dir = 'projects', opt = {})
+
+      repository = opt[:repository]
+      branch = opt[:branch]
+
+      if output_dir.blank?
+        output_dir = Dir.pwd
+      end
+
+      if package_name == :prompt
+        say("Please enter the Java Package Name to be used for your app (e.g. com.awesome.sample ):")
+        package_name = ask("Package Name: ")
+      end
+
+      dest_folder = nil
+      unless name.nil?
+        dest_folder = File.join(output_dir,"#{name}")
+        Dir.chdir dest_folder
+      else
+        dest_folder = Dir.pwd
+      end
+
+      if title.nil?
+
+        doc = Nokogiri.XML(File.read('config.droiuby'))
+
+        doc.css('app_descriptor name').each do |element|
+          title = element.content
+        end
+
+      end
+
+      template_repository = ENV['droiuby_template'] || repository || 'https://github.com/jedld/droiuby-template.git'
+
+      say "using repository #{template_repository} ..."
+
+      template_namespace = URI.parse(template_repository).path.sub('.git','')
+
+      template_directory = File.expand_path(File.join("~/.droiuby/android_project_templates", "#{template_namespace}.#{branch.nil? ? 'master' : branch}"))
+
+      say "checking out to #{template_directory}"
+
+      unless File.exists?(template_directory)
+        say "no cached copy yet. obtaining template project from repository"
+
+        branch = unless branch.nil?
+          "-b #{branch}"
+        else
+          ""
+        end
+
+        `git clone #{branch} --depth 1 #{template_repository} #{template_directory}`
+      else
+        say "checking for template updates..."
+        Dir.chdir template_directory
+        `git pull`
+      end
+
+      #prepare
+      directory template_directory, File.join(dest_folder,'project')
+      remove_dir "#{File.join(dest_folder,'project')}/.git"
+
+      Dir.chdir File.join(dest_folder,'project')
+
+      say "creating android project in #{dest_folder}"
+      require "#{File.join(dest_folder,'project','init.rb')}"
+
+      dest_folder = if dest_folder.end_with? '/'
+        dest_folder
+      else
+        "#{dest_folder}/"
+      end
+
+      archive_name = File.basename(dest_folder.sub!(%r[/$],'')) if archive_name.nil?
+
+      init = Init.new
+      init.options = opt[:xoptions] || {}
+      init.init(package_name, "#{archive_name}.zip", title)
+      Dir.chdir dest_folder
+      bundle
+      package(name, '', "true")
+      say "Your android project is located at #{dest_folder}/project."
+    end
+
+
   }
 
 
@@ -140,136 +282,19 @@ class Project < Thor
   end
 
   desc "standalone NAME [PACKAGE_NAME]", "create an android project for this app with the specified java package name"
+  method_option :xoptions, :type => :hash, :default => {}
   def standalone(name, package_name, title = nil, output_dir = 'projects', repository = nil, branch = nil)
-
-    if output_dir.blank?
-      output_dir = Dir.pwd
-    end
-
-    if package_name == :prompt
-      say("Please enter the Java Package Name to be used for your app (e.g. com.awesome.sample ):")
-      package_name = ask("Package Name: ")
-    end
-
-    dest_folder = nil
-    unless name.nil?
-      dest_folder = File.join(output_dir,"#{name}")
-      Dir.chdir dest_folder
-    else
-      dest_folder = Dir.pwd
-    end
-
-    if title.nil?
-
-      doc = Nokogiri.XML(File.read('config.droiuby'))
-
-      doc.css('app_descriptor name').each do |element|
-        title = element.content
-      end
-
-    end
-
-    template_repository = ENV['droiuby_template'] || repository || 'https://github.com/jedld/droiuby-template.git'
-    template_directory = File.expand_path("~/.droiuby/android_project_templates.#{branch.nil? ? 'master' : branch}")
-
-    unless File.exists?(template_directory)
-      say "no cached copy yet. obtaining template project from repository"
-
-      branch = unless branch.nil?
-        "-b #{branch}"
-      else
-        ""
-      end
-
-      `git clone #{branch} --depth 1 #{template_repository} #{template_directory}`
-    else
-      say "checking for template updates..."
-      Dir.chdir template_directory
-      `git pull`
-    end
-
-    #prepare
-    directory template_directory, File.join(dest_folder,'project')
-    remove_dir "#{File.join(dest_folder,'project')}/.git"
-
-    Dir.chdir File.join(dest_folder,'project')
-
-    say "creating android porject in #{dest_folder}"
-    require "#{File.join(dest_folder,'project','init.rb')}"
-
-    dest_folder = if dest_folder.end_with? '/'
-      dest_folder
-    else
-      "#{dest_folder}/"
-    end
-
-    archive_name = File.basename(dest_folder.sub!(%r[/$],'')) if archive_name.nil?
-
-    init = Init.new
-    init.init(package_name, "#{archive_name}.zip", title)
-    Dir.chdir dest_folder
-    bundle
-    package(name, '', "true")
-    say "Your android project is located at #{dest_folder}/project."
+    options[:repository] = respository
+    options[:branch] = branch
+    template_generator(name, package_name, title , output_dir , options)
   end
 
 
   desc "create PROJECT_NAME [APP_NAME] [WORKSPACE_DIR]","create a new droiuby project with NAME"
 
   def create(name, app_name = :prompt, output_dir = 'projects', type = 'droiuby')
-    @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 = ''
-    if type == 'droiuby'
-      @main_xml = File.join("app","views","index.xml")
-    elsif type == 'hybrid'
-      @main_xml = File.join("app","activities","index.rb")
-    else
-      say_error "Invalid project type specified"
-      exit(1);
-    end
-
-    if output_dir.blank?
-      output_dir = Dir.pwd
-    end
-
-    dest_folder = File.join(output_dir,"#{name}")
-    template File.join('ruby','Gemfile.erb'), File.join(dest_folder,"Gemfile")
-    template File.join('ruby','config.droiuby.erb'), File.join(dest_folder,"config.droiuby")
-    template File.join('ruby','gitignore.erb'), File.join(dest_folder,".gitignore")
-
-    if type == 'droiuby'
-      template File.join('ruby','index.xml.erb'), File.join(dest_folder,"app","views","index.xml")
-    end
-
-    template File.join('ruby','application.css.erb'), File.join(dest_folder,"app","views","styles","application.css")
-    if type == 'droiuby'
-      template File.join('ruby','index.rb.erb'), File.join(dest_folder,"app","activities","index.rb")
-    elsif type == 'hybrid'
-      template File.join('ruby','index-hybrid.rb.erb'), File.join(dest_folder,"app","activities","index.rb")
-    end
-    template File.join('ruby','index_spec.rb.erb'), File.join(dest_folder,"spec","activities","index_spec.rb")
-    template File.join('ruby','spec_helper.rb.erb'), File.join(dest_folder,"spec","spec_helper.rb")
-
-    empty_directory File.join(dest_folder,"lib")
-
-    Dir.chdir dest_folder
-    if type == 'hybrid'
-      standalone(nil, :prompt, nil,  nil, nil, 'hybrid-mode')
-    end
-
-    say "running bundle install"
-    `bundle install`
-
-
+      opt =  {type:  type.to_sym}
+    project_generator(name, app_name, output_dir, opt)
   end
 
   desc "package NAME [WORKSPACE_DIR] [true|false]","package a project"
@@ -288,7 +313,14 @@ class Project < Thor
     say "exsits? #{project_directory}"
     if File.exists? project_directory
       say "Android Project exists. Updating build inside assets ..."
-      copy_file archive, File.join(project_directory,'assets',File.basename(archive)), force: true
+
+      target_directory = if File.exists?(File.join(project_directory,'build.gradle'))
+        File.join(project_directory,'app','src','main','assets',File.basename(archive))
+      else
+        File.join(project_directory,'assets',File.basename(archive))
+      end
+
+      copy_file archive, target_directory, force: true
     end
   end
 
@@ -423,26 +455,41 @@ class Project < Thor
     if !ignore_project && File.exists?(project_directory)
       say "Android Project exists. Building debug project instead ..."
       Dir.chdir(project_directory)
-      doc = Nokogiri.XML(File.read('AndroidManifest.xml'))
 
-      package_name = nil
-      doc.css('manifest').each do |element|
-        package_name = element['package']
-      end
+      is_gradle = false
+      #figure out type of project
+        doc = if File.exists?('build.gradle')
+          is_gradle = true
+          Nokogiri.XML(File.read(File.join('app','src','main','AndroidManifest.xml')))
+        else
+          Nokogiri.XML(File.read('AndroidManifest.xml'))
+        end
 
-      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"
-        if ant_args.nil?
-          puts `ant debug`
+        package_name = nil
+        doc.css('manifest').each do |element|
+          package_name = element['package']
+        end
+
+        say "running build..."
+        if !get_connected_devices.empty?
+
+          if is_gradle
+            puts `gradle installDebug`
+          else
+            puts `ant debug install`
+          end
+
+          say "Starting activity #{package_name}"
+          `adb shell am start  -S --activity-clear-top --activity-brought-to-front -n #{package_name}/.StartupActivity`
         else
-          puts `ant #{ant_args}`
+          say "No device connected. will just build the project"
+          if ant_args.nil?
+            puts `ant debug`
+          else
+            puts `ant #{ant_args}`
+          end
         end
-      end
+
     else
       upload name, device_ip, source_dir
     end

data/lib/droiuby/support/autoload.rb

@@ -19,6 +19,7 @@ module MissingHandler
       require_path = File.join(*path_array)
 
       begin
+        puts "require #{require_path}"
         require require_path
         klass = const_get(name)
         return klass if klass

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droiuby
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Joseph Emmanuel Dayo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake