filament 0.3.0 → 0.4.0

data/plugins/05push/lib/filament/plugins/push.rb

@@ -3,16 +3,13 @@ require 'filament/plugin'
 module Filament::Plugins
   class Push < Filament::Plugin
     def initialize(app)
-      app.subcommand('push', "Pushes deployables to selected PUSH_CONDUIT") do |args|
-        targets = Filament::TargetList.new(*args)
-        push_conduit = ENV['PUSH_CONDUIT'] || :Filter
+      push_conduit = ENV['PUSH_CONDUIT'] || :Filter
 
-        targets.each do |target|
-          target.build do
-            klass = Filament::Push::Conduits.module_eval(push_conduit.to_s + 'Conduit')
-            conduit = klass.new
-            conduit.push_targets(targets)  
-          end
+      Filament::Target.on_define do |target|
+        task :push do
+          klass = Filament::Push::Conduits.module_eval(push_conduit.to_s + 'Conduit')
+          conduit = klass.new
+          conduit.push_targets([target])  
         end
       end
     end

data/plugins/05push/lib/filament/push.rb

@@ -9,7 +9,7 @@ module Filament::Push
             files << deployable 
           end
         end
-    
+        
         push_files(files)
       end
         

data/plugins/05push/lib/filament/push/conduits/filter_conduit.rb

@@ -4,7 +4,7 @@ module Filament::Push::Conduits
     def initialize(filter = nil)
       @filter = filter || ENV['PUSH_FILTER']
   
-      raise "@filter must be set" if @filter.nil?
+      raise "PUSH_FILTER must be set" if @filter.nil?
     end
     
     def push_files(files)

metadata

@@ -3,13 +3,19 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: filament
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2006-04-03 00:00:00 -04:00
+  version: 0.4.0
+date: 2006-05-04 00:00:00 -04:00
 summary: A flexible dependency-based build platform based on Rake
 require_paths: 
 - lib
+- plugins/11http/lib
+- plugins/01java/lib
+- plugins/05push/lib
+- plugins/10svn/lib
+- plugins/00util/lib
+- plugins/04spin/lib
 email: ajb@rubyforge.org
-homepage: http://filament.rubyforge.org
+homepage: http://www.software4i.com/projects/filament
 rubyforge_project: filament
 description: 
 autorequire: 
@@ -29,90 +35,83 @@ authors:
 - Adam Bouhenguel
 files: 
 - bin/filament
-- bin/filament-dbg
 - bin/filament-opt
+- bin/filament-dbg
 - bin/filament-test
 - tests/platform_test.rb
 - lib/filament
 - lib/filament.rb
 - lib/inflector.rb
+- lib/filament/util
+- lib/filament/plugin.rb
+- lib/filament/workspace.rb
 - lib/filament/context.rb
-- lib/filament/os.rb
 - lib/filament/package.rb
-- lib/filament/platform.rb
-- lib/filament/plugin.rb
+- lib/filament/block_object.rb
+- lib/filament/os.rb
 - lib/filament/resolver.rb
+- lib/filament/platform.rb
 - lib/filament/target.rb
-- lib/filament/util
-- lib/filament/workspace.rb
-- lib/filament/util/filelist2.rb
 - lib/filament/util/fileutils.rb
+- lib/filament/util/filelist2.rb
 - lib/filament/util/lazy_list.rb
-- plugins/00util
+- plugins/11http
 - plugins/01java
-- plugins/02javame
-- plugins/04spin
 - plugins/05push
 - plugins/10svn
-- plugins/11http
-- plugins/00util/lib
-- plugins/00util/lib/filament
-- plugins/00util/lib/init.rb
-- plugins/00util/lib/filament/plugins
-- plugins/00util/lib/filament/plugins/util.rb
+- plugins/00util
+- plugins/04spin
+- plugins/11http/lib
+- plugins/11http/lib/filament
+- plugins/11http/lib/init.rb
+- plugins/11http/lib/filament/plugins
+- plugins/11http/lib/filament/scm
+- plugins/11http/lib/filament/plugins/http.rb
+- plugins/11http/lib/filament/scm/http.rb
 - plugins/01java/lib
 - plugins/01java/lib/filament
 - plugins/01java/lib/init.rb
 - plugins/01java/lib/filament/java
 - plugins/01java/lib/filament/plugins
