filament 0.1.2 → 0.2.0

data/CHANGELOG

@@ -1,3 +1,16 @@
+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.

data/bin/filament

@@ -1,11 +1,6 @@
 #!/usr/bin/env ruby
 
-#load "#{ENV['WR']}/tools/filament/lib/filament.rb"
 require 'filament'
 
-if FileTest.symlink?($0)
-  $actions << File.basename($0).to_sym
-end
-
-Filament::Application.new.run
+Filament::run
 

data/bin/filament-dbg

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-build BUILD_TYPE=DBG $@
+filament BUILD_TYPE=DBG $@

data/bin/filament-opt

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-build BUILD_TYPE=OPT $@
+filament BUILD_TYPE=OPT $@

data/bin/filament-test

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-build BUILD_TYPE=TEST test $@
+filament BUILD_TYPE=TEST test $@

data/lib/filament/package.rb

@@ -21,14 +21,13 @@ module Filament
       klass.new(name, &block)
     end
     
-    attr_reader :parent, :name, :realpath, :workspace, :package_resolver, :target_resolver, :build_context
+    attr_reader :parent, :name, :realpath, :workspace, :package_resolver, :target_resolver, :build_context, :scm
     alias :pathname :realpath
     
     def initialize(h)
       @parent = h[:parent]
       @workspace = h[:workspace]
       
-      
       if @workspace.nil?
         unless @parent.nil?
           @workspace = @parent.workspace

data/lib/filament/plugin.rb

@@ -0,0 +1,8 @@
+module Filament
+  # A basic class that plugins should use for extension
+  class Plugin
+    def initialize(application)
+      
+    end
+  end
+end

data/lib/filament/target.rb

@@ -1,8 +1,5 @@
 require 'filament/util/lazy_list'
 
-# TODO quick fixes..
-# switch to package.rb
-
 module Filament
   class TargetList < LazyList
     def initialize(*args)
@@ -89,9 +86,11 @@ module Filament
     alias :[] :get_output
 
     # builds this specific target (and all dependencies)
-    def build
+    # after building, it executes the provided block in the build context
+    def build(&block)
       @package.build_context.execute do
         invoke
+        block.call unless block.nil?
       end
     end
     

data/lib/filament.rb

@@ -1,6 +1,7 @@
 require 'pathname'
 require 'set'
 
+
 # rake stuff
 begin
   require 'rake'
@@ -8,11 +9,18 @@ rescue LoadError
   require 'rubygems'
   require_gem 'rake'
 end
+
+begin
+  require 'cmdparse'
+rescue LoadError
+  require 'rubygems'
+  require_gem 'cmdparse'
+end
+
 require 'rake/clean'
 
 require 'filament/workspace'
 require 'filament/platform'
-require 'filament/plugins'
 require 'filament/package'
 require 'filament/target'
 require 'filament/artifact'
@@ -44,172 +52,127 @@ module Filament
   def verbose(on)
     RakeFileUtils.verbose(false)
     $verbose = on
-#     if on
-#       trace_var :$context, lambda { |c| 
-#         puts "$context is now #{c}" 
-#       }
-#     else
-#       untrace_var :$context
-#     end
   end
   
-  $actions ||= []
-  
   class Application
-    OPTIONS = [ 
-    ['--trace', '-t', GetoptLong::NO_ARGUMENT, 
-        "Turn on invoke/execute tracing"],
-    ]
+    @@plugins = [] 
+
+    def self.plugin(klass)
+      @@plugins << klass
+    end
     
-    TARGET_ACTIONS = {
-      :build => Proc.new { |targets|
-        targets.each { |target| target.build }
-      },
-      :clobber => Proc.new { |targets|
-        targets.each { |target| target.package.clobber }
-      },
-      :execute => Proc.new { |targets|
-        targets.each do |target|
-          target.build
-          block = target[:execute]
-          target.package.build_context.execute(&block) unless block.nil?
-        end
-      },
-    }
+    def initialize
+      @cmd = CmdParse::CommandParser.new(true)
+      @cmd.program_name = "filament"
+      @cmd.program_version = [0, 2, 0]
+      @cmd.add_command(CmdParse::HelpCommand.new)
+      @cmd.add_command(CmdParse::VersionCommand.new)
+      @cmd.options = CmdParse::OptionParserWrapper.new do |opt|
+        opt.separator "Global options"
+        opt.on("--verbose", "Dump lots of stuff") { |t| verbose(true) }
+        opt.on("--trace", "Turn on tracing") { |t| $trace = true; verbose(true) }
+      end
+
+      @@plugins.each do |plugin|
+        plugin.new(self)
+      end
+    end
+    
+    def subcommand(name, short_desc, &block)
+      subcommand = CmdParse::Command.new(name, false)
+      subcommand.short_desc = short_desc
+      subcommand.set_execution_block(&block)
+      @cmd.add_command(subcommand)
+    end
     
