purplepkg 0.0.5 → 0.0.6

data/bin/purple

@@ -8,8 +8,8 @@ require 'purple'
 
 def usage
     puts <<-EOS
-Purple Packager, Copyright (c) 2004, Simon Conrad-Armes <curne@curnomatic.dk>
-Rights granted, under GNU GPL (version 2 or later), see file LICENSE
+Purple Packager, Copyright (c) 2004-2005, Simon Conrad-Armes <curne@curnomatic.dk>
+Rights granted, under GNU GPL (version 2 or later), see file COPYING
 
 Usage: #{File.basename $0} [options] <package>
 
@@ -45,6 +45,8 @@ def filetype url
     return case filename
     when /\.tar\.(gz|bz2)|\.tgz$/
         :tarball
+    when /\.zip$/
+        :zipfile
     when /\.purple$/
         :script
     end
@@ -67,11 +69,10 @@ opts.set_options(
 
 OPTIONS = Hash.new
 opts.each_option { |name,arg| OPTIONS[name.gsub(/^--/, '')] = arg }
-p OPTIONS
 
 usage if OPTIONS.has_key? 'help'
 
-steps = [:prepare, :config, :build, :stage]
+steps = [:prepare, :setup, :config, :build, :stage]
 
 if OPTIONS.has_key? 'make' or 'deps' == OPTIONS['stop-at']
     steps << :deps
@@ -106,33 +107,34 @@ end
 arg_ref = arg_uri.to_s
 
 # Decide what to do with the argument
-puts "DEBUG main: #{filetype(arg_ref).inspect}"
 case filetype(arg_ref)
-when :tarball
+when :tarball, :zipfile
     @cabinet = Purple.cabinet_from_url arg_ref
 when :script
     @cabinet = Purple::Script.open URI.parse(arg_ref).path
 else
     raise "Unknown file type of argument '#{arg_ref}'"
 end
-p @cabinet
 
 error = catch :stop do
-    @cabinet.setup
+    begin
+        @cabinet.setup
 
-    @cabinet.run_steps steps
+        @cabinet.run_steps steps
 
-    if OPTIONS.has_key? 'make' or OPTIONS.has_key? 'deploy'
-	Purple::Platform.detect
-        @cabinet.make
-    end
+        if OPTIONS.has_key? 'make' or OPTIONS.has_key? 'deploy'
+            Purple::Platform.detect
+            @cabinet.make
+        end
 
-    if OPTIONS.has_key? 'deploy'
-        puts "DEBUG: Doing deploy"
-        @cabinet.deploy
-    end
+        if OPTIONS.has_key? 'deploy'
+            @cabinet.deploy
+        end
 
-    :normal_complete
+        :normal_complete
+    rescue StandardError => e
+        throw e.to_s
+    end
 end
 
 if :normal_complete != error

data/lib/purple.rb

@@ -77,38 +77,45 @@ module Purple
             end
         end
 
-        def prepare
+        def prepare_step
             @packages.each do |p|
                 p.files.each { |f| fetch f }
                 p.prepare
             end
         end
 
-        def config
+        def setup_step
+            @packages.each do |p|
+                p.files.each { |f| fetch f }
+                p.setup
+            end
+        end
+
+        def config_step
             @packages.each { |p|
                 return false if not p.config
             }
         end
         
-        def build
+        def build_step
             @packages.each { |p|
                 return false if not p.build
             }
         end
         
-        def stage
+        def stage_step
             @packages.each { |p|
                 return false if not p.stage
             }
         end
 
-        def deps
+        def deps_step
             true
         end
 
-        def run_steps steps=[:prepare, :build, :deps, :make]
+        def run_steps steps=[:prepare, :setup, :build, :deps, :make]
             steps.each do |step|
-                self.method(step).call
+                self.method("#{step}_step").call
             end
         end
 

data/lib/purple/getter.rb

@@ -7,7 +7,18 @@ module Purple
             @uri = URI.parse url
             plugin = case @uri.scheme
                 when /http|ftp/
-                    'wget'
+                    getter = nil
+                    ENV['PATH'].split(':').each { |p|
+                        case true
+                        when FileTest.executable?(File.join(p, 'wget'))
+                            getter = 'wget'
+                            break
+                        when FileTest.executable?(File.join(p, 'wget'))
+                            getter = 'wget'
+                            break
+                        end
+                    }
+                    getter
                 when 'file'
                     'cp'
                 else

data/lib/purple/getter_curl.rb

@@ -0,0 +1,55 @@
+require 'open3'
+
+module Purple
+    module Getter
+        class Getter_curl < Generic
+            def initialize *args
+                super
+                @done = "0"
+            end
+
+            def get
+                @thread = Thread.new do
+                    filename = File.basename uri.path
+                    Open3.popen3 "curl -o '#{@destdir}/#{filename}' #{@uri.to_s}" do
+                        |pw, pr, pe|
+                        parse_input pw, pr, pe
+                    end
+                end
+            end
+
+            def get_status
+                [@status, @done]
+            end
+
+            # curl specific methods
+
+            def parse_input pw, pr, pe
+                puts "DEBUG Getter_curl#parse_input: Start" if $DEBUG
+
+                # Start line
+                2.times { pe.gets }
+
+                # Data incoming
+                while line = pe.read(79)
+                    puts "->#{line.inspect}" if $DEBUG
+                    break if line.size < 79
+                    
+                    # % Total % Received % Xferd AverageDload SpeedUpload
+                    # TimeTotal Current Left Speed Current
+                    md = /
+                    if md
+                        @done = md[1]
+                        @rate = md[7]
+                    end
+
+                    if "100" == @done
+                        @status = "Done"
+                    end
+                end
+                pe.read
+                puts "DEBUG Getter_curl#parse_input: Done" if $DEBUG
+            end
+        end
+    end
+end

data/lib/purple/osx.rb

@@ -86,10 +86,19 @@ end
                 end
 
                 Dir.mkdir "#{osx_stage}/Resources"
-                File.open "#{osx_stage}/Resources/Welcome.txt", "w" do |f|
-                    f.print <<-EOS
-Hello, World!
-                    EOS
+
+                info = ['README', 'NOTICE'].find { |f|
+                    FileTest.exists? File.join(pkg.srcdir, f)
+                }
+                if info
+                    FileUtils.cp File.join(pkg.srcdir, info), File.join(osx_stage, 'Resources/', 'ReadMe.txt')
+                end
+
+                license = ['COPYING', 'LICENSE'].find { |f|
+                    FileTest.exists? "#{pkg.srcdir}/#{f}"
+                }
+                if license
+                    FileUtils.cp "#{pkg.srcdir}/#{license}", "#{osx_stage}/Resources/License.txt"
                 end
 
                 File.open "#{osx_stage}/Info.plist", "w" do |f|

data/lib/purple/pkg_actions.rb

@@ -15,10 +15,21 @@ module Purple
                     end
                 end
                 def #{name}= prc
-                    @method_#{name}_package = prc
+                    case prc
+                    when Proc
+                        @method_#{name}_package = prc
+                    when String
+                        @method_#{name}_package = proc { |pkg|
+                            prc = eval("%(\#{prc})") if prc =~ /\\\#\\\{/
+                            puts "DEBUG: prc==\#{prc}" if $DEBUG
+                            pkg.cabinet.sys #{name.to_s.inspect}, prc
+                        }
+                    when Array
+                        self.#{name} = prc.join '; '
+                    end
                 end
             EOS