-- plugins/01java/lib/filament/java/mixins
+- plugins/01java/lib/filament/javame
+- plugins/01java/lib/filament/javase
 - plugins/01java/lib/filament/java/tools
+- plugins/01java/lib/filament/java/mixins
 - plugins/01java/lib/filament/java/tools.rb
-- plugins/01java/lib/filament/java/mixins/classpath.rb
-- plugins/01java/lib/filament/java/tools/compile.rb
+- plugins/01java/lib/filament/java/tasks
+- plugins/01java/lib/filament/java/library.rb
 - plugins/01java/lib/filament/java/tools/execute.rb
+- plugins/01java/lib/filament/java/tools/javadoc.rb
 - plugins/01java/lib/filament/java/tools/jar.rb
 - plugins/01java/lib/filament/java/tools/proguard.rb
+- plugins/01java/lib/filament/java/tools/compile.rb
+- plugins/01java/lib/filament/java/mixins/classpath.rb
+- plugins/01java/lib/filament/java/tasks/library_task.rb
 - plugins/01java/lib/filament/plugins/java.rb
-- plugins/02javame/lib
-- plugins/02javame/lib/filament
-- plugins/02javame/lib/init.rb
-- plugins/02javame/lib/filament/javame
-- plugins/02javame/lib/filament/javame/library.rb
-- plugins/02javame/lib/filament/javame/suite.rb
-- plugins/02javame/lib/filament/javame/tasks
-- plugins/02javame/lib/filament/javame/tasks.rb
-- plugins/02javame/lib/filament/javame/tools
-- plugins/02javame/lib/filament/javame/tools.rb
-- plugins/02javame/lib/filament/javame/tasks/library_task.rb
-- plugins/02javame/lib/filament/javame/tools/descriptor.rb
-- plugins/02javame/lib/filament/javame/tools/emulator.rb
-- plugins/02javame/lib/filament/javame/tools/external
-- plugins/02javame/lib/filament/javame/tools/platform.rb
-- plugins/02javame/lib/filament/javame/tools/preverifier.rb
-- plugins/02javame/lib/filament/javame/tools/external/mpp_sdk.rb
-- plugins/02javame/lib/filament/javame/tools/external/wtk.rb
-- plugins/04spin/lib
-- plugins/04spin/lib/filament
-- plugins/04spin/lib/init.rb
-- plugins/04spin/lib/spin
-- plugins/04spin/lib/filament/spin
-- plugins/04spin/lib/filament/spin/sji.rb
-- plugins/04spin/lib/filament/spin/tasks
-- plugins/04spin/lib/filament/spin/tasks/sji_task.rb
-- plugins/04spin/lib/spin/sji.rb
+- plugins/01java/lib/filament/javame/tools
+- plugins/01java/lib/filament/javame/tools.rb
+- plugins/01java/lib/filament/javame/tasks.rb
+- plugins/01java/lib/filament/javame/suite.rb
+- plugins/01java/lib/filament/javame/tools/external
+- plugins/01java/lib/filament/javame/tools/descriptor.rb
+- plugins/01java/lib/filament/javame/tools/preverifier.rb
+- plugins/01java/lib/filament/javame/tools/emulator.rb
+- plugins/01java/lib/filament/javame/tools/external/mpp_sdk.rb
+- plugins/01java/lib/filament/javame/tools/external/wtk.rb
+- plugins/01java/lib/filament/javase/application.rb
+- plugins/01java/lib/filament/javase/tasks.rb
 - plugins/05push/lib
-- plugins/05push/lib/bluetooth.rb
 - plugins/05push/lib/filament
 - plugins/05push/lib/init.rb
-- plugins/05push/lib/filament/plugins
+- plugins/05push/lib/bluetooth.rb
 - plugins/05push/lib/filament/push
+- plugins/05push/lib/filament/plugins
 - plugins/05push/lib/filament/push.rb
