filament 0.2.3 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,29 @@
+0.3.0:
+  Filament:
+    - Updated Target#output to optionally take a block as output value
+    - Renamed Scm => SCM
+    - Created CompoundSCM to manage many SCMs
+    - Moved Filament::Platform module to Filament::OS
+    - Created Platform class, to manage platforms - use Platform.import(<yaml>)
+    - Replaced Artifact with Target
+    - FileList2 now has a tag attribute, allowing to set the tag it uses to resolve targets
+    - Added dependence on mechanize gem
+    - [FIXED] create scms with realpath, not package
+  HTTP Plugin:
+    - Uses mechanize to crawl a page for links
+    - Added plugin to manage pulling stuff from the web
+    - Future support may include pushing stuff to the web (over webdav)
+  Spin Plugin:
+    - Added libs for generating sji (both java and spin) interfaces
+    - creates a target with :java and :spin source outputs
+    - outputs a jad_proc to add entries for interpreter startup
+
+  Java Plugin:
+    - Dropped use of JAVAC, JAR, etc. to just use java_bin('javac'), etc.
+  JavaME Plugin:
+    - Merged Library and Suite functionality into a single rake tasklib
+    - Simplified Library and Suite artifacts
+
 0.2.3:
 	SVN Plugin:
 	  - Fixed an svn include problem

data/lib/filament/os.rb

