setup 5.0.0 → 5.0.1

data/HISTORY

@@ -1,5 +1,21 @@
 = RELEASE HISTORY
 
+== 5.0.1 / 2010-02-07
+
+Version 5.0.1 fixes a bug reading configuration options,
+and makes some minor adjusemnt to exit error messages.
+
+Changes:
+
+* 1 Bug Fix
+
+    * Fixed parsing of ruby install parameters on systems with custom configurations.
+
+* 1 Minor Enhancement
+
+    * Use 'abort $!.message' instead of 'exit 1' when exiting on error.
+
+
 == 5.0.0 / 2010-01-12
 
 Version 5 represents a major milestone in Setup.rb's development.

data/MANIFEST

@@ -2,6 +2,7 @@ COPYING
 HISTORY
 MANIFEST
 README.rdoc
+Syckfile
 bin/setup.rb
 lib/setup
 lib/setup.rb

data/Syckfile

@@ -0,0 +1,77 @@
+---
+email:
+  service : Email
+  file    : ~
+  subject : ~
+  mailto  : ruby-talk@ruby-lang.org
+  from    : <%= ENV['EMAIL_ACCOUNT'] %>
+  server  : <%= ENV['EMAIL_SERVER'] %>
+  port    : <%= ENV['EMAIL_PORT'] %>
+  account : <%= ENV['EMAIL_ACCOUNT'] %>
+  domain  : <%= ENV['EMAIL_DOMAIN'] %>
+  login   : <%= ENV['EMAIL_LOGIN'] %>
+  secure  : <%= ENV['EMAIL_SECURE'] %>
+  active  : true
+
+gemcutter:
+  service: GemCutter
+  active : true
+
+box:
+  service: Box
+  active : true
+  types  : [gem, gz]
+  include: [bin, lib, meta, script, test, "[A-Z]*"]
+  exclude: [InstalledFiles, SetupConfig]
+  master : true
+
+ridoc:
+  service: RIDoc
+  include: ~
+  exclude: ~
+  active : true
+
+rdoc:
+  service: RDoc
+  include: ~
+  exclude: ~
+  active : true
+
+syntax:
+  service  : Syntax
+  loadpath : ~
+  exclude  : ~
+  active   : false
+
+testrb:
+  service  : Testrb
+  tests    : ~
+  exclude  : ~
+  loadpath : ~
+  requires : ~
+  live     : false   
+  active   : false
+
+dnote:
+  service  : DNote
+  loadpath : ~
+  labels   : ~
+  output   : ~
+  active   : false
+
+vclog:
+  service  : VClog
+  format   : html   # xml, txt
+  layout   : rel    # gnu
+  typed    : false
+  output   : ~
+  active   : false
+
+stats:
+  service  : Stats
+  title    : ~
+  loadpath : ~
+  exclude  : ~
+  output   : ~
+  active   : true
+

data/lib/setup.rb

@@ -1,3 +1,3 @@
 module Setup
-  VERSION   = '5.0.0'
+  VERSION   = '5.0.1'
 end

data/lib/setup/command.rb

@@ -89,11 +89,11 @@ module Setup
 
       begin
         session.__send__(task)
-      rescue Error
-        raise if $DEBUG
+      rescue Error => err
+        raise err if $DEBUG
         $stderr.puts $!.message
         $stderr.puts "Try 'setup.rb --help' for detailed usage."
-        exit 1
+        abort $!.message #exit 1
       end
 
       puts unless session.quiet?

data/lib/setup/configuration.rb

@@ -2,6 +2,7 @@ require 'rbconfig'
 require 'fileutils'
 require 'erb'
 require 'yaml'
+require 'shellwords'
 require 'setup/core_ext'
 require 'setup/constants'
 
@@ -83,9 +84,13 @@ module Setup
     end
 
     # Turn all of CONFIG["configure_args"] into methods.
-
-    ::Config::CONFIG["configure_args"].each do |ent|
-      key, val = *ent.split("=")
+    config_args = Shellwords.shellwords(::Config::CONFIG["configure_args"])
+    config_args.each do |ent|
+      if ent.index("=")
+        key, val = *ent.split("=")
+      else
+        key, val = ent, true
+      end
       name = key.downcase
       name = name.sub(/^--/,'')
       name = name.gsub(/-/,'_')

data/lib/setup/installer.rb

@@ -136,7 +136,7 @@ module Setup
         File.extname(file) == ".#{dllext}"
       end
       if ents.empty? && !files.empty?
-        raise Error, "ruby extention not compiled: 'setup.rb setup' first"
+        raise Error, "ruby extention not compiled: 'setup.rb make' first"
       end
       ents
     end

data/lib/setup/session.rb

@@ -114,7 +114,7 @@ module Setup
 
     #
     def make
-      abort "must setup config first" unless configuration.exist?
+      abort "must run 'setup config' first" unless configuration.exist?
       log_header('Compile')
       compiler.compile
     end
@@ -124,7 +124,7 @@ module Setup
 
     #
     def install
-      abort "must setup config first" unless configuration.exist?
+      abort "must run 'setup config' first" unless configuration.exist?
       log_header('Install')
       installer.install
     end

data/meta/version

@@ -1 +1 @@
-5.0.0
+5.0.1