-- plugins/05push/lib/filament/plugins/push.rb
 - plugins/05push/lib/filament/push/conduits
 - plugins/05push/lib/filament/push/conduits/bluetooth_conduit.rb
-- plugins/05push/lib/filament/push/conduits/filter_conduit.rb
 - plugins/05push/lib/filament/push/conduits/scp_conduit.rb
+- plugins/05push/lib/filament/push/conduits/filter_conduit.rb
+- plugins/05push/lib/filament/plugins/push.rb
 - plugins/10svn/lib
 - plugins/10svn/lib/filament
 - plugins/10svn/lib/init.rb
@@ -121,22 +120,33 @@ files:
 - plugins/10svn/lib/filament/scm
 - plugins/10svn/lib/filament/plugins/svn.rb
 - plugins/10svn/lib/filament/scm/svn.rb
-- plugins/11http/lib
-- plugins/11http/lib/filament
-- plugins/11http/lib/init.rb
-- plugins/11http/lib/filament/plugins
-- plugins/11http/lib/filament/scm
-- plugins/11http/lib/filament/plugins/http.rb
-- plugins/11http/lib/filament/scm/http.rb
+- plugins/00util/lib
+- plugins/00util/lib/filament
+- plugins/00util/lib/init.rb
+- plugins/00util/lib/filament/plugins
+- plugins/00util/lib/filament/plugins/util.rb
+- plugins/04spin/lib
+- plugins/04spin/lib/filament
+- plugins/04spin/lib/spin
+- plugins/04spin/lib/init.rb
+- plugins/04spin/lib/filament/spin
+- plugins/04spin/lib/filament/spin/tasks
+- plugins/04spin/lib/filament/spin/sji.rb
+- plugins/04spin/lib/filament/spin/tasks/sji_task.rb
+- plugins/04spin/lib/spin/sji.rb
 - README
-- CHANGELOG
+- CHANGES
 test_files: []
 
-rdoc_options: []
-
+rdoc_options: 
+- --title
+- Filament -- Pragmatic build control
+- --main
+- README
+- --line-numbers
 extra_rdoc_files: 
 - README
-- CHANGELOG
+- CHANGES
 executables: 
 - filament
 extensions: []

data/CHANGELOG

@@ -1,81 +0,0 @@
-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
-	  - Fixed the svn commands to work with new package.scm
-
-0.2.2:
-  Filament:
-    - Fixed handling for scm actions for packages without scm
-
-0.2.1:
-  Filament:
-    - Added ability to create workspace, package
-    - Added ability to checkout (and create) a package
-    - Can now execute the filament command outside a workspace
-    - Moved svn parts to PackageScm
-    - Supports in place to work with other forms of version control
-
-0.2.0:
-  Filament:
-    - removed old tests
-    - Using cmdparse gem; One action per command
-    - added dependency on memoize gem
-    - general cleanup
-  All Plugins:
-    - Plugins now extend Filament::Plugin where necessary
-  JavaME Plugin:
-    - Moved vendor-specific stuff to tasks.rb in //vendor/libraries/javame 
-  SVN Plugin:
-    - Created svn plugin, should make it easier to support other version control schemes in the future
-
-0.1.2:
-  JavaME Plugin:
-    - Changed the default for obfuscating JavaME::Suite targets to false.
-
-0.1.1:
-  Filament:
-    - Packages can't be hidden directories now
-    - Doesn't force working_dir and output_dir creation
-    - Package descriptor is now /package.rb instead of rakefile.rb
-    - package.rb is now evaluated within the scope of the Package object. 
-    - targets are now defined by target(name, class, &block)
-    - future cleanups code cleanups will benefit from the two above items.
-  All Plugins:
-    - Updated external path references (Wtk, MppSdk, Proguard classes) to only use ENV
-    - Added ENV support for WTK_HOME, MPP_SDK_HOME, PROGUARD_HOME
-  Java Plugin:
-     - Added support for Proguard obfuscation
-     - Targets can output a 1-argument-block tagged :proguard and configure the obfuscator for dependencies
-  JavaME Plugin:
-     - Suite now takes itself into account when traversing deps for :jad_config outputs
-     - Obfuscation is available if you set obfuscate to true -- will auto-detect in the future
-
-0.1.0:
-  Filament:
-    - Initial Release

