packo 0.0.1.alpha.1 → 0.0.1.alpha.2

data/lib/packo/rbuild/modules/{misc/fetcher.rb → fetcher.rb}

@@ -20,7 +20,7 @@
 require 'uri'
 require 'digest/sha1'
 
-module Packo; module RBuild; module Modules; module Misc
+module Packo; module RBuild; module Modules
 
 class Fetcher < Module
   @@wrappers = {}
@@ -89,7 +89,7 @@ class Fetcher < Module
       package.distfiles = {}
 
       sources = Hash[package.source.map {|(name, source)|
-        next if package.digests[url(source)] && (Do.digest("#{package.fetchdir}/#{package.digests[url(source)].name}") rescue false) == package.digests[url(source)].digest
+        next if package.digests[url(source)] && (Packo.digest("#{package.fetchdir}/#{package.digests[url(source)].name}") rescue false) == package.digests[url(source)].digest
 
         url = Fetcher.url(source, package) or fail "Failed to get the real URL for: #{source}"
 
@@ -125,7 +125,7 @@ class Fetcher < Module
       package.distfiles = []
 
       sources = [package.source].flatten.compact.map {|source|
-        next if package.digests[url(source)] && (Do.digest("#{package.fetchdir}/#{package.digests[url(source)].name}") rescue false) == package.digests[url(source)].digest
+        next if package.digests[url(source)] && (Packo.digest("#{package.fetchdir}/#{package.digests[url(source)].name}") rescue false) == package.digests[url(source)].digest
 
         url = Fetcher.url(source, package) or fail "Failed to get the real URL for: #{source}"
 
@@ -164,7 +164,7 @@ class Fetcher < Module
         file ||= name
 
         original = package.digests[file.url].digest or next
-        digest   = Do.digest(file.path) or next
+        digest   = Packo.digest(file.path) or next
 
         if digest != original
           raise ArgumentError.new("#{File.basename(file.path)} digest is #{digest} but should be #{original}")
@@ -174,4 +174,4 @@ class Fetcher < Module
   end
 end
 
-end; end; end; end
+end; end; end

data/lib/packo/rbuild/modules/fetching.rb

@@ -0,0 +1,29 @@
+#--
+# Copyleft meh. [http://meh.doesntexist.org | meh@paranoici.org]
+#
+# This file is part of packo.
+#
+# packo is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# packo is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with packo. If not, see <http://www.gnu.org/licenses/>.
+#++
+
+require 'packo/rbuild/modules/fetcher'
+
+require 'packo/rbuild/modules/fetching/gnu'
+require 'packo/rbuild/modules/fetching/sourceforge'
+require 'packo/rbuild/modules/fetching/github'
+
+# Bleeding edge stuff
+require 'packo/rbuild/modules/fetching/git'
+require 'packo/rbuild/modules/fetching/subversion'
+require 'packo/rbuild/modules/fetching/mercurial'

data/lib/packo/rbuild/modules/{misc/fetching → fetching}/git.rb

@@ -17,7 +17,7 @@
 # along with packo. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-module Packo; module RBuild; module Modules; module Misc; module Fetching
+module Packo; module RBuild; module Modules; module Fetching
 
 class Git < Module
   def initialize (package)
@@ -26,32 +26,38 @@ class Git < Module
     package.avoid [Fetcher, Unpacker]
 
     package.stages.add :fetch, self.method(:fetch), after: :beginning
+
+    package.after :initialize do
+      package.dependencies << 'vcs/git!'
+    end
   end
 
   def finalize
     package.stages.delete :fetch, self.method(:fetch)
   end
 
+  def git (*args)
+    Packo.sh 'git', *args
+  end
+
   def fetch
     package.stages.callbacks(:fetch).do {
-      whole, url, branch, commit = package.source.match(%r[^(\w+://.*?)(?::(.*?))?(?:@(.*?))?$]).to_a
-
       package.clean!
       package.create!
 
       options = []
-      options << '--branch' << branch if branch
-      options << '--depth'  << '1'    if !commit
+      options << '--branch' << package.git[:branch].to_s.interpolate(package) if package.git[:branch]
+      options << '--depth'  << '1' unless package.git[:commit]
 
-      Packo.sh 'git', 'clone', *options, url, package.workdir
+      git :clone, *options, package.git[:repository].to_s.interpolate(package), package.workdir
 
       Do.cd package.workdir
 
-      if commit
-        Packo.sh 'git', 'checkout', commit
+      if package.git[:commit] || package.git[:tag]
+        git 'checkout', (package.git[:commit] || package.git[:tag]).to_s.interpolate(package)
       end
     }
   end
 end
 
-end; end; end; end; end
+end; end; end; end

data/lib/packo/rbuild/modules/{misc/fetching → fetching}/github.rb

@@ -17,7 +17,7 @@
 # along with packo. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-module Packo; module RBuild; module Modules; module Misc
+module Packo; module RBuild; module Modules; module Fetching
 
 Fetcher.register :github do |url, package|
   whole, user, project, file = url.interpolate(package).match(%r{^(.*?)/(.*?)/(.*?)$}).to_a

data/lib/packo/rbuild/modules/{misc/fetching → fetching}/gnu.rb

@@ -19,7 +19,7 @@
 
 require 'net/http'
 
-module Packo; module RBuild; module Modules; module Misc
+module Packo; module RBuild; module Modules; module Fetching
 
 Fetcher.register :gnu do |url, package|
   whole, name, version = url.interpolate(package).match(%r{^(.*?)/(.*?)$}).to_a

data/lib/packo/rbuild/modules/{misc/fetching → fetching}/mercurial.rb

@@ -17,7 +17,7 @@
 # along with packo. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-module Packo; module RBuild; module Modules; module Misc; module Fetching
+module Packo; module RBuild; module Modules; module Fetching
 
 class Mercurial < Module
   def initialize (package)
@@ -26,26 +26,30 @@ class Mercurial < Module
     package.avoid [Fetcher, Unpacker]
 
     package.stages.add :fetch, self.method(:fetch), after: :beginning
+
+    package.after :initialize do
+      package.dependencies << 'vcs/mercurial!'
+    end
   end
 
   def finalize
     package.stages.delete :fetch, self.method(:fetch)
   end
 
+  def hg (*args)
+    Packo.sh 'hg', *args
+  end
+
   def fetch
     package.stages.callbacks(:fetch).do {
-      whole, url = package.source.match(%r[^(\w+://.*?)$]).to_a
-
       package.clean!
       package.create!
 
-      options = []
-
-      Packo.sh 'hg', 'clone', *options, url, package.workdir
+      hg :clone, package.mercurial[:repository].to_s.interpolate(package), package.workdir
 
       Do.cd package.workdir
     }
   end
 end
 
-end; end; end; end; end
+end; end; end; end

data/lib/packo/rbuild/modules/{misc/fetching → fetching}/sourceforge.rb

@@ -19,7 +19,7 @@
 
 require 'net/http'
 
-module Packo; module RBuild; module Modules; module Misc
+module Packo; module RBuild; module Modules; module Fetching
 
 Fetcher.register :sourceforge, do |url, package|
   whole, project, path = url.interpolate(package).match(%r{^(.*?)/(.*?)$}).to_a

data/lib/packo/rbuild/modules/{misc/fetching → fetching}/subversion.rb

@@ -17,7 +17,7 @@
 # along with packo. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-module Packo; module RBuild; module Modules; module Misc; module Fetching
+module Packo; module RBuild; module Modules; module Fetching
 
 class Subversion < Module
   def initialize (package)
@@ -26,26 +26,44 @@ class Subversion < Module
     package.avoid [Fetcher, Unpacker]
 
     package.stages.add :fetch, self.method(:fetch), after: :beginning
+
+    package.after :initialize do
+      package.dependencies << 'vcs/subversion!'
+    end
   end
 
   def finalize
     package.stages.delete :fetch, self.method(:fetch)
   end
 
+  def svn (*args)
+    Packo.sh 'svn', *args
+  end
+
   def fetch
     package.stages.callbacks(:fetch).do {
-      whole, url = package.source.match(%r[^(\w+://.*?)$]).to_a
-
       package.clean!
       package.create!
 
+      repository = package.subversion[:repository].to_s.interpolate(package)
+
       options = []
 
-      Packo.sh 'svn', 'checkout', *options, url, package.workdir
+      if package.subversion[:revision]
+        options << '--revision' << package.subversion[:revision].to_s.interpolate(package)
+      end
+
+      if package.subversion[:tag]
+        svn 'checkout', *options, "#{repository}/tags/#{package.subversion[:tag].to_s.interpolate(package)}", package.workdir
+      elsif package.subversion[:branch]
+        svn 'checkout', *options, "#{repository}/branches/#{package.subversion[:branch].to_s.interpolate(package)}", package.workdir
+      else
+        svn 'checkout', *options, "#{repository}/trunk", package.workdir
+      end
 
       Do.cd package.workdir
     }
   end
 end
 
-end; end; end; end; end
+end; end; end; end

data/lib/packo/rbuild/modules/misc.rb

@@ -16,11 +16,3 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with packo. If not, see <http://www.gnu.org/licenses/>.
 #++
-
-require 'packo/rbuild/modules/misc/fetcher'
-require 'packo/rbuild/modules/misc/unpacker'
-
-# Bleeding edge stuff
-require 'packo/rbuild/modules/misc/fetching/git'
-require 'packo/rbuild/modules/misc/fetching/mercurial'
-require 'packo/rbuild/modules/misc/fetching/subversion'

data/lib/packo/rbuild/modules/packager.rb

@@ -0,0 +1,63 @@
+#--
+# Copyleft meh. [http://meh.doesntexist.org | meh@paranoici.org]
+#
+# This file is part of packo.
+#
+# packo is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# packo is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with packo. If not, see <http://www.gnu.org/licenses/>.
+#++
+
+module Packo; module RBuild; module Modules
+
+class Packager < Module
+  @@formats = {}
+
+  def self.register (type, &block)
+    @@formats[type] = block
+  end
+
+  def self.do (package, to=nil)
+
+    block = @@formats.find {|extension, block|
+      (to || '.pko').end_with?(extension)
+    }.last rescue nil
+
+    if block
+      block.call(package, to)
+    else
+      Packo.debug 'Package format unsupported'
+    end
+  end
+
+  def initialize (package)
+    super(package)
+
+    package.stages.add :pack, self.method(:pack), at: :end, strict: true
+
+    before :initialize do |package|
+      package.define_singleton_method :pack, &Packager.method(:do)
+    end
+  end
+
+  def finalize
+    package.stages.delete :pack, self.method(:pack)
+  end
+
+  def pack
+    package.stages.callbacks(:pack).do {
+      Packager.do(package)
+    }
+  end
+end
+
+end; end; end

data/lib/packo/rbuild/modules/packaging.rb

@@ -17,4 +17,6 @@
 # along with packo. If not, see <http://www.gnu.org/licenses/>.
 #++
 
+require 'packo/rbuild/modules/packager'
+
 require 'packo/rbuild/modules/packaging/pko'

data/lib/packo/rbuild/modules/packaging/pko.rb

@@ -19,60 +19,40 @@
 
 module Packo; module RBuild; module Modules; module Packaging
 
-class PKO < Module
-  def self.pack (name, *files)
-    Packo.sh 'tar', 'cJf', name, *files, '--preserve', silent: true
-  end
-
-  def self.unpack (name, to)
-    FileUtils.mkpath(to) rescue nil
-
-    Packo.sh 'tar', 'xJf', name, '-C', to, '--preserve', silent: true
-  end
-
-  def initialize (package)
-    super(package)
-
-    package.stages.add :pack, self.method(:pack), at: :end, strict: true
-  end
-
-  def finalize
-    package.stages.delete :pack, self.method(:pack)
-  end
+pack = lambda do |name, *files|
+  Packo.sh 'tar', 'cJf', name, *files, '--preserve', silent: true
+end
 
-  def pack
-    package.stages.callbacks(:pack).do {
-      path = "#{package.to_s(:package)}.pko"
+Packager.register('.pko') do |package, to=nil|
+  path = to || "#{package.to_s(:package)}.pko"
 
-      Dir.chdir package.directory
+  Dir.chdir package.directory
 
-      FileUtils.mkpath "#{package.directory}/pre"
+  FileUtils.mkpath "#{package.directory}/pre"
 
-      package.filesystem.pre.each {|name, file|
-        File.write("pre/#{name}", file.content, 0777)
-      }
+  package.filesystem.pre.each {|name, file|
+    File.write("pre/#{name}", file.content, 0777)
+  }
 
-      FileUtils.mkpath "#{package.directory}/post"
-      package.filesystem.post.each {|name, file|
-        File.write("post/#{name}", file.content, 0777)
-      }
+  FileUtils.mkpath "#{package.directory}/post"
+  package.filesystem.post.each {|name, file|
+    File.write("post/#{name}", file.content, 0777)
+  }
 
-      FileUtils.mkpath "#{package.directory}/selectors"
-      package.filesystem.selectors.each {|name, file|
-        File.write("selectors/#{name}", file.content, 0777)
-      }
+  FileUtils.mkpath "#{package.directory}/selectors"
+  package.filesystem.selectors.each {|name, file|
+    File.write("selectors/#{name}", file.content, 0777)
+  }
 
-      Package::Manifest.new(package).save('manifest.xml')
+  Package::Manifest.new(package).save('manifest.xml')
 
-      package.stages.callbacks(:pack!).do {
-        Do.clean(package.distdir)
+  package.stages.callbacks(:packing).do {
+    Do.clean(package.distdir)
 
-        PKO.pack(path, 'dist/', 'pre/', 'post/', 'selectors/', 'manifest.xml')
-      }
+    pack.call(path, 'dist/', 'pre/', 'post/', 'selectors/', 'manifest.xml')
+  }
 
-      path
-    }
-  end
+  path
 end
 
 end; end; end; end

data/lib/packo/rbuild/modules/{misc/unpacker.rb → unpacker.rb}

@@ -17,7 +17,7 @@
 # along with packo. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-module Packo; module RBuild; module Modules; module Misc
+module Packo; module RBuild; module Modules
 
 class Unpacker < Module
   @@formats = {}
@@ -67,4 +67,4 @@ class Unpacker < Module
   end
 end
 
-end; end; end; end
+end; end; end

data/lib/packo/rbuild/modules/{misc/unpacking.rb → unpacking.rb}

@@ -17,7 +17,9 @@
 # along with packo. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'packo/rbuild/modules/misc/unpacking/tar'
-require 'packo/rbuild/modules/misc/unpacking/zip'
-require 'packo/rbuild/modules/misc/unpacking/lzma'
-require 'packo/rbuild/modules/misc/unpacking/xz'
+require 'packo/rbuild/modules/unpacker'
+
+require 'packo/rbuild/modules/unpacking/tar'
+require 'packo/rbuild/modules/unpacking/zip'
+require 'packo/rbuild/modules/unpacking/lzma'
+require 'packo/rbuild/modules/unpacking/xz'