motion-gradle 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50c2e48c77d0f368ee44667ae5d574c85ceb2c25
-  data.tar.gz: 577d8d409dd2fd063f9ca2d1e224561353279bfd
+  metadata.gz: 617e05877b988ee1f537b0adaff8e9cfdade69c3
+  data.tar.gz: d7228639f466ed173c28e5bdd02945f4501ec01f
 SHA512:
-  metadata.gz: 98c82bdc75995ee8bfbe97bf5dda498089bf64b25350751aed15768ba5f8cb94727c698d1861dd7291b212ff6c3c66a822902618b71b0fe76081aa2f0646d600
-  data.tar.gz: 1492d7d43990043f70e0613af41ee12218a4a4be77308672902ac8ee9683d3ed36f39f40ee57366daaf840e7428c35ad3ec1fa7e10bb663c7ccff0bf221b69cc
+  metadata.gz: 5de72870a3a9c756edb92f19f90ca098e60521bbb29f9cef1f3df7d28668b2c12ad47dceeed6ebb0fc425a10e2da2f1ba3fe456db0ed101e029c8d1c202933f9
+  data.tar.gz: 400569c31a723e7faafd65e521919c1df6bb6abe205e0ae7ef5d231c127e1c98945935bd9bc3bd3859d01e87e9506a7399103beab9afea2b83ebb0ed12846fa8

data/lib/motion-gradle.rb

@@ -1,6 +1,10 @@
 require 'pathname'
 require 'shellwords'
-require 'motion/project/legacy_dependency'
+require 'motion_gradle/legacy_dependency'
+require 'motion_gradle/aidl'
+require 'motion_gradle/template'
+require 'motion_gradle/version'
 require 'motion/project/gradle'
-require 'motion/project/aidl'
-require 'motion/project/version'
+
+module MotionGradle
+end

data/lib/motion/project/gradle.rb

@@ -1,9 +1,9 @@
 unless defined?(Motion::Project::Config)
-  raise("This file must be required within a RubyMotion project Rakefile.")
+  fail('This file must be required within a RubyMotion project Rakefile.')
 end
 
 if Motion::Project::App.template != :android
-  raise("This file must be required within a RubyMotion Android project.")
+  fail('This file must be required within a RubyMotion Android project.')
 end
 
 module Motion::Project
@@ -50,7 +50,7 @@ module Motion::Project
       if name.include?(':')
         @dependencies << name
       else
-        @dependencies << LegacyDependency.new(name, options)
+        @dependencies << MotionGradle::LegacyDependency.new(name, options)
       end
     end
 
@@ -59,15 +59,11 @@ module Motion::Project
       unless Pathname.new(path).absolute?
         path = File.join('../..', path)
       end
-
-      @libraries << {
-        name: library_name,
-        path: path
-      }
+      @libraries << { name: library_name, path: path }
     end
 
     def aidl(package, aidl_file_path)
-      @aidl_files << Aidl.new(package, aidl_file_path)
+      @aidl_files << MotionGradle::Aidl.new(package, aidl_file_path)
     end
 
     def classpath(classpath)
@@ -82,11 +78,11 @@ module Motion::Project
       @repositories << url
     end
 
-    def install!(update)
+    def install!
       vendor_aidl_files
-      generate_gradle_settings_file
-      generate_gradle_build_file
-      system("#{gradle_command} --build-file #{gradle_build_file} generateDependencies")
+      generate_settings_file
+      generate_build_file
+      system("#{gradle_command} --build-file #{build_file} generateDependencies")
 
       # this might be uneeded in the future
       # if RM does support .aar out of the box
@@ -124,14 +120,14 @@ module Motion::Project
         if File.exist?(main_jar)
           jar_path = File.join(dependency, "#{File.basename(dependency)}.jar")
           FileUtils.mv(main_jar, jar_path)
-          vendor_options = {:jar => jar_path}
+          vendor_options = { jar: jar_path }
         else
           next
         end
 
         # libs/*.jar may contain dependencies, let's vendor them
         Dir[File.join(dependency, 'libs/*.jar')].each do |internal_dependancy|
-          @config.vendor_project({:jar => internal_dependancy})
+          @config.vendor_project(jar: internal_dependancy)
         end
 
         res = File.join(dependency, 'res')
@@ -146,7 +142,7 @@ module Motion::Project
             @config.armeabi_directory_name(arch)
           end
 
-          libs = Dir[File.join(native, "{#{archs.join(',')}}", "*.so")]
+          libs = Dir[File.join(native, "{#{archs.join(',')}}", '*.so')]
           if libs.count != archs.count
             App.info('[warning]', "Found only #{libs.count} lib(s) -> #{libs.join(',')} for #{archs.count} arch(s) : #{archs.join(',')}")
           end
@@ -160,7 +156,7 @@ module Motion::Project
     def vendor_jars
       jars = Dir[File.join(GRADLE_ROOT, 'dependencies/*.jar')]
       jars.each do |jar|
-        @config.vendor_project(:jar => jar)
+        @config.vendor_project(jar: jar)
       end
     end
 
@@ -169,36 +165,40 @@ module Motion::Project
     end
 
     def extract_aars
