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

data/lib/packo/environment.rb

@@ -238,7 +238,7 @@ class Environment < Hash
       if key.to_s.end_with?('FLAGS')
         self[key] = Flags.parse(value.to_s)
       elsif key.to_s.end_with?('PATH')
-        self[key] = Pathname.new(value.to_s)
+        self[key] = Path.new(value.to_s)
       end
     }
   end
@@ -253,7 +253,7 @@ class Environment < Hash
     if name.to_s.end_with?('FLAGS')
       value = Flags.parse(value.to_s)
     elsif name.to_s.end_with?('PATH')
-      value = Pathname.new(value.to_s)
+      value = Path.new(value.to_s)
     end
 
     super(name.to_sym, value)

data/lib/packo/extensions.rb

@@ -18,11 +18,31 @@
 #++
 
 require 'ostruct'
+require 'memoized'
+require 'pathname'
+
+Path = Pathname
+
+class Pathname
+  def self.clean (path)
+    Pathname.new(path).cleanpath.to_s
+  end
+end
 
 class Object
   def numeric?
     true if Float(self) rescue false
   end
+
+  def refine_method (meth, &block)
+    return unless block_given?
+
+    old = self.instance_method(meth) rescue Proc.new {}
+
+    define_method(meth) {|*args|
+      self.instance_exec((old.is_a?(Proc) ? old : old.bind(self)), *args, &block)
+    }
+  end
 end
 
 module Kernel
@@ -57,12 +77,6 @@ class String
   def interpolate (on)
     on.instance_eval("%{#{self}}") rescue self
   end
-
-  def === (value)
-    value.is_a?(Packo::Host) ?
-      value == self :
-      super(value)
-  end
 end
 
 class OpenStruct

data/lib/packo/host.rb

@@ -119,3 +119,13 @@ class Host
 end
 
 end
+
+class String
+  refine_method(:==) do |old, value|
+    value.is_a?(Packo::Host) ? value == self : old.call(value)
+  end
+
+  refine_method(:===) do |old, value|
+    value.is_a?(Packo::Host) ? value === self : old.call(value)
+  end
+end

data/lib/packo/models.rb

@@ -78,11 +78,17 @@ class Property
     end
 
     def load (value)
-      Versionomy.parse(value.to_s) unless value.to_s.empty?
+      return if value.to_s.empty?
+
+      whole, version, format = value.to_s.match(/^(.+?):([^:]+)$/).to_a
+
+      Versionomy.parse(version, format)
     end
 
     def dump (value)
-      value.to_s unless value.nil?
+      return unless value
+
+      "#{value}:#{Versionomy::Format.canonical_name_for(value.format)}"
     end
 
     def typecast_to_primitive (value)

data/lib/packo/models/repository.rb

@@ -97,16 +97,9 @@ class Repository
         }
       end
     else
-      if matches = expression.match(/^([<>]?=?)/)
-        validity = ((matches[1] && !matches[1].empty?) ? matches[1] : nil)
-        expression = expression.sub(/^([<>]?=?)/, '')
+      whole, validity, package, expression = expression.match(/^([<>]?=?)?(.+?)\s*(?:\[(.*)\])?$/).to_a
 
-        validity = nil if validity == '='
-      else
-        validity = nil
-      end
-
-      package = Packo::Package.parse(expression)
+      package = Packo::Package.parse(package || '')
 
       conditions = { order: [:name.asc] }
 
@@ -128,16 +121,26 @@ class Repository
         }
       end
 
-      if validity
+      if validity && !validity.empty?
         result = result.select {|pkg|
           case validity
-            when '>';  pkg.version >  package.version
-            when '>='; pkg.version >= package.version
-            when '<';  pkg.version <  package.version
-            when '<='; pkg.version <= package.version
+            when '~', '~=' then true
+            when '>'       then pkg.version >  package.version
+            when '>='      then pkg.version >= package.version
+            when '<'       then pkg.version <  package.version
+            when '<='      then pkg.version <= package.version
+            else                pkg.version == package.version
           end
         }
       end
+
+      if expression && !expression.empty?
+        expression = Packo::Package::Tags::Expression.parse(expression)
+
+        result = result.select {|pkg|
+          expression.evaluate(Packo::Package.wrap(pkg))
+        }
+      end
     end
 
     return result

data/lib/packo/package.rb

@@ -27,6 +27,8 @@ module Packo
 
 class Package
   def self.parse (text, type=:standard)
+    return text if text.is_a?(Package)
+
     data = {}
 
     case type
@@ -36,7 +38,7 @@ class Package
         data[:features] = matches[3]
         data[:flavor]   = matches[5]
 
-        matches = matches[1].match(/^(.*?)(-(\d.*?))?(%(.*?))?$/)
+        matches = matches[1].match(/^(.*?)(?:-(\d.*?))?(?:%(.*?))?(?:@(.*?))?$/)
 
         data[:tags] = matches[1].split('/')
 
@@ -44,8 +46,12 @@ class Package
           data[:name] = data[:tags].pop
         end
 
