appmap 0.37.0 → 0.40.0

data/spec/fixtures/hook/instance_method.rb

@@ -17,6 +17,10 @@ class InstanceMethod
     kw.to_s
   end
 
+  def say_kws(*args, kw1:, kw2: 'kw2', **kws)
+    [kw1, kw2, kws, args].join
+  end
+
   def say_block(&block)
     yield
   end

data/spec/fixtures/hook/labels.rb

@@ -0,0 +1,6 @@
+# @label has-cls-label
+class ClassWithLabel
+  # @label has-fn-label
+  def fn_with_label
+  end
+end

data/spec/fixtures/rails5_users_app/Gemfile

@@ -0,0 +1,50 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+gem 'rails', '~> 5'
+
+gem 'haml-rails'
+
+gem 'activerecord', require: false
+gem 'pg'
+gem 'sequel', '= 5.20.0', require: false
+gem 'sequel-rails', require: false
+gem 'sequel_secure_password', require: false
+
+appmap_path = \
+  # Support debugging inside the container with volume-mounted source
+  if File.directory?('/src/appmap-ruby')
+    '/src/appmap-ruby'
+  elsif File.exist?('../../../appmap.gemspec')
+    '../../..'
+  end
+
+if appmap_path
+  # Set the branch parameter, so that 'bundle config local.appmap' will work
+  appmap_branch = Dir.chdir appmap_path do
+    `git rev-parse --abbrev-ref HEAD`.strip
+  end
+end
+
+appmap_options = \
+  if appmap_path && appmap_branch
+    { git: appmap_path, branch: appmap_branch }
+  elsif appmap_path
+    { path: appmap_path }
+  else
+    {}
+  end.merge(require: %w[appmap])
+
+group :development, :test do
+  gem 'appmap', appmap_options
+  gem 'cucumber-rails', require: false
+  gem 'rspec-rails'
+  # Required for Sequel, since without ActiveRecord, the Rails transactional fixture support
+  # isn't activated.
+  gem 'database_cleaner'
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'pry-byebug'
+end
+
+group :development do
+end

data/spec/fixtures/rails5_users_app/app/controllers/users_controller.rb

@@ -0,0 +1,13 @@
+class UsersController < ApplicationController
+  def index
+    @users = User.all
+  end
+
+  def show
+    if (@user = User[login: params[:id]])
+      render plain: @user
+    else
+      render plain: 'Not found', status: 404
+    end
+  end
+end

data/spec/fixtures/rails5_users_app/appmap.yml

@@ -0,0 +1,4 @@
+name: rails5_users_app
+packages:
+  - path: app
+  - gem: sequel

data/spec/fixtures/{rails_users_app → rails5_users_app}/config/application.rb

@@ -19,6 +19,8 @@ when 'activerecord'
   require 'active_record/railtie'
 end
 
+require 'appmap/railtie' if defined?(AppMap)
+
 # require "active_storage/engine"
 # require "action_mailer/railtie"
 # require "action_cable/engine"

data/spec/fixtures/{rails4_users_app → rails5_users_app}/config/routes.rb

@@ -3,10 +3,9 @@ Rails.application.routes.draw do
     resources :users, only: %i[index create]
   end
 
-  resources :users, only: %i[index]
+  resources :users, only: %i[index show]
 
   get 'health', to: 'health#show'
 
   root 'users#index'
-  
 end

data/spec/fixtures/{rails_users_app → rails5_users_app}/spec/controllers/users_controller_api_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe Api::UsersController, feature_group: 'Users', type: :controller,
       post :create, params: { login: 'alice' }
     end
     it 'lists the users' do
-      post :index, params: {}
+      get :index, params: {}
       users = JSON.parse(response.body)
       expect(users.map { |r| r['login'] }).to include('alice')
     end

data/spec/fixtures/rails5_users_app/spec/controllers/users_controller_spec.rb

@@ -0,0 +1,27 @@
+require 'rails_helper'
+require 'rack/test'
+
+RSpec.describe UsersController, type: :controller do
+  render_views
+
+  describe 'GET /users', feature: 'Show all users' do
+    before do
+      User.create login: 'alice'
+    end
+    it 'lists the users' do
+      get :index
+      expect(response).to be_ok
+    end
+  end
+
+  describe 'GET /users/:login', feature: 'Show a user' do
+    before do
+      User.create login: 'alice'
+    end
+
+    it 'shows the user' do
+      get :show, params: { id: 'alice' }
+      expect(response).to be_ok
+    end
+  end
+end