-    PACKAGE_ACTIONS = {
-      
-    }
+    def run(args)
+      verbose(false)
+
+      this_package = $workspace.package_for_realpath(Pathname.pwd.realpath)
+      this_package.execute do
+        log "ROOT PACKAGES: #{$context[:package_resolver].root_package_names.join(', ')}"
+        # do it.
+        @cmd.parse(args)
+      end
+    end
+  end
+  
+  class << self
+    def get_plugin_dirs(path)
+      pn = Pathname.new(path)
+      return pn.children.sort  
+    end
+
+    def update_env(plugin_base_dir)
+      plugin_dirs = get_plugin_dirs(plugin_base_dir)
+      script_dirs = plugin_dirs.collect {|dir| dir + 'script' }
+      ENV['PATH'] = script_dirs.join(':') + ':' + ENV['PATH']
+    end
     
-    def collect_other_args
-      targets = []
-      packages = []
-      actions = []
+    def load_plugins(plugin_base_dir)
+      update_env(plugin_base_dir)
+
+      plugins = []
+      dirs = get_plugin_dirs(plugin_base_dir)
+      dirs.each do |child|      
+        ln = child + 'lib'
+
+        if ln.exist?
+          $LOAD_PATH << ln.realpath
+          cn = ln + 'init.rb'
+          raise "cannot init filament plugin '#{child}'" unless cn.exist?
+          load cn.realpath
+          plugins << child.basename.to_s
+        end
+      end
+
+      log "PLUGINS: #{plugins.join(', ')}"
+    end
+
+    def partition_args
       vars = {}
+      args = []
       ARGV.each do |arg|
         if arg =~ /^(\w+)=(.*)$/
           vars[$1] = $2
-        elsif arg =~ /^[^\/^:]/
-          actions << arg.to_sym
         else
-          targets << arg
-          if arg =~ /^\/[^:]/
-            packages << arg
-          end
+          args << arg
         end
       end
       return { :vars => vars,
-               :targets => targets,
-               :packages => packages,
-               :actions => actions }
+               :args => args }
     end
     
-    def do_option(opt, value)
-      case opt
-      when '--trace'
-        $trace = true
-        verbose(true)
-      else
-        fail "Unknown option: #{opt}"
-      end
-    end
-    
-    def command_line_options
-      OPTIONS.collect { |lst| lst[0..-2] }
-    end
-    
-    def handle_options
-      opts = GetoptLong.new(*command_line_options)
-      opts.each { |opt, value| do_option(opt, value) }
-    end
-    
-    def run(&block)
-      verbose(false)
+    def run
+      h = partition_args
+      vars = h[:vars]
+      args = h[:args]
 
-      handle_options
-      
-      begin
-        other_args = collect_other_args
-        vars = other_args[:vars]
-        
-        vars.each do |key, val|
-          ENV[key] = val
-        end
-        
-        actions = $actions + other_args[:actions]
-        actions.compact!
-        
-        workspace_path = ENV['WR'] || Filament::find_dir(Pathname.pwd, '.workspace')
-        $workspace = Workspace.new(workspace_path)
-        $target_platform = (ENV['TARGET_PLATFORM'] || :mpp_sdk || :i860 || :wt2_2).to_sym
-
-        build_type = (ENV['BUILD_TYPE'] || :DBG).to_sym
-        dirs = { :TEST => 'test', 	# this is a folder for testing targets to use 
-                 :DBG  => 'dbg',	# final jars, binaries, etc. are placed in these
-                 :OPT  => 'opt' } 	# this is for obfuscated, compressed, releasable versions
-
-        raise "unknown build type: '#{build_type}'" unless dirs.key?(build_type) 
-          
-        $build_dir_prefix = "#{dirs[build_type]}/#{$target_platform.to_s}"
-
-        pn = Pathname.new(__FILE__).parent.parent + 'plugins'
-        Filament::load_plugins(pn.realpath)
-
-        $workspace.load_tasks
-        this_package = $workspace.package_for_realpath(Pathname.pwd.realpath)
-        
-        this_package.execute do
-          targets = TargetList.new(*other_args[:targets])
-          packages = PackageList.new(*other_args[:packages])
-        
-          if targets.empty?
-            log "assuming default target of '#{this_package.uri}'"
-            targets.include(this_package.uri) 
-          end
-        
-          if packages.empty?
-            log "assuming default package of '#{this_package.uri}'"
-            packages.include(this_package.uri)
-          end
-        
-          if block.nil?
-            target_blocks = []
-            package_blocks = []
-          
-            actions.each do |action|
-              if TARGET_ACTIONS.key?(action)
-                target_blocks << TARGET_ACTIONS[action]
-              elsif PACKAGE_ACTIONS.key?(action)
-                package_blocks << PACKAGE_ACTIONS[action]
-              else
-                raise "Unknown action: #{action}"  
-              end
-            end
-            
-            # some debug
-            root_packages = $context[:package_resolver].root_packages.collect { |p| p.full_name }
-            puts "ACTIONS:      #{actions.join(', ')}"
-            puts "PACKAGE_RESOLVER:   #{root_packages.join(', ')}"
-
-            target_blocks.each { |b| b.call(targets) }
-            package_blocks.each { |b| b.call(packages) }
-          else
-            targets.each(&block)
-          end
-        end
-      rescue Exception => ex
-        puts "Build aborted!"
-        puts ex.message
-        if $trace
-          puts ex.backtrace.join("\n")
-        else
-          puts ex.backtrace.find {|str| str =~ /rakefile.rb/ } || ""
-        end
-        exit(1)
+      vars.each do |key, val|
+        ENV[key] = val
       end