-        data[:version] = matches[3]
-        data[:slot]    = matches[5]
+        data[:version] = matches[2]
+        data[:slot]    = matches[3]
+        
+        if matches[4]
+          data[:repository] = Repository.parse(matches[4])
+        end
     end
 
     Package.new(data)

data/lib/packo/profile.rb

@@ -47,7 +47,7 @@ class Profile
     }
 
     @paths.dup.each {|name, path|
-      @paths[name] = Pathname.new(path)
+      @paths[name] = Path.new(path)
     }
   end
 
@@ -60,7 +60,7 @@ class Profile
       if respond_to? "#{id}="
         send "#{id}=", *args
       else
-        @paths[id] = Pathname.new(args.first)
+        @paths[id] = Path.new(args.first)
       end
     end
   end

data/lib/packo/rbuild.rb

@@ -18,5 +18,3 @@
 #++
 
 require 'packo/rbuild/package'
-require 'packo/rbuild/modules'
-require 'packo/rbuild/behaviors'

data/lib/packo/rbuild/behaviors/default.rb

@@ -20,8 +20,9 @@
 module Packo; module RBuild; module Behaviors
 
 Default = [
-  Modules::Misc::Fetcher, Modules::Misc::Unpacker,
-  Modules::Building::Patch, Modules::Building::Autotools, Modules::Building::Strip
+  Modules::Building::Patch,
+  Modules::Building::Autotools,
+  Modules::Building::Strip
 ]
 
 end; end; end

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

@@ -17,6 +17,11 @@
 # along with packo. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'packo/rbuild/modules/misc/fetching/gnu'
-require 'packo/rbuild/modules/misc/fetching/sourceforge'
-require 'packo/rbuild/modules/misc/fetching/github'
+module Packo; module RBuild; module Behaviors
+
+Python = [
+  Modules::Building::Patch,
+  Modules::Building::PythonSetup
+]
+
+end; end; end

data/lib/packo/rbuild/modules.rb

@@ -19,9 +19,8 @@
 
 require 'packo/rbuild/module'
 
+require 'packo/rbuild/modules/fetching'
+require 'packo/rbuild/modules/unpacking'
 require 'packo/rbuild/modules/building'
 require 'packo/rbuild/modules/packaging'
 require 'packo/rbuild/modules/misc'
-
-require 'packo/rbuild/modules/misc/fetching'
-require 'packo/rbuild/modules/misc/unpacking'

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

@@ -17,8 +17,11 @@
 # along with packo. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'packo/rbuild/modules/building/autotools'
+require 'packo/rbuild/modules/building/patch'
 require 'packo/rbuild/modules/building/cmake'
+
+require 'packo/rbuild/modules/building/autotools'
 require 'packo/rbuild/modules/building/rake'
-require 'packo/rbuild/modules/building/patch'
+require 'packo/rbuild/modules/building/scons'
+
 require 'packo/rbuild/modules/building/strip'

data/lib/packo/rbuild/modules/building/autotools.rb

@@ -104,22 +104,22 @@ class Autotools < Module
 
       @enable.each {|name, value|
         case value
-          when true;  result += "--enable-#{name} "
-          when false; result += "--disable-#{name} "
-          else;       result += "--enable-#{name}='#{value}' "
+          when true;  result += "--enable-#{name.shellescape} "
+          when false; result += "--disable-#{name.shellescape} "
+          else;       result += "--enable-#{name.shellescape}=#{value.shellescape} "
         end
       }
 
       @with.each {|name, value|
         case value
-          when true;  result += "--with-#{name} "
-          when false; result += "--without-#{name} "
-          else;       result += "--with-#{name}='#{value}' "
+          when true;  result += "--with-#{name.shellescape} "
+          when false; result += "--without-#{name.shellescape} "
+          else;       result += "--with-#{name.shellescape}=#{value.shellescape} "
         end
       }
 
       @other.each {|name, value|
-        result += "--#{name}='#{value}' "
+        result += "--#{name.shellescape}=#{value.shellescape} "
       }
 
       return result
@@ -268,10 +268,10 @@ class Autotools < Module
   def configure
     @configuration = Configuration.new(self)
 
-    @configuration.set 'prefix',         (System.env[:INSTALL_PATH] + '/usr').cleanpath
-    @configuration.set 'sysconfdir',     (System.env[:INSTALL_PATH] + '/etc').cleanpath
-    @configuration.set 'sharedstatedir', (System.env[:INSTALL_PATH] + '/com').cleanpath
-    @configuration.set 'localstatedir',  (System.env[:INSTALL_PATH] + '/var').cleanpath
+    @configuration.set 'prefix',         Path.clean(System.env[:INSTALL_PATH] + '/usr')
+    @configuration.set 'sysconfdir',     Path.clean(System.env[:INSTALL_PATH] + '/etc')
+    @configuration.set 'sharedstatedir', Path.clean(System.env[:INSTALL_PATH] + '/com')
+    @configuration.set 'localstatedir',  Path.clean(System.env[:INSTALL_PATH] + '/var')
 
     @configuration.set 'host',   package.host
     @configuration.set 'build',  package.host

data/lib/packo/rbuild/modules/building/rake.rb

