pindah 0.1.0 → 0.1.1

data/README.md

@@ -2,6 +2,8 @@
 
 A tool for writing Android applications in [Mirah](http://mirah.org).
 
+<img src="https://github.com/mirah/pindah/raw/master/pindah.png" alt="Pindah logo" align="right" />
+
 ## Requirements
 
 You must have the [Android SDK](http://d.android.com/sdk/) installed
@@ -16,9 +18,9 @@ and is a reasonable target for new applications. Once the platform
 tools are installed, place the SDK's <tt>platform-tools/</tt>
 directory on your $PATH as well.
 
-You'll also need [JRuby](http://jruby.org) installed with bin/ on your
-$PATH. If your gem and rake are not from from JRuby, prefix the gem
-and rake commands with jruby -S:
+You'll also need [JRuby](http://jruby.org) version 1.6 or higher 
+installed with bin/ on your $PATH. If your gem and rake are not from 
+from JRuby, prefix the gem and rake commands with jruby -S:
 
     $ gem install pindah
 
@@ -96,6 +98,12 @@ your application.
 See [Garrett](http://github.com/technomancy/Garrett) for an example of
 a basic project.
 
+## Community
+
+Problems? Suggestions? Bring them up on the
+[Mirah mailing list](http://groups.google.com/group/mirah/) or the #mirah
+IRC channel on freenode.
+
 ## See Also
 
 If Mirah is just too low-level and you need something more dynamic,

data/bin/pindah

@@ -4,6 +4,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'pindah_
 
 begin
   PindahCLI.send *ARGV
-rescue ArgumentError
+rescue ArgumentError, NoMethodError
   abort "Usage: #{File.basename($0)} create org.example.hello [/path/to/hello_world] [HelloActivity]"
 end

data/lib/pindah.rb

@@ -12,10 +12,11 @@ end
 require "mirah"
 
 module Pindah
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
   def self.infer_sdk_location(path)
     tools = path.split(":").detect {|p| File.exists? "#{p}/android" }
+    abort "\"android\" executable not found on $PATH" if tools.nil?
     File.expand_path("#{tools}/..")
   end
 
@@ -35,7 +36,7 @@ module Pindah
 
   desc "Tail logs from a device or a device or emulator"
   task :logcat do
-    system "adb -d logcat #{@spec[:log_filter]}"
+    system "adb logcat #{@spec[:log_spec]}"
   end
 
   desc "Print the project spec"
@@ -53,7 +54,7 @@ module Pindah
 
     @spec[:root] = File.expand_path "."
     @spec[:target] ||= TARGETS[@spec[:target_version].to_s.sub(/android-/, '')]
-    @spec[:classes] ||= "#{@spec[:output]}/classes"
+    @spec[:classes] ||= "#{@spec[:output]}/classes/"
     @spec[:classpath] << @spec[:classes]
     @spec[:classpath] << "#{@spec[:sdk]}/platforms/android-#{@spec[:target]}/android.jar"
     @spec[:log_spec] ||= "ActivityManager:I #{@spec[:name]}:D " +

data/lib/pindah_cli.rb

@@ -4,12 +4,13 @@ require 'erb'
 module PindahCLI
   DEFAULT_TARGET_VERSION = '2.1'
 
-  def self.create(package, location=nil, activity_name="Start")
+  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'
@@ -38,18 +39,22 @@ module PindahCLI
     
     log "Created project in #{location}."
 
-    activity_location = File.join(src_dir, "#{activity_name}.mirah")
-    activity_template = File.read(File.join(File.dirname(__FILE__),
-                                            '..', 'templates',
-                                            'initial_activity.mirah'))
+    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|
-      f.puts activity_template.gsub(/INITIAL_ACTIVITY/, activity_name)
+      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
-    log "Created Activity '#{activity_name}' in '#{activity_location}'."
   end
 
   private
+
   def self.log(msg)
     STDERR.puts msg
   end

data/templates/AndroidManifest.xml

@@ -5,7 +5,7 @@
       android:versionName="1.0">
     <application android:label="@string/app_name" 
                  android:debuggable="true"
-                 android:icon="@drawable/ic_launcher" >
+                 android:icon="@drawable/ic_launcher">
       <% if activity_name %>
         <activity android:name="<%= activity_name %>"
                   android:label="@string/app_name">

data/templates/build.xml

@@ -20,14 +20,8 @@
 
     <target name="compile" depends="-resource-src, -aidl, javac"
             description="Compiles project's .mirah files into .class files">
-      <!-- TODO: mirahc task doesn't infer package correctly.
-           <mirahc src="${src}" destdir="${classes}" 
-           classpath="${classpath}" /> -->
-      <exec executable="mirahc" dir="src" failonerror="true">
-        <arg line="-c ${classpath}" />
-        <arg line="-d ${classes}" />
-        <arg value="." />
-      </exec>
+      <mirahc src="${src}" destdir="${classes}" 
+              classpath="${classpath}" />
     </target>
 
     <setup />

data/templates/initial_activity.mirah

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

data/test/fixtures/HelloWorld.mirah

@@ -3,5 +3,6 @@ import android.app.Activity
 class HelloWorld < Activity
   def onCreate(state)
     super state
+    setContentView R.layout.main
   end
 end

metadata

@@ -1,96 +1,117 @@
 --- !ruby/object:Gem::Specification 
 name: pindah
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
-  version: 0.1.0
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
-  - Phil Hagelberg
+- Phil Hagelberg
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -08:00
+date: 2011-04-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: mirah
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.0.5
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: hoe
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 2.8.0
-    type: :development
-    version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mirah
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 0
+        - 5
+        version: 0.0.5
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
+        version: 2.8.0
+  type: :development
+  version_requirements: *id002
 description: ""
 email: 
-  - technomancy@gmail.com
+- technomancy@gmail.com
 executables: 
-  - pindah
+- pindah
 extensions: []
 
 extra_rdoc_files: 
-  - History.txt
-  - Manifest.txt
+- History.txt
+- Manifest.txt
 files: 
-  - History.txt
-  - Manifest.txt
-  - README.md
-  - Rakefile
-  - bin/pindah
-  - lib/pindah.rb
-  - lib/pindah_cli.rb
-  - templates/AndroidManifest.xml
-  - templates/build.xml
-  - templates/main.xml
-  - templates/strings.xml
-  - templates/Rakefile
-  - templates/initial_activity.mirah
-  - templates/.gitignore
-  - templates/res/drawable-mdpi/ic_launcher.png
-  - templates/res/drawable-hdpi/ic_launcher.png
-  - templates/res/drawable-ldpi/ic_launcher.png
-  - test/fixtures/HelloWorld.mirah
-  - test/pindah_cli_test.rb
+- History.txt
+- Manifest.txt
+- README.md
+- Rakefile
+- bin/pindah
+- lib/pindah.rb
+- lib/pindah_cli.rb
+- templates/AndroidManifest.xml
+- templates/build.xml
+- templates/main.xml
+- templates/strings.xml
+- templates/Rakefile
+- templates/initial_activity.mirah
+- templates/.gitignore
+- templates/res/drawable-mdpi/ic_launcher.png
+- templates/res/drawable-hdpi/ic_launcher.png
+- templates/res/drawable-ldpi/ic_launcher.png
+- test/fixtures/HelloWorld.mirah
+- test/pindah_cli_test.rb
 has_rdoc: true
 homepage: http://github.com/mirah/pindah
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-  - --main
-  - README.md
+- --main
+- README.md
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: pindah
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A tool for writing Android applications in Mirah