+
+      workspace_path = ENV['WORKSPACE_PATH'] || Filament::find_dir(Pathname.pwd, '.workspace')
+
+      $target_platform = (ENV['TARGET_PLATFORM'] || :mpp_sdk || :i860 || :wt2_2).to_sym
+      $build_type = (ENV['BUILD_TYPE'] || :DBG || :OPT || :TEST).to_sym
+      raise "unknown build type: '#{$build_type}'" unless [:DBG, :OPT, :TEST].member?($build_type) 
+      # :TEST => this is a folder for testing targets to use 
+      # :DBG => final jars, binaries, etc. are placed in these
+      # :OPT => this is for obfuscated, compressed, releasable versions
+      $build_dir_prefix = "#{$build_type.to_s.downcase}/#{$target_platform.to_s}"
+
+      pn = Pathname.new(__FILE__).parent.parent + 'plugins'
+      Filament::load_plugins(pn.realpath)
+
+      $workspace = Workspace.new(workspace_path)
+      $workspace.load_tasks
+
+      Filament::Application.new.run(args)
     end
   end
 end
 
 include Filament::Platform
 include Filament
+

data/plugins/00util/lib/filament/plugins/util.rb

@@ -0,0 +1,59 @@
+require 'filament/plugin'
+
+module Filament::Plugins
+  class Util < Plugin
+    def initialize(app)
+      app.subcommand('build', "Build the given targets") do |args|
+        targets = TargetList.new(*args)
+        targets.each { |target| target.build }
+      end
+
+      app.subcommand('clobber', "Clobber the generated files for the given packages") do |args|
+        packages = PackageList.new(*args)
+        packages.each { |package| package.clobber }
+      end
+
+      app.subcommand('execute', "Executes the target, if it is executable") do |args|
+        targets = TargetList.new(*args)
+        targets.each do |target|
+          target.build do
+            block = target[:execute]
+            block.call unless block.nil?
+          end
+        end
+      end
+      
+      app.subcommand('targets', "Shows targets of given package") do |args|
+        packages =  PackageList.new(*args)
+        packages.each do |package|
+          puts "  #{package.full_name}"
+          package.targets.each do |target|
+            puts "    #{target.uri}"
+          end
+        end
+      end
+
+      app.subcommand('prereqs', "Shows prerequisites of given packages") do |args|
+        targets = TargetList.new(*args)
+        targets.each do |target|
+          puts "    #{target.uri}"
+          target.deps.each do |dep|
+            puts "      #{dep.uri}"
+          end
+        end
+      end
+      
+      app.subcommand('list', "Lists subpackages of given packages") do |args|
+        packages = PackageList.new(*args)
+        packages.each do |package|
+          package.list
+        end
+      end
+
+      app.subcommand('workspace', "Creates a filament workspace at the provided path (or the working directory)") do |args|
+      
+      end
+      
+    end
+  end
+end

data/plugins/00util/lib/init.rb

@@ -1,47 +1,4 @@
-class Filament::Util
-  package_actions = {
-    :list => Proc.new { |packages|
-      packages.each do |package|
-        package.list
-      end      
-    },
-    :update => Proc.new { |packages|
-      packages.each do |package|
-        package.update
-      end
-    },    
-    :status => Proc.new { |packages|
-      packages.each do |package|
-        package.status
-      end
-    },    
-    :commit => Proc.new { |packages|
-      packages.each do |package|
-        package.commit
-      end
-    },
-    #Display the targets and dependencies, then exit.
-    :targets => Proc.new { |packages|
-      packages.each do |package|
-        puts "  #{package.full_name}"
-        package.targets.each do |target|
-          puts "    #{target.uri}"
-        end
-      end
-    }
-  }
-  
-  target_actions = {
-    :prereqs => Proc.new { |targets|
-      targets.each do |target|
-        puts "    #{target.uri}"
-        target.deps.each do |dep|
-          puts "      #{dep.uri}"
-        end
-      end
-    }
-  }
-    
-  Application::PACKAGE_ACTIONS.merge!(package_actions)
-  Application::TARGET_ACTIONS.merge!(target_actions)
-end
+require 'filament'
+require 'filament/plugins/util'
+
+Filament::Application::plugin(Filament::Plugins::Util)

