motion-gradle 1.6.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 617e05877b988ee1f537b0adaff8e9cfdade69c3
-  data.tar.gz: d7228639f466ed173c28e5bdd02945f4501ec01f
+  metadata.gz: ac0efdc59361c5d8567a761cd02c6bbffa1ef442
+  data.tar.gz: e925d8e61e0c5b6079807352499139df86300446
 SHA512:
-  metadata.gz: 5de72870a3a9c756edb92f19f90ca098e60521bbb29f9cef1f3df7d28668b2c12ad47dceeed6ebb0fc425a10e2da2f1ba3fe456db0ed101e029c8d1c202933f9
-  data.tar.gz: 400569c31a723e7faafd65e521919c1df6bb6abe205e0ae7ef5d231c127e1c98945935bd9bc3bd3859d01e87e9506a7399103beab9afea2b83ebb0ed12846fa8
+  metadata.gz: 0de3923bd24a53138064fd5c754b7d62bf0f528bed9e342223ca69339f3f5a037acb256f3b3339b7c5e221c47f70d8d3547734e20c104b4b4a16d9c493a2c704
+  data.tar.gz: 44a1eb959f3589c09967fad7a71946bec84d9fca8112d24b7a515cb4ca600ca6a85d7be0c62913b281a200424d39b8d88de91f0e508088e2caaae5498efeeb1c

data/README.md

@@ -48,6 +48,9 @@ From version 1.1.0 you can use the same gradle dependency string that Java users
     app.gradle do
       dependency 'net.sf.ehcache:ehcache:2.9.0'
       dependency 'com.joanzapata.pdfview:android-pdfview:1.0.+@aar'
+      dependency 'com.danikula:videocache:2.3.1' do
+        exclude module: 'android', group: 'com.google.android'
+      end
     end
   end
   ```

data/lib/motion-gradle.rb

@@ -1,6 +1,6 @@
 require 'pathname'
 require 'shellwords'
-require 'motion_gradle/legacy_dependency'
+require 'motion_gradle/dependency'
 require 'motion_gradle/aidl'
 require 'motion_gradle/template'
 require 'motion_gradle/version'

data/lib/motion/project/gradle.rb

@@ -46,12 +46,8 @@ module Motion::Project
       @gradle_path = path
     end
 
-    def dependency(name, options = {})
-      if name.include?(':')
-        @dependencies << name
-      else
-        @dependencies << MotionGradle::LegacyDependency.new(name, options)
-      end
+    def dependency(name, &block)
+      @dependencies << MotionGradle::Dependency.new(name, &block)
     end
 
     def library(library_name, options = {})

data/lib/motion_gradle/dependency.rb

@@ -0,0 +1,16 @@
+module MotionGradle
+  class Dependency
+    attr_reader :name
+    attr_reader :excludes
+
+    def initialize(name, &block)
+      @name = name
+      @excludes = []
+      instance_eval(&block) if block_given?
+    end
+
+    def exclude(options = {})
+      @excludes << options
+    end
+  end
+end

data/lib/motion_gradle/templates/build.gradle.erb

@@ -51,10 +51,11 @@ dependencies {
     compile project(':<%= library[:name] %>')
   <% end %>
   <% dependencies.each do |dependency| %>
-    <% if dependency.is_a?(MotionGradle::LegacyDependency) %>
-      <%= dependency.parse %>
-    <% else %>
-      compile '<%= dependency %>'
-    <% end %>
+    compile '<%= dependency.name %>', {
+      <% dependency.excludes.each do |exclude| %>
+        exclude module: '<%= exclude[:module] %>',
+                group: '<%= exclude[:group] %>'
+      <% end %>
+    }
   <% end %>
 }

data/lib/motion_gradle/version.rb

@@ -1,3 +1,3 @@
 module MotionGradle
-  VERSION = '1.6.0'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-gradle
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Joffrey Jaffeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-26 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -36,7 +36,7 @@ files:
 - lib/motion-gradle.rb
 - lib/motion/project/gradle.rb
 - lib/motion_gradle/aidl.rb
-- lib/motion_gradle/legacy_dependency.rb
+- lib/motion_gradle/dependency.rb
 - lib/motion_gradle/template.rb
 - lib/motion_gradle/templates/aidl_build.gradle.erb
 - lib/motion_gradle/templates/android_manifest.xml.erb

data/lib/motion_gradle/legacy_dependency.rb

@@ -1,23 +0,0 @@
-module MotionGradle
-  class LegacyDependency
-    def initialize(name, params)
-      @options = normalized_dependency(name, params)
-    end
-
-    def parse
-      options = @options.delete_if { |_, v| v.nil? }.map { |k, v| "#{k}: '#{v}'" }
-      "compile #{options.join(', ')}"
-    end
-
-    protected
-
-    def normalized_dependency(name, params)
-      {
-        group: name,
-        version: params.fetch(:version, '+'),
-        name: params.fetch(:artifact, name),
-        ext: params.fetch(:extension, nil)
-      }
-    end
-  end
-end