filament 0.2.0 → 0.2.1

data/CHANGELOG

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

data/lib/filament/package.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'pathname'
 require 'yaml'
 require 'open-uri'
+require 'memoize'
 
 require 'filament/util/fileutils'
 require 'filament/util/lazy_list'
@@ -16,15 +17,42 @@ module Filament
     end
   end
   
+  class PackageScm
+    def self.applies?(package)
+      return false
+    end
+    
+    def initialize(package)
+      @package = package
+    end
+
+    def revision; return nil; end
+
+    def update; end
+
+    def status; end
+
+    def commit(msg); end
+  end
+  
   class Package
+    include Memoize
+
+    @@package_scms = []
+    def self.scm(klass)
+      @@package_scms << klass
+    end
+    
     def target(name, klass, &block)
       klass.new(name, &block)
     end
     
-    attr_reader :parent, :name, :realpath, :workspace, :package_resolver, :target_resolver, :build_context, :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]
       
@@ -129,7 +157,7 @@ module Filament
     # 1. this package refers to a directory that exists
     # 2. this package has a valid parent
     def valid?
-      return false unless exist? and @pathname.directory?
+      return false unless exist? and @realpath.directory?
       return has_valid_parent?
     end
     
@@ -169,6 +197,11 @@ module Filament
       return nil
     end
     
+    def create
+      raise "directory #{@realpath} does not exist" unless exist?
+      make_valid!
+    end
+    
     # returns the full name of the package
     def uri
       return '//' + path
@@ -252,6 +285,13 @@ module Filament
       end
     end
 
+    def scm
+      @@package_scms.each do |scm|
+        return scm.new(self) if scm.applies?(self)
+      end
+      return nil
+    end
+
     # executes cmd with this packages as the wd, and with $this_package set to self
     def execute(&block)
       @execution_context.execute(&block)
@@ -301,7 +341,6 @@ module Filament
         pn += "#{subdir}/#{$build_dir_prefix}" 
       end
       
-#       mkdir_p(pn) unless pn.exist?
       return pn.to_s
     end
     

data/lib/filament/util/fileutils.rb

@@ -46,6 +46,6 @@ module Filament
       p = p.parent
     end
   
-    raise "Root directory not found for '#{package_dir}'"
+    return nil
   end
 end

data/lib/filament/workspace.rb

@@ -1,10 +1,20 @@
 require 'pathname'
+require 'fileutils'
 
 require 'filament/package'
 require 'filament/resolver'
 
 module Filament
   class Workspace
+    class << self
+      def create(path)
+        FileUtils.mkdir_p(path)
+        FileUtils.cd path do 
+          FileUtils.touch('.workspace')
+        end
+      end
+    end
+
     attr_reader :package_resolver, :realpath
     
     def initialize(path)
@@ -39,6 +49,20 @@ module Filament
       return package
     end
     
+    def create_package_for_path(path)
+      return nil if path.nil?
+
+      FileUtils.mkdir_p(path)
+      realpath_p = Pathname.new(path).realpath
+
+      puts realpath_p
+      package = package_for_realpath(realpath_p)
+
+      package.create
+      
+      return package
+    end
+    
     def resolve_package(uri)
       @package_resolver.resolve_package(uri)
     end

data/lib/filament.rb

@@ -64,7 +64,7 @@ module Filament
     def initialize
       @cmd = CmdParse::CommandParser.new(true)
       @cmd.program_name = "filament"
-      @cmd.program_version = [0, 2, 0]
+      @cmd.program_version = [0, 2, 1]
       @cmd.add_command(CmdParse::HelpCommand.new)
       @cmd.add_command(CmdParse::VersionCommand.new)
       @cmd.options = CmdParse::OptionParserWrapper.new do |opt|
@@ -78,40 +78,58 @@ module Filament
       end
     end
     
-    def subcommand(name, short_desc, &block)
-      subcommand = CmdParse::Command.new(name, false)
+    def workspace_path
+      return ENV['WORKSPACE_PATH'] || Filament::find_dir(Pathname.pwd, '.workspace')
+    end
+    
+    def subcommand(name, short_desc, has_subcommands=false, &block)
+      subcommand = CmdParse::Command.new(name, has_subcommands)
       subcommand.short_desc = short_desc
       subcommand.set_execution_block(&block)
       @cmd.add_command(subcommand)
+      return subcommand
+    end
+    
+    def parse(args)
+      @cmd.parse(args)
     end
     
+    
     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)
+      if workspace_path.nil?
+        parse(args)
+      else
+        $workspace = Workspace.new(workspace_path)
+        $workspace.load_tasks
+        this_package = $workspace.package_for_realpath(Pathname.pwd.realpath)
+        if this_package.nil?
+          parse(args)
+        else
+          this_package.execute do
+            log "ROOT PACKAGES: #{$context[:package_resolver].root_package_names.join(', ')}"
+            # do it.
+            @cmd.parse(args)
+          end
+        end
       end
     end
   end
   
   class << self