data/plugins/01java/lib/filament/plugins/java.rb

@@ -0,0 +1,9 @@
+require 'filament/plugin'
+
+module Filament::Plugins
+  class Java < Plugin
+    def initialize(app)
+      
+    end
+  end
+end

data/plugins/01java/lib/init.rb

@@ -1 +1,5 @@
-require 'filament/java/tools'
+require 'filament'
+require 'filament/java/tools'
+require 'filament/plugins/java'
+
+Filament::Application::plugin(Filament::Plugins::Java)

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

@@ -2,64 +2,8 @@ require 'filament/platform'
 
 module Filament::JavaME
   module Tools
-    def self.vendor_dir(name)
-      return "#{$workspace.realpath}/vendor/libraries/javame/#{name}"
-    end
-
-    def self.jsr_classpath(jsr)
-      return ["#{vendor_dir('jsr')}/#{jsr}/#{jsr}.jar"]
-    end
-      
-    SUN_DIR = vendor_dir('sun')
-    MPP_DIR = vendor_dir('mpp-sdk')
-    MOTOROLA_DIR = vendor_dir('motorola')
-
-    TAGS = {
-      :midp1 => ["#{SUN_DIR}/midpapi10.jar"],
-      :midp2 => ["#{SUN_DIR}/midpapi20.jar"],
-      :jsr_75 => jsr_classpath(75),
-      :jsr_82 => jsr_classpath(82),
-      :jsr_120 => jsr_classpath(120),
-      :jsr_135 => jsr_classpath(135),
-      :jsr_172 => jsr_classpath(172),
-      :jsr_184 => jsr_classpath(184),
-    }
-    
-    TARGET_PLATFORMS[:wtk2_2] = { 
-      :tags => [:wtk, :midp2, :jsr_82], 
-      :cldc_version => 1.1
-    }
-
-    TARGET_PLATFORMS[:mpp_sdk] = {
-      :tags => [:mpp, :midp2, :jsr_82],
-      :cldc_version => 1.1
-    }
-
-    TARGET_PLATFORMS[:a1000] = {
-      :tags => [:midp2, :jsr_82, :jsr_120, :jsr_185, :jsr_135],
-      :cldc_version => 1.0
-    }
-    
-    TARGET_PLATFORMS[:weme] = {
-      :tags => [:midp2, :jsr_75, :jsr_172],
-      :cldc_version => 1.1
-    }
-    
-    TARGET_PLATFORMS[:i860] = {
-      :tags => [:iden],
-      :cldc_version => 1.0,
-      :classpath => ["#{MOTOROLA_DIR}/i860/i860.jar"]
-    }
-
-		TARGET_PLATFORMS[:e398] = {
-		  :tags => [:midp2, :jsr_120, :jsr_135],
-      :cldc_version => 1.0
-    }
-		
-    TARGET_PLATFORMS[:e680] = {
-      :tags => [:midp2, :jsr_120, :jsr_135, :jsr_184, :jsr_185],
-      :cldc_version => 1.0
-    }
+    TAGS = {}
+    TARGET_PLATFORMS = {}
     
     class << self
       def platform(model)

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

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

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

@@ -10,20 +10,8 @@ require 'filament/push/conduits/bluetooth_conduit'
 require 'filament/push/conduits/scp_conduit'
 require 'filament/push/conduits/filter_conduit'
 
-module Filament::Push::Conduits
-  Application::TARGET_ACTIONS[:push] = Proc.new { |targets|
-    push_conduit = ENV['PUSH_CONDUIT'] || :Filter
-   
-    targets.each do |target|
-      target.build
-    end
-    
-    klass = eval(push_conduit.to_s + 'Conduit')
-    conduit = klass.new
-    
-    conduit.push_targets(targets)  
-  }
-end
+require 'filament/plugins/push'
 
+Filament::Application::plugin(Filament::Plugins::Push)
 
 

data/plugins/10svn/lib/filament/package/svn.rb

