motion-gradle 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab7bf0fb48a2a11c7185f459e73eb4c29a8cd5ed
-  data.tar.gz: ec1558bda34ca51e8685eff54ff71162b26c2975
+  metadata.gz: 39b4a42fbe8c34267f2f47de45c2757d9dbb1951
+  data.tar.gz: 033579f979e473691b7473e5111608ed9486c31c
 SHA512:
-  metadata.gz: 86af7c01d52090e405c6a59b6e1ce264f9900981c6eb3407c22d39bacf7826b7d15fa0bfa653ec729f5bd83288140e7faa069507ecdfb493fa89821b769b33cc
-  data.tar.gz: 31a5aefb68bfd69046c44daeae47fda97a780d857bdd03ded26f63436f531a948783360681a2d346299d57558ec73aad76894be1a50150eb52deeb3d6553c115
+  metadata.gz: ae45d3fdf2ca007820c94270b2925caa9452f40aefb372d776e9ce06547d5250a76c5b689b925189b3d8f4c6ce8b80611bc2a3ad819cd12691d5fe48e223ee4b
+  data.tar.gz: bc48780d63289ab320aee9d106dbe1f87fd2045a759759d4de0f00f3df33a5e5792eca8780a39b7e8ade5bcfe9ded8e5f80a255d5d43209485b76795a5a368a2

data/README.md

@@ -76,6 +76,15 @@ Motion::Project::App.setup do |app|
 end
 ```
 
+## Support for local libraries
+
+app.gradle do
+  library 'mylib', path: '/Users/joffreyjaffeux/Projects/mylib'
+end
+
+If you don’t specify the path option, the library will be searched in the vendor folder.
+
+
 ## Tasks
 
 To tell motion-gradle to download your dependencies, run the following rake

data/lib/motion/project/gradle.erb

@@ -9,12 +9,12 @@ task generateDependencies(type: Copy) {
 repositories {
   <% if android_repository %>
     maven {
-      url "<%= ENV['RUBYMOTION_ANDROID_SDK'] %>/extras/android/m2repository/"
+      url "<%= ENV['RUBYMOTION_ANDROID_SDK'].shellescape %>/extras/android/m2repository/"
     }
   <% end %>
   <% if google_repository %>
     maven {
-      url "<%= ENV['RUBYMOTION_ANDROID_SDK'] %>/extras/google/m2repository/"
+      url "<%= ENV['RUBYMOTION_ANDROID_SDK'].shellescape %>/extras/google/m2repository/"
     }
   <% end %>
   <% @repositories.each do |url| %>
@@ -24,8 +24,11 @@ repositories {
   <% end %>
   mavenCentral()
 }
- 
+
 dependencies {
+  <% @libraries.each do |library| %>
+    compile project(':<%= library[:name] %>')
+  <% end %>
   <% @dependencies.each do |dependency| %>
     <% if dependency.is_a?(String) %>
       compile '<%= dependency %>'

data/lib/motion/project/gradle.rb

@@ -22,12 +22,14 @@ module Motion::Project
   class Gradle
     GRADLE_ROOT = 'vendor/Gradle'
     attr_reader :dependencies
+    attr_reader :libraries
 
     def initialize(config)
       @gradle_path = '/usr/bin/env gradle'
       @config = config
       @dependencies = []
       @repositories = []
+      @libraries = []
       configure_project
     end
 
@@ -49,11 +51,16 @@ module Motion::Project
       end
     end
 
+    def library(library_name, options = {})
+      @libraries << {name: library_name, path: options.fetch(:path, "../../vendor/#{library_name}")}
+    end
+
     def repository(url)
       @repositories << url
     end
 
     def install!(update)
+      generate_gradle_settings_file
       generate_gradle_build_file
       system("#{gradle_command} --build-file #{gradle_build_file} generateDependencies")
 
@@ -128,6 +135,14 @@ module Motion::Project
       end 
     end
 
+    def generate_gradle_settings_file
+      template_path = File.expand_path("../settings.erb", __FILE__)
+      template = ERB.new(File.new(template_path).read, nil, "%")
+      File.open(gradle_build_file, 'w') do |io|
+        io.puts(template.result(binding))
+      end
+    end
+
     def generate_gradle_build_file
       template_path = File.expand_path("../gradle.erb", __FILE__)
       template = ERB.new(File.new(template_path).read, nil, "%")

data/lib/motion/project/settings.erb

@@ -0,0 +1,4 @@
+<% @libraries.each do |library| %>
+  include '<%= library[:name] %>'
+  project(':<%= library[:name] %>').projectDir = new File('<%= library[:path].shellescape %>')
+<% end %>

data/lib/motion/project/version.rb

@@ -1,5 +1,5 @@
 module Motion::Project
   class Gradle
-    VERSION = '1.1.1'
+    VERSION = '1.2.1'
   end
 end

data/lib/motion-gradle.rb

@@ -1,2 +1,3 @@
+require 'shellwords'
 require 'motion/project/gradle'
 require 'motion/project/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-gradle
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Joffrey Jaffeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies: []
 description: motion-gradle allows RubyMotion Android projects to have access to the
   Gradle dependency manager.
@@ -22,6 +22,7 @@ files:
 - lib/motion-gradle.rb
 - lib/motion/project/gradle.erb
 - lib/motion/project/gradle.rb
+- lib/motion/project/settings.erb
 - lib/motion/project/version.rb
 homepage: http://www.rubymotion.com
 licenses: