gorp 0.28.1 → 0.28.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 29bdf58fd820cc12dfffc32f3648f7697605d56c
+  data.tar.gz: a9428e2bcc50bbdc419808359866303bb7ac269e
+SHA512:
+  metadata.gz: bad09563e09eb6508bf607ee495a5074d64c8b5b86232ad5e68226c824962c836666c799630784c5d0e896d1a9602379bb7a227ecdc5d7ea40e0038cdeff5123
+  data.tar.gz: d9b40dabca7a05207bdb1f7cf515b20ffe6d0b0e424b31eb8ae4cdfc42ec73efa53859af8875a696b9809bc128b9adbbaed0016064b04481c127b9f2870c14ae

data/Rakefile

@@ -24,6 +24,7 @@ Echoe.new('gorp', Gorp::VERSION::STRING) do |p|
     i18n
     rack
     rake
+    http-cookie
   )
   # Does not include mail -- as it depends on active_support
   # test-unit -- incompatible with i18n one hash required (testrunner.rb:116)

data/gorp.gemspec

@@ -1,25 +1,26 @@
 # -*- encoding: utf-8 -*-
+# stub: gorp 0.28.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "gorp"
-  s.version = "0.28.1"
+  s.version = "0.28.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Sam Ruby"]
-  s.date = "2011-10-22"
+  s.date = "2016-02-02"
   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", "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.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.homepage = "http://github.com/rubys/gorp"
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Gorp", "--main", "README"]
-  s.require_paths = ["lib"]
+  s.rdoc_options = ["--line-numbers", "--title", "Gorp", "--main", "README"]
   s.rubyforge_project = "gorp"
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "2.5.1"
   s.summary = "Rails scenario testing support library"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<builder>, [">= 0"])
@@ -27,12 +28,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_runtime_dependency(%q<http-cookie>, [">= 0"])
     else
       s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<http-cookie>, [">= 0"])
     end
   else
     s.add_dependency(%q<builder>, [">= 0"])
@@ -40,5 +43,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<http-cookie>, [">= 0"])
   end
 end

data/lib/gorp.rb

@@ -4,6 +4,7 @@
 # You have been warned.
 
 require 'gorp/env'
+require 'gorp/config'
 require 'gorp/commands'
 require 'gorp/edit'
 require 'gorp/output'

data/lib/gorp/commands.rb

@@ -21,11 +21,54 @@ module Gorp
       $sections << [number, title, steps]
     end
 