data/spec/fixtures/rails6_users_app/.dockerignore

@@ -0,0 +1 @@
+Gemfile.lock

data/spec/fixtures/rails6_users_app/.gitignore

@@ -0,0 +1,39 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+vendor
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore uploaded files in development
+/storage/*
+!/storage/.keep
+
+/node_modules
+/yarn-error.log
+
+/public/assets
+.byebug_history
+
+# Ignore master key for decrypting credentials and more.
+/config/master.key
+
+# Other
+.DS_Store
+.appmap
+appmap.json
+appmap-recording-*.json
+capybara-*.html
+
+# appmap gem is pre-installed, don't lock to a version
+Gemfile.lock
+

data/spec/fixtures/rails6_users_app/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/spec/fixtures/rails6_users_app/.ruby-version

@@ -0,0 +1 @@
+2.6.2

data/spec/fixtures/{rails4_users_app → rails6_users_app}/Dockerfile

@@ -10,13 +10,12 @@ RUN apt-get install -y postgresql-client
 RUN mkdir /app
 WORKDIR /app
 
-RUN gem install -v '~> 1.17' -N bundler
- 
+RUN gem install -N bundler
+
 COPY Gemfile .
 
 RUN bundle
-RUN bundle binstubs --force \
-    bundler rake rspec-core
+RUN bundle binstubs bundler rspec-core --force
 
 COPY . .
 

data/spec/fixtures/{rails4_users_app → rails6_users_app}/Dockerfile.pg

@@ -1,3 +1,3 @@
-FROM postgres:9.6
+FROM postgres:10
 
 HEALTHCHECK --interval=1s --retries=10 CMD psql -U postgres -c "select 1" || exit 1

data/spec/fixtures/{rails_users_app → rails6_users_app}/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.3'
+gem 'rails', '~> 6'
 
 gem 'haml-rails'
 
@@ -34,11 +34,10 @@ appmap_options = \
     { path: appmap_path }
   else
     {}
-  end.merge(require: %w[appmap appmap/railtie])
-
-gem 'appmap', appmap_options
+  end.merge(require: %w[appmap])
 
 group :development, :test do
+  gem 'appmap', appmap_options
   gem 'cucumber-rails', require: false
   gem 'rspec-rails'
   # Required for Sequel, since without ActiveRecord, the Rails transactional fixture support

data/spec/fixtures/{rails4_users_app → rails6_users_app}/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
 Rails.application.load_tasks

data/spec/fixtures/{rails4_users_app → rails6_users_app}/app/controllers/api/users_controller.rb

@@ -1,5 +1,5 @@
 module Api
-  class UsersController < ApplicationController
+  class UsersController < ActionController::API
     def index
       @users = User.all
       render json: @users

data/spec/fixtures/rails6_users_app/app/controllers/application_controller.rb

@@ -0,0 +1,2 @@
+class ApplicationController < ActionController::Base
+end

data/spec/fixtures/{rails4_users_app → rails6_users_app}/app/controllers/health_controller.rb

@@ -1,4 +1,4 @@
-class HealthController < ApplicationController
+class HealthController < ActionController::API
   def show
     render nothing: true, status: 204
   end

data/spec/fixtures/rails6_users_app/app/controllers/users_controller.rb

@@ -0,0 +1,13 @@
+class UsersController < ApplicationController
+  def index
+    @users = User.all
+  end
+
+  def show
+    if (@user = User[login: params[:id]])
+      render plain: @user
+    else
+      render plain: 'Not found', status: 404
+    end
+  end
+end

data/spec/fixtures/rails6_users_app/app/models/sequel/user.rb

@@ -0,0 +1,25 @@
+class User < Sequel::Model(:users)
+  plugin :secure_password, cost: 12, include_validations: false
+  plugin :validation_helpers
+
+  def authenticate(unencrypted)
+    # Just be extra sure that empty passwords aren't accepted
+    return false if unencrypted.blank? || password.blank?
+
+    super
+  end
+
+  def validate
+    super
+
+    errors.add :password, 'doesn\'t match confirmation' if password_provided? && password != password_confirmation
+
+    validates_presence %i[login]
+  end
+
+  protected
+
+  def password_provided?
+    !(password.blank? && password_confirmation.blank?)
+  end
+end