motion-maven 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 140346936cae80384ecfb1e7a7f4bc3d48fac9d1
-  data.tar.gz: 8681fcae9e4c5de403fb7ece4a274a35f7a21706
+  metadata.gz: db808f99383a8d38ad44950c72cc0fed9da9e6e9
+  data.tar.gz: 5518a51db4851714062d8e2a1072d855e808a180
 SHA512:
-  metadata.gz: 0bdd8f95c1adcc828b336a3a8d585c7691603200a2a3b274aed53a10ff4984b0b4f49a8d4f4f2927de112b67f5113eedd1acdf0c7680fd2df97d185b35f60d67
-  data.tar.gz: 47a09c105a72b255e867c78617b1918b60883bac2885177714a0219efa7f9cc448acb5967813f2b0cc3dc027742420aa0323ef6e0b4e32617178c094e4831859
+  metadata.gz: eba08a4c262f80e6d1205ffc803f62ea105153b08616e06169a55067241dea5b8aaf319a452f4bd374e3e86e245a600e618dbc1b6a3f8821ecef0a4bd6620819
+  data.tar.gz: 80ce08c06b67ab3fbefbdc88e28bca55d9710c1e692c5ac76098f7b5b6cbca3387e3bc7e56eef9a6dd9088cbc68f59154291f50e22736355ef28cf2ab6934a6c

data/README.md

@@ -6,13 +6,13 @@ motion-maven allows RubyMotion projects to integrate with the
 
 ## Installation
 
-You need to have maven installed : 
+You need to have maven installed: 
 
 ```
 $ brew install maven
 ```
 
-And the gem installed : 
+And the gem installed: 
 
 ```
 $ [sudo] gem install motion-maven
@@ -39,25 +39,25 @@ gem 'motion-maven'
 
    ```ruby
    Motion::Project::App.setup do |app|
-     # ...
-     app.maven do
-       dependency 'com.mcxiaoke.volley', :artifact => 'library', :version => '1.0.10'
-       dependency 'commons-cli'
-       dependency 'ehcache', :version => '1.2.3'
-     end
+      # ...
+      app.maven do
+        dependency 'com.mcxiaoke.volley', :artifact => 'library', :version => '1.0.10'
+        dependency 'commons-cli'
+        dependency 'ehcache', :version => '1.2.3'
+      end
    end
    ```
 
-   * Other options are : :scope, :type
+   * Other options are: :scope, :type
 
-   * :version will default to : LATEST
+   * :version will default to: LATEST
 
    * :artifact will default to dependency name
 
 
 ## Configuration
 
-If the `mvn` command is not in your path, you can configure it :
+If the `mvn` command is not in your path, you can configure it:
 
 ```ruby
 Motion::Project::App.setup do |app|
@@ -66,6 +66,18 @@ Motion::Project::App.setup do |app|
 end
 ```
 
+You can also add other repositories :
+
+```ruby
+Motion::Project::App.setup do |app|
+   # ...
+   app.maven do
+     repository 'https://bintray.com/bintray/jcenter'
+     dependency 'com.google.android', :artifact => 'support-v4'
+   end
+end
+```
+
 ## Tasks
 
 To tell motion-maven to download your dependencies, run the following rake
@@ -84,3 +96,8 @@ That’s all.
 
 * Improve the pom.xml generated file, if you are a fine Maven connoisseur, feel free to help us.
 * Improve edge cases.
+
+
+## Note
+
+motion-maven does not support android support libraries, RubyMotion might support it out of the box in the future: http://hipbyte.myjetbrains.com/youtrack/issue/RM-763

data/lib/motion/project/maven.rb

@@ -26,6 +26,7 @@ module Motion::Project
       @maven_path = 'mvn'
       @config = config
       @dependencies = []
+      @repositories = []
       configure_project
     end
 
@@ -41,6 +42,10 @@ module Motion::Project
       @dependencies << normalized_dependency(name, options)
     end
 
+    def repository(url)
+      @repositories << url
+    end
+
     def install!(update)
       generate_pom
       system "#{maven_command} -f #{pom_path} clean install"
@@ -48,68 +53,11 @@ module Motion::Project
 
     # Helpers
     def generate_pom
+      template_path = File.expand_path("../pom.erb", __FILE__)
+      template = ERB.new(File.new(template_path).read, nil, "%")
       File.open(pom_path, 'w') do |io|
-        xml ||= <<EOS
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.maventest</groupId>
-  <artifactId>dependencies</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0</version>
-  <name>dependencies</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-EOS
-
-        @dependencies.each do |dependency|
-          xml << <<EOS
-<dependency>
-  <groupId>#{dependency[:name]}</groupId>
-  <artifactId>#{dependency[:artifact]}</artifactId>
-  <version>#{dependency[:version]}</version>
-EOS
-
-          if dependency[:scope]
-            xml << "<scope>#{dependency[:scope]}</scope>"
-          end
-
-          if dependency[:type]
-            xml << "<type>#{dependency[:type]}</type>"
-          end
-
-          xml << <<EOS
-</dependency>
-EOS
-        end
-
-        xml << <<EOS
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <finalName>${project.artifactId}</finalName>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
-EOS
-
-        io.puts xml
+        io.puts template.result(binding)
       end
-
       system "xmllint --output #{pom_path} --format #{pom_path}"
     end
 

data/lib/motion/project/version.rb

@@ -1,5 +1,5 @@
 module Motion::Project
   class Maven
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-maven
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Joffrey Jaffeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies: []
 description: motion-maven allows RubyMotion Android projects to have access to the
   Maven dependency manager.