robotkit 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a225cdc8cb5c7126b7ff836c28b4b2791703d68a
-  data.tar.gz: ae5d0f7c23d4b114bc436296ade95433153d57eb
+  metadata.gz: 73a428358fbb5d3b840f5ec0fb5353bfc66c18c8
+  data.tar.gz: 2b409b582190fe765f50029cb4e1746cef1d69a7
 SHA512:
-  metadata.gz: 372b0b14efe51332e1ea88f73745a2a4885874b13c8ca80ce83f33c05cd88e39021aa6e497c51195724a05919bb5023238b41866bbf5bc64a725f8cae24e7546
-  data.tar.gz: d01646b28ffa7f6541a74f39b03f1c2d2269e7adb69986adf695b9f90f17a58e66760cc562271e0cd1d58fd0e3ae479f7366ae071079ac065b963696e01b49b9
+  metadata.gz: e45b7e08126ca25ff472c40f1e3fd8bfa851a2f1937af2b9e63a186be72427d9ad157bbafc66163548a05168b1c4aa841953567a888810e497095c73edf85491
+  data.tar.gz: b65537914fdb1c3d0d6e52cd1e05f13721c0492c77edca1266321d164f807df36aa1583f52a3289043c37d590e166f08d6d15c479bbf71a86864655f57419c7d

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.idea/

data/fixtures/{build.gradle → build.gradle.erb}

@@ -3,14 +3,17 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.3'
+        <%- if library_options.include?('android-maven-gradle-plugin') -%>
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        <%- end -%>
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

data/fixtures/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Fri Sep 08 22:04:47 JST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

data/fixtures/{gradle.properties → gradle.properties.erb}

@@ -1,10 +1,10 @@
 # SDK versions
-compile_sdk_version=25
-build_tools_version=25.0.2
-min_sdk_version=15
-target_sdk_version=25
+compile_sdk_version=26
+build_tools_version=26.0.1
+min_sdk_version=<%= min_sdk %>
+target_sdk_version=<%= target_sdk %>
 # Library versions
-support_lib_version=25.3.1
+support_lib_version=26.0.2
 # Build options
 org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true

data/fixtures/gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

data/fixtures/gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

data/fixtures/{library_module}/{build.gradle → build.gradle.erb}

@@ -1,5 +1,7 @@
 apply plugin: 'com.android.library'
+<%- if library_options.include?('android-maven-gradle-plugin') -%>
 apply plugin: 'com.github.dcendents.android-maven'
+<%- end -%>
 
 android {
     compileSdkVersion compile_sdk_version as int

data/lib/robotkit/cli.rb

@@ -13,12 +13,11 @@ module Robotkit
       options[:output_dir] = prompt.ask('What is library name?', default: 'SampleLibrary')
       options[:package_name] = prompt.ask('What is package name?', default: 'com.android.sample')
       options[:module_name] = prompt.ask('What is module name?', default: options[:output_dir].downcase)
-      # options[:min_sdk] = prompt.ask('Type min_sdk version', default: 16)
-      # options[:target_sdk] = prompt.ask('Type target_sdk version', default: 25)
-      #
-      # library_choices = %w(maven-gradle-plugin jack)
-      # options[:selected_library_options] = prompt.multi_select("Select library module options: ", library_choices)
-      #
+      options[:min_sdk] = prompt.ask('Type min_sdk version', default: 16)
+      options[:target_sdk] = prompt.ask('Type target_sdk version', default: 25)
+      library_choices = %w(android-maven-gradle-plugin)
+      options[:library_options] = prompt.multi_select("Select library module options: ", library_choices)
+
       # sample_choices = %w(jack rxjava1 rxjava2)
       # options[:selected_sample_options] = prompt.multi_select("Select sample module options: ", sample_choices)
       Robotkit.exec(options)
@@ -34,6 +33,9 @@ module Robotkit
     sample_package_name = "#{params[:package_name]}.sample"
     library_module = params[:module_name] || "library"
     sample_module = params[:sample_module] || "sample"
+    min_sdk = params[:min_sdk]
+    target_sdk = params[:target_sdk]
+    library_options = params[:library_options]
 
     # copy from fixtues dir to output dir
     FileUtils.mkdir(output_dir)
@@ -58,7 +60,7 @@ module Robotkit
     sample_files = %w(MainActivity SampleApplication)
     sample_files.each do |file_name|
       File.open("#{sample_package_src}/#{file_name}.java", "w") do |file|
-        result = ERB.new(File.open("#{output_dir}/#{sample_module}/src/main/java/{sample_package}/#{file_name}.java.erb").read).result(binding)
+        result = ERB.new(File.open("#{output_dir}/#{sample_module}/src/main/java/{sample_package}/#{file_name}.java.erb").read, nil, '-').result(binding)
         file.write(result)
       end
     end
@@ -67,7 +69,7 @@ module Robotkit
 
     #eval erb
     Dir.glob("#{output_dir}/**/*").select{|it| it.end_with?("erb")}.each do |path|
-      result = ERB.new(File.open(path).read).result(binding)
+      result = ERB.new(File.open(path).read, nil, '-').result(binding)
       File.open(path.sub(".erb", ""), "w") do |file|
         file.write(result)
       end

data/lib/robotkit/version.rb

@@ -1,3 +1,3 @@
 module Robotkit
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robotkit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - kazuki-yoshida
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-09 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty
@@ -100,15 +100,15 @@ files:
 - bin/setup
 - exe/robotkit
 - fixtures/.gitignore
-- fixtures/build.gradle
-- fixtures/gradle.properties
+- fixtures/build.gradle.erb
+- fixtures/gradle.properties.erb
 - fixtures/gradle/wrapper/gradle-wrapper.jar
 - fixtures/gradle/wrapper/gradle-wrapper.properties
 - fixtures/gradlew
 - fixtures/gradlew.bat
 - fixtures/settings.gradle.erb
 - fixtures/{library_module}/.gitignore
-- fixtures/{library_module}/build.gradle
+- fixtures/{library_module}/build.gradle.erb
 - fixtures/{library_module}/proguard-rules.pro
 - fixtures/{library_module}/src/main/AndroidManifest.xml.erb
 - fixtures/{library_module}/src/main/java/{library_package}/.gitkeep
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Android library template generator