ratch 0.3.0 → 0.4.0

data/lib/ratch/{project → metadata}/package.rb

@@ -21,8 +21,8 @@
 #   You should have received a copy of the GNU General Public License
 #   along with Ratch.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'ratch/project/project'
-require 'ratch/project/release'
+require 'ratch/metadata/project'
+require 'ratch/metadata/release'
 
 
 module Ratch
@@ -42,6 +42,9 @@ module Ratch
       package
     end
 
+    # Overrides Project#name.
+    # TODO: Is this what we want ?
+
     def name
       @name ||= release.name
     end
@@ -71,6 +74,29 @@ module Ratch
       end
     end
 
+    # Package name is generally in the form of +name-version+, or
+    # +name-version-platform+ if +platform+ is specified.
+    #
+    # Template can be used to modify the name via sprintf. The defaults
+    # is "%s-%s" for name-version or "%s-%s-%s for name-version-platform.
+
+    def package_name(template=nil)
+      unless template
+        template = platform ? "%s-%s-%s" : "%s-%s"
+      end
+
+      if buildno  # TODO Make this better.
+        buildno = Time.now.strftime("%H*60+%M")
+        versnum = "#{version}.#{buildno}"
+      else
+        versnum = version
+      end
+
+      template % [ name, versnum, platform ]
+    end
+
+    alias_method :stage_name, :package_name
+
     #
 
     #validate "release isnt valid" do

data/lib/ratch/{project → metadata}/project.rb

@@ -22,7 +22,7 @@
 #   along with Ratch.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'facets/filelist'
-require 'ratch/project/information'
+require 'ratch/metadata/information'
 
 
 module Ratch
@@ -91,7 +91,13 @@ module Ratch
 
     # Brief one-line description of the package (Max 80 chars.)
     attr_accessor :summary, :brief do
-      @summary.to_s[0..79]
+      if @summary
+        @summary.to_s[0..79]
+      else
+        i = @description.index('.') || 79
+        i = 79 if i > 79
+        @description[0..i]
+      end
     end
 
     # More detailed description of the package.
@@ -407,20 +413,6 @@ module Ratch
     # Generate documentation on installation?
     attr_accessor :document
 
-    # Package name is in the form of +name-version+, or
-    # +name-version-arch+ if +arch+ is not 'any', 'all' or nil.
-    #
-    # TODO Not sure how this can work actually. What about
-    # multiple architectures?
-    def package_name
-      case platform
-      when 'any', 'all', nil
-        "#{package}-#{version}"
-      else
-        "#{package}-#{version}-#{platform}"
-      end
-    end
-
 
     # Distribution
     #------------------------------------------------------------------------

data/lib/ratch/{project → metadata}/release.rb

@@ -21,7 +21,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with Ratch.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'ratch/project/information'
+require 'ratch/metadata/information'
 
 module Ratch
 
@@ -69,7 +69,7 @@ module Ratch
 
     #
 
-    ROLLRC_FILE   = '{.,meta/}{roll}{rc,}'
+    ROLLRC_FILE   = '{.,meta/}{roll}{.rc,rc,}'
 
     # Load release information.
 
@@ -95,15 +95,15 @@ module Ratch
         str = io.to_s
       end
 
-      str = str.strip.split(/\n/).first
+      stamp, *libpath = str.strip.split(/\n/)
 
-      name, version, status, date, *null = *str.split(/\s+/)
+      name, version, status, date, *null = *stamp.split(/\s+/)
 
       { :name     => name,
         :version  => version,
         :status   => status,
-        :date     => date #,
-        #:codename => codename
+        :date     => date,
+        :libpath  => libpath
       }
     end
 

data/lib/ratch/support/errors.rb

@@ -0,0 +1,4 @@
+
+class OverwriteError < Exception
+end
+

data/lib/ratch/support/filename.rb

@@ -0,0 +1,18 @@
+class String
+
+  # Find actual filename (casefolding) and returns it.
+  # Returns nil if no file is found.
+
+  def to_actual_filename
+    Dir.glob(self, File::FNM_CASEFOLD).first
+  end
+
+  # Find actual filename (casefolding) and replace string with it.
+  # If file not found, string remains the same and method returns nil.
+
+  def to_actual_filename!
+    filename = to_actual_filename
+    replace(filename) if filename
+  end
+
+end