@@ -0,0 +1,121 @@
+require 'filament/package'
+
+module Filament
+  class Package
+    # returns true if this package is under svn control
+    def svn?
+      p = @realpath + '.svn'
+      return p.exist?
+    end
+
+    def revision
+      return svn_revision
+    end
+
+    def update
+      return svn_update
+    end
+
+    def status
+      return svn_status
+    end
+
+    def commit(msg)
+      return svn_commit(msg)
+    end
+
+    def svn_info
+      stream = IO.popen("svn info #{@pathname.realpath}")
+      return YAML.load(stream)
+    end
+
+    def svn_revision
+      return 0 unless svn?
+      return svn_info['Last Changed Rev'].to_i
+    end
+
+    def svn_url
+      return nil unless svn?
+      return svn_info['URL']
+    end
+
+    def svn_base_url
+      return url.gsub(/\/(trunk|branches\/[.^\/]*|tags\/[.^\/]*)$/, '')
+    end
+
+    # if this package is under version control, it will update it
+    # if this package has subpackages, it will update them
+    def svn_update
+      if svn?
+        puts full_name
+        system('svn update')
+      end
+      subpackages.each { |s| s.update }
+    end
+
+    # if this package is under version control, it will print its status
+    # if this package has subpackages it will print their status
+    def svn_status
+      if svn?
+        puts full_name
+        system('svn status')
+      end
+      subpackages.each { |s| s.status }
+    end
+
+    # if this package is under version control, it will commit it with the 
+    # given msg
+    # if this package has subpackages it will commit them
+    def svn_commit(msg)
+      if svn?
+        puts full_name
+        system("svn ci -m \"#{msg}\"") 
+      end
+      subpackages.each { |s| s.commit(msg) }
+    end
+
+    def self.build_uri(h)
+      uri = h[:uri]
+
+      return uri unless @uri.nil?
+
+      package_path = h[:package_path]
+      base_uri = h[:root_uri] || ENV['BASE_SVN_URL']
+
+      tag = h[:tag]
+      branch = h[:branch]
+
+      return "#{base_uri}/tags/#{package_path}/#{tag}" unless tag.nil?
+      return "#{base_uri}/branches/#{package_path}/#{branch}" unless branch.nil?
+      return "#{base_uri}/trunk/#{package_path}"
+    end
+
+    # checks out the package into the current wd (preserving its path)
+    def self.checkout(h)
+      uri = Package.build_uri(h)
+      pkg = Package.create(h)
+      pkg.system("svn co #{uri} .")
+      return pkg
+    end
+
+    # exports a url to a given dir
+    def self.export(h)
+      uri = Package.build_uri(h)
+      pkg = Package.create(h)
+      pkg.system("svn export #{uri} .")
+      return pkg
+    end
+  end
+end
+
+
+#class URI::Generic
+#  def to_package
+#    s = SVN.new(uri)
+#    raise "not an svn uri" unless s.valid?
+#    pkg = export(:package_path => s.path,
+#                 :uri => s.uri,
+#                 :root_dir => Filament::Package.CACHE_DIR)
+#    return pkg
+#  end
+#end

data/plugins/10svn/lib/filament/plugins/svn.rb

@@ -0,0 +1,28 @@
+require 'filament/package/svn'
+require 'svn'
+
+module Filament::Plugins
+  class SvnPlugin < Plugin
+    def initialize(app)
+      app.subcommand('update', "Updates given package and subpackages") do |args|
+        packages = PackageList.new(*args)
+        packages.each do |package|
+          package.update
+        end
+      end
+      
+      app.subcommand('status', "Shows status given of package and subpackages") do |args|
+        packages = PackageList.new(*args)
+        packages.each do |package|
+          package.status
+        end
+      end
+
+      app.subcommand('checkout', "Checks out a package into the workspace") do |args|
+        url, package_uri = *args
+        
+        
+      end
+    end
+  end
+end

data/plugins/10svn/lib/init.rb

@@ -0,0 +1,3 @@
+require 'filament/plugins/svn'
+
+Filament::Application::plugin(Filament::Plugins::SvnPlugin)

data/{lib → plugins/10svn/lib}/svn.rb

@@ -75,4 +75,12 @@ class SVN
 			SVN.new("#{@uri}/#{child}")
 		end
 	end
+	
+	def checkout(path)
+	  raise "error checking out to #{path}" unless system("svn co #{@uri} #{path}")
+  end
+  
+  def export(path)
+    raise "error exporting to #{path}" unless system("svn export #{@uri} #{path}")
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: filament
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2006-03-16 00:00:00 -05:00
+  version: 0.2.0
+date: 2006-03-17 00:00:00 -05:00
 summary: A flexible dependency-based build platform based on Rake
 require_paths: 
 - lib
@@ -32,35 +32,20 @@ files:
 - bin/filament-dbg
 - bin/filament-opt
 - bin/filament-test
-- bin/init
-- tests/build
-- tests/gen
-- tests/java
 - tests/platform_test.rb
 - tests/root