data/script/setup

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Setup.rb, 2010-01-13 04:14:39
+# Setup.rb, 2010-02-07 08:33:15
 #
 # This is a stand-alone bundle of the setup.rb application.
 # You can place it in your projects script/ directory, or
@@ -8,7 +8,7 @@
 # root directory (just like old times).
 #
 module Setup
-  VERSION   = '5.0.0'
+  VERSION   = '5.0.1'
 end
 class << File #:nodoc: all
   unless respond_to?(:read)   # Ruby 1.6 and less
@@ -133,13 +133,13 @@ module Setup
       compiler.configure if compile? #compiler.compiles?
     end
     def make
-      abort "must setup config first" unless configuration.exist?
+      abort "must run 'setup config' first" unless configuration.exist?
       log_header('Compile')
       compiler.compile
     end
     alias_method :setup, :make
     def install
-      abort "must setup config first" unless configuration.exist?
+      abort "must run 'setup config' first" unless configuration.exist?
       log_header('Install')
       installer.install
     end
@@ -327,6 +327,7 @@ require 'rbconfig'
 require 'fileutils'
 require 'erb'
 require 'yaml'
+require 'shellwords'
 module Setup
   class Configuration
     RBCONFIG  = ::Config::CONFIG
@@ -362,7 +363,7 @@ module Setup
     option :shebang         , :pick, 'shebang line (#!) editing mode (all,ruby,never)'
     option :no_test, :t     , :bool, 'run pre-installation tests'
     option :no_ri,   :d     , :bool, 'generate ri documentation'
-    option :no_doc,         , :bool, 'install doc/ directory'
+    option :no_doc          , :bool, 'install doc/ directory'
     option :no_ext          , :bool, 'compile/install ruby extentions'
     option :install_prefix  , :path, 'install to alternate root location'
     option :root            , :path, 'install to alternate root location'
@@ -373,8 +374,13 @@ module Setup
       name = key.to_s.downcase
       define_method(name){ val }
     end
-    ::Config::CONFIG["configure_args"].each do |ent|
-      key, val = *ent.split("=")
+    config_args = Shellwords.shellwords(::Config::CONFIG["configure_args"])
+    config_args.each do |ent|
+      if ent.index("=")
+        key, val = *ent.split("=")
+      else
+        key, val = ent, true
+      end
       name = key.downcase
       name = name.sub(/^--/,'')
       name = name.gsub(/-/,'_')
@@ -948,7 +954,7 @@ module Setup
         File.extname(file) == ".#{dllext}"
       end
       if ents.empty? && !files.empty?
-        raise Error, "ruby extention not compiled: 'setup.rb setup' first"
+        raise Error, "ruby extention not compiled: 'setup.rb make' first"
       end
       ents
     end
@@ -1236,11 +1242,11 @@ module Setup
       print_header
       begin
         session.__send__(task)
-      rescue Error
-        raise if $DEBUG
+      rescue Error => err
+        raise err if $DEBUG
         $stderr.puts $!.message
         $stderr.puts "Try 'setup.rb --help' for detailed usage."
-        exit 1
+        abort $!.message #exit 1
       end
       puts unless session.quiet?
     end

data/test/features/install.feature

@@ -3,7 +3,6 @@ Feature: Install
   As a Ruby Developer
   I want to use the setup.rb install command
 
-
   Scenario: Install project to Ruby's site locations
     Given a setup.rb compliant Ruby project
     And 'setup.rb config --type=site' has been run

data/test/features/step_definitions/install_steps.rb

@@ -19,7 +19,7 @@ When /I issue the command 'setup.rb install' unprepared$/ do
 end
 
 Then /^I will be told that I must first run 'setup\.rb make'$/ do
-  $setup_feature_error.message.assert =~ /setup\.rb make first/
+  $setup_feature_error.to_s.assert =~ /setup\.rb make\'? first/
 end
 
 # Site Ruby Locations

data/test/features/step_definitions/setup_steps.rb

@@ -20,7 +20,7 @@ Then /^the extensions should be compiled$/ do
 end
 
 Then /^I will be told that I must first run 'setup\.rb config'$/ do
-  $setup_feature_error.message.assert == "must setup config first"
+  $setup_feature_error.message.assert == "must run \'setup config\' first"
 end
 
 Then /^the extensions will not be compiled$/ do

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: setup
 version: !ruby/object:Gem::Version 
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors: 
-- |-
-  Minero Aoki <aamine@loveruby.net>
-  7rans <transfire@gmail.com>
+- Minero Aoki <aamine@loveruby.net>
+- 7rans <transfire@gmail.com>
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 -05:00
+date: 2010-02-07 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -24,7 +23,7 @@ description: |-
   Setup converts setup.rb into a stand-alone application.
   No longer will you need distribute setup.rb with you
   Ruby packages. Just instruct your users to use Setup.
-email: Tiger Ops <tigerops-community@rubyforge.org>
+email: 
 executables: 
 - setup.rb
 extensions: []
@@ -36,6 +35,7 @@ files:
 - HISTORY
 - MANIFEST
 - README.rdoc
+- Syckfile
 - bin/setup.rb
 - lib/setup.rb
 - lib/setup/base.rb
@@ -113,6 +113,6 @@ rubyforge_project: setup
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Every Rubyist is aware of Minero Aoki's ever useful
+summary: Setup.rb as a stand-alone application.
 test_files: 
 - lib/setup/tester.rb