data/lib/ratch/toolset/ruby/compile

@@ -0,0 +1,49 @@
+#!/usr/bin/env ratch
+
+# compile extensions
+
+main :compile => [ :make_config ] do
+  extension_directories.each do |directory|
+    build File.join(directory, 'Makefile')
+    cd(directory) do
+      make
+    end
+  end
+end
+
+# Setup Makefile builds
+
+task :make_config do
+  extension_directories.each do |directory|
+    file File.join(directory, 'Makefile') do
+      cd(directory) do
+        ruby "extconf.rb"
+      end
+    end
+  end
+end
+
+#
+
+def extension_directories
+  glob('ext/**/extconf.rb').map do |ext|
+    File.dirname(ext)
+  end
+end
+
+
+
+
+# Eric Hodel said NOT to copy the compiled libs.
+#
+#task :copy_files do
+#  cp "ext/**/*.#{dlext}", "lib/**/#{arch}/"
+#end
+#
+#def dlext
+#  Config::CONFIG['DLEXT']
+#end
+#
+#def arch
+#  Config::CONFIG['arch']
+#end

data/lib/ratch/toolset/ruby/pack/gem

@@ -2,6 +2,8 @@
 
 # generate gem package
 
+# TODO: Should this use staging too, like zip/tgz?
+
 begin
   require 'rubygems/specification'
   Gem::manage_gems
@@ -9,29 +11,43 @@ rescue LoadError
   raise LoadError, "RubyGems is not installed?"
 end
 
-require 'ratch/project/package'
-
-#
+# Create a Gem package.
 
 main 'pack/gem' do
-  # load config (TODO)
-  #source  = Dir.pwd
-  store   = 'pkg'
-  package = Ratch::Package.load
-  #status "Creating RubyGem(s)"
+  status "Creating .gem package"
+
+  config = configuration['pack'] || {}
+  config = config['gem'] || {}
+
+  package = package().clone
+  package.update(config)
+
+  store = config[:store] || 'pkg'
+
+  #dir  = Dir.pwd
+
   file = nil
-  #cd(source) do
+  #cd(dir) do
     #status "vi #{metadata.name}.gemspec"
     builder = ::Gem::Builder.new(gemspec(package))
-    #status "gem build #{package.name}"
+    status "gem build #{package.name}"
     unless dryrun?
       file = builder.build
       file = File.expand_path(file)
     end
   #end
+
   transfer(file, store)
 end
 
+# Transfer package file to storage location.
+
+def transfer(file, store)
+  dest = File.join(store, File.basename(file))    # move to store, unless already there
+  dest = File.expand_path(dest)
+  mv(file, store) unless file == dest
+end
+
 # Create Gem::Specification.
 
 def gemspec(package)
