pry-rails 0.3.3 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0305d55aec048e6be191698ab148bab078139b2
-  data.tar.gz: 58c8deaa37ed83f87251cd03ba954249a38a24a7
+  metadata.gz: 41aa1ef9e06430dee0459e3bd3d33e532917e53b
+  data.tar.gz: ba1c80d4a6d03aacd095cb8d809ac26666dd4c10
 SHA512:
-  metadata.gz: 8af889acb91bb091cd9f8c375720d070418f7f2a5596dede8df28bd23a6977c2c284c9f966b40f067eefcdd7ee640ca2ef7e2c787b001c3e98ad726a813ad24b
-  data.tar.gz: 46707372f135a2c289f0d2c097d3062de5410cf6c18e1dc97c0afc1266ece9a79652b04e29730df8dfdf141f7f12d17375526cad90c5bb0363fd510453c45f68
+  metadata.gz: 4a454d20554dde8a311f9d30d839ea768b5906e4cad43c758d6783d972744aca56cd0c75ed7df56449fc18aca8b882c32df7b59266980d3ec0c79258a96c7cd0
+  data.tar.gz: cc3610d5d6e7691dc34f4f2f0f668fc4e0af999956fab25cfc6fb200347df8e9346d222aa94fd92066d4e9aa29382c8e566d232427c4ea77e99f35965ea0912e

data/.gitignore

