pindah 0.1.2 → 0.1.3

data/lib/pindah_cli.rb

@@ -1,77 +1,77 @@
-require 'fileutils'
-require 'erb'
-
-module PindahCLI
-  DEFAULT_TARGET_VERSION = '2.1'
-
-  def self.create(package, location=nil, activity_name=nil)
-    segments = package.split('.')
-    location ||= segments.last
-    src_dir  = File.join(location, 'src', *segments)
-
-    mkdir location, File.join('src', *segments)
-    mkdir location, 'bin'
-    mkdir location, 'libs'
-    mkdir location, 'res'
-    mkdir location, 'res/drawable-hdpi'
-    mkdir location, 'res/drawable-ldpi'
-    mkdir location, 'res/drawable-mdpi'
-    mkdir location, 'res/layout'
-    mkdir location, 'res/values'
-
-    name = location.split("/").last
-    app_name = name.split(/[-_]/).map{ |w| w.capitalize }.join(" ")
-
-    FileUtils.mkdir_p src_dir
-
-    create_templated("Rakefile", location, binding)
-    create_templated("AndroidManifest.xml", location, binding)
-    create_templated("main.xml", File.join(location, 'res', 'layout'), binding)
-    create_templated("strings.xml", File.join(location, 'res', 'values'), binding)
-    create_templated(".gitignore", location, binding)
-
-    # Default icons of various sizes
-    ["hdpi", "mdpi", "ldpi"].each do |s|
-      FileUtils.cp(File.join(File.dirname(__FILE__), '..', 'templates', "res",
-                             "drawable-#{s}", "ic_launcher.png"),
-                   File.join(location, "res", "drawable-#{s}", "ic_launcher.png"))
-    end
-    
-    log "Created project in #{location}."
-
-    if activity_name
-      activity_location = File.join(src_dir, "#{activity_name}.mirah")
-      activity_template = File.read(File.join(File.dirname(__FILE__),
-                                              '..', 'templates',
-                                              'initial_activity.mirah'))
-
-      File.open(activity_location, 'w') do |f|
-        template_with_classname = activity_template.gsub(/INITIAL_ACTIVITY/, activity_name)
-        f.puts ERB.new(template_with_classname).result(binding)
-      end
-      log "Created Activity '#{activity_name}' in '#{activity_location}'."
-    end
-  end
-
-  private
-
-  def self.log(msg)
-    STDERR.puts msg
-  end
-
-  def self.create_templated(name, project_location, scope)
-    location = File.join(project_location, name)
-    template = File.read(File.join(File.dirname(__FILE__), 
-                                   '..', 'templates', name))
-
-    File.open(location, 'w') do |f|
-      f.puts ERB.new(template).result(scope)
-    end
-  end
-
-  def self.mkdir(base, directory)
-    location = File.join(base, directory)
-    FileUtils.mkdir_p location
-    log "Created '#{location}'."
-  end
-end
+require 'fileutils'
+require 'erb'
+
+module PindahCLI
+  DEFAULT_TARGET_VERSION = '2.3.3'
+
+  def self.create(package, location=nil, activity_name=nil)
+    segments = package.split('.')
+    location ||= segments.last
+    src_dir  = File.join(location, 'src', *segments)
+
+    mkdir location, File.join('src', *segments)
+    mkdir location, 'bin'
+    mkdir location, 'libs'
+    mkdir location, 'res'
+    mkdir location, 'res/drawable-hdpi'
+    mkdir location, 'res/drawable-ldpi'
+    mkdir location, 'res/drawable-mdpi'
+    mkdir location, 'res/layout'
+    mkdir location, 'res/values'
+
+    name = File.basename(location)
+    app_name = name.split(/[-_]/).map{ |w| w.capitalize }.join(" ")
+
+    FileUtils.mkdir_p src_dir
+
+    create_templated("Rakefile", location, binding)
+    create_templated("AndroidManifest.xml", location, binding)
+    create_templated("main.xml", File.join(location, 'res', 'layout'), binding)
+    create_templated("strings.xml", File.join(location, 'res', 'values'), binding)
+    create_templated(".gitignore", location, binding)
+
+    # Default icons of various sizes
+    ["hdpi", "mdpi", "ldpi"].each do |s|
+      FileUtils.cp(File.join(File.dirname(__FILE__), '..', 'templates', "res",
+                             "drawable-#{s}", "ic_launcher.png"),
+                   File.join(location, "res", "drawable-#{s}", "ic_launcher.png"))
+    end
+    
+    log "Created project in #{location}."
+
+    if activity_name
+      activity_location = File.join(src_dir, "#{activity_name}.mirah")
+      activity_template = File.read(File.join(File.dirname(__FILE__),
+                                              '..', 'templates',
+                                              'initial_activity.mirah'))
+
+      File.open(activity_location, 'w') do |f|
+        template_with_classname = activity_template.gsub(/INITIAL_ACTIVITY/, activity_name)
+        f.puts ERB.new(template_with_classname).result(binding)
+      end
+      log "Created Activity '#{activity_name}' in '#{activity_location}'."
+    end
+  end
+
+  private
+
+  def self.log(msg)
+    STDERR.puts msg
+  end
+
+  def self.create_templated(name, project_location, scope)
+    location = File.join(project_location, name)
+    template = File.read(File.join(File.dirname(__FILE__), 
+                                   '..', 'templates', name))
+
+    File.open(location, 'w') do |f|
+      f.puts ERB.new(template).result(scope)
+    end
+  end
+
+  def self.mkdir(base, directory)
+    location = File.join(base, directory)
+    FileUtils.mkdir_p location
+    log "Created '#{location}'."
+  end
+end

