filament 0.2.2 → 0.2.3

data/CHANGELOG

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

data/lib/filament/package.rb

@@ -28,11 +28,17 @@ module Filament
 
     def revision; return nil; end
 
-    def update; end
+    def update
+      @package.subpackages.each {|s| s.scm.update}  
+    end
 
-    def status; end
+    def status
+      @package.subpackages.each {|s| s.scm.status}
+    end
 
-    def commit(msg); end
+    def commit(msg)
+      @package.subpackages.each {|s| s.scm.commit(msg)}
+    end
   end
   
   class Package
@@ -285,11 +291,14 @@ module Filament
       end
     end
 
+    # returns the scm for this package
     def scm
       @@package_scms.each do |scm|
         return scm.new(self) if scm.applies?(self)
       end
-      return nil
+      
+      # default to the simplest scm
+      return PackageScm.new(self)
     end
 
     # executes cmd with this packages as the wd, and with $this_package set to self

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, 2]
+      @cmd.program_version = [0, 2, 3]
       @cmd.add_command(CmdParse::HelpCommand.new)
       @cmd.add_command(CmdParse::VersionCommand.new)
       @cmd.options = CmdParse::OptionParserWrapper.new do |opt|

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

@@ -6,14 +6,14 @@ module Filament::Plugins
       app.subcommand('update', "Updates given package and subpackages") do |args|
         packages = PackageList.new(*args)
         packages.each do |package|
-          package.update
+          package.scm.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
+          package.scm.status
         end
       end
 

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

@@ -33,7 +33,7 @@ module Filament::Scm
     def update
       puts @package.full_name
       system("svn update #{@package.realpath}")
-      subpackages.each { |s| s.scm.update }
+      super
     end
 
     # if this package is under version control, it will print its status
@@ -41,7 +41,7 @@ module Filament::Scm
     def status
       puts @package.full_name
       system("svn status #{@package.realpath}")
-      subpackages.each { |s| s.scm.status }
+      super
     end
 
     # if this package is under version control, it will commit it with the 
@@ -49,8 +49,8 @@ module Filament::Scm
     # 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) }
+      system("svn ci -m '#{msg.gsub(/"/,"\\\"")}'")
+      super(msg)
     end
     
     def svn_url

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: filament
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 date: 2006-03-18 00:00:00 -05:00
 summary: A flexible dependency-based build platform based on Rake
 require_paths: