crate 0.1.1 → 0.2.1

data/HISTORY

@@ -1,4 +1,26 @@
 = Changelog
+== Version 0.2.1 2009-01-18
+
+=== Enhancements
+* update with new amalgalite vesion
+* update to new openssl version
+
+=== Bugfixes
+* fix missing libs on final build
+* fix lib ordering on final build
+
+== Version 0.2.0 2008-12-20
+
+=== Enhancements
+* use Net::FTP for passive ftp [ jonbrenner ]
+* use Net::HTTP instead of open-uri
+
+=== Bugfixes
+* update sha1 hash for amalgalite gem [ jonbrenner ]
+* update dependencies, removing progressbar and adding logging
+* fix digest check task [ jonbrenner ]
+* set binary mode for writing downloaded files to disk
+
 == Version 0.1.1
 
 * fix packing of ruby stdlib extension's pure ruby components

data/README

@@ -4,12 +4,13 @@
 * {Rubyforge Project}[http://rubyforge.org/projects/copiousfreetime/]
 * email jeremy at copiousfreetime dot org 
 * git clone url git://github.com/copiousfreetime/crate.git
-* {Packaging an Application With Crate}[http://copiousfreetime.org/articles/2008/11/30/package-an-application-with-crate.html
+* {Packaging an Application With Crate}[http://copiousfreetime.org/articles/2008/11/30/package-an-application-with-crate.html]
+* {RubyConf '08 Presentation}[http://rubyconf2008.confreaks.com/crate-packaging-your-ruby-application.html]
 
 == DESCRIPTION
 
 Crate is a developer tool to help package up your application as a custom static
-build of the ruby interpreter plus all dependedent binary extensions.  All the
+build of the ruby interpreter plus all dependent binary extensions.  All the
 pure ruby code (the ruby application, the ruby stdlib, etc ) is packed into one
 or more SQLite databases.
 

data/data/recipes/amalgalite/amalgalite.rake

@@ -1,7 +1,7 @@
 #
 # The recipe for integrating amalgalite into the ruby build
 #
-Crate::GemIntegration.new("amalgalite", "0.5.1") do |t|
-  t.upstream_source  = "http://rubyforge.org/frs/download.php/47660/amalgalite-0.5.1.gem"
-  t.upstream_sha1    = "fca93f2ab3abf46c86e78202d46489f25b7acb33"
+Crate::GemIntegration.new("amalgalite", "0.7.1") do |t|
+  t.upstream_source = "http://rubyforge.org/frs/download.php/50393/amalgalite-0.7.1.gem"
+  t.upstream_sha1   = "84a84fd1192cef2d77701ec74afc8325a2a99ca7"
 end

data/data/recipes/openssl/openssl.rake

@@ -1,10 +1,10 @@
 #
 # Crate recipe for openssl
 #
-Crate::Dependency.new("openssl", "0.9.8i") do |t|
+Crate::Dependency.new("openssl", "0.9.8j") do |t|
   t.depends_on( "zlib" )
-  t.upstream_source  = "http://www.openssl.org/source/openssl-0.9.8i.tar.gz"
-  t.upstream_sha1    = "b2e029cfb68bf32eae997d60317a40945db5a65f"
+  t.upstream_source = "http://openssl.org/source/openssl-0.9.8j.tar.gz"
+  t.upstream_sha1   = "f70f7127a26e951e8a0d854c0c9e6b4c24df78e4"
 
   t.build_commands = [
     "./config --prefix=#{File.join( '/', 'usr' )} zlib no-threads no-shared",

data/data/recipes/ruby/ext-openssl-openssl_missing.h.patch

@@ -0,0 +1,14 @@
+* make sure the headers for openssl match up
+--- ext/openssl/openssl_missing.h  2008-08-03 22:43:34.000000000 -0600
++++ ext/openssl/openssl_missing.h  2009-01-18 17:46:19.000000000 -0700
+@@ -120,8 +120,8 @@
+ int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
+ int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
+ int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
+-int BN_rand_range(BIGNUM *r, BIGNUM *range);
+-int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range);
++int BN_rand_range(BIGNUM *rnd, const BIGNUM *range);
++int BN_pseudo_rand_range(BIGNUM *r, const BIGNUM *range);
+ char *CONF_get1_default_config_file(void);
+ int PEM_def_callback(char *buf, int num, int w, void *key);
+ 

data/gemspec.rb

@@ -6,7 +6,7 @@ Crate::GEM_SPEC = Gem::Specification.new do |spec|
   proj = Configuration.for('project')
   spec.name         = proj.name
   spec.version      = Crate::VERSION
-  
+
   spec.author       = proj.author
   spec.email        = proj.email
   spec.homepage     = proj.homepage
@@ -14,34 +14,33 @@ Crate::GEM_SPEC = Gem::Specification.new do |spec|
   spec.description  = proj.description
   spec.platform     = Gem::Platform::RUBY
 
-  
+
   pkg = Configuration.for('packaging')
   spec.files        = pkg.files.all
   spec.executables  = pkg.files.bin.collect { |b| File.basename(b) }
 
   # add dependencies here
-  spec.add_dependency("rake", ">= 0.8.1")
-  spec.add_dependency("configuration", "~> 0.0.5")
-  spec.add_dependency("progressbar")
-  spec.add_dependency("archive-tar-minitar")
-  spec.add_dependency("amalgalite", "~> 0.5.0")
-  
-   
-  
+  spec.add_dependency( "rake", "~> 0.8.3")
+  spec.add_dependency( "configuration", "~> 0.0.5")
+  spec.add_dependency( "archive-tar-minitar")
+  spec.add_dependency( "amalgalite", "~> 0.7")
+  spec.add_dependency( "logging", "~> 0.9" )
+
+
   if rdoc = Configuration.for_if_exist?('rdoc') then
     spec.has_rdoc         = true
     spec.extra_rdoc_files = pkg.files.rdoc
     spec.rdoc_options     = rdoc.options + [ "--main" , rdoc.main_page ]
   else
     spec.has_rdoc         = false
-  end 
+  end
 
   if test = Configuration.for_if_exist?('testing') then
     spec.test_files       = test.files
-  end 
+  end
 
   if rf = Configuration.for_if_exist?('rubyforge') then
     spec.rubyforge_project  = rf.project
-  end 
+  end
 
 end

data/lib/crate.rb

@@ -16,6 +16,7 @@ Logging::Appender.stdout.layout = Logging::Layouts::Pattern.new(
 )
 
 module Crate
+  class Error < ::StandardError; end
 
   # The root directory of the project is considered to be the parent directory
   # of the 'lib' directory.

data/lib/crate/dependency.rb

@@ -159,7 +159,7 @@ module Crate
     def define_verify
       desc "Verify source against its checksum"
       task :verify => "#{name}:download" do 
-        if @digenst then 
+        if @digest then 
           if @digest.valid?( local_source ) then
               logger.info "#{local_source} validates against #{@digest.hex}"
           else

data/lib/crate/project.rb

@@ -158,10 +158,11 @@ CRATE_BOOT_H
     def link_project
       link_options = %w[ CFLAGS XCFLAGS LDFLAGS ].collect { |c| compile_params[c] }.join(' ')
       Dir.chdir( ::Crate.ruby.pkg_dir ) do
-        dot_a = FileList[ "**/*.a" ]
+        dot_a = FileList[ "ext/**/*.a" ]
+        dot_a << %w[ libssl.a libcrypto.a libz.a libruby-static.a  ] # order is important on the last 4
         dot_o = [ "ext/extinit.o", File.join( project_root, "crate_boot.o" )]
         libs = compile_params['LIBS']
-        cmd = "#{compile_params['CC']} #{link_options} #{dot_o.join(' ')} #{dot_a.join(' ')} -o #{File.join( dist_dir, name) }"
+        cmd = "#{compile_params['CC']} #{link_options} #{dot_o.join(' ')} #{libs} #{dot_a.join(' ')} -o #{File.join( dist_dir, name) }"
         logger.debug cmd
         sh cmd
       end
@@ -174,7 +175,7 @@ CRATE_BOOT_H
       lib_db = File.join( dist_dir, "lib.db" )
       app_db = File.join( dist_dir, "app.db" )
       directory dist_dir
-      packer_cmd = "~/Projects/amalgalite/bin/amalgalite-pack"
+      packer_cmd = "amalgalite-pack"
 
       task :pack_ruby => dist_dir do
         prefix = File.join( ::Crate.ruby.pkg_dir, "lib" )

data/lib/crate/utils.rb

@@ -1,14 +1,20 @@
 require 'archive/tar/minitar'
 require 'zlib'
-require 'open-uri'
 require 'fileutils'
-require 'progressbar'
 require 'rubygems/installer'
+require 'net/ftp'
+require 'net/http'
 
 module Crate
   #
   # Utiltiy methods useful for many items
   module Utils
+
+    def logger
+      @logger ||= Logging::Logger['Crate::Utils']
+    end
+    extend self 
+
     #
     # Changes into a directory and unpacks the archive.
     #
@@ -26,6 +32,7 @@ module Crate
       end
     end
 
+
     #
     # Verify the given file against a digest value.  If the digest value is nil
     # then it is a no-op.
@@ -34,30 +41,63 @@ module Crate
       return ( against ? against.verify( file ) : true )
     end
 
+
     #
-    # download the given URI to a specified location, show progress with a
-    # progress bar.
+    # download the given URI to a specified location
     #
     def download( uri, to )
       to_dir = File.dirname( to )
       FileUtils.mkdir_p( to_dir ) unless File.directory?( to_dir )
 
-      pbar = nil 
-      File.open( to , "w" ) do |outf|
-        begin
-          uri.open( :content_length_proc => lambda { |t| pbar = ::ProgressBar.new( File.basename( local_source ), t ) if  t && 0 < t  },  
-                    :progress_proc       => lambda { |s| pbar.set s if pbar } ) do |inf|
-            outf.write inf.read
-          end 
-        rescue => e
-          puts
-          STDERR.puts "Error downloading #{uri.to_s} : #{e}"
-          exit 1
+      begin
+        case uri
+        when URI::FTP  : download_via_ftp( uri, to )
+        when URI::HTTP : download_via_http( uri, to )
+        else
+          raise ::Crate::Error, "Downloading is only supported via FTP or HTTP at this time"
         end
+      rescue => e
+        puts
+        STDERR.puts "Error downloading #{uri.to_s} : #{e}"
+        exit 1
       end
     end
 
+
+    # download vi FTP
     #
+    def download_via_ftp( uri, to )
+      Net::FTP.open( uri.host ) do |ftp|
+        ftp.passive = true
+        ftp.login
+        ftp.getbinaryfile( uri.path, to )
+      end
+    end
+
+
+    # download via HTTP, following redirects
+    #
+    def download_via_http( uri, to, limit = 10 )
+      uri = URI.parse( uri ) unless URI === uri
+      raise ::Crate::Error, "Reached HTTP Redirect limit with #{uri.to_s}" if limit == 0
+      Net::HTTP.start( uri.host, uri.port ) do |http|
+        http.request_get( uri.request_uri ) do |response|
+          case response
+          when Net::HTTPSuccess then
+            Utils.logger.debug "success! saving to #{to}"
+            File.open( to, "wb" ) do |outf|
+              response.read_body { |bytes| outf.write bytes }
+            end
+          when Net::HTTPRedirection then
+            Utils.logger.debug "redirect to #{response['location']}"
+            download_via_http( response['location'], to, limit - 1 )
+          else response.error!
+          end
+        end
+      end
+    end
+
+    
     # Apply the given patch file in a particular directory
     #
     def apply_patch( patch_file, location )
@@ -65,10 +105,5 @@ module Crate
         %x[ patch -p0 < #{patch_file} ]
       end
     end
-
-    #
-    # Wrap a command sending its output to the the Crate.project logger at the
-    # debug level
-    #
   end
 end

data/lib/crate/version.rb

@@ -6,7 +6,7 @@
 module Crate
   module Version
     MAJOR   = 0
-    MINOR   = 1
+    MINOR   = 2
     BUILD   = 1
 
     def to_a 

data/tasks/rubyforge.rake

@@ -45,7 +45,7 @@ if rf_conf = Configuration.for_if_exist?("rubyforge") then
       info = Utils.announcement
 
       puts "Subject : #{info[:subject]}"
-      msg = "#{info[:title]}\n\n#{info[:urls]}\n\n#{info[:release_notes]}"
+      msg = "#{info[:title]}\n\n#{info[:urls]}\n\n#{info[:description]}\n\n#{info[:release_notes]}"
       puts msg
 
       rubyforge = RubyForge.new

data/tasks/utils.rb

@@ -54,7 +54,7 @@ module Utils
     #
     def release_notes_from(history_file)
       releases = {}
-      File.read(history_file).split(/^(?==)/).each do |section|
+      File.read(history_file).split(/^(?=== Version)/).each do |section|
         lines = section.split("\n")
         md = %r{Version ((\w+\.)+\w+)}.match(lines.first)
         next unless md

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: crate
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-01 00:00:00 -07:00
+date: 2009-01-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.8.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: configuration
@@ -33,7 +33,7 @@ dependencies:
         version: 0.0.5
     version: 
 - !ruby/object:Gem::Dependency 
-  name: progressbar
+  name: archive-tar-minitar
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -43,26 +43,26 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: archive-tar-minitar
+  name: amalgalite
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "0.7"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: amalgalite
+  name: logging
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.5.0
+        version: "0.9"
     version: 
-description: Crate is a developer tool to help package up your application as a custom static build of the ruby interpreter plus all dependedent binary extensions.  All the pure ruby code (the ruby application, the ruby stdlib, etc ) is packed into one or more SQLite databases.  The final distributable pieces are a single executable and a few SQLite databases which can be then wrapped up appropriately as an OS X App; a self extracting executable for Windows; a shar archive, rpm or tarball for Unixes.
+description: Crate is a developer tool to help package up your application as a custom static build of the ruby interpreter plus all dependent binary extensions.  All the pure ruby code (the ruby application, the ruby stdlib, etc ) is packed into one or more SQLite databases.  The final distributable pieces are a single executable and a few SQLite databases which can be then wrapped up appropriately as an OS X App; a self extracting executable for Windows; a shar archive, rpm or tarball for Unixes.
 email: jeremy@copiousfreetime.org
 executables: 
 - crate
@@ -111,6 +111,7 @@ files:
 - data/recipes/openssl/openssl.rake
 - data/recipes/ruby
 - data/recipes/ruby/ext-extmk.rb.patch
+- data/recipes/ruby/ext-openssl-openssl_missing.h.patch
 - data/recipes/ruby/ruby.rake
 - data/recipes/rubygems
 - data/recipes/rubygems/rubygems.rake
@@ -155,6 +156,6 @@ rubyforge_project: copiousfreetime
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Crate is a developer tool to help package up your application as a custom static build of the ruby interpreter plus all dependedent binary extensions
+summary: Crate is a developer tool to help package up your application as a custom static build of the ruby interpreter plus all dependent binary extensions
 test_files: []