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

data/lib/packo/rbuild/modules/{misc/unpacking → unpacking}/lzma.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 Unpacking
 
 Unpacker.register /\.lzma$/ do |path, to|
   Packo.sh 'lzma', '-dfk', path

data/lib/packo/rbuild/modules/{misc/unpacking → unpacking}/tar.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 Unpacking
 
 Unpacker.register /\.((tar\.(bz2|gz|xz|lzma))|tgz)$/ do |path, to|
   options = [case File.extname(path)

data/lib/packo/rbuild/modules/{misc/unpacking → unpacking}/xz.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 Unpacking
 
 Unpacker.register /\.xz$/ do |path, to|
   Packo.sh 'xz', '-dfk', path

data/lib/packo/rbuild/modules/{misc/unpacking → unpacking}/zip.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 Unpacking
 
 Unpacker.register /\.zip$/ do |path, to|
   Packo.sh 'unzip', '-qq', *(to ? ['-d', to] : []), path

data/lib/packo/rbuild/package.rb

@@ -29,6 +29,9 @@ require 'packo/rbuild/features'
 require 'packo/rbuild/flavor'
 require 'packo/rbuild/package/manifest'
 
+require 'packo/rbuild/modules'
+require 'packo/rbuild/behaviors'
+
 module Packo; module RBuild
 
 class Package < Packo::Package
@@ -75,8 +78,8 @@ class Package < Packo::Package
     @stages.add :dependencies, self.method(:dependencies_check), at: :beginning
     @stages.add :blockers,     self.method(:blockers_check),     at: :beginning
 
+    use      Modules::Fetcher, Modules::Unpacker, Modules::Packager
     behavior Behaviors::Default
-    use      Modules::Packaging::PKO
 
     if (@parent = Package.last)
       self.instance_exec(self, &@parent.instance_eval('@block'))
@@ -126,7 +129,7 @@ class Package < Packo::Package
       }
     }
 
-    self.directory = Pathname.new("#{package.env[:TMP]}/#{tags.to_s(true)}/#{name}/#{slot}/#{version}").cleanpath.to_s
+    self.directory = Path.clean("#{package.env[:TMP]}/#{tags.to_s(true)}/#{name}/#{slot}/#{version}")
     self.workdir   = "#{package.directory}/work"
     self.distdir   = "#{package.directory}/dist"
     self.tempdir   = "#{package.directory}/temp"
@@ -235,20 +238,26 @@ class Package < Packo::Package
     ] if @build_start_at
   end
 
-  def use (klass)
-    @modules << klass.new(self)
+  def use (*modules)
+    modules.flatten.compact.each {|klass|
+      @modules << klass.new(self)
+    }
   end
 