-            #puts prg
+            puts "DEBUG PackageActions##package_method: prg=\n#{prg}" if $DEBUG
             module_eval prg
         end
 
@@ -26,10 +37,11 @@ module Purple
             return @srcdir if defined? @srcdir
             dirs = Dir.new(cabinet.srcdir).reject { |s| s =~ /^\.{1,2}$/ }
             if 1 == dirs.size
-                @srcdir = "#{cabinet.srcdir}/#{dirs[0]}"
+                s = dirs[0]
             else
-                @srcdir = Dir.new(cabinet.srcdir).find { |s| s =~ Regexp.new('^' + Regexp.escape(name)) }
+                s = Dir.new(cabinet.srcdir).find { |s| s =~ Regexp.new('^' + Regexp.escape(name)) }
             end
+            @srcdir = File.join(cabinet.srcdir, s)
             throw :stop, "Unable to determine source directory for package #{name}" if not @srcdir
             puts "Choosing #{@srcdir} as source code folder"
             @srcdir
@@ -40,22 +52,32 @@ module Purple
         end
 
         package_method :prepare
+        package_method :setup
         package_method :config
         package_method :build
         package_method :stage
         package_method :make
 
+        def default_setup
+        end
+
         def default_prepare
             puts "DEBUG PackageActions#default_prepare" if $DEBUG
             files.each do |f|
                 unpack = case f
