gorp 0.28.0 → 0.28.1

data/Manifest

@@ -1,7 +1,6 @@
 Manifest
 README
 Rakefile
-gorp.gemspec
 lib/gorp.rb
 lib/gorp/commands.rb
 lib/gorp/edit.rb

data/gorp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gorp"
-  s.version = "0.28.0"
+  s.version = "0.28.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = "    Enables the creation of scenarios that involve creating a rails project,\n    starting and stoppping of servers, generating projects, editing files,\n    issuing http requests, running of commands, etc.  Output is captured as\n    a single HTML file that can be viewed locally or uploaded.\n\n    Additionally, there is support for verification, in the form of defining\n    assertions based on selections (typically CSS) against the generated HTML.\n"
   s.email = "rubys@intertwingly.net"
   s.extra_rdoc_files = ["README", "lib/gorp.rb", "lib/gorp/commands.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/net.rb", "lib/gorp/output.css", "lib/gorp/output.rb", "lib/gorp/rails.env", "lib/gorp/rails.rb", "lib/gorp/test.rb", "lib/gorp/xml.rb", "lib/version.rb"]
-  s.files = ["Manifest", "README", "Rakefile", "gorp.gemspec", "lib/gorp.rb", "lib/gorp/commands.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/net.rb", "lib/gorp/output.css", "lib/gorp/output.rb", "lib/gorp/rails.env", "lib/gorp/rails.rb", "lib/gorp/test.rb", "lib/gorp/xml.rb", "lib/version.rb"]
+  s.files = ["Manifest", "README", "Rakefile", "lib/gorp.rb", "lib/gorp/commands.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/net.rb", "lib/gorp/output.css", "lib/gorp/output.rb", "lib/gorp/rails.env", "lib/gorp/rails.rb", "lib/gorp/test.rb", "lib/gorp/xml.rb", "lib/version.rb", "gorp.gemspec"]
   s.homepage = "http://github.com/rubys/gorp"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Gorp", "--main", "README"]
   s.require_paths = ["lib"]

data/lib/gorp/output.rb

@@ -96,12 +96,12 @@ at_exit do
     "<ul class=\"todos\">\n#{$todos.target!.gsub(/^/,' '*6)}    </ul>"
   $x.target!.gsub! '<strong/>', '<strong></strong>'
   $x.target!.gsub! /(<textarea[^>]+)\/>/, '\1></textarea>'
-  log :WRITE, Gorp.path("#{$output}.html")
+  Gorp.log :WRITE, Gorp.path("#{$output}.html")
   open("#{$WORK}/#{$output}.html",'w') { |file| file.write $x.target! }
   
   # run tests
   if $checker
-    log :CHECK, "#{$output}.html"
+    Gorp.log :CHECK, "#{$output}.html"
     Dir.chdir $BASE
     STDOUT.puts
     if $checker.respond_to? :call

data/lib/gorp/rails.rb

@@ -104,10 +104,11 @@ module Gorp
       rails = Gorp.which_rails($rails)
       rails += ' new' if `#{rails} -v` !~ /Rails 2/ 
       opt = ''
-      if File.exist? 'Gemfile'
+      gemfile = ENV['BUNDLE_GEMFILE'] || 'Gemfile'
+      if File.exist? gemfile
         rails = "bundle exec " + rails
         opt += ' --skip-bundle'
-        opt += ' --dev' if File.read('Gemfile') =~ /gem ['"]rails['"], :path/
+        opt += ' --dev' if File.read(gemfile) =~ /gem ['"]rails['"], :path/
       elsif `ruby -v` =~ /1\.8/
         rails.sub! /^/, 'ruby ' unless rails =~ /^ruby /
         rails.sub! 'ruby ', 'ruby -rubygems '

data/lib/version.rb

@@ -2,7 +2,7 @@ module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 28
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gorp
 version: !ruby/object:Gem::Version 
-  hash: 111
+  hash: 109
   prerelease: 
   segments: 
   - 0
   - 28
-  - 0
-  version: 0.28.0
+  - 1
+  version: 0.28.1
 platform: ruby
 authors: 
 - Sam Ruby
@@ -111,7 +111,6 @@ files:
 - Manifest
 - README
 - Rakefile
-- gorp.gemspec
 - lib/gorp.rb
 - lib/gorp/commands.rb
 - lib/gorp/edit.rb
@@ -124,6 +123,7 @@ files:
 - lib/gorp/test.rb
 - lib/gorp/xml.rb
 - lib/version.rb
+- gorp.gemspec
 homepage: http://github.com/rubys/gorp
 licenses: []