@@ -75,11 +91,3 @@ def gemspec(package)
     spec.test_files = distribute.select{ |f| f =~ /^test\// }  # TODO make test_files configurable
   end
 end
-
-# Transfer package file to storage location.
-
-def transfer(file, store)
-  dest = File.join(store, File.basename(file))    # move to store, unless already there
-  dest = File.expand_path(dest)
-  mv(file, store) unless file == dest
-end

data/lib/ratch/toolset/ruby/pack/tgz

@@ -1,85 +1,46 @@
 #!/usr/bin/env ratch
 
-# generate gem package
+# generate tar gzip package
 
-begin
-  require 'rubygems/specification'
-  Gem::manage_gems
-rescue LoadError
-  raise LoadError, "RubyGems is not installed?"
-end
-
-require 'ratch/project/package'
-
-#
+require 'ratch/extra/stage'
+require 'ratch/extra/zip'
 
-main 'pack/gem' do
-  # load config (TODO)
-  #source  = Dir.pwd
-  store   = 'pkg'
-  package = Ratch::Package.load
-  #status "Creating RubyGem(s)"
-  file = nil
-  #cd(source) do
-    #status "vi #{metadata.name}.gemspec"
-    builder = ::Gem::Builder.new(gemspec(package))
-    #status "gem build #{package.name}"
-    unless dryrun?
-      file = builder.build
-      file = File.expand_path(file)
-    end
-  #end
-  transfer(file, store)
-end
+# Create a Tar'd Gzip package.
 
-# Create Gem::Specification.
+main 'pack/tgz' do
+  status "Creating .tgz package"
 
-def gemspec(package)
-  distribute = package.filelist
-  #distribute = Dir.multiglob_with_default( '**/*', distribute )
+  config = configuration['pack'] || {}
+  config = config['tgz'] || {}
 
-  ::Gem::Specification.new do |spec|
-    spec.name              = package.name
-    spec.version           = package.version
-    spec.summary           = package.brief
-    spec.description       = package.description
-    spec.author            = package.author
-    spec.email             = package.email
-    spec.rubyforge_project = package.development if /rubyforge.org/ =~ package.development
-    spec.homepage          = package.homepage
+  package = package.clone
+  package.update(config)
 
-    # Platform: ruby, mswin32, i586-linux, powerpc-darwin, current
-    spec.platform = 'ruby'  # TODO current support!
+  store = config[:store] || 'pkg'
+  templ = config[:template]
 
-    spec.require_paths = [package.gem_path].flatten.reverse
+  name  = package.stage_name(templ)
+  stage = File.join(store, name)
+  files = package.filelist
 
-    #if package.platform != 'ruby'
-    #  spec.require_paths.concat(spec.require_paths.collect{ |d| File.join(d, platform) })
-    #end
+  stage(stage, files)
 
-    spec.bindir = "bin"
-    spec.executables  = package.executables
-    spec.requirements = package.requirements
-    spec.has_rdoc     = package.document
-
-    if package.dependencies
-      package.dependencies.each do |d,v|
-        spec.add_dependency(*[d,v].compact)
-      end
+  if dryrun?
+    status "tar -cxf #{name}.tgz"
+  else
+    file = nil
+    cd(store) do
+      file = tgz(name)
     end
-
-    spec.extensions = package.compile
-
-    spec.files = distribute
-
-    spec.test_files = distribute.select{ |f| f =~ /^test\// }  # TODO make test_files configurable
+    transfer(file, store)
   end
 end
 
 # Transfer package file to storage location.
 
 def transfer(file, store)
-  dest = File.join(store, File.basename(file))    # move to store, unless already there
+  # move to store, unless already there
+  dest = File.join(store, File.basename(file))
   dest = File.expand_path(dest)
   mv(file, store) unless file == dest
 end

data/lib/ratch/toolset/ruby/pack/zip

@@ -0,0 +1,46 @@
+#!/usr/bin/env ratch
+
+# generate zip package
+
+require 'ratch/extra/stage'
+require 'ratch/extra/zip'
+
+# Create Zip package.
+
+main 'pack/zip' do
+  status "Creating .zip package"
+
+  config = configuration['pack'] || {}
+  config = config['zip'] || {}
+
+  package = package().clone
+  package.update(config)
+
+  store = config[:store] || 'pkg'
+  templ = config[:template]
+
+  name  = package.stage_name(templ)
+  stage = File.join(store, name)
+  files = package.filelist
+
+  stage(stage, files)
+
+  if dryrun?
+    status "tar -cxf #{name}.zip"
+  else
+    file = nil
+    cd(store) do
+      file = zip(name)
+    end
+    transfer(file, store)
+  end
+end
+
+# Transfer package file to storage location.
+
+def transfer(file, store)
+  # move to store, unless already there
+  dest = File.join(store, File.basename(file))
+  dest = File.expand_path(dest)
+  mv(file, store) unless file == dest
+end

data/lib/ratch/toolset/ruby/publish

@@ -1,8 +1,8 @@
 #!/usr/bin/env ratch
 
-# Publish website to rubyforge
+# publish website to rubyforge
 #
-# This task publishes the source dir (deafult 'doc/site')
+# This task publishes the source dir (deafult 'doc')
 # to a rubyforge website.
 
 main :publish do
@@ -10,10 +10,17 @@ main :publish do
 
   project     = config['project']
   subdir      = config['subdir']
-  source      = config['source'] || "doc/site"
-  username    = config['username']
-  protect     = %w{usage statcvs statsvn robot.txt wiki}
-  exclude     = %w{.svn}
+  source      = config['source'] || "doc"
+  username    = config['username'] || ENV['RUBYFORGE_USERNAME']
+  clear       = config['clear']
+
+  if clear
+    protect   = config['protect'].to_a
+    exclude   = config['exclude'].to_a
+  else
+    protect   = %w{usage statcvs statsvn robot.txt wiki} + config['protect'].to_a
+    exclude   = %w{.svn} + config['exclude'].to_a
+  end
 
   abort "no project"  unless project
   abort "no username" unless username
@@ -27,32 +34,24 @@ main :publish do
   dir = source.chomp('/') + '/'
   url = "#{username}@rubyforge.org:/var/www/gforge-projects/#{destination}"
 
-  op = ['-rLvz', '--delete']  # maybe -p ?
+  op = ['-rLvz', '--delete-after']  # maybe -p ?
 
-  # add filter options. The commandline version didn't seem
+  # Using commandline filter options didn't seem
   # to work, so I opted for creating an .rsync_filter file for
   # all cases.
 
-  filter_file = File.join(source,'.rsync-filter')
-
-  unless file?(filter_file)
-    File.open(filter_file, 'w') do |f|
-      exclude.map{|e| f << "- #{e}\n"}
-      protect.map{|e| f << "P #{e}\n"}
+  unless protect.empty? && exclude.empty?
+    rsync_file = File.join(source,'.rsync-filter')
+    unless file?(rsync_file)
+      File.open(rsync_file, 'w') do |f|
+        exclude.each{|e| f << "- #{e}\n"}
+        protect.each{|e| f << "P #{e}\n"}
+      end
     end
+    op << "--filter='dir-merge #{rsync_file}'"
   end
 
-  op << "--filter='dir-merge #{filter_file}'"
-
-  #if file?(filter_file)
-  #  op << "--filter='dir-merge #{filter_file}'"
-  #else  # NOT WORKING?
-  #  op.concat exclude.map{|e| "--filter='- #{e}'"}
-  #  op.concat protect.map{|e| "--filter='P #{e}'"}
-  #end
-
   args = op + [dir, url]
 
   rsync(*args.to_params)
 end
-

data/lib/ratch/toolset/ruby/release

@@ -0,0 +1,8 @@
+#!/usr/bin/env ratch
+
+# release packages to rubyforge (with icli)
+
+main :release do
+  name, version = rollrc.name, rollrc.version
+  icli "rubyforge release --version=#{version}"
+end

data/lib/ratch/toolset/ruby/stamp

@@ -0,0 +1,33 @@
+#!/usr/bin/env ratch
+
+# update version stamps
+
+# You can change these via the command line.
+version = commandline['version'] || rollrc.version
+status  = commandline['status']  || rollrc.status
+
+# Update ROLLRC file.
+
+main :stamp do
+  if version != rollrc.version or status != rollrc.status
+    build rollrc.file
+  end
+end
+
+#
+
+file rollrc.file do
+  w = ''
+  w << "#{rollrc.name} #{version} #{status} #{Time.now.strftime('%Y-%m-%d')}"
+  w << " #{rollrc.default}" if rollrc.default
+  w << "\n"
+  w << rollrc.libpath.join("\n")
+
+  if dryrun?
+    puts rollrc.file + ":"
+    puts w
+  else
+    File.open(rollrc.file, 'w'){|f| f << w}
+    puts "#{rollrc.file} updated."
+  end
+end

data/lib/ratch/toolset/sandbox

@@ -0,0 +1,11 @@
+#!/usr/bin/env ratch
+
+puts
+puts "[Directories]"
+puts "root: " + root_directory
+puts "call: " + call_directory
+puts "batch: " + batch_directory
+puts
+puts "[Configuration]"
+y configuration
+puts