data/plugins/02javame/lib/filament/javame/library.rb

@@ -1,79 +0,0 @@
-require 'filament/java/mixins/classpath'
-require 'filament/javame/tasks/library_task'
-
-module Filament::JavaME
-  class Library < Filament::Target
-    include Filament::Java::Mixins::Classpath
-    
-    attr_accessor2 :obfuscate
-    
-    attr_writer :should_package_deps
-    attr_reader :srcs, :resources, :platform, :cldc_version
-    
-    def custom_entries(h)
-      @custom_entries.merge!(h)
-    end
-    
-    def append_entries(h)
-      h.keys.each do |key|
-        @append_entries[key] ||= []
-        entry = h[key]
-        if entry.is_a?(Array)
-          @append_entries[key] += entry
-        else
-          @append_entries[key] << entry
-        end
-      end
-    end
-
-    def init
-      @srcs = Filament::FileList2.new
-      @srcs.tag = :java
-      
-      @resources = Filament::FileList2.new
-      @should_package_deps = false
-      
-      @platform = Filament::JavaME::Tools.tags_for($target_platform)
-      @cldc_version = Filament::JavaME::Tools.cldc_version_for($target_platform)
-      @bootclasspath = Filament::JavaME::Tools.classpath_for($target_platform)
-      
-      @custom_classpath = []
-
-      @append_entries = {}
-      @custom_entries = {}
-    end
-    
-    def define
-      @library = Filament::JavaME::Tasks::LibraryTask.new do |l| 
-        define_library(l)
-      end
-      
-      output :tag => [:default, :jar], 
-       :output => @library.jar_path,
-       :deployable => true,
-       :tasks => @library.tasks
-             
-      output :tag => :jad_proc do |d|
-        d.append_entries(@append_entries)
-        d.custom_entries(@custom_entries)
-      end
-    end
-    
-    def define_library(l)
-      l.working_dir = working_dir
-      l.output_dir = output_dir
-      l.name = name
-      l.classpath = classpath
-      l.bootclasspath = @bootclasspath
-      l.srcs = @srcs
-      
-      l.resources = @resources + (@should_package_deps ? flattened_deps_jars : [])
-
-      l.task_deps << package.descriptor
-      
-      l.proguard_proc = Proc.new do |o|
-        flattened_deps.collect{|dep| dep[:proguard_proc]}.compact.each{|p| p.call(o)}
-      end
-    end
-  end
-end

data/plugins/02javame/lib/filament/javame/tools/platform.rb

@@ -1,50 +0,0 @@
-require 'filament/platform'
-
-module Filament::JavaME
-  module Tools
-    TAGS = {}
-    TARGET_PLATFORMS = {}
-    
-    class << self
-      def platform(model)
-        p = Filament::Platform.find(:name => model)
-        raise "Unknown target platform: #{model}" if p.nil? 
-        raise "Not a JavaME platform: #{p.inspect}, #{p.tags.inspect}" unless p.tags.include?(:javame)
-        return p
-      end
-      
-      def tags_for(model)
-        return platform(model).tags.clone
-      end
-      
-      def cldc_version_for(model)
-        return platform(model).javame_configuration_version
-      end
-
-      def classpath_for(model)
-        cldc_version = cldc_version_for(model)
-        
-        base_classpath = platform(model).classpath
-
-        classpath = []
-        classpath += base_classpath unless base_classpath.nil?
-        
-        case cldc_version
-        when 1.0
-          classpath << "#{SUN_DIR}/cldcapi10.jar"
-        when 1.1
-          classpath << "#{SUN_DIR}/cldcapi11.jar"
-        end
-        
-        tags = tags_for(model)
-        
-        tags.each do |tag|
-          tag_classpath = TAGS[tag]
-          classpath += tag_classpath unless tag_classpath.nil?
-        end
-        
-        return classpath
-      end
-    end
-  end
-end