@@ -4,4 +4,4 @@ Gemfile.lock
 pkg/*
 spec/log
 spec/tmp
-gemfiles/*.lock
+scenarios/*.lock

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in pry-rails.gemspec
 gemspec

data/Rakefile

@@ -23,7 +23,14 @@ end
 
 desc 'Start the Rails console'
 task :console => :development_env do
-  require 'rails/commands/console'
+  if (Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 1) ||
+      Rails::VERSION::MAJOR >= 6
+    require 'rails/command'
+    require 'rails/commands/console/console_command'
+  else
+    require 'rails/commands/console'
+  end
+
   Rails::Console.start(Rails.application)
 end
 

data/Readme.md

@@ -6,6 +6,7 @@ This is a small gem which causes `rails console` to open [pry](http://pry.github
 # Prerequisites
 
 - A Rails >= 3.0 Application
+- Ruby >= 1.9
 
 # Installation
 
@@ -75,19 +76,52 @@ $ DISABLE_PRY_RAILS=1 rails console
 irb(main):001:0>
 ```
 
+## Custom Rails prompt
+
+If you want to permanently include the current Rails environment and project name
+in the Pry prompt, put the following lines in your project's `.pryrc`:
+
+```ruby
+Pry.config.prompt = Pry::Prompt[:rails][:value]
+```
+
+If `.pryrc` could be loaded without pry-rails being available or installed,
+guard against setting `Pry.config.prompt` to `nil`:
+
+```ruby
+if Pry::Prompt[:rails]
+  Pry.config.prompt = Pry::Prompt[:rails][:value]
+end
+```
+
+Check out `change-prompt --help` for information about temporarily
+changing the prompt for the current Pry session.
+
 # Developing and Testing
 
-To generate Gemfiles for Rails 3.0, 3.1, 3.2, 4.0, 4.1, and 4.2, run `rake
-appraisal:gemfiles appraisal:install`.
+This repo uses [Roadshow] to generate a [Docker Compose] file for each
+supported version of Rails (with a compatible version of Ruby for each one).
+
+To run specs across all versions, you can either [get the Roadshow tool] and
+run `roadshow run`, or use Docker Compose directly:
+
+```
+$ for fn in scenarios/*.docker-compose-yml; do docker-compose -f $fn run --rm scenario; done
+```
+
+You can also manually run the Rails console and server on each version with
+`roadshow run rake console` and `roadshow run rake server`, or run them on a
+specific version with, e.g., `roadshow run -s rails40 rake console`.
 
-You can then run the tests across all four versions with `rake appraisal`.  You
-can also manually run the Rails console and server with `rake appraisal
-console` and `rake appraisal server`.
+To update the set of scenarios, edit `scenarios.yml` and run `roadshow
+generate`, although the Gemfiles in the `scenarios` directory need to be
+maintained manually.
 
-For a specific version of Rails, use `rake appraisal:rails30`, `rake
-appraisal:rails31`, `rake appraisal:rails32`, etc.
+[Roadshow]: https://github.com/rf-/roadshow
+[Docker Compose]: https://docs.docker.com/compose/
+[get the Roadshow tool]: https://github.com/rf-/roadshow/releases
 
 # Alternative
 
 If you want to enable pry everywhere, make sure to check out
-[pry everywhere](http://lucapette.com/pry/pry-everywhere/).
+[pry everywhere](http://lucapette.me/pry-everywhere).

data/lib/pry-rails/commands/find_route.rb

@@ -2,7 +2,6 @@ class PryRails::FindRoute < Pry::ClassCommand
   match 'find-route'
   group 'Rails'
   description 'See which URLs match a given Controller.'
-  command_options argument_required: true
   banner <<-BANNER
     Usage: find-route <controller>
 
@@ -11,13 +10,15 @@ class PryRails::FindRoute < Pry::ClassCommand
     find-route MyController#show  #=> The URL that matches the MyController show action
     find-route MyController       #=> All the URLs that hit MyController
     find-route Admin              #=> All the URLs that hit the Admin namespace
+    find-route Com                #=> All the URLS whose controller regex matches /Comm/, e.g CommentsController
   BANNER
 
   def process(controller)
-    if single_action?(controller)
-      single_action(controller)
+    controller_string = controller.to_s
+    if single_action?(controller_string)
+      single_action(controller_string)
     else
-      all_actions(controller)
+      all_actions(controller_string)
     end
   end
 
@@ -29,7 +30,7 @@ class PryRails::FindRoute < Pry::ClassCommand
 
   def all_actions(controller)
     show_routes do |route|
-      route.defaults[:controller].to_s.starts_with?(normalize_controller_name(controller))
+      route.defaults[:controller].to_s =~ /#{normalize_controller_name(controller)}/
     end
   end
 
@@ -50,14 +51,14 @@ class PryRails::FindRoute < Pry::ClassCommand
     all_routes = routes.select(&block)
     if all_routes.any?
       grouped_routes = all_routes.group_by { |route| route.defaults[:controller] }
-      result = grouped_routes.each_with_object("") do |(controller, routes), result|
-        result << "Routes for " + text.bold(controller.camelize + "Controller") + "\n"
-        result << "--\n"
+      result = grouped_routes.each_with_object("") do |(controller, routes), res|
+        res << "Routes for " + text.bold(controller.to_s.camelize + "Controller") + "\n"
+        res << "--\n"
         routes.each do |route|
           spec = route.path.is_a?(String) ? route.path : route.path.spec
-          result << "#{route.defaults[:action]} #{text.bold(verb_for(route))} #{spec}" + "\n"
+          res << "#{route.defaults[:action]} #{text.bold(verb_for(route))} #{spec}  #{route_helper(route.name)}" + "\n"
         end
-        result << "\n"
+        res << "\n"
       end
       stagger_output result
     else
@@ -65,6 +66,10 @@ class PryRails::FindRoute < Pry::ClassCommand
     end
   end
 
+  def route_helper(name)
+    name && "[#{name}]"
+  end
+
   def verb_for(route)
     %w(GET PUT POST PATCH DELETE).find { |v| route.verb === v }
   end

data/lib/pry-rails/commands/show_models.rb

@@ -40,6 +40,10 @@ class PryRails::ShowModels < Pry::ClassCommand
     models = []
 
     ObjectSpace.each_object do |o|
+      # If this is deprecated, calling any methods on it will emit a warning,
+      # so just back away slowly.
+      next if ActiveSupport::Deprecation::DeprecationProxy === o
+
       is_model = false
 
       begin

data/lib/pry-rails/commands/show_routes.rb

@@ -8,23 +8,38 @@ class PryRails::ShowRoutes < Pry::ClassCommand
   BANNER
 
   def options(opt)
-    opt.on :G, "grep", "Filter output by regular expression", :argument => true
+    opt.on :G, "grep", "Filter output by regular expression",
+           :argument => true,
+           :as => Array
   end
 
   def process
     Rails.application.reload_routes!
     all_routes = Rails.application.routes.routes
 
-    formatted = case Rails.version.to_s
-      when /^[45]/
+    formatted =
+      if Rails::VERSION::MAJOR >= 6
+        process_rails_6_and_higher(all_routes)
+      elsif Rails::VERSION::MAJOR == 4 || Rails::VERSION::MAJOR == 5
         process_rails_4_and_5(all_routes)
-      when /^3\.2/
+      elsif Rails::VERSION::MAJOR >= 3 && Rails::VERSION::MINOR >= 2
         process_rails_3_2(all_routes)
       else
         process_rails_3_0_and_3_1(all_routes)
       end
 
-    output.puts formatted.grep(Regexp.new(opts[:G] || ".")).join("\n")
+    output.puts grep_routes(formatted).join("\n")
+  end
+
+  # Takes an array of lines. Returns a list filtered by the conditions in
+  # `opts[:G]`.
+  def grep_routes(formatted)
+    return formatted unless opts[:G]
+    grep_opts = opts[:G]
+
+    grep_opts.reduce(formatted) do |lines, pattern|
+      lines.grep(Regexp.new(pattern))
+    end
   end
 
   # Cribbed from https://github.com/rails/rails/blob/3-1-stable/railties/lib/rails/tasks/routes.rake
@@ -51,12 +66,26 @@ class PryRails::ShowRoutes < Pry::ClassCommand
 
   def process_rails_3_2(all_routes)
     require 'rails/application/route_inspector'
+
     Rails::Application::RouteInspector.new.format(all_routes)
   end
 
   def process_rails_4_and_5(all_routes)
     require 'action_dispatch/routing/inspector'
-    ActionDispatch::Routing::RoutesInspector.new(all_routes).format(ActionDispatch::Routing::ConsoleFormatter.new).split(/\n/)
+
+    ActionDispatch::Routing::RoutesInspector.
+      new(all_routes).
+      format(ActionDispatch::Routing::ConsoleFormatter.new).
+      split(/\n/)
+  end
+
+  def process_rails_6_and_higher(all_routes)
+    require 'action_dispatch/routing/inspector'
+
+    ActionDispatch::Routing::RoutesInspector.
+      new(all_routes).
+      format(ActionDispatch::Routing::ConsoleFormatter::Sheet.new).
+      split(/\n/)
   end
 
   PryRails::Commands.add_command(self)

data/lib/pry-rails/model_formatter.rb

@@ -49,12 +49,12 @@ module PryRails
 
       model.relations.each do |other_model, ref|
         options = []
-        options << 'autosave'  if ref.options[:autosave]
-        options << 'autobuild' if ref.options[:autobuild]
-        options << 'validate'  if ref.options[:validate]
+        options << 'autosave'  if ref.options[:autosave] || ref.autosave?
+        options << 'autobuild' if ref.options[:autobuild] || ref.autobuilding?
+        options << 'validate'  if ref.options[:validate] || ref.validate?
 
-        if ref.options[:dependent]
-          options << "dependent-#{ref.options[:dependent]}"
+        if ref.options[:dependent] || ref.dependent
+          options << "dependent-#{ref.options[:dependent] || ref.dependent}"
         end
 
         out.push format_association \
@@ -82,13 +82,23 @@ module PryRails
     end
 
     def kind_of_relation(relation)
-      case relation.to_s.sub(/^Mongoid::Relations::/, '')
-        when 'Referenced::Many' then 'has_many'
-        when 'Referenced::One'  then 'has_one'
-        when 'Referenced::In'   then 'belongs_to'
-        when 'Embedded::Many'   then 'embeds_many'
-        when 'Embedded::One'    then 'embeds_one'
-        when 'Embedded::In'     then 'embedded_in'
+      case relation.to_s.sub(/^Mongoid::(Relations::|Association::)/, '')
+      when 'Referenced::Many', 'Referenced::HasMany::Proxy'
+        'has_many'
+      when 'Referenced::One', 'Referenced::HasOne::Proxy'
+        'has_one'
+      when 'Referenced::In', 'Referenced::BelongsTo::Proxy'
+        'belongs_to'
+      when 'Referenced::HasAndBelongsToMany::Proxy'
+        'has_and_belongs_to_many'
+      when 'Embedded::Many', 'Embedded::EmbedsMany::Proxy'
+        'embeds_many'
+      when 'Embedded::One', 'Embedded::EmbedsOne::Proxy'
+        'embeds_one'
+      when 'Embedded::In', 'Embedded::EmbeddedIn::Proxy'
+        'embedded_in'
+      else
+        '(unknown relation)'
       end
     end
 

data/lib/pry-rails/prompt.rb

@@ -0,0 +1,51 @@
+module PryRails
+  class Prompt
+    class << self
+      def formatted_env
+        if Rails.env.production?
+          bold_env = Pry::Helpers::Text.bold(Rails.env)
+          Pry::Helpers::Text.red(bold_env)
+        elsif Rails.env.development?
+          Pry::Helpers::Text.green(Rails.env)
+        else
+          Rails.env
+        end
+      end
+
+      def project_name
+        if Rails::VERSION::MAJOR >= 6
+          Rails.application.class.module_parent_name.underscore
+        else
+          Rails.application.class.parent_name.underscore
+        end
+      end
+    end
+  end
+
+  desc = "Includes the current Rails environment and project folder name.\n" \
+          "[1] [project_name][Rails.env] pry(main)>"
+  if Pry::Prompt.respond_to?(:add)
+    Pry::Prompt.add 'rails', desc, %w(> *) do |target_self, nest_level, pry, sep|
+      "[#{pry.input_ring.size}] " \
+      "[#{Prompt.project_name}][#{Prompt.formatted_env}] " \
+      "#{pry.config.prompt_name}(#{Pry.view_clip(target_self)})" \
+      "#{":#{nest_level}" unless nest_level.zero?}#{sep} "
+    end
+  else
+    draw_prompt = lambda do |target_self, nest_level, pry, sep|
+      "[#{pry.input_array.size}] " \
+      "[#{Prompt.project_name}][#{Prompt.formatted_env}] " \
+      "#{pry.config.prompt_name}(#{Pry.view_clip(target_self)})" \
+      "#{":#{nest_level}" unless nest_level.zero?}#{sep} "
+    end
+    prompts = [
+      proc do |target_self, nest_level, pry|
+        draw_prompt.call(target_self, nest_level, pry, '>')
+      end,
+      proc do |target_self, nest_level, pry|
+        draw_prompt.call(target_self, nest_level, pry, '*')
+      end
+    ]
+    Pry::Prompt::MAP["rails"] = {value: prompts, description: desc}
+  end
+end

data/lib/pry-rails/railtie.rb

@@ -14,12 +14,12 @@ module PryRails
         end
       end
 
-      if Rails::VERSION::MAJOR == 4 || Rails::VERSION::MAJOR == 5
+      if Rails::VERSION::MAJOR >= 4
         Rails.application.config.console = Pry
       end
 
       if (Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 2) ||
-          Rails::VERSION::MAJOR == 4 || Rails::VERSION::MAJOR == 5
+          Rails::VERSION::MAJOR >= 4
         require "rails/console/app"
         require "rails/console/helpers"
         TOPLEVEL_BINDING.eval('self').extend ::Rails::ConsoleMethods

data/lib/pry-rails/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module PryRails
-  VERSION = "0.3.3"
+  VERSION = "0.3.9"
 end

data/lib/pry-rails.rb

@@ -7,4 +7,5 @@ if defined?(Rails) && !ENV['DISABLE_PRY_RAILS']
   require 'pry-rails/railtie'
   require 'pry-rails/commands'
   require 'pry-rails/model_formatter'
+  require 'pry-rails/prompt'
 end

data/pry-rails.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/rweng/pry-rails"
   s.summary     = %q{Use Pry as your rails console}
   s.license     = "MIT"
+  s.required_ruby_version = ">= 1.9.1"
   # s.description = %q{TODO: Write a gem description}
 
   # s.rubyforge_project = "pry-rails"
@@ -19,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "pry", ">= 0.9.10"
+  s.add_dependency "pry", ">= 0.10.4"
   s.add_development_dependency "appraisal"
   s.add_development_dependency "minitest"
 end

data/scenarios/rails30.docker-compose.yml

@@ -0,0 +1,15 @@
+---
+version: "2"
+services:
+  scenario:
+    build:
+      context: ..
+      dockerfile: scenarios/rails30.dockerfile
+    image: pryrails_scenario_rails30
+    volumes:
+    - "..:/scenario"
+    - "bundle_rails30:/usr/local/bundle"
+    environment:
+      BUNDLE_GEMFILE: scenarios/rails30.gemfile
+volumes:
+  bundle_rails30: {}

data/scenarios/rails30.dockerfile

@@ -0,0 +1,5 @@
+FROM ruby:2.0
+RUN mkdir -p /scenario
+WORKDIR /scenario
+ENV LANG=C.UTF-8
+CMD (bundle check || (gem install bundler && bundle install)) && bundle exec rake

data/scenarios/rails30.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 3.0.0"
+gem "sqlite3"
+gem "test-unit"
+
+gemspec :path => "../"

data/scenarios/rails31.docker-compose.yml

@@ -0,0 +1,15 @@
+---
+version: "2"
+services:
+  scenario:
+    build:
+      context: ..
+      dockerfile: scenarios/rails31.dockerfile
+    image: pryrails_scenario_rails31
+    volumes:
+    - "..:/scenario"
+    - "bundle_rails31:/usr/local/bundle"
+    environment:
+      BUNDLE_GEMFILE: scenarios/rails31.gemfile
+volumes:
+  bundle_rails31: {}

data/scenarios/rails31.dockerfile

@@ -0,0 +1,5 @@
+FROM ruby:2.0
+RUN mkdir -p /scenario
+WORKDIR /scenario
+ENV LANG=C.UTF-8
+CMD (bundle check || (gem install bundler && bundle install)) && bundle exec rake

data/scenarios/rails31.gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 3.1.0"
+gem "mongoid"
+gem "sqlite3"
+gem "test-unit"
+
+gemspec :path => "../"

data/scenarios/rails32.docker-compose.yml

@@ -0,0 +1,15 @@
+---
+version: "2"
+services:
+  scenario:
+    build:
+      context: ..
+      dockerfile: scenarios/rails32.dockerfile
+    image: pryrails_scenario_rails32
+    volumes:
+    - "..:/scenario"
+    - "bundle_rails32:/usr/local/bundle"
+    environment:
+      BUNDLE_GEMFILE: scenarios/rails32.gemfile
+volumes:
+  bundle_rails32: {}

data/scenarios/rails32.dockerfile

@@ -0,0 +1,5 @@
+FROM ruby:2.0
+RUN mkdir -p /scenario
+WORKDIR /scenario
+ENV LANG=C.UTF-8
+CMD (bundle check || (gem install bundler && bundle install)) && bundle exec rake

data/scenarios/rails32.gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 3.2.0"
+gem "mongoid"
+gem "sqlite3"
+gem "test-unit"
+
+gemspec :path => "../"

data/scenarios/rails40.docker-compose.yml

@@ -0,0 +1,15 @@
+---
+version: "2"
+services:
+  scenario:
+    build:
+      context: ..
+      dockerfile: scenarios/rails40.dockerfile
+    image: pryrails_scenario_rails40
+    volumes:
+    - "..:/scenario"
+    - "bundle_rails40:/usr/local/bundle"
+    environment:
+      BUNDLE_GEMFILE: scenarios/rails40.gemfile
+volumes:
+  bundle_rails40: {}

data/scenarios/rails40.dockerfile

@@ -0,0 +1,5 @@
+FROM ruby:2.3
+RUN mkdir -p /scenario
+WORKDIR /scenario
+ENV LANG=C.UTF-8
+CMD (bundle check || (gem install bundler && bundle install)) && bundle exec rake

data/scenarios/rails40.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+gem "sqlite3"
+
+gemspec :path => "../"

data/scenarios/rails41.docker-compose.yml

@@ -0,0 +1,15 @@
+---
+version: "2"
+services:
+  scenario:
+    build:
+      context: ..
+      dockerfile: scenarios/rails41.dockerfile
+    image: pryrails_scenario_rails41
+    volumes:
+    - "..:/scenario"
+    - "bundle_rails41:/usr/local/bundle"
+    environment:
+      BUNDLE_GEMFILE: scenarios/rails41.gemfile
+volumes:
+  bundle_rails41: {}

data/scenarios/rails41.dockerfile

@@ -0,0 +1,5 @@
+FROM ruby:2.3
+RUN mkdir -p /scenario
+WORKDIR /scenario
+ENV LANG=C.UTF-8
+CMD (bundle check || (gem install bundler && bundle install)) && bundle exec rake

data/scenarios/rails41.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+gem "mongoid"
+gem "sqlite3"
+
+gemspec :path => "../"

data/scenarios/rails42.docker-compose.yml

@@ -0,0 +1,15 @@
+---
+version: "2"
+services:
+  scenario:
+    build:
+      context: ..
+      dockerfile: scenarios/rails42.dockerfile
+    image: pryrails_scenario_rails42
+    volumes:
+    - "..:/scenario"
+    - "bundle_rails42:/usr/local/bundle"
+    environment:
+      BUNDLE_GEMFILE: scenarios/rails42.gemfile
+volumes:
+  bundle_rails42: {}

data/scenarios/rails42.dockerfile

@@ -0,0 +1,5 @@
+FROM ruby:2.4
+RUN mkdir -p /scenario
+WORKDIR /scenario
+ENV LANG=C.UTF-8
+CMD (bundle check || (gem install bundler && bundle install)) && bundle exec rake

data/scenarios/rails42.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "mongoid"
+gem "sqlite3"
+
+gemspec :path => "../"

data/scenarios/rails50.docker-compose.yml

@@ -0,0 +1,15 @@
+---
+version: "2"
+services:
+  scenario:
+    build:
+      context: ..
+      dockerfile: scenarios/rails50.dockerfile
+    image: pryrails_scenario_rails50
+    volumes:
+    - "..:/scenario"
+    - "bundle_rails50:/usr/local/bundle"
+    environment:
+      BUNDLE_GEMFILE: scenarios/rails50.gemfile
+volumes:
+  bundle_rails50: {}

data/scenarios/rails50.dockerfile

@@ -0,0 +1,5 @@
+FROM ruby:2.4
+RUN mkdir -p /scenario
+WORKDIR /scenario
+ENV LANG=C.UTF-8
+CMD (bundle check || (gem install bundler && bundle install)) && bundle exec rake

data/scenarios/rails50.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0.0"
+gem "mongoid"
+gem "sqlite3"
+
+gemspec :path => "../"

data/scenarios/rails51.docker-compose.yml

@@ -0,0 +1,15 @@
+---
+version: "2"
+services:
+  scenario:
+    build:
+      context: ..
+      dockerfile: scenarios/rails51.dockerfile
+    image: pryrails_scenario_rails51
+    volumes:
+    - "..:/scenario"
+    - "bundle_rails51:/usr/local/bundle"
+    environment:
+      BUNDLE_GEMFILE: scenarios/rails51.gemfile
+volumes:
+  bundle_rails51: {}

data/scenarios/rails51.dockerfile

@@ -0,0 +1,5 @@
+FROM ruby:2.4
+RUN mkdir -p /scenario
+WORKDIR /scenario
+ENV LANG=C.UTF-8
+CMD (bundle check || (gem install bundler && bundle install)) && bundle exec rake

data/scenarios/rails51.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 5.1.0"
+gem "mongoid"
+gem "sqlite3"
+
+gemspec :path => "../"

data/scenarios/rails52.docker-compose.yml

@@ -0,0 +1,15 @@
+---
+version: "2"
+services:
+  scenario:
+    build:
+      context: ..
+      dockerfile: scenarios/rails52.dockerfile
+    image: pryrails_scenario_rails52
+    volumes:
+    - "..:/scenario"
+    - "bundle_rails52:/usr/local/bundle"
+    environment:
+      BUNDLE_GEMFILE: scenarios/rails52.gemfile
+volumes:
+  bundle_rails52: {}

data/scenarios/rails52.dockerfile

@@ -0,0 +1,5 @@
+FROM ruby:2.4
+RUN mkdir -p /scenario
+WORKDIR /scenario
+ENV LANG=C.UTF-8
+CMD (bundle check || (gem install bundler && bundle install)) && bundle exec rake

data/scenarios/rails52.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+gem "mongoid"
+gem "sqlite3"
+
+gemspec :path => "../"

data/scenarios/rails60.docker-compose.yml

@@ -0,0 +1,15 @@
+---
+version: "2"
+services:
+  scenario:
+    build:
+      context: ..
+      dockerfile: scenarios/rails60.dockerfile
+    image: pryrails_scenario_rails60
+    volumes:
+    - "..:/scenario"
+    - "bundle_rails60:/usr/local/bundle"
+    environment:
+      BUNDLE_GEMFILE: scenarios/rails60.gemfile
+volumes:
+  bundle_rails60: {}

data/scenarios/rails60.dockerfile

@@ -0,0 +1,5 @@
+FROM ruby:2.5
+RUN mkdir -p /scenario
+WORKDIR /scenario
+ENV LANG=C.UTF-8
+CMD (bundle check || (gem install bundler && bundle install)) && bundle exec rake

data/scenarios/rails60.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rails", github: "rails/rails"
+gem "mongoid"
+gem "sqlite3"
+
+gemspec :path => "../"

data/scenarios.yml

@@ -0,0 +1,30 @@
+project: pryrails
+
+shared:
+  from: ruby:2.4
+  cmd: "(bundle check || (gem install bundler && bundle install)) && bundle exec rake"
+  service:
+    volumes:
+      - bundle_{{scenario_name}}:/usr/local/bundle
+    environment:
+      BUNDLE_GEMFILE: scenarios/{{scenario_name}}.gemfile
+  volumes:
+    bundle_{{scenario_name}}:
+
+scenarios:
+  rails30:
+    from: ruby:2.0
+  rails31:
+    from: ruby:2.0
+  rails32:
+    from: ruby:2.0
+  rails40:
+    from: ruby:2.3
+  rails41:
+    from: ruby:2.3
+  rails42: {}
+  rails50: {}
+  rails51: {}
+  rails52: {}
+  rails60:
+    from: ruby:2.5

data/spec/config/environment.rb

@@ -4,6 +4,11 @@ require 'active_support/core_ext'
 
 require 'pry-rails'
 
+begin
+  require 'mongoid'
+rescue LoadError # Mongoid doesn't support Rails 3.0
+end
+
 # Initialize our test app
 
 class TestApp < Rails::Application
@@ -58,9 +63,7 @@ class Pokemon < ActiveRecord::Base
   has_many :beers, :through => :hacker
 end
 
-begin
-  require 'mongoid'
-
+if defined?(Mongoid)
   class Artist
     include Mongoid::Document
 
@@ -75,5 +78,4 @@ begin
     field :name, :type => String
     embedded_in :artist
   end
-rescue LoadError # Mongoid doesn't support Rails 3.0
 end

data/spec/find_route_spec.rb

@@ -16,29 +16,29 @@ describe "find-route" do
 
   it 'returns the route for a single action' do
     output = mock_pry('find-route Admin::UsersController#show', 'exit-all')
-    output.must_match /show GET/
-    output.wont_match /index GET/
+    output.must_match(/show GET/)
+    output.wont_match(/index GET/)
   end
 
   it 'returns all the routes for a controller' do
     output = mock_pry('find-route Admin::UsersController', 'exit-all')
-    output.must_match /index GET/
-    output.must_match /show GET/
-    output.must_match /new GET/
-    output.must_match /edit GET/
-    output.must_match /update (PATCH|PUT)/
-    output.must_match /update PUT/
-    output.must_match /destroy DELETE/
+    output.must_match(/index GET/)
+    output.must_match(/show GET/)
+    output.must_match(/new GET/)
+    output.must_match(/edit GET/)
+    output.must_match(/update (PATCH|PUT)/)
+    output.must_match(/update PUT/)
+    output.must_match(/destroy DELETE/)
   end
 
   it 'returns all routes for controllers under a namespace' do
     output = mock_pry('find-route Admin', 'exit-all')
-    output.must_match /Routes for Admin::UsersController/
-    output.must_match /Routes for Admin::ImagesController/
+    output.must_match(/Routes for Admin::UsersController/)
+    output.must_match(/Routes for Admin::ImagesController/)
   end
 
   it 'returns no routes found when controller is not recognized' do
     output = mock_pry('find-route Foo', 'exit-all')
-    output.must_match /No routes found/
+    output.must_match(/No routes found/)
   end
 end

data/spec/railtie_spec.rb

@@ -1,7 +1,14 @@
 # encoding: UTF-8
 
 require 'spec_helper'
-require 'rails/commands/console'
+
+if (Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 1) ||
+    Rails::VERSION::MAJOR >= 6
+  require 'rails/command'
+  require 'rails/commands/console/console_command'
+else
+  require 'rails/commands/console'
+end
 
 describe PryRails::Railtie do
   it 'should start Pry instead of IRB and make the helpers available' do

data/spec/recognize_path_spec.rb

@@ -28,21 +28,21 @@ describe "recognize-path" do
 
   it "prints info about controller/action that is bound to the given path" do
     output = mock_pry('recognize-path example.com', 'exit-all')
-    output.must_match /controller.+foo/
-    output.must_match /action.+index/
+    output.must_match(/controller.+foo/)
+    output.must_match(/action.+index/)
   end
 
   it "accepts short path" do
     output = mock_pry('recognize-path /booms/1/edit', 'exit-all')
-    output.must_match /action.+edit/
-    output.must_match /controller.+booms/
-    output.must_match /id.+1/
+    output.must_match(/action.+edit/)
+    output.must_match(/controller.+booms/)
+    output.must_match(/id.+1/)
   end
 
   it "accepts -m switch" do
     output = mock_pry('recognize-path example.com/booms -m post', 'exit-all')
-    output.must_match /controller.+booms/
-    output.must_match /action.+create/
+    output.must_match(/controller.+booms/)
+    output.must_match(/action.+create/)
   end
 
   it "doesn't accept unknown methods" do

data/spec/show_model_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "show-models" do
+describe "show-model" do
   it "should print one ActiveRecord model" do
     output = mock_pry('show-model Beer', 'exit-all')
 
@@ -32,8 +32,8 @@ Artist
   embeds_many :instruments (validate)
 MODEL
 
-      output.gsub! /^ *_type: String\n/, '' # mongoid 3.0 and 3.1 differ on this
-      output.gsub! /Moped::BSON/, 'BSON'    # mongoid 3 and 4 differ on this
+      output.gsub!(/^ *_type: String\n/, '') # mongoid 3.0 and 3.1 differ on this
+      output.gsub!(/Moped::BSON/, 'BSON')    # mongoid 3 and 4 differ on this
       output.must_equal expected
     end
   end
@@ -50,6 +50,6 @@ MODEL
 
   it "should print help if no model name is given" do
     output = mock_pry('show-model', 'exit-all')
-    output.must_match /Usage: show-model/
+    output.must_match(/Usage: show-model/)
   end
 end

data/spec/show_models_spec.rb

@@ -42,13 +42,27 @@ Instrument
   embedded_in :artist
 MODELS
 
+    internal_models = <<MODELS
+ActiveRecord::InternalMetadata
+  key: string
+  value: string
+  created_at: datetime
+  updated_at: datetime
+MODELS
+
+    expected_output = ar_models
+
     if defined?(Mongoid)
-      output.gsub! /^ *_type: String\n/, '' # mongoid 3.0 and 3.1 differ on this
-      output.gsub! /Moped::BSON/, 'BSON'    # mongoid 3 and 4 differ on this
-      output.must_equal [ar_models, mongoid_models].join
-    else
-      output.must_equal ar_models
+      output.gsub!(/^ *_type: String\n/, '') # mongoid 3.0 and 3.1 differ on this
+      output.gsub!(/Moped::BSON/, 'BSON')    # mongoid 3 and 4 differ on this
+      expected_output += mongoid_models
     end
+
+    if Rails::VERSION::MAJOR >= 5
+      expected_output = internal_models + expected_output
+    end
+
+    output.must_equal expected_output
   end
 
   it "should highlight the given phrase with --grep" do

data/spec/show_routes_spec.rb

@@ -10,6 +10,20 @@ describe "show-routes" do
   it "should print a list of routes" do
     output = mock_pry('show-routes', 'exit-all')
 
-    output.must_match %r{^edit_pokemon GET    /pokemon/edit}
+    output.must_match %r{edit_pokemon GET    /pokemon/edit}
+  end
+
+  it "should print a list of routes which include grep option" do
+    output = mock_pry('show-routes -G edit', 'exit-all')
+
+    output.must_match %r{edit_pokemon GET    /pokemon/edit}
+    output.must_match %r{   edit_beer GET    /beer/edit}
+  end
+
+  it "should filter list based on multiple grep options" do
+    output = mock_pry('show-routes -G edit -G pokemon', 'exit-all')
+
+    output.must_match %r{edit_pokemon GET    /pokemon/edit}
+    output.wont_match %r{edit_beer}
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.9
 platform: ruby
 authors:
 - Robin Wenglewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2018-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -60,18 +60,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- Appraisals
 - Gemfile
 - LICENCE
 - Rakefile
 - Readme.md
-- gemfiles/rails30.gemfile
-- gemfiles/rails31.gemfile
-- gemfiles/rails32.gemfile
-- gemfiles/rails40.gemfile
-- gemfiles/rails41.gemfile
-- gemfiles/rails42.gemfile
-- gemfiles/rails50.gemfile
 - lib/pry-rails.rb
 - lib/pry-rails/commands.rb
 - lib/pry-rails/commands/find_route.rb
@@ -82,9 +74,41 @@ files:
 - lib/pry-rails/commands/show_routes.rb
 - lib/pry-rails/console.rb
 - lib/pry-rails/model_formatter.rb
+- lib/pry-rails/prompt.rb
 - lib/pry-rails/railtie.rb
 - lib/pry-rails/version.rb
 - pry-rails.gemspec
+- scenarios.yml
+- scenarios/rails30.docker-compose.yml
+- scenarios/rails30.dockerfile
+- scenarios/rails30.gemfile
+- scenarios/rails31.docker-compose.yml
+- scenarios/rails31.dockerfile
+- scenarios/rails31.gemfile
+- scenarios/rails32.docker-compose.yml
+- scenarios/rails32.dockerfile
+- scenarios/rails32.gemfile
+- scenarios/rails40.docker-compose.yml
+- scenarios/rails40.dockerfile
+- scenarios/rails40.gemfile
+- scenarios/rails41.docker-compose.yml
+- scenarios/rails41.dockerfile
+- scenarios/rails41.gemfile
+- scenarios/rails42.docker-compose.yml
+- scenarios/rails42.dockerfile
+- scenarios/rails42.gemfile
+- scenarios/rails50.docker-compose.yml
+- scenarios/rails50.dockerfile
+- scenarios/rails50.gemfile
+- scenarios/rails51.docker-compose.yml
+- scenarios/rails51.dockerfile
+- scenarios/rails51.gemfile
+- scenarios/rails52.docker-compose.yml
+- scenarios/rails52.dockerfile
+- scenarios/rails52.gemfile
+- scenarios/rails60.docker-compose.yml
+- scenarios/rails60.dockerfile
+- scenarios/rails60.gemfile
 - spec/config/config.ru
 - spec/config/database.yml
 - spec/config/environment.rb
@@ -109,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -117,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Use Pry as your rails console

data/Appraisals

@@ -1,40 +0,0 @@
-appraise "rails30" do
-  gem "rails", "3.0.20"
-  gem "sqlite3"
-end
-
-appraise "rails31" do
-  gem "rails", "3.1.12"
-  gem "mongoid"
-  gem "sqlite3"
-end
-
-appraise "rails32" do
-  gem "rails", "3.2.21"
-  gem "mongoid"
-  gem "sqlite3"
-end
-
-appraise "rails40" do
-  gem "rails", "4.0.13"
-  gem "mongoid"
-  gem "sqlite3"
-end
-
-appraise "rails41" do
-  gem "rails", "4.1.9"
-  gem "mongoid"
-  gem "sqlite3"
-end
-
-appraise "rails42" do
-  gem "rails", "4.2.0"
-  gem "mongoid"
-  gem "sqlite3"
-end
-
-appraise "rails50" do
-  gem "rails", github: "rails/rails"
-  gem 'arel', github: "rails/arel"
-  gem "sqlite3"
-end

data/gemfiles/rails30.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "3.0.20"
-gem "sqlite3"
-
-gemspec :path => "../"

data/gemfiles/rails31.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "3.1.12"
-gem "mongoid"
-gem "sqlite3"
-
-gemspec :path => "../"

data/gemfiles/rails32.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "3.2.21"
-gem "mongoid"
-gem "sqlite3"
-
-gemspec :path => "../"

data/gemfiles/rails40.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "4.0.13"
-gem "mongoid"
-gem "sqlite3"
-
-gemspec :path => "../"

data/gemfiles/rails41.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "4.1.9"
-gem "mongoid"
-gem "sqlite3"
-
-gemspec :path => "../"

data/gemfiles/rails42.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "4.2.0"
-gem "mongoid"
-gem "sqlite3"
-
-gemspec :path => "../"

data/gemfiles/rails50.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", :github => "rails/rails"
-gem "arel", :github => "rails/arel"
-gem "sqlite3"
-
-gemspec :path => "../"