data/templates/.gitignore

@@ -1,2 +1,2 @@
-bin
-gen
+bin/
+gen/

data/templates/AndroidManifest.xml

@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="<%= package %>"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <application android:label="@string/app_name" 
-                 android:debuggable="true"
-                 android:icon="@drawable/ic_launcher">
-      <% if activity_name %>
-        <activity android:name="<%= activity_name %>"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-      <% end %>
-    </application>
-</manifest> 
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="<%= package %>"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <application android:label="@string/app_name" 
+                 android:debuggable="true"
+                 android:icon="@drawable/ic_launcher">
+<% if activity_name %>
+        <activity android:name="<%= activity_name %>"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+<% end %>
+    </application>
+</manifest>

data/templates/Rakefile

@@ -1,7 +1,7 @@
-require "rubygems"
-require "pindah"
-
-Pindah.spec = {
-  :name => "<%= name %>",
-  :target_version => "<%= DEFAULT_TARGET_VERSION %>"
-}
+require "rubygems"
+require "pindah"
+
+Pindah.spec = {
+  :name => "<%= name %>",
+  :target_version => "<%= DEFAULT_TARGET_VERSION %>"
+}

data/templates/build.xml

@@ -1,32 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="<%= @spec[:name] %>">
-    <path id="android.antlibs">
-        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
-    </path>
-    <path id="java.classpath">
-        <pathelement location="${classpath}" />
-    </path>
-
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs" />
-
-    <taskdef name="mirahc" classname="org.mirah.ant.Compile" />
-
-    <!-- TODO: better support for mixed-source builds -->
-    <target name="javac" description="Compiles R.java and other gen/ files.">
-      <javac srcdir="gen" destdir="${classes}" 
-             includeantruntime="false" failonerror="true" />
-    </target>
-
-    <target name="compile" depends="-resource-src, -aidl, javac"
-            description="Compiles project's .mirah files into .class files">
-        <mirahc src="${src}" destdir="${classes}">
-            <classpath refid="java.classpath" />
-        </mirahc>
-    </target>
-
-    <setup />
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="<%= @spec[:name] %>">
+    <property file="local.properties" />
+
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <property file="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+          unless="sdk.dir" />
+
+    <path id="java.classpath">
+      <pathelement location="${classpath}" />
+      <pathelement location="${out.classes.absolute.dir}" />
+    </path>
+
+    <taskdef name="mirahc" classname="org.mirah.ant.Compile" />
+
+    <!-- TODO: better support for mixed-source builds -->
+    <target name="javac" description="Compiles R.java and other gen/ files.">
+      <javac srcdir="${gen.absolute.dir}"
+             destdir="${out.classes.absolute.dir}"
+             source="1.6"
+             target="1.6"
+             includeantruntime="false"
+             failonerror="true" />
+    </target>
+
+    <target name="compile" depends="-compile" />
+
+    <target name="-compile" depends="-build-setup, -pre-build, -code-gen, -pre-compile, javac">
+      <mirahc dir="src" destdir="bin/classes" jvmversion="1.6">
+        <classpath refid="java.classpath" />
+      </mirahc>
+    </target>
+
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+    <% if @spec[:extra_ant_xml] %>
+    <import file="<%= File.expand_path @spec[:extra_ant_xml] %>" />
+    <% end %>
+</project>