-  def avoid (klass)
-    [klass].flatten.compact.each {|klass|
+  def avoid (*modules)
+    modules.flatten.compact.each {|klass|
       @modules.delete(@modules.find {|mod|
         mod.class == klass
       }).finalize rescue nil
     }
   end
 
-  def behavior (uses)
-    uses.each {|use|
+  def behavior (behavior)
+    if @behavior
+      avoid @behavior
+    end
+
+    (@behavior = behavior).each {|use|
       self.use(use)
     }
   end

data/lib/packo/repository.rb

@@ -40,7 +40,7 @@ class Repository
   end
 
   def self.wrap (model)
-    Repository.new(
+    Repository.const_get(model.type.capitalize).new(
       type: model.type,
       name: model.name,
 

data/lib/packo/repository/virtual.rb

@@ -61,6 +61,22 @@ class Virtual < Repository
   def packages (*args)
     Enumerator.new(self, :each_package, *args)
   end
+
+  def dependencies (*args)
+    Enumerator.new(self, :each_dependency, *args)
+  end
+
+  def has? (package)
+    false
+  end
+
+  def install (package)
+    false
+  end
+
+  def uninstall (package)
+    true
+  end
 end
 
 end; end

data/lib/packo/utils.rb

@@ -0,0 +1,106 @@
+#--
+# 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/extensions'
+require 'digest/sha1'
+require 'fileutils'
+require 'shellwords'
+require 'memoized'
+
+module Packo
+  def self.protected?
+    !!(ENV['SANDBOX_ACTIVE'] || ENV['FAKED_MODE'])
+  end
+
+  def self.sh (*cmd, &block)
+    options = (Hash === cmd.last) ? cmd.pop : {}
+    cmd     = cmd.flatten.compact.map {|c| c.to_s}
+
+    if !block_given?
+      show_command = cmd.join(' ')
+      show_command = show_command[0, 42] + '...' unless $trace
+
+      block = lambda {|ok, status|
+        ok or fail "Command failed with status (#{status.exitstatus}): [#{show_command}] in {#{Dir.pwd}}"
+      }
+    end
+
+    if options[:silent]
+      options[:out] = '/dev/null'
+      options[:err] = '/dev/null'
+    else
+      print "#{cmd.first} "
+      cmd[1 .. cmd.length].each {|cmd|
+        if cmd.match(/[ \$'`]/)
+          print %Q{"#{cmd}" }
+        else
+          print "#{cmd} "
+        end
+      }
+      print "\n"
+    end
+
+    options.delete :silent
+
+    result = Kernel.system(options[:env] || {}, *cmd, options)
+    status = $?
+
+    block.call(result, status)
+  end
+
+  def self.load (path, options={})
+    if !File.readable? path
+      raise LoadError.new("no such file to load -- #{path}")
+    end
+
+    eval("#{options[:before]}#{File.read(path, encoding: 'utf-8').split(/^__END__$/).first}#{options[:after]}", options[:binding] || binding, path, 1)
+  end
+
+  def self.digest (path)
+    Digest::SHA1.hexdigest(File.read(path))
+  end
+
+  def self.contents (obj, &block)
+    Enumerator.new do |e|
+      obj.each {|file|
+        next unless File.directory?(file) || File.symlink?(file) || File.file?(file)
+
+        data = {}
+        data.merge!(block.call(file) || {}) if block
+
+        next if data[:next]
+
+        data[:source] ||= file
+        data[:path]   ||= file
+
+        if File.directory?(file)
+          data[:type] ||= :dir
+        elsif File.symlink?(file)
+          data[:type] ||= :sym
+          data[:meta] ||= File.readlink(file)
+        elsif File.file?(file)
+          data[:type] ||= :obj
+          data[:meta] ||= Packo.digest(file)
+        end
+
+        e << OpenStruct.new(data)
+      }
+    end
+  end
+end

data/lib/packo/version.rb

@@ -20,7 +20,7 @@
 module Packo
 
 def self.version
-  '0.0.1.alpha.1'
+  '0.0.1.alpha.2'
 end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: packo
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.0.1.alpha.1
+  version: 0.0.1.alpha.2
 platform: ruby
 authors: 
 - meh.
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 Z
+date: 2011-05-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -46,7 +46,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: datamapper
+  name: memoized
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -57,7 +57,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: dm-transactions
+  name: datamapper
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -68,7 +68,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: dm-timestamps
+  name: dm-transactions
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -79,7 +79,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: dm-types
+  name: dm-timestamps
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -90,7 +90,7 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: dm-constraints
+  name: dm-types
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -101,7 +101,7 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: versionomy
+  name: dm-constraints
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -112,16 +112,27 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: fffs
+  name: versionomy
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.4.1
   type: :runtime
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: fffs
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.7
+  type: :runtime
+  version_requirements: *id011
 description: A really flexible package manager, inspired by portage and pacman.
 email: meh@paranoici.org
 executables: 
@@ -141,22 +152,21 @@ extra_rdoc_files: []
 files: 
 - lib/packo.rb
 - lib/packo/rbuild/stages.rb
+- lib/packo/rbuild/modules/unpacking/lzma.rb
+- lib/packo/rbuild/modules/unpacking/zip.rb
+- lib/packo/rbuild/modules/unpacking/xz.rb
+- lib/packo/rbuild/modules/unpacking/tar.rb
+- lib/packo/rbuild/modules/packager.rb
 - lib/packo/rbuild/modules/packaging.rb
-- lib/packo/rbuild/modules/misc/unpacking/lzma.rb
-- lib/packo/rbuild/modules/misc/unpacking/zip.rb
-- lib/packo/rbuild/modules/misc/unpacking/xz.rb
-- lib/packo/rbuild/modules/misc/unpacking/tar.rb
-- lib/packo/rbuild/modules/misc/fetcher.rb
-- lib/packo/rbuild/modules/misc/fetching/gnu.rb
-- lib/packo/rbuild/modules/misc/fetching/sourceforge.rb
-- lib/packo/rbuild/modules/misc/fetching/subversion.rb
-- lib/packo/rbuild/modules/misc/fetching/git.rb
-- lib/packo/rbuild/modules/misc/fetching/github.rb
-- lib/packo/rbuild/modules/misc/fetching/mercurial.rb
-- lib/packo/rbuild/modules/misc/fetching/wget.rb
-- lib/packo/rbuild/modules/misc/unpacker.rb
-- lib/packo/rbuild/modules/misc/fetching.rb
-- lib/packo/rbuild/modules/misc/unpacking.rb
+- lib/packo/rbuild/modules/fetcher.rb
+- lib/packo/rbuild/modules/fetching/gnu.rb
+- lib/packo/rbuild/modules/fetching/sourceforge.rb
+- lib/packo/rbuild/modules/fetching/subversion.rb
+- lib/packo/rbuild/modules/fetching/git.rb
+- lib/packo/rbuild/modules/fetching/github.rb
+- lib/packo/rbuild/modules/fetching/mercurial.rb
+- lib/packo/rbuild/modules/unpacker.rb
+- lib/packo/rbuild/modules/fetching.rb
 - lib/packo/rbuild/modules/misc.rb
 - lib/packo/rbuild/modules/packaging/pko.rb
 - lib/packo/rbuild/modules/building.rb
@@ -165,11 +175,14 @@ files:
 - lib/packo/rbuild/modules/building/strip.rb
 - lib/packo/rbuild/modules/building/cmake.rb
 - lib/packo/rbuild/modules/building/autotools.rb
+- lib/packo/rbuild/modules/building/scons.rb
+- lib/packo/rbuild/modules/unpacking.rb
 - lib/packo/rbuild/package.rb
 - lib/packo/rbuild/package/manifest.rb
 - lib/packo/rbuild/feature.rb
 - lib/packo/rbuild/behaviors.rb
 - lib/packo/rbuild/flavor.rb
+- lib/packo/rbuild/behaviors/python.rb
 - lib/packo/rbuild/behaviors/default.rb
 - lib/packo/rbuild/features.rb
 - lib/packo/rbuild/modules.rb
@@ -215,6 +228,7 @@ files:
 - lib/packo/package/features.rb
 - lib/packo/package/blocker.rb
 - lib/packo/package/blockers.rb
+- lib/packo/utils.rb
 - lib/packo/repository.rb
 - lib/packo/cli/base.rb
 - lib/packo/cli/environment.rb

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

@@ -1,57 +0,0 @@
-#--
-# 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; module Fetching
-
-class Wget < Module
-  def self.fetch (path, to, package={})
-    Packo.sh 'wget', '-c', '-O', to, path
-  end
-
-  def self.url (url, package={})
-    Packo.interpolate(url, package)
-  end
-
-  def initialize (package)
-    super(package)
-
-    package.stages.add :fetch, self.method(:fetch), after: :beginning
-  end
-
-  def fetch
-    version = package.version
-
-    distfiles = []
-    sources   = [package.source].flatten.compact.map {|s|
-      Wget.url(s, package)
-    }
-
-    package.stages.callbacks(:fetch).do(sources) {
-      sources.each {|source|
-        distfiles << "#{package.fetchdir || '/tmp'}/#{File.basename(source)}"
-
-        Wget.fetch source, distfiles.last, package
-      }
-    }
-
-    package.distfiles distfiles
-  end
-end
-
-end; end; end; end