@@ -0,0 +1,77 @@
+module Filament::OS
+  TARGET_PLATFORMS = {}
+  
+  def darwin?
+	  return ! PLATFORM.index("darwin").nil?
+  end
+
+  def windows?
+    return cygwin?
+  end
+
+  def cygwin?
+    return ! PLATFORM.index("cygwin").nil?
+  end
+
+  def sys(c)
+    log c
+    raise "!!! Error executing '#{c}'" unless system(c)
+  end
+
+  def to_unix_path(path)
+    return nil if path.nil?
+    if cygwin?
+      return path unless /:\\/ === path
+      drive, path = path.split(":\\", 2)
+      path.gsub!(/\\/, '/')
+      return "/cygdrive/#{drive}/#{path}"
+    end
+    return path 
+  end
+
+  def to_exec_path(path)
+    return nil if path.nil?    
+    return to_unix_path(path) if cygwin?
+    return path
+  end
+
+  def to_windows_path(path)
+    return nil if path.nil?
+    if path.index('cygdrive').nil?
+      puts "#{path}\n"
+      return path
+    end
+  
+    path = path.chomp.sub(/\/cygdrive\//, '')
+    drive, path = path.split(/\//, 2)
+
+    return "#{drive}:/#{path}"
+  end
+
+  def fix_paths(paths)
+    return nil if paths.nil?
+  
+    if cygwin?
+      paths = paths.to_a.collect do |path|
+        to_windows_path(path)
+      end
+    end
+  
+    return paths.to_a
+  end
+
+  def join_paths(paths)
+    return nil if paths.nil?
+
+    if windows?
+      joined = fix_paths(paths).join(';')
+      return "'#{joined}'"
+    end
+
+    return fix_paths(paths).join(':')
+  end
+
+  alias :u :to_unix_path
+  alias :w :to_windows_path
+  alias :fix :fix_paths
+end

data/lib/filament/package.rb

@@ -17,33 +17,72 @@ module Filament
     end
   end
   
-  class PackageScm
-    def self.applies?(package)
-      return false
-    end
-    
-    def initialize(package)
-      @package = package
-    end
+  module SCM
+    class Base
+      def self.applies?(path)
+        return false
+      end
 
-    def revision; return nil; end
+      def initialize(path)
+        @realpath = Pathname.new(path)
+        raise "path must be absolute" unless @realpath.absolute?
+      end
+
+      def revision; return nil; end
+
+      def update; end
 
-    def update
-      @package.subpackages.each {|s| s.scm.update}  
+      def status; end
+
+      def commit(msg); end
     end
 
-    def status
-      @package.subpackages.each {|s| s.scm.status}
+    class CompoundSCM
+      def initialize
+        @scms = []
+      end
+    
+      def <<(scm)
+        @scms << scm
+      end
+    
+      def update
+        @scms.each {|s| s.update}
+      end
+    
+      def status
+        @scms.each {|s| s.status}
+      end
+    
+      def commit(msg)
+        @scms.each {|s| s.commit(msg)}
+      end
+      
+      def empty?
+        return @scms.empty?
+      end
     end
+    
+    class PackageSCM
+      def initialize(package)
+        @package = package
+      end
+
+      def update
+        @package.subpackages.each {|s| s.scm.update}  
+      end
 
-    def commit(msg)
-      @package.subpackages.each {|s| s.scm.commit(msg)}
+      def status
+        @package.subpackages.each {|s| s.scm.status}
+      end
+
+      def commit(msg)
+        @package.subpackages.each {|s| s.scm.commit(msg)}
+      end
     end
   end
   
   class Package
-    include Memoize
-
     @@package_scms = []
     def self.scm(klass)
       @@package_scms << klass
@@ -53,12 +92,12 @@ module Filament
       klass.new(name, &block)
     end
     
+    attr_accessor2 :scm
+    
     attr_reader :parent, :name, :realpath, :workspace, :package_resolver, :target_resolver, :build_context
     alias :pathname :realpath
     
     def initialize(h)
-      memoize :scm
-      
       @parent = h[:parent]
       @workspace = h[:workspace]
       
@@ -104,6 +143,8 @@ module Filament
 
       @execution_context = ExecutionContext.new(self)
       @build_context = BuildContext.new(self)
+      
+      @scm = SCM::CompoundSCM.new
     end
     
     def exist?
@@ -293,12 +334,18 @@ module Filament
 
     # returns the scm for this package
     def scm
+      load
+      
+      return @scm unless @scm.empty?
+      
+      @scm << Filament::SCM::PackageSCM.new(self)
+      
       @@package_scms.each do |scm|
-        return scm.new(self) if scm.applies?(self)
+        @scm << scm.new(@realpath) if scm.applies?(self)
       end
       
       # default to the simplest scm
-      return PackageScm.new(self)
+      return @scm
     end
 
     # executes cmd with this packages as the wd, and with $this_package set to self
@@ -317,7 +364,7 @@ module Filament
     end
 
     ### Target-related stuff  
-    def descriptor_loaded?
+    def loaded?
       return @descriptor_loaded
     end
   
@@ -330,14 +377,17 @@ module Filament
       return self
     end
   
-    def load
-      return if descriptor_loaded?
+    def load(fail_on_missing=false)
+      return if loaded?
       @descriptor_loaded = true
 
       pn = Pathname.new(descriptor)
       unless pn.exist?
-        return if parent?
-        raise "package descriptor for #{@realpath} does not exist '#{pn}'"
+        unless parent? or not fail_on_missing
+          raise "package descriptor for #{@realpath} does not exist '#{pn}'"
+        end
+        
+        return
       end
       
       @execution_context.execute { instance_eval(pn.read, pn.realpath) }

data/lib/filament/platform.rb

@@ -1,79 +1,82 @@
-module Filament
-	module Platform
-	  TARGET_PLATFORMS = {}
-	    
-	  def darwin?
-	  	  return ! PLATFORM.index("darwin").nil?
-	  end
-	  
-	  def windows?
-	    return cygwin?
-	  end
-	  
-	  def cygwin?
-	    return ! PLATFORM.index("cygwin").nil?
-	  end
-	  
-	  def sys(c)
-	    log c
-	    raise "!!! Error executing '#{c}'" unless system(c)
-	  end
-	  
-	  def to_unix_path(path)
-	    return nil if path.nil?
-	    if cygwin?
-	      return path unless /:\\/ === path
-	      drive, path = path.split(":\\", 2)
-	      path.gsub!(/\\/, '/')
-	      return "/cygdrive/#{drive}/#{path}"
-	    end
-	    return path 
-	  end
-	  
-	  def to_exec_path(path)
-      return nil if path.nil?    
-	    return to_unix_path(path) if cygwin?
-	    return path
-	  end
-	  
-	  def to_windows_path(path)
-      return nil if path.nil?
-	    if path.index('cygdrive').nil?
-	      puts "#{path}\n"
-	      return path
-	    end
-	    
-	    path = path.chomp.sub(/\/cygdrive\//, '')
-	    drive, path = path.split(/\//, 2)
-	  
-	    return "#{drive}:/#{path}"
-	  end
-	  
-	  def fix_paths(paths)
-	    return nil if paths.nil?
-	    
-	    if cygwin?
-	      paths = paths.to_a.collect do |path|
-	        to_windows_path(path)
-	      end
-	    end
-	    
-	    return paths.to_a
-	  end
-	  
-	  def join_paths(paths)
-	    return nil if paths.nil?
-	  
-	    if windows?
-	      joined = fix_paths(paths).join(';')
-	      return "'#{joined}'"
-	    end
-	  
-	    return fix_paths(paths).join(':')
-	  end
-	  
-	  alias :u :to_unix_path
-	  alias :w :to_windows_path
-	  alias :fix :fix_paths
-	end
+require 'yaml'
+
+module Filament
+  class Platform
+    def self.property(*attrs)
+      attrs.each do |a|
+        attr_writer(a)
+        define_method(a) do
+          value = @attributes[a]
+          return value unless value.nil?
+          prototypes.each do |p| 
+            value = p.send(a)
+            break if value.nil?
+          end
+          return value
+        end
+      end
+    end
+  
+    def self.property_list(*attrs)
+      attrs.each do |a|
+        attr_writer(a)
+        define_method(a) do
+          value = @attributes[a] || []
+          value = value.to_a
+          prototypes.each {|p| value += p.send(a)}
+          return value
+        end
+      end
+    end
+  
+    def self.import(data)
+      platforms = YAML.load(data)
+    
+      platforms.each do |name, map|
+        attributes = {}
+        map.each do |key, value|
+          attributes[key.to_sym] = value
+        end
+        
+        create(name, attributes)
+      end
+    end
+  
+    def self.create(name, attributes)
+      name = name.to_sym
+    
+      prototypes = attributes.delete(:inherit) || []
+      prototypes = prototypes.to_a
+    
+      platform = new(name, prototypes, attributes)
+      @@platforms ||= {}
+      @@platforms[name] = platform
+    end
+  
+    def self.find(h)
+      name = h[:name].to_sym
+      
+      @@platforms ||= {}
+      return @@platforms[name]
+    end
+  
+    property_list :tags, :classpath
+    property :javame_configuration, :javame_configuration_version
+
+    attr_reader :name
+
+    def prototypes
+      return @prototypes.collect {|p| Platform.find(:name => p)}
+    end
+  
+    private
+    def initialize(name, prototypes, attributes)
+      @name = name
+      @attributes = attributes
+      @prototypes = prototypes
+
+      tags = @attributes[:tags] || []
+      @attributes[:tags] = tags.to_a.collect {|tag| tag.to_sym}
+    end
+  end
 end

data/lib/filament/target.rb

@@ -28,7 +28,7 @@ module Filament
 
       @package = h[:package] || $context[:this_package]
       @invoked = false
-      @block = block
+      @proc = Proc.new {}
       @outputs = {}
       @deployables = []
       
@@ -36,6 +36,27 @@ module Filament
       raise 'targets must have a package' if @package.nil?
       
       @package << self       
+
+      init
+      
+      @proc = Proc.new do 
+        instance_eval(&block)
+        define
+      end
+    end
+    
+    def init; end
+    
+    def define; end
+
+    def working_dir(subdir=nil)
+      base = "#{$context[:working_dir]}/#{package.path}/#{name}"
+      
+      return subdir.nil? ? base : "#{base}/#{subdir.to_s}"
+    end
+    
+    def output_dir
+      return "#{$context[:output_dir]}/#{package.path}"
     end
     
     def uri
@@ -48,8 +69,9 @@ module Filament
     end
     
     # walks tree of dependencies, returns a complete list
-    def flattened_deps
+    def flattened_deps(include_weak=false)
       all = @deps.to_a.clone
+      all += @weak_deps.to_a.clone if include_weak
       
       fd = []
       until all.empty?
@@ -57,33 +79,43 @@ module Filament
         unless fd.include?(d)
           fd << d
           all += d.deps
+          all += d.weak_deps if include_weak
         end
       end
       return fd
     end
     
     # adds some :output to the given :tag
+    # if a block is given, assume that's the output
     # if :deployable is true, also adds :output to deployables
-    def output(h)
+    def output(h, &block)
       tag = h[:tag]
-      output = h[:output]
+      h[:output] ||= block
       if tag.respond_to?(:to_ary)
         tag.to_ary.each do |t|
-          output(:tag => t, :output => output)
+          h2 = h.clone
+          h2[:tag] = t
+          output(h2)
         end
       else 
-        @outputs[tag] = output 
+        @outputs[tag] = h 
       end
       
-      @deployables << output if h[:deployable]
+      @deployables << h[:output] if h[:deployable]
     end
     
     # returns the value in the output hash for the given tag
-    def get_output(tag)
+    def [](tag)
       invoke
-      return @outputs[tag]
+
+      o = @outputs[tag]
+      
+      return nil if o.nil?
+
+      tasks = o[:tasks]
+      tasks.each {|t| t.invoke} unless tasks.nil?
+      return o[:output]
     end
-    alias :[] :get_output
 
     # builds this specific target (and all dependencies)
     # after building, it executes the provided block in the build context
@@ -106,8 +138,15 @@ module Filament
       @package.execute do
         @weak_deps.each {|t| t.invoke}
         @deps.each {|t| t.invoke}
+
         puts ">>> BUILDING #{uri} (#{@package.pathname}, #{self})"
-        instance_eval(&@block)
+        instance_eval(&@proc)
+        
+        @outputs.values.select{|h| h.key?(:tasks)}.collect{|h| h[:tasks]}.each do |tasks|
+          tasks.each do |t|
+            t.invoke
+          end
+        end
       end
     end
   end

data/lib/filament/util/filelist2.rb

@@ -2,21 +2,29 @@ require 'filament/target'
 
 module Filament
   class FileList2 < FileList
+    attr_accessor :tag
+    attr_reader :targets
+    
     def initialize(*args)
       super(*args)
       @target_resolver = $context[:target_resolver]
+      @tag = :default
+      @targets = []
     end
     
     def resolve_filament_uris(*entries)
       files = []
       entries.each do |entry|
         if entry.respond_to? :to_ary
-          resolve_uris(*entry.to_ary)
+          resolve_filament_uris(*entry.to_ary)
         else
           if @target_resolver.valid_uri?(entry)
             target = @target_resolver.resolve(entry)
+
             raise "target does not exist: #{entry}" if target.nil?
-            files << target[:default]
+            @targets << target
+            
+            include(*target[@tag].to_a)
           else
             files << entry
           end

data/lib/filament/util/fileutils.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 require 'pathname'
 
 module Filament
-  def cp_r_if(src, dest, &block)
+  def self.cp_r_if(src, dest, &block)
     src_p = Pathname.new(src)
     dest_p = Pathname.new(dest)