data/templates/initial_activity.mirah

@@ -1,10 +1,10 @@
-package <%= package %>
-
-import android.app.Activity
-
-class INITIAL_ACTIVITY < Activity
-  def onCreate(state)
-    super state
-    setContentView R.layout.main
-  end
-end
+package <%= package %>
+
+import android.app.Activity
+
+class INITIAL_ACTIVITY < Activity
+  def onCreate(state)
+    super state
+    setContentView R.layout.main
+  end
+end

data/templates/main.xml

@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<TextView  
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:text="Hello World, <%= name %>"
-    />
-</LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:text="Hello World, <%= name %>"
+    />
+</LinearLayout>
+

data/templates/strings.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name"><%= app_name %></string>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name"><%= app_name %></string>
+</resources>

data/test/fixtures/HelloWorld.mirah

@@ -1,10 +1,10 @@
-package tld.pindah.testapp
-
-import android.app.Activity
-
-class HelloWorld < Activity
-  def onCreate(state)
-    super state
-    setContentView R.layout.main
-  end
-end
+package tld.pindah.testapp
+
+import android.app.Activity
+
+class HelloWorld < Activity
+  def onCreate(state)
+    super state
+    setContentView R.layout.main
+  end
+end

data/test/pindah_cli_test.rb

@@ -1,85 +1,85 @@
-require 'test/unit'
-require 'tmpdir'
-require 'fileutils'
-require 'rubygems'
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'pindah_cli'))
-
-class PindahCLITest < Test::Unit::TestCase
-  PWD = File.expand_path(File.dirname(__FILE__))
-
-  def fixture(name)
-    File.read(File.join(PWD, 'fixtures', name))
-  end
-
-  def setup
-    @temp = Dir.mktmpdir("pindah-")
-    @project_path = "#{@temp}/testapp"
-    FileUtils.mkdir_p File.dirname(@temp)
-    Dir.chdir File.dirname(@temp)
-    PindahCLI.create('tld.pindah.testapp', @project_path, 'HelloWorld')
-  end
-
-  def teardown
-    FileUtils.rm_rf @temp
-  end
-
-  def test_create_should_create_basic_project_structure
-    PindahCLI.create('tld.pindah.testapp', '.')
-    assert File.directory?(File.join(@project_path, 'src', 'tld', 'pindah', 'testapp'))
-
-    directories = %w{ src/tld/pindah/testapp bin libs res
-                      res/drawable-hdpi res/drawable-ldpi
-                      res/drawable-mdpi res/layout res/values }
-
-    directories.each do |d|
-      expected = File.join(@project_path, d)
-      assert File.directory?(expected), "Expected #{expected.inspect} to be a directory."
-    end
-  end
-
-  def test_create_should_create_rakefile
-    rake_path = File.join(@project_path, 'Rakefile')
-
-    assert File.exists?(rake_path)
-    assert_equal fixture("Rakefile"), File.read(rake_path)
-  end
-
-  def test_create_should_create_an_activity_if_desired
-    actual = File.read(File.join(@project_path, 'src',
-                                 'tld', 'pindah',
-                                 'testapp', 'HelloWorld.mirah'))
-    assert_equal fixture('HelloWorld.mirah'), actual
-  end
-
-  def test_create_should_create_manifest
-    manifest_path = File.join(@project_path, 'AndroidManifest.xml')
-
-    assert File.exists?(manifest_path)
-    assert_equal fixture("AndroidManifest.xml").gsub(/\s+/, ' '), File.read(manifest_path).gsub(/\s+/, ' ')
-  end
-
-  def test_create_should_create_manifest_without_activity
-    @temp = Dir.mktmpdir("pindah-")
-    @project_path = "#{@temp}/testapp"
-    FileUtils.mkdir_p File.dirname(@temp)
-    Dir.chdir File.dirname(@temp)
-    PindahCLI.create('tld.pindah.testapp', @project_path)
-
-    manifest_path = File.join(@project_path, 'AndroidManifest.xml')
-
-    assert File.exists?(manifest_path)
-    assert_equal fixture("AndroidManifest.xml.no-activity").gsub(/\s+/, ' '), File.read(manifest_path).gsub(/\s+/, ' ')
-  end
-
-  def test_create_should_create_strings
-    path = File.join(@project_path, 'res', 'values', 'strings.xml')
-    assert File.exists?(path)
-    assert_equal fixture("strings.xml").strip, File.read(path).strip
-  end
-  
-  def test_create_should_create_layout
-    path = File.join(@project_path, 'res', 'layout', 'main.xml')
-    assert File.exists?(path)
-    assert_equal fixture("main.xml").strip, File.read(path).strip
-  end
-end
+require 'test/unit'
+require 'tmpdir'
+require 'fileutils'
+require 'rubygems'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'pindah_cli'))
+
+class PindahCLITest < Test::Unit::TestCase
+  PWD = File.expand_path(File.dirname(__FILE__))
+
+  def fixture(name)
+    File.read(File.join(PWD, 'fixtures', name))
+  end
+
+  def setup
+    @temp = Dir.mktmpdir("pindah-")
+    @project_path = "#{@temp}/testapp"
+    FileUtils.mkdir_p File.dirname(@temp)
+    Dir.chdir File.dirname(@temp)
+    PindahCLI.create('tld.pindah.testapp', @project_path, 'HelloWorld')
+  end
+
+  def teardown
+    FileUtils.rm_rf @temp
+  end
+
+  def test_create_should_create_basic_project_structure
+    PindahCLI.create('tld.pindah.testapp', '.')
+    assert File.directory?(File.join(@project_path, 'src', 'tld', 'pindah', 'testapp'))
+
+    directories = %w{ src/tld/pindah/testapp bin libs res
+                      res/drawable-hdpi res/drawable-ldpi
+                      res/drawable-mdpi res/layout res/values }
+
+    directories.each do |d|
+      expected = File.join(@project_path, d)
+      assert File.directory?(expected), "Expected #{expected.inspect} to be a directory."
+    end
+  end
+
+  def test_create_should_create_rakefile
+    rake_path = File.join(@project_path, 'Rakefile')
+
+    assert File.exists?(rake_path)
+    assert_equal fixture("Rakefile"), File.read(rake_path)
+  end
+
+  def test_create_should_create_an_activity_if_desired
+    actual = File.read(File.join(@project_path, 'src',
+                                 'tld', 'pindah',
+                                 'testapp', 'HelloWorld.mirah'))
+    assert_equal fixture('HelloWorld.mirah'), actual
+  end
+
+  def test_create_should_create_manifest
+    manifest_path = File.join(@project_path, 'AndroidManifest.xml')
+
+    assert File.exists?(manifest_path)
+    assert_equal fixture("AndroidManifest.xml").gsub(/\s+/, ' '), File.read(manifest_path).gsub(/\s+/, ' ')
+  end
+
+  def test_create_should_create_manifest_without_activity
+    @temp = Dir.mktmpdir("pindah-")
+    @project_path = "#{@temp}/testapp"
+    FileUtils.mkdir_p File.dirname(@temp)
+    Dir.chdir File.dirname(@temp)
+    PindahCLI.create('tld.pindah.testapp', @project_path)
+
+    manifest_path = File.join(@project_path, 'AndroidManifest.xml')
+
+    assert File.exists?(manifest_path)
+    assert_equal fixture("AndroidManifest.xml.no-activity").gsub(/\s+/, ' '), File.read(manifest_path).gsub(/\s+/, ' ')
+  end
+
+  def test_create_should_create_strings
+    path = File.join(@project_path, 'res', 'values', 'strings.xml')
+    assert File.exists?(path)
+    assert_equal fixture("strings.xml").strip, File.read(path).strip
+  end
+  
+  def test_create_should_create_layout
+    path = File.join(@project_path, 'res', 'layout', 'main.xml')
+    assert File.exists?(path)
+    assert_equal fixture("main.xml").strip, File.read(path).strip
+  end
+end