-      aars = Dir[File.join(GRADLE_ROOT, "dependencies/**/*.aar")]
+      aars = Dir[File.join(GRADLE_ROOT, 'dependencies/**/*.aar')]
       aar_dir = File.join(GRADLE_ROOT, 'aar')
       FileUtils.mkdir_p(aar_dir)
       aars.each do |aar|
         filename = File.basename(aar, '.aar')
-        system("/usr/bin/unzip -o -qq #{aar} -d #{ File.join(aar_dir, filename)}")
+        system("/usr/bin/unzip -o -qq #{aar} -d #{File.join(aar_dir, filename)}")
       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_settings_file, 'w') do |io|
-        io.puts(template.result(binding))
-      end
+    def generate_settings_file
+      template = MotionGradle::Template.new('settings.gradle')
+      template.destination = settings_file
+      template.write({libraries: @libraries})
     end
 
-    def generate_gradle_build_file
-      template_path = File.expand_path("../gradle.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
+    def generate_build_file
+      template = MotionGradle::Template.new('build.gradle')
+      template.destination = build_file
+      template.write({
+        classpaths: @classpaths,
+        plugins: @plugins,
+        libraries: @libraries,
+        repositories: @repositories,
+        dependencies: @dependencies,
+        android_repository: android_repository,
+        google_repository: google_repository
+      })
     end
 
-    def gradle_build_file
+    def build_file
       File.join(GRADLE_ROOT, 'build.gradle')
     end
 
-    def gradle_settings_file
+    def settings_file
       File.join(GRADLE_ROOT, 'settings.gradle')
     end
 
@@ -218,14 +218,14 @@ module Motion::Project
 end
 
 namespace :gradle do
-  desc "Download and build dependencies"
+  desc 'Download and build dependencies'
   task :install do
     root = Motion::Project::Gradle::GRADLE_ROOT
     FileUtils.mkdir_p(root)
     rm_rf(File.join(root, 'dependencies'))
     rm_rf(File.join(root, 'aar'))
     dependencies = App.config.gradle
-    dependencies.install!(true)
+    dependencies.install!
   end
 end
 

data/lib/motion_gradle/aidl.rb

@@ -0,0 +1,51 @@
+module MotionGradle
+  class Aidl
+    def initialize(package, aidl_file_path)
+      @package = package
+      @aidl_file_path = File.expand_path(aidl_file_path)
+    end
+
+    def create_lib
+      create_structure
+      create_gradle_build_file
+      create_manifest
+    end
+
+    def name
+      @name ||= File.basename(@aidl_file_path, '.aidl').downcase
+    end
+
+    def path
+      @path ||= File.join(Motion::Project::Gradle::GRADLE_ROOT, name)
+    end
+
+    protected
+
+    def create_manifest
+      template = MotionGradle::Template.new('android_manifest.xml')
+      template.destination = File.join(path, 'src', 'main', 'AndroidManifest.xml')
+      template.write({ package: @package })
+    end
+
+    def create_gradle_build_file
+      template = MotionGradle::Template.new('aidl_build.gradle')
+      template.destination = File.join(path, 'build.gradle')
+      template.write({ last_build_tools_version: last_build_tools_version })
+    end
+
+    def create_structure
+      aidl_file_dir = File.join(path, 'src', 'main', 'aidl', *@package.split('.'))
+      FileUtils.mkdir_p(aidl_file_dir)
+      FileUtils.cp(@aidl_file_path, aidl_file_dir)
+    end
+
+    def last_build_tools_version
+      build_tools = File.join(ENV['RUBYMOTION_ANDROID_SDK'], 'build-tools')
+      glob_pattern = File.join(build_tools, '*')
+      builds_tools_directories = Dir.glob(glob_pattern).select do |file|
+        File.directory?(file)
+      end
+      File.basename(builds_tools_directories.last)
+    end
+  end
+end

data/lib/motion_gradle/legacy_dependency.rb

@@ -0,0 +1,23 @@
+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

data/lib/motion_gradle/template.rb

@@ -0,0 +1,17 @@
+module MotionGradle
+  class Template
+    attr_accessor :destination
+
+    def initialize(name)
+      template_path = File.expand_path("../templates/#{name}.erb", __FILE__)
+      @template = ERB.new(File.new(template_path).read)
+    end
+
+    def write(locals = {})
+      File.open(self.destination, 'w') do |io|
+        struct = OpenStruct.new(locals)
+        io.puts(@template.result(struct.instance_eval { binding }))
+      end
+    end
+  end
+end

data/lib/{motion/project/aidl_build_gradle.erb → motion_gradle/templates/aidl_build.gradle.erb}

@@ -10,12 +10,12 @@ buildscript {
 }
 
 android {
-  compileSdkVersion <%= App.config.api_version %>
+  compileSdkVersion <%= App.config.api_version.to_i %>
   buildToolsVersion "<%= last_build_tools_version %>"
 
   defaultConfig {
-    minSdkVersion <%= App.config.api_version %>
-    targetSdkVersion <%= App.config.api_version %>
+    minSdkVersion <%= App.config.api_version.to_i %>
+    targetSdkVersion <%= App.config.api_version.to_i %>
     versionCode 1
     versionName "1.0"
   }

data/lib/motion_gradle/templates/android_manifest.xml.erb

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="<%= package %>">
+</manifest>

data/lib/{motion/project/gradle.erb → motion_gradle/templates/build.gradle.erb}

@@ -4,7 +4,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    <% @classpaths.each do |classpath| %>
+    <% classpaths.each do |classpath| %>
       classpath '<%= classpath %>'
     <% end %>
   }
@@ -19,7 +19,7 @@ allprojects {
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
-<% @plugins.each do |plugin| %>
+<% plugins.each do |plugin| %>
   apply plugin: '<%= plugin %>'
 <% end %>
 
@@ -39,7 +39,7 @@ repositories {
       url "<%= ENV['RUBYMOTION_ANDROID_SDK'].shellescape %>/extras/google/m2repository/"
     }
   <% end %>
-  <% @repositories.each do |url| %>
+  <% repositories.each do |url| %>
     maven {
       url "<%= url %>"
     }
@@ -47,11 +47,11 @@ repositories {
 }
 
 dependencies {
-  <% @libraries.each do |library| %>
+  <% libraries.each do |library| %>
     compile project(':<%= library[:name] %>')
   <% end %>
-  <% @dependencies.each do |dependency| %>
-    <% if dependency.is_a?(LegacyDependency) %>
+  <% dependencies.each do |dependency| %>
+    <% if dependency.is_a?(MotionGradle::LegacyDependency) %>
       <%= dependency.parse %>
     <% else %>
       compile '<%= dependency %>'

data/lib/{motion/project/settings.erb → motion_gradle/templates/settings.gradle.erb}

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

data/lib/motion_gradle/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: motion-gradle
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Joffrey Jaffeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
-dependencies: []
+date: 2015-09-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: motion-gradle allows RubyMotion Android projects to have access to the
   Gradle dependency manager.
 email: j.jaffeux@gmail.com
@@ -20,13 +34,15 @@ files:
 - LICENSE
 - README.md
 - lib/motion-gradle.rb
-- lib/motion/project/aidl.rb
-- lib/motion/project/aidl_build_gradle.erb
-- lib/motion/project/gradle.erb
 - lib/motion/project/gradle.rb
-- lib/motion/project/legacy_dependency.rb
-- lib/motion/project/settings.erb
-- lib/motion/project/version.rb
+- lib/motion_gradle/aidl.rb
+- lib/motion_gradle/legacy_dependency.rb
+- lib/motion_gradle/template.rb
+- lib/motion_gradle/templates/aidl_build.gradle.erb
+- lib/motion_gradle/templates/android_manifest.xml.erb
+- lib/motion_gradle/templates/build.gradle.erb
+- lib/motion_gradle/templates/settings.gradle.erb
+- lib/motion_gradle/version.rb
 homepage: http://www.rubymotion.com
 licenses:
 - MIT

data/lib/motion/project/aidl.rb

@@ -1,54 +0,0 @@
-class Aidl
-  def initialize(package, aidl_file_path)
-    @package = package
-    @aidl_file_path = File.expand_path(aidl_file_path)
-  end
-
-  def create_lib
-    create_lib_structure
-    create_gradle_build_file
-    create_manifest
-  end
-
-  def name
-    @name ||= File.basename(@aidl_file_path, '.aidl').downcase
-  end
-
-  def path
-    @path ||= File.join(Motion::Project::Gradle::GRADLE_ROOT, name)
-  end
-
-  protected
-
-  def create_manifest
-    io = File.new(File.join(path, 'src', 'main', 'AndroidManifest.xml'), "w")
-    io.puts("<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\" package=\"#{@package}\"></manifest>")
-    io.close
-  end
-
-  def create_gradle_build_file
-    locals = {last_build_tools_version: last_build_tools_version}
-    erb_template = generate_erb_template(File.expand_path("../aidl_build_gradle.erb", __FILE__), locals)
-    io = File.new(File.join(path, 'build.gradle',), "w")
-    io.puts(erb_template)
-    io.close
-  end
-
-  def create_lib_structure
-    aidl_file_dir = File.join(path, 'src', 'main', 'aidl', *@package.split('.'))
-    FileUtils.mkdir_p(aidl_file_dir)
-    FileUtils.cp(@aidl_file_path, aidl_file_dir)
-  end
-
-  def generate_erb_template(path, locals)
-    template_path = File.expand_path(path, __FILE__)
-    template = File.new(template_path).read
-    ERB.new(template).result(OpenStruct.new(locals).instance_eval { binding })
-  end
-
-  def last_build_tools_version
-    build_tools = File.join(ENV['RUBYMOTION_ANDROID_SDK'], 'build-tools')
-    builds_tools_directories = Dir.glob(File.join(build_tools, '*')).select {|f| File.directory? f}
-    File.basename(builds_tools_directories.last)
-  end
-end

data/lib/motion/project/legacy_dependency.rb

@@ -1,21 +0,0 @@
-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

data/lib/motion/project/version.rb

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