+    def versioned_subdir(path)
+      base_dir = Pathname.new(path).parent
+      version = (base_dir + 'VERSION').read.chomp
+      return base_dir + version
+    end
+  
     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 load_plugins(plugin_base_dir)
-      update_env(plugin_base_dir)
-
       plugins = []
       dirs = get_plugin_dirs(plugin_base_dir)
       dirs.each do |child|      
@@ -152,8 +170,6 @@ module Filament
         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) 
@@ -165,9 +181,6 @@ module Filament
       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

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

@@ -1,3 +1,4 @@
+require 'cmdparse'
 require 'filament/plugin'
 
 module Filament::Plugins
@@ -50,10 +51,30 @@ module Filament::Plugins
         end
       end
 
-      app.subcommand('workspace', "Creates a filament workspace at the provided path (or the working directory)") do |args|
+      generate = app.subcommand('generate', "Generates directory or file templates", true)
       
+      generate_workspace = CmdParse::Command.new('workspace', false)
+      generate_workspace.short_desc = "Creates a workspace at the given path"
+      generate_workspace.set_execution_block do |args|
+        args.each do |path|
+          Workspace.create(path)
+          puts "Workspace created."
+        end
+      end
+      
+      generate.add_command(generate_workspace)
+      
+      generate_package = CmdParse::Command.new('package', false)
+      generate_package.short_desc = "Creates a package with the given name"
+      generate_package.set_execution_block do |args|
+        args.each do |path|
+          raise "Workspace not defined." if $workspace.nil?
+          $workspace.create_package_for_path(path)
+          puts "Package created."
+        end
       end
       
+      generate.add_command(generate_package)
     end
   end
 end

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

@@ -18,10 +18,15 @@ module Filament::Plugins
         end
       end
 
-      app.subcommand('checkout', "Checks out a package into the workspace") do |args|
-        url, package_uri = *args
+      app.subcommand('checkout', "Checks out a package to a path in the workspace, creating a package if necessary") do |args|
+        url, path = *args
         
+        raise "Workspace not defined." if $workspace.nil?
         
+        package = $workspace.create_package_for_path(path)
+
+        svn = SVN.new(url)
+        svn.checkout(package.realpath)
       end
     end
   end

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

@@ -0,0 +1,69 @@
+require 'filament/package'
+
+module Filament::Scm
+  class SvnPackageScm < PackageScm
+    # returns true if this package is under svn control
+    def self.applies?(package)
+      p = package.realpath + '.svn'
+      return p.exist?
+    end
+    
+    def self.build_uri(h)
+      uri = h[:uri]
+
+      return uri unless @uri.nil?
+
+      package_path = h[:package_path]
+      base_uri = h[:repos_uri] || ENV['FILAMENT_SVN_REPOS_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
+    
+    def revision
+      return svn_info['Last Changed Rev'].to_i
+    end
+
+    # if this package is under version control, it will update it
+    # if this package has subpackages, it will update them
+    def update
+      puts @package.full_name
+      system("svn update #{@package.realpath}")
+      subpackages.each { |s| s.scm.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 status
+      puts @package.full_name
+      system("svn status #{@package.realpath}")
+      subpackages.each { |s| s.scm.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 commit(msg)
+      puts @package.full_name
+      system("svn ci -m '#{msg.gsub(/"/,"\\\"")}'") 
+      subpackages.each { |s| s.scm.commit(msg) }
+    end
+    
+    def svn_url
+      return svn_info['URL']
+    end
+
+    def svn_base_url
+      return url.gsub(/\/(trunk|branches\/[.^\/]*|tags\/[.^\/]*)$/, '')
+    end
+
+    def svn_info
+      stream = IO.popen("svn info #{@package.realpath}")
+      return YAML.load(stream)
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
 require 'filament/plugins/svn'
+require 'filament/scm/svn'
 
-Filament::Application::plugin(Filament::Plugins::SvnPlugin)
+Filament::Application::plugin(Filament::Plugins::SvnPlugin)
+Filament::Package::scm(Filament::Scm::SvnPackageScm)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: filament
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2006-03-17 00:00:00 -05:00
+  version: 0.2.1
+date: 2006-03-18 00:00:00 -05:00
 summary: A flexible dependency-based build platform based on Rake
 require_paths: 
 - lib
@@ -108,10 +108,10 @@ files:
 - 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/scm
 - plugins/10svn/lib/filament/plugins/svn.rb
+- plugins/10svn/lib/filament/scm/svn.rb
 - README
 - CHANGELOG
 test_files: []

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

@@ -1,121 +0,0 @@
-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