-    $x = Builder::XmlMarkup.new(:indent => 2)
-    $toc = Builder::XmlMarkup.new(:indent => 2)
-    $todos = Builder::XmlMarkup.new(:indent => 2)
+    # workaround for https://github.com/jimweirich/builder/commit/7c824996637d2d76455c87ad47d76ba440937e38
+    x = Builder::XmlMarkup.new
+    x.pre ''
+    if x.target! == '<pre/>'
+      class XmlMarkup < Builder::XmlMarkup
+        def tag!(sym, *args, &block)
+          sym = "#{sym}:#{args.shift}" if args.first.kind_of?(::Symbol)
+          if not block and args.first == ''
+            attrs = {}
+            attrs.merge!(args.last) if ::Hash === args.last
+            _indent
+            _start_tag(sym, attrs)
+            _end_tag(sym)
+            _newline
+          else
+            super
+          end
+        end
+      end
+    else
+      XmlMarkup = Builder::XmlMarkup
+    end
+
+    # Determine which version of the rails cli to use.  Over time, things
+    # change.  The basic strategy is to code the scripts to the latest
+    # version of rails, and have the DSL automatically substitute prior
+    # equivalents when run against older baselines.
+    #
+    # This method returns a list of symbols that can be used to control
+    # which version of a given command is to be used.
+    def rails_epoc
+      return @rails_epoc if @rails_epoc
+      version = File.read('Gemfile.lock')[/^\s+rails \((\d+\.\d+)/, 1].
+        split('.').map(&:to_i)
+
+      @rails_epoc = []
+
+      @rails_epoc << :rake_test if (version <=> [5, 0]) == -1
+      @rails_epoc << :rake_db   if (version <=> [5, 0]) == -1
+
+      @rails_epoc
+    end
+
+    $x = XmlMarkup.new(:indent => 2)
+    $toc = XmlMarkup.new(:indent => 2)
+    $todos = XmlMarkup.new(:indent => 2)
     $issue = 0
-    $style = Builder::XmlMarkup.new(:indent => 2)
+    $style = XmlMarkup.new(:indent => 2)
 
     $semaphore = Mutex.new
     class Builder::XmlMarkup
@@ -55,12 +98,17 @@ module Gorp
     end
     alias :desc :note
 
+    def flag message
+      $x.p message, :class=>'traceback'
+    end
+    alias :warn :flag
+
     def log type, message
       Gorp.log type, message
     end
 
     @@section_number = 0
-    def head number, title
+    def section_head number, title
       $section = "#{number} #{title}".strip
       number ||= (@@section_number+=1)
       log '====>', $section
@@ -74,19 +122,20 @@ module Gorp
 
       $issue+=1
       $x.p :class => 'issue', :id => "issue-#{$issue}" do
-	$x.text! text
-	if options[:ticket]
-	  $x.text! ' ('
-	  $x.a "ticket #{options[:ticket]}", :href=>
-	    'https://rails.lighthouseapp.com/projects/8994/tickets/' + 
-	    options[:ticket].to_s
-	  $x.text! ')'
-	end
+        $x.text! text
+        if options[:pull]
+          $x.text! ' ('
+          repository = options[:repository] || 'rails'
+          $x.a "pull #{options[:pull]}", :href=>
+            "https://github.com/rails/#{repository}/pull/#{options[:pull]}"
+            options[:ticket].to_s
+          $x.text! ')'
+        end
       end
       $todos.li do
-	section = $section.split(' ').first
-	$todos.a "Section #{section}:", :href => "#section-#{section}"
-	$todos.a "#{text}", :href => "#issue-#{$issue}"
+        section = $section.split(' ').first
+        $todos.a "Section #{section}:", :href => "#section-#{section}"
+        $todos.a "#{text}", :href => "#issue-#{$issue}"
       end
     end
 
@@ -101,16 +150,40 @@ module Gorp
       if args == 'script/server'
         restart_server
       else
-        cmd "ruby #{args}"
+        args = args.split(' ')
+        args.map! do |arg|
+          if arg.include? '*'
+            files = Dir[arg]
+            arg = files.first if files.length == 1
+          end
+          arg
+        end
+        cmd "ruby #{args.join(' ')}"
       end
     end
 
-    def rake args
-      cmd "rake #{args}"
+    def rake args, opts = {}
+      if args == 'test:controllers' and File.exist? 'test/functional'
+        args = 'test:functionals'
+      elsif args == 'test:models' and File.exist? 'test/unit'
+        args = 'test:units'
+      end
+
+      status = cmd "rake #{args}"
+      if status and (opts[:pass] or opts[:fail])
+        if status.success? == true and opts[:pass]
+          issue opts[:pass], opts
+        end
+        if status.success? == false and opts[:fail]
+          issue opts[:fail], opts
+        end
+      end
     end
 
     def console script, env=nil
-      if File.exist? 'script/rails'
+      if File.exist? 'bin/rails'
+        console_cmd = 'bin/rails console'
+      elsif File.exist? 'script/rails'
         console_cmd = 'script/rails console'
       else
         console_cmd = 'script/console'
@@ -137,18 +210,72 @@ module Gorp
 
     def generate *args
       if args.length == 1
-        ruby "script/generate #{args.first}"
+        cmd "rails generate #{args.first}"
       else
         if args.last.respond_to? :keys
           args.push args.pop.map {|key,value| "#{key}:#{value}"}.join(' ')
         end
         args.map! {|arg| arg.inspect.include?('\\') ? arg.inspect : arg}
-        ruby "script/generate #{args.join(' ')}"
+        cmd "rails generate #{args.join(' ')}"
       end
     end
 
     def runner *args
-      ruby "script/runner #{args.join(' ')}"
+      cmd "rails runner #{args.join(' ')}"
+    end
+
+    def unbundle
+      save = {}
+      ENV.keys.dup.each {|key| save[key]=ENV.delete(key) if key =~ /^BUNDLE_/}
+      save['RUBYOPT'] = ENV.delete('RUBYOPT') if ENV['RUBYOPT']
+
+      yield
+    ensure
+      save.delete('BUNDLE_GEMFILE')
+      save.each {|key, value| ENV[key] = value}
+    end
+
+    def bundle *args
+      unbundle do
+        args << '--local' if args == ['install']
+        cmd "bundle #{args.join(' ')}"
+      end
+    end
+
+    def db action
+      if rails_epoc.include? :rake_db
+        cmd "rake db:#{action}"
+      else
+        cmd "rails db:#{action}"
+      end
+    end
+
+    def test *args
+      if args.length == 0
+        if rails_epoc.include? :rake_test
+          rake 'test'
+        else
+          cmd 'rails test'
+        end
+      elsif args.join.include? '.'
+        if File.exist? 'bin/rails'
+          # target = Dir[args.first].first.sub(/^test\//,'').sub(/\.rb$/,'')
+          target = Dir[args.first].first
+          if rails_epoc.include? :rake_test
+            cmd "rake test #{target}"
+          else
+            cmd "rails test #{target}"
+          end
+        else
+          ruby "-I test #{args.join(' ')}"
+        end
+      else
+        if rails_epoc.include? :rake_test
+          rake "test:#{args.first}"
+        else
+          cmd "rails test:#{args.first}"
+        end
+      end
     end
 
     def cmd args, opts={}
@@ -161,11 +288,11 @@ module Gorp
 
       if RUBY_PLATFORM =~ /w32/
         args.gsub! '/', '\\' unless args =~ /http:/
-	args.sub! /^cmd \\c/, 'cmd /c'
-	args.sub! /^cp -v/, 'xcopy /i /f /y'
-	args.sub! /^ls -p/, 'dir/w'
-	args.sub! /^ls/, 'dir'
-	args.sub! /^cat/, 'type'
+        args.sub! /^cmd \\c/, 'cmd /c'
+        args.sub! /^cp -v/, 'xcopy /i /f /y'
+        args.sub! /^ls -p/, 'dir/w'
+        args.sub! /^ls/, 'dir'
+        args.sub! /^cat/, 'type'
       end
 
       as = opts[:as] || args
@@ -174,16 +301,17 @@ module Gorp
       log :cmd, as
       $x.pre as, :class=>'stdin'
 
-      if args == 'rake db:migrate'
-	Dir.chdir 'db/migrate' do
-	  date = '20110711000000'
+      if args == 'rake db:migrate' and File.exist? 'db/migrate'
+        Dir.chdir 'db/migrate' do
+          time = ((defined? DATETIME) ? Time.parse(DATETIME) : Time.now)
+          date = time.strftime('%Y%m%d000000')
           mask = Regexp.new("^#{date[0..-4]}")
-	  Dir['[0-9]*'].sort_by {|fn| fn=~mask ? fn : 'x'+fn}.each do |file|
-	    file =~ /^([0-9]*)_(.*)$/
-	    FileUtils.mv file, "#{date}_#{$2}" unless $1 == date.next!
-	    $x.pre "mv #{file} #{date}_#{$2}"  unless $1 == date
-	  end
-	end
+          Dir['[0-9]*'].sort_by {|fn| fn=~mask ? fn : 'x'+fn}.each do |file|
+            file =~ /^([0-9]*)_(.*)$/
+            FileUtils.mv file, "#{date}_#{$2}" unless $1 == date.next!
+            $x.pre "mv #{file} #{date}_#{$2}"  unless $1 == date
+          end
+        end
       end
       args += ' -C' if args == 'ls -p'
       popen3 args, opts[:highlight] || []
@@ -195,44 +323,45 @@ module Gorp
         args = "bash -c #{$4.inspect}"
         echo = eval($1).gsub("\\n","\n")
       end
-      Open3.popen3(args) do |pin, pout, perr|
-	terr = Thread.new do
+      Open3.popen3(args) do |pin, pout, perr, wait|
+        terr = Thread.new do
           begin
-	    $x.pre! perr.readline.chomp, :class=>'stderr' until perr.eof?
+            $x.pre! perr.readline.chomp, :class=>'stderr' until perr.eof?
           rescue EOFError
           end
-	end
-	tin = Thread.new do
+        end
+        tin = Thread.new do
           echo.split("\n").each do |line|
-	    pin.puts line
+            pin.puts line
           end
-	  pin.close
-	end
-	until pout.eof?
+          pin.close
+        end
+        until pout.eof?
           begin
-	    line = pout.readline
+            line = pout.readline
           rescue EOFError
             break
           end
 
-	  if highlight.any? {|pattern| line.include? pattern}
-	    outclass='hilight'
-	  elsif line =~ /\x1b\[\d/
-	    outclass = 'logger'
-	    outclass = 'stderr' if line =~ /\x1b\[31m/
-	    line.gsub! /(\x1b\[1m)?\x1b\[3\dm(.*?)\x1b\[0m/, '\2'
-	  else
-	    outclass='stdout'
-	  end
-
-	  if line.strip.size == 0
-	    $x.pre! ' ', :class=>outclass
-	  else
-	    $x.pre! line.chomp, :class=>outclass
-	  end
-	end
-	terr.join
+          if highlight.any? {|pattern| line.include? pattern}
+            outclass='hilight'
+          elsif line =~ /\x1b\[\d/
+            outclass = 'logger'
+            outclass = 'stderr' if line =~ /\x1b\[31m/
+            line.gsub! /\x1b\[\d+m/, ''
+          else
+            outclass='stdout'
+          end
+
+          if line.strip.size == 0
+            $x.pre! ' ', :class=>outclass
+          else
+            $x.pre! line.chomp, :class=>outclass
+          end
+        end
+        terr.join
         tin.join
+        wait && wait.value
       end
     end
 
@@ -242,37 +371,37 @@ module Gorp
       cmd = "irb -f -rubygems -r ./config/boot --prompt-mode simple " + 
         "#{$CODE}/#{file}"
       Open3.popen3(cmd) do |pin, pout, perr|
-	terr = Thread.new do
-	  until perr.eof?
-	    line = perr.readline.chomp
-	    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'
-	  end
-	end
-	pin.close
-	prompt = nil
-	until pout.eof?
-	  line = pout.readline
-	  if line =~ /^([?>]>)\s*#\s*(START|END):/
-	    prompt = $1
-	  elsif line =~ /^([?>]>)\s+$/
-	    $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'
-	  elsif line =~ /^\s+from [\/.:].*:\d+:in `\w.*'\s*$/
-	    $x.pre! line.chomp, :class=>'stderr'
-	  else
-	    $x.pre! line.chomp, :class=>'stdout'
-	  end
-	end
-	terr.join
+        terr = Thread.new do
+          until perr.eof?
+            line = perr.readline.chomp
+            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'
+          end
+        end
+        pin.close
+        prompt = nil
+        until pout.eof?
+          line = pout.readline
+          if line =~ /^([?>]>)\s*#\s*(START|END):/
+            prompt = $1
+          elsif line =~ /^([?>]>)\s+$/
+            $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'
+          elsif line =~ /^\s+from [\/.:].*:\d+:in `\w.*'\s*$/
+            $x.pre! line.chomp, :class=>'stderr'
+          else
+            $x.pre! line.chomp, :class=>'stdout'
+          end
+        end
+        terr.join
       end
     end
   end