-                    when /gz$/; '-z'
-                    when /bz2$/; '-j'
-                    else ''
-                end
-                if not cabinet.sys 'prepare', "tar xv #{unpack} -C '#{cabinet.srcdir}' -f #{cabinet.filesdir}/#{f}"
-                    throw :stop
+                    when /(gz|bz2)$/
+                        compress_arg = case $1
+                            when 'gz'; '-z'
+                            when 'bz2'; '-j'
+                            else ''
+                        end
+                        proc { |filename| "tar xv #{compress_arg} -C '#{cabinet.srcdir}' -f #{cabinet.filesdir}/#{filename}" }
+                    when /zip$/
+                        proc { |filename| "cd '#{cabinet.srcdir}'; unzip -o '#{cabinet.filesdir}/#{filename}'" }
+                    else
+                        throw :stop
                 end
+                throw :stop unless cabinet.sys 'prepare', unpack.call(f)
             end
 
         end

data/lib/purple/script.rb

@@ -24,12 +24,12 @@ package(#{pkg.name.inspect}) { |p|
     p.long_name #{pkg.long_name.inspect}
     p.identifier #{pkg.identifier.inspect}
     p.version #{pkg.version.inspect}
-    p.major #{pkg.major}
-    p.minor #{pkg.minor}
+    p.major #{pkg.major.inspect}
+    p.minor #{pkg.minor.inspect}
 
     # Uncomment and modify for special configuration
     #p.config proc { |pkg|
-    #    throw :stop unless system "cd \#{pkg.srcdir}; ./configure --prefix=/usr"
+    #    throw :stop unless pkg.cabinet.sys "cd \#{pkg.srcdir}; ./configure --prefix=/usr"
     #}
 
 }
@@ -44,6 +44,7 @@ module Purple
 
         def self.parse string
             script = self.new
+            puts "DEBUG Purple::Script##parse: script_string=#{string}" if $DEBUG
             script.instance_eval string
             puts "DEBUG Purple::Script##parse: cabinet=#{script.cabinet}" if $DEBUG
             script.cabinet
@@ -68,7 +69,7 @@ module Purple
         end
 
         def package name=nil
-            puts "> #package(#{name.inspect})"
+            puts "> #package(#{name.inspect})" if $DEBUG
             package = PackageScript.new @cabinet
             @package_scripts << package
             package.name name
@@ -119,7 +120,7 @@ module Purple
             end
 
             callthrough :long_name, :name, :identifier, :version, :major, :minor
-            callthrough :prepare, :config, :build, :stage, :make
+            callthrough :prepare, :setup, :config, :build, :stage, :make
 
             def pkg
                 @package

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: purplepkg
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
-date: 2004-11-23
-summary: A simple pre-packing tool with meta-package plugin support.
+  version: 0.0.6
+date: 2005-03-08
+summary: A simple pre-packaging tool with meta-package plugin support.
 require_paths: 
   - lib
 author: Simon Conrad-Armes
 email: curne@curnomatic.dk
 homepage: purplepkg.rubyforge.org
-rubyforge_project: purple
+rubyforge_project: purplepkg
 description: 
 autorequire: 
 default_executable: 
@@ -40,6 +40,7 @@ files:
   - lib/purple/platform.rb
   - lib/purple/debian.rb
   - lib/purple/process.rb
+  - lib/purple/getter_curl.rb
   - bin/purple
   - bin/install_ruby
 test_files: []