-- tests/build/artifact_name_test.rb
-- tests/build/artifact_test.rb
-- tests/gen/java
-- tests/gen/java/block_test.rb
-- tests/gen/java/callable_test.rb
-- tests/gen/java/method_test.rb
-- tests/gen/java/statement_test.rb
-- tests/java/tools_test.rb
 - lib/filament
 - lib/filament.rb
 - lib/inflector.rb
-- lib/svn.rb
 - lib/filament/artifact.rb
 - lib/filament/context.rb
-- lib/filament/package
 - lib/filament/package.rb
 - lib/filament/platform.rb
-- lib/filament/plugins.rb
+- lib/filament/plugin.rb
 - lib/filament/resolver.rb
 - lib/filament/target.rb
 - lib/filament/util
 - lib/filament/workspace.rb
-- lib/filament/package/svn.rb
 - lib/filament/util/filelist2.rb
 - lib/filament/util/fileutils.rb
 - lib/filament/util/lazy_list.rb
@@ -68,12 +53,17 @@ files:
 - plugins/01java
 - plugins/02javame
 - plugins/05push
+- plugins/10svn
 - 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/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/java/tools
 - plugins/01java/lib/filament/java/tools.rb
@@ -82,6 +72,7 @@ files:
 - plugins/01java/lib/filament/java/tools/execute.rb
 - plugins/01java/lib/filament/java/tools/jar.rb
 - plugins/01java/lib/filament/java/tools/proguard.rb
+- plugins/01java/lib/filament/plugins/java.rb
 - plugins/02javame/lib
 - plugins/02javame/lib/filament
 - plugins/02javame/lib/init.rb
@@ -105,12 +96,22 @@ files:
 - plugins/05push/lib/bluetooth.rb
 - plugins/05push/lib/filament
 - plugins/05push/lib/init.rb
+- plugins/05push/lib/filament/plugins
 - plugins/05push/lib/filament/push
 - 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/10svn/lib
+- plugins/10svn/lib/filament
+- plugins/10svn/lib/init.rb
+- plugins/10svn/lib/svn.rb
+- plugins/10svn/lib/filament/package
+- plugins/10svn/lib/filament/plugins
+- plugins/10svn/lib/filament/package/svn.rb
+- plugins/10svn/lib/filament/plugins/svn.rb
 - README
 - CHANGELOG
 test_files: []
@@ -136,3 +137,21 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.7.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: cmdparse
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: memoize
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.2
+    version: 

data/bin/init

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export BUILD_PLUGINS=${BUILD}/plugins
-#export PATH=`ls -1 ${BUILD_PLUGINS} | xargs -I qq echo -n "${BUILD_PLUGINS}/qq/script:"`${PATH}

data/lib/filament/package/svn.rb

@@ -1,123 +0,0 @@
-require 'filament/package'
-
-module Filament
-  class Package    
-      # returns true if this package is under svn control
-      def svn?
-        p = @pathname + '.svn'
-        return p.exist?
-      end
-
-      def revision
-        return svn_revision
-      end
-
-      def update
-        return svn_update
-      end
-
-      def status
-        return svn_status
-      end
-
-      def commit(msg)
-        return svn_commit(msg)
-      end
-
-      def svn_info
-        stream = IO.popen("svn info #{@pathname.realpath}")
-        return YAML.load(stream)
-      end
-
-      def svn_revision
-        return 0 unless svn?
-        return svn_info['Last Changed Rev'].to_i
-      end
-
-      def svn_url
-        return nil unless svn?
-        return svn_info['URL']
-      end
-
-      def svn_base_url
-        return url.gsub(/\/(trunk|branches\/[.^\/]*|tags\/[.^\/]*)$/, '')
-      end
-
-      # if this package is under version control, it will update it
-      # if this package has subpackages, it will update them
-      def svn_update
-        if svn?
-          puts full_name
-          system('svn update')
-        end
-        subpackages.each { |s| s.update }
-      end
-
-      # if this package is under version control, it will print its status
-      # if this package has subpackages it will print their status
-      def svn_status
-        if svn?
-          puts full_name
-          system('svn status')
-        end
-        subpackages.each { |s| s.status }
-      end
-
-      # if this package is under version control, it will commit it with the 
-      # given msg
-      # if this package has subpackages it will commit them
-      def svn_commit(msg)
-        if svn?
-          puts full_name
-          system("svn ci -m \"#{msg}\"") 
-        end
-        subpackages.each { |s| s.commit(msg) }
-      end
-    end
-
-    def self.build_uri(h)
-      uri = h[:uri]
-
-      return uri unless @uri.nil?
-
-      package_path = h[:package_path]
-      base_uri = h[:root_uri] || ENV['BASE_SVN_URL']
-
-      tag = h[:tag]
-      branch = h[:branch]
-
-      return "#{base_uri}/tags/#{package_path}/#{tag}" unless tag.nil?
-      return "#{base_uri}/branches/#{package_path}/#{branch}" unless branch.nil?
-      return "#{base_uri}/trunk/#{package_path}"
-    end
-
-    # checks out the package into the current wd (preserving its path)
-    def self.checkout(h)
-      uri = Package.build_uri(h)
-      pkg = Package.create(h)
-      pkg.system("svn co #{uri} .")
-      return pkg
-    end
-
-    # exports a url to a given dir
-    def self.export(h)
-      uri = Package.build_uri(h)
-      pkg = Package.create(h)
-      pkg.system("svn export #{uri} .")
-      return pkg
-    end
-
-  end
-end
-
-
-#class URI::Generic
-#  def to_package
-#    s = SVN.new(uri)
-#    raise "not an svn uri" unless s.valid?
-#    pkg = export(:package_path => s.path,
-#                 :uri => s.uri,
-#                 :root_dir => Filament::Package.CACHE_DIR)
-#    return pkg
-#  end
-#end

