gorp 0.18.4 → 0.19.0

data/Rakefile

@@ -20,6 +20,7 @@ Echoe.new('gorp', Gorp::VERSION::STRING) do |p|
   p.email          = "rubys@intertwingly.net"
   p.dependencies   = %w(
     builder
+    bundler
     erubis
     i18n
     mail

data/gorp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.18.4"
+  s.version = "0.19.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = %q{2010-01-02}
+  s.date = %q{2010-01-05}
   s.description = %q{    Enables the creation of scenarios that involve creating a rails project,
     starting and stoppping of servers, generating projects, editing files,
     issuing http requests, running of commands, etc.  Output is captured as
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<builder>, [">= 0"])
+      s.add_runtime_dependency(%q<bundler>, [">= 0"])
       s.add_runtime_dependency(%q<erubis>, [">= 0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<mail>, [">= 0"])
@@ -43,6 +44,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
     else
       s.add_dependency(%q<builder>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<erubis>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<mail>, [">= 0"])
@@ -56,6 +58,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<builder>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<erubis>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<mail>, [">= 0"])

data/lib/gorp/commands.rb

@@ -27,6 +27,11 @@ module Gorp
     $issue = 0
     $style = Builder::XmlMarkup.new(:indent => 2)
 
+    $semaphore = Mutex.new
+    def $x.pre! *args
+      $semaphore.synchronize { $x.pre *args }
+    end
+
     def secsplit section
       section.to_s.split('.').map {|n| n.to_i}
     end
@@ -122,7 +127,7 @@ module Gorp
     def popen3 args, hilight=[]
       Open3.popen3(args) do |pin, pout, perr|
 	terr = Thread.new do
-	  $x.pre perr.readline.chomp, :class=>'stderr' until perr.eof?
+	  $x.pre! perr.readline.chomp, :class=>'stderr' until perr.eof?
 	end
 	pin.close
 	until pout.eof?
@@ -137,9 +142,9 @@ module Gorp
 	  end
 
 	  if line.strip.size == 0
-	    $x.pre ' ', :class=>outclass
+	    $x.pre! ' ', :class=>outclass
 	  else
-	    $x.pre line.chomp, :class=>outclass
+	    $x.pre! line.chomp, :class=>outclass
 	  end
 	end
 	terr.join
@@ -158,7 +163,7 @@ module Gorp
 	    line.gsub! /\x1b\[4(;\d+)*m(.*?)\x1b\[0m/, '\2'
 	    line.gsub! /\x1b\[0(;\d+)*m(.*?)\x1b\[0m/, '\2'
 	    line.gsub! /\x1b\[0(;\d+)*m/, ''
-	    $x.pre line, :class=>'stderr'
+	    $x.pre! line, :class=>'stderr'
 	  end
 	end
 	pin.close
@@ -168,18 +173,18 @@ module Gorp
 	  if line =~ /^([?>]>)\s*#\s*(START|END):/
 	    prompt = $1
 	  elsif line =~ /^([?>]>)\s+$/
-	    $x.pre ' ', :class=>'irb'
+	    $x.pre! ' ', :class=>'irb'
 	    prompt ||= $1
 	  elsif line =~ /^([?>]>)(.*)\n/
 	    prompt ||= $1
 	    $x.pre prompt + $2, :class=>'irb'
 	    prompt = nil
 	  elsif line =~ /^\w+(::\w+)*: /
-	    $x.pre line.chomp, :class=>'stderr'
+	    $x.pre! line.chomp, :class=>'stderr'
 	  elsif line =~ /^\s+from [\/.:].*:\d+:in `\w.*'\s*$/
-	    $x.pre line.chomp, :class=>'stderr'
+	    $x.pre! line.chomp, :class=>'stderr'
 	  else
-	    $x.pre line.chomp, :class=>'stdout'
+	    $x.pre! line.chomp, :class=>'stdout'
 	  end
 	end
 	terr.join

data/lib/gorp/edit.rb

@@ -60,7 +60,7 @@ module Gorp
     end
 
     def dcl(name, *options)
-      re = Regexp.new '\n(\s*)(class|def|test)\s+"?' + name +
+      re = Regexp.new '^(\s*)(class|def|test)\s+"?' + name +
         '"?.*?\n\1end\n', Regexp::MULTILINE
       raise IndexError.new('regexp not matched') unless match(re)
 

data/lib/gorp/rails.rb

@@ -13,10 +13,31 @@ end
 # select a version of Rails
 if ARGV.first =~ /^_\d[.\d]*_$/
   $rails = "rails #{ARGV.first}"
-elsif File.directory?(ARGV.first.to_s)
-  $rails = ARGV.first
-  $rails = File.join($rails,'rails') if
-    File.directory?(File.join($rails,'rails'))
+elsif File.directory?(ARGV.first.split(File::PATH_SEPARATOR).first)
+  if ARGV.first.include?(File::PATH_SEPARATOR)
+    # first path is Rails, additional paths are added to the RUBYLIBS
+    libs = ENV['RUBYLIBS'].to_s.split(File::PATH_SEPARATOR)
+    ARGV.first.split(File::PATH_SEPARATOR).reverse.each do |lib|
+      lib = File.expand_path(lib)
+      if !File.directory?(lib)
+        STDERR.puts "No such library: #{lib.inspect}"
+        exit
+      elsif File.directory?(File.join(lib,'lib'))
+        libs.unshift File.join(lib,'lib')
+      else
+        libs.unshift lib
+      end
+    end
+    $rails = libs.shift
+    ENV['RUBYLIBS'] = libs.join(File::PATH_SEPARATOR)
+  else
+    $rails = ARGV.first
+  end
+
+  if File.directory?(File.join($rails,'rails'))
+    $rails = File.join($rails,'rails')
+  end
+
   $rails = File.expand_path($rails)
 else
   $rails = 'rails'
@@ -91,7 +112,7 @@ module Gorp
       if $rails != 'rails' and File.directory?($rails)
         if File.exist? 'Gemfile'
           if $bundle
-            if ENV['RUBYLIB']
+            if ENV['RUBYLIB'] or ARGV.include?('system')
               gem=open('Gemfile') {|file| file.read}
 
               gem.sub! /gem "rails", :path => "(.*)"/ do
@@ -101,9 +122,19 @@ module Gorp
                   eval(file.read.gsub(/\s*(module|end).*\n/, '').downcase)
                 end
 
-                ENV['RUBYLIB'].split(File::PATH_SEPARATOR).each do |lib|
-                  rails << "directory #{lib.sub(/\/lib$/,'').inspect}\n"
+                if ARGV.include?('system')
+                  rails = <<-EOF.gsub(/^\s+/,'') + rails
+                    @environment.clear_sources
+                    @environment.add_source SystemGemSource.instance
+                  EOF
                 end
+
+                if ENV['RUBYLIB']
+                  ENV['RUBYLIB'].split(File::PATH_SEPARATOR).each do |lib|
+                    rails << "directory #{lib.sub(/\/lib$/,'').inspect}\n"
+                  end
+                end
+
                 rails + "gem \"rails\", #{version.inspect}"
               end
 

data/lib/gorp/test.rb

@@ -39,6 +39,13 @@ module Gorp
       @one.method_missing sym, *args, &block
       @two.method_missing sym, *args, &block
     end
+
+    def pre! *args
+      $semaphore.synchronize do
+        @one.pre *args
+        @two.pre *args
+      end
+    end
   end
 end
 

data/lib/version.rb

@@ -1,8 +1,8 @@
 module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 18
-    TINY  = 4
+    MINOR = 19
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gorp
 version: !ruby/object:Gem::Version 
-  version: 0.18.4
+  version: 0.19.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-02 00:00:00 -05:00
+date: 2010-01-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: erubis
   type: :runtime