@@ -20,14 +20,71 @@
 module Packo; module RBuild; module Modules; module Building
 
 class Rake < Module
+  class Configuration
+    attr_reader :module
+
+    def initialize (mod=nil)
+      @module = mod
+
+      @options = {}
+    end
+
+    def clear
+      @options.clear
+    end
+
+    def enable (*names)
+      names.flatten.compact.each {|name|
+        @options[name] = true
+      }
+    end
+
+    def disable (*names)
+      names.flatten.compact.each {|name|
+        @options[name] = false
+      }
+    end
+
+    def set (name, value)
+      @options[name.to_s] = value.to_s
+    end
+
+    def get (name)
+      @options[name.to_s]
+    end
+
+    def delete (*names)
+      names.flatten.each {|name|
+        @options.delete(name.to_s)
+      }
+    end
+
+    def to_s
+      result = ''
+
+      @options.each {|name, value|
+        case value
+          when true;  result += "#{name.shellescape}=on "
+          when false; result += "#{name.shellescape}=off "
+          else;       result += "#{name.shellescape}=#{value.shellescape} "
+        end
+      }
+
+      return result
+    end
+  end
+
   def initialize (package)
     super(package)
 
-    package.stages.add :compile, self.method(:compile), after: :fetch
-    package.stages.add :install, self.method(:install), after: :compile
+    package.stages.add :configure, self.method(:configure), after: :fetch
+    package.stages.add :compile,   self.method(:compile),   after: :configure
+    package.stages.add :install,   self.method(:install),   after: :compile
 
-    package.before :build do
+    package.after :initialize do
       package.environment[:RUBYOPT] = ''
+
+      package.dependencies << 'interpreter/ruby!'
     end
 
     package.rake = Class.new(Module::Helper) {
@@ -54,19 +111,26 @@ class Rake < Module
   end
 
   def finalize
-    package.stages.delete :compile, self.method(:compile)
-    package.stages.delete :install, self.method(:install)
+    package.stages.delete :configure, self.method(:configure)
+    package.stages.delete :compile,   self.method(:compile)
+    package.stages.delete :install,   self.method(:install)
+  end
+
+  def configure
+    @configuration = Configuration.new(self)
+
+    package.stages.callbacks(:configure).do(@configuration)
   end
 
   def compile
     package.stages.callbacks(:compile).do(@configuration) {
-      package.rake.do
+      package.rake.do @configuration.to_s.shellsplit
     }
   end
 
   def install
     package.stages.callbacks(:install).do(@configuration) {
-      package.rake.install
+      package.rake.install @configuration.to_s.shellsplit
     }
   end
 end

data/lib/packo/rbuild/modules/building/scons.rb

@@ -0,0 +1,128 @@
+#--
+# 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 Building
+
+class Scons < Module
+  class Configuration
+    attr_reader :module
+
+    def initialize (mod=nil)
+      @module = mod
+
+      @options = {}
+    end
+
+    def clear
+      @options.clear
+    end
+
+    def enable (*names)
+      names.flatten.compact.each {|name|
+        @options[name] = true
+      }
+    end
+
+    def disable (*names)
+      names.flatten.compact.each {|name|
+        @options[name] = false
+      }
+    end
+
+    def set (name, value)
+      @options[name.to_s] = value.to_s
+    end
+
+    def get (name)
+      @options[name.to_s]
+    end
+
+    def delete (*names)
+      names.flatten.each {|name|
+        @options.delete(name.to_s)
+      }
+    end
+
+    def to_s
+      result = ''
+
+      @options.each {|name, value|
+        case value
+          when true;  result += "#{name.shellescape}=on "
+          when false; result += "#{name.shellescape}=off "
+          else;       result += "#{name.shellescape}=#{value.shellescape} "
+        end
+      }
+
+      return result
+    end
+  end
+
+  def initialize (package)
+    super(package)
+
+    package.stages.add :configure, self.method(:configure), after: :fetch
+    package.stages.add :compile,   self.method(:compile),   after: :configure
+    package.stages.add :install,   self.method(:install),   after: :compile
+
+    package.before :initialize do
+      package.dependencies << 'development/utility/scons!'
+    end
+
+    package.scons = Class.new(Module::Helper) {
+      def initialize (package)
+        super(package)
+      end
+
+      def do (*args)
+        package.environment.sandbox {
+          Packo.sh 'scons', *args
+        }
+      end
+
+      def version (name, slot=nil)
+        slot ? @versions[name.to_sym] = slot : @versions[name.to_sym]
+      end
+    }.new(package)
+  end
+
+  def finalize
+    package.stages.delete :configure, self.method(:configure)
+    package.stages.delete :compile,   self.method(:compile)
+    package.stages.delete :install,   self.method(:install)
+  end
+
+  def configure
+    @configuration = Configuration.new(self)
+
+    package.stages.callbacks(:configure).do(@configuration)
+  end
+
+  def compile
+    package.stages.callbacks(:compile).do(@configuration) {
+      package.scons.do @configuration.to_s.shellsplit
+    }
+  end
+
+  def install
+    package.stages.callbacks(:install).do(@configuration)
+  end
+end
+
+end; end; end; end