data/lib/filament/plugins.rb

@@ -1,32 +0,0 @@
-module Filament
-  def self.get_plugin_dirs(path)
-    pn = Pathname.new(path)
-    return pn.children.sort  
-  end
-  
-  def self.load_plugins(plugin_base_dir)
-    update_env(plugin_base_dir)
-
-    plugins = []
-    dirs = get_plugin_dirs(plugin_base_dir)
-    dirs.each do |child|      
-      ln = child + 'lib'
-      
-      if ln.exist?
-        $LOAD_PATH << ln.realpath
-        cn = ln + 'init.rb'
-        raise "cannot init filament plugin '#{child}'" unless cn.exist?
-        load cn.realpath
-        plugins << child.basename.to_s
-      end
-    end
-    
-    puts "PLUGINS: #{plugins.join(', ')}"
-  end
-
-  def self.update_env(plugin_base_dir)
-    plugin_dirs = get_plugin_dirs(plugin_base_dir)
-    script_dirs = plugin_dirs.collect {|dir| dir + 'script' }
-    ENV['PATH'] = script_dirs.join(':') + ':' + ENV['PATH']
-  end
-end

data/tests/build/artifact_name_test.rb

@@ -1,85 +0,0 @@
-require 'test/unit'
-
-require 'build/artifact_lib'
-
-class ArtifactNameTest < Test::Unit::TestCase
-  def test_parse
-    bad_an = [nil,
-              '',
-              'blah',
-              ':target',
-              'package:target']
-    
-    bad_an.each do |an|
-      assert_nil(Build::ArtifactName.parse(an))
-    end
-
-    good_an = [['//package', 'package', 'package'],
-               ['//package/sub_package', 'package/sub_package', 'sub_package'],
-               ['//package/sub_package:target', 'package/sub_package', 'target'],
-               ['//package:target', 'package', 'target'],
-               ['//j2me_util', 'j2me_util', 'j2me_util']]
-        
-    good_an.each do |an, pn, tn|
-      a = Build::ArtifactName.parse(an)
-      assert_not_nil(a, "'#{an}' should not parse to nil")
-      assert_equal(pn, a.package)
-      assert_equal(tn, a.target)
-    end
-  end
-  
-  def test_target_name
-    bad_tn = [nil,
-              '',
-              'blah',
-              '//package']
-    bad_tn.each do |tn|
-      assert_equal(false, 
-                   Build::ArtifactName.target_name?(tn),
-                   "'#{tn}' should not be a valid target name.")
-    end
-    
-    good_tn = [':target']
-    good_tn.each do |tn|
-      assert(Build::ArtifactName.target_name?(tn),
-             "'#{tn}' should be a valid target name.")
-    end
-  end
-  
-  def test_package_name
-    bad_pn = [nil,
-              '',
-              'blah',
-              ':target',
-              '//package:target']
-    bad_pn.each do |pn|
-      assert_equal(false,
-                   Build::ArtifactName.package_name?(pn),
-                   "'#{pn}' should not be a valid package name.")
-    end
-    
-    good_pn = ['//package',
-               '//package/sub_package']
-               
-    good_pn.each do |pn|
-      assert(Build::ArtifactName.package_name?(pn),
-             "'#{pn}' should be a valid package name.")
-    end
-  end
-  
-  def test_strip
-    stripped = [['package', '//package'],
-                ['package/sub_package', '//package/sub_package'],
-                ['target', ':target'],
-                ['blah', 'blah'],
-                ['//package:target', '//package:target']]
-    
-    stripped.each do |val, arg|
-      assert_equal(val, Build::ArtifactName.strip(arg))
-    end
-  end
-  
-  def test_fetch
-    an = Build::ArtifactName.new(:target => 'target', :package => 'package')
-  end
-end

data/tests/build/artifact_test.rb

@@ -1,23 +0,0 @@
-require 'test/unit'
-
-require 'build/artifact'
-
-class ArtifactTest < Test::Unit::TestCase
-  def test_flatten_deps
-    a1 = Build::Artifact.define_artifact(:a1, :p)
-    a2 = Build::Artifact.define_artifact(:a2, :p)
-    b1 = Build::Artifact.define_artifact(:b1, :p, ['//p:a1'])
-    b2 = Build::Artifact.define_artifact(:b2, :p, ['//p:a1', '//p:a2'])
-    c =  Build::Artifact.define_artifact(:a1, :p, ['//p:b1', '//p:b2'])
-    
-    all_deps = Build::Artifact.flatten_deps(c).collect do |artifact|
-      artifact.name.to_s
-    end
-    all_deps.sort!
-    
-    answer = ['//p:a1', '//p:a2', '//p:b1', '//p:b2']
-    answer.sort!
-    
-    assert_equal(answer, all_deps)
-  end
-end

data/tests/gen/java/block_test.rb

@@ -1,42 +0,0 @@
-require 'test/unit'
-
-require 'gen/java/block'
-
-class JavaBlockTest < Test::Unit::TestCase
-  include Gen::Java
-  
-  STATEMENTS = ['int a = 0;',
-                'int b = a + 2;',
-                '//start',
-                'System.out.println(b);',
-                '//end']
-
-  def test_append    
-    jb = JavaBlock.new            
-    STATEMENTS.each do |s|
-      jb << s
-    end
-    
-    assert_equal(STATEMENTS, 
-                 jb.statements)
-  end
-
-  def test_parse
-    text = ""
-    STATEMENTS.each do |s|
-      text << s << "\n"
-    end
-    
-    assert_equal(STATEMENTS, 
-                 JavaBlock.parse(text).statements)
-  end
-  
-  def test_to_s
-    j = ['a = b;',
-         'b = c;']
-         
-    s = "{\n    a = b;\n    b = c;\n  }"
-    assert_equal(s, 
-                 JavaBlock.new(:statements => j).to_s(1))
-  end
-end

data/tests/gen/java/callable_test.rb

@@ -1,23 +0,0 @@
-require 'test/unit'
-
-require 'gen/java/variable'
-require 'gen/java/callable'
-
-class JavaCallableTest < Test::Unit::TestCase
-  include Gen::Java
-  
-  def test_to_s
-    jb = JavaBlock.new(:indent => 1,
-                       :statements => ['a = b;',
-                                      'b = c;'])
-    a  = JavaVariable.new(:int, :a)
-    b  = JavaVariable.new(:String, :b)
-
-    s = "callable(int a, String b) {\n    a = b;\n    b = c;\n  }"
-
-    assert_equal(s, 
-                 JavaCallable.new(:name => :callable,
-                                  :params => [a, b],
-                                  :block => jb).to_s(1))
-  end
-end

data/tests/gen/java/method_test.rb

@@ -1,25 +0,0 @@
-require 'test/unit'
-
-require 'gen/java/method'
-
-class JavaMethodTest < Test::Unit::TestCase
-  include Gen::Java
-  
-  def test_to_s
-    jb = JavaBlock.new(:indent => 1,
-                       :statements => ['a = b;',
-                                      'b = c;'])
-    a  = JavaVariable.new(:int, :a)
-    b  = JavaVariable.new(:String, :b)
-
-    s = "private int callable(int a, String b) {\n  a = b;\n  b = c;\n}"
-
-    assert_equal(s, 
-                 JavaMethod.new(:type => :int,
-                                :visibility => :private,
-                                :name => :callable,
-                                :params => [a, b],
-                                :block => jb).to_s)
-  
-  end
-end

data/tests/gen/java/statement_test.rb

@@ -1,16 +0,0 @@
-require 'test/unit'
-
-require 'gen/java/statement'
-
-class JavaStatementTest < Test::Unit::TestCase
-  include Gen::Java
-  
-  def test_comment?
-    js = JavaStatement.new('a = b;')
-    
-    assert(!js.comment?, "#{js.to_s} should not be considered a comment")
-    
-    js = JavaStatement.new('//asdf')
-    assert(js.comment?, "#{js.to_s} should be considered a comment")
-  end
-end

data/tests/java/tools_test.rb

@@ -1,8 +0,0 @@
-require 'test/unit'
-
-require 'java/tools'
-
-class JavaTest < Test::Unit::TestCase
-  def test_something
-  end
-end