appmap 0.52.1 → 0.54.3

data/spec/fixtures/rails5_users_app/config/environments/test.rb

@@ -1,3 +1,6 @@
+require 'active_support'
+require 'active_support/core_ext'
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/fixtures/rails6_users_app/Dockerfile

@@ -2,7 +2,6 @@ ARG GEM_VERSION
 ARG RUBY_VERSION
 
 FROM appmap:${GEM_VERSION} as appmap
-
 FROM ruby:${RUBY_VERSION}
 
 SHELL ["/bin/bash", "-c"]

data/spec/fixtures/rails6_users_app/appmap.yml

@@ -5,4 +5,6 @@ packages:
   - path: app/controllers
     labels: [ mvc.controller ]
   - gem: sequel
-
+swagger:
+  project_version: 1.1.0
+  output_dir: tmp/swagger

data/spec/fixtures/rails6_users_app/config/environments/test.rb

@@ -1,3 +1,6 @@
+require 'active_support'
+require 'active_support/core_ext'
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/fixtures/rails6_users_app/lib/tasks/appmap.rake

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+namespace :appmap do
+  def swagger_tasks
+    require 'appmap/swagger'
+
+    AppMap::Swagger::RakeTasks.define_tasks
+  end
+
+  if %w[test development].member?(Rails.env)
+    swagger_tasks
+  end
+end

data/spec/hook_spec.rb

@@ -985,4 +985,13 @@ describe 'AppMap class Hooking', docker: false do
       expect(InstanceMethod.new.method(:say_echo).arity).to be(1)
     end
   end
+
+  describe 'kwargs handling' do
+    # https://github.com/applandinc/appmap-ruby/issues/153
+    it 'empty hash for **kwrest can be proxied as a regular function argument', github_issue: 153 do
+      invoke_test_file 'spec/fixtures/hook/kwargs.rb' do
+        expect(Kwargs.has_kwrest_calls_no_kwargs(nil, {})).to eq({})
+      end
+    end
+  end
 end

data/spec/rails_recording_spec.rb

@@ -224,7 +224,7 @@ describe 'Rails' do
                 'name' => 'ActionView',
                 'children' => include(hash_including(
                   # Rails 6/5 difference
-                  'name' => /^(Template)?Renderer$/,                  
+                  'name' => /^(Template)?Renderer$/,
                   'children' => include(hash_including(
                     'name' => 'render',
                     'labels' => ['mvc.view']

data/spec/record_net_http_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'diffy'
 require 'rack'
+require 'webrick'
 require 'rack/handler/webrick'
 
 class HelloWorldApp

data/spec/swagger/swagger_spec.rb

@@ -0,0 +1,47 @@
+require_relative '../rails_spec_helper'
+
+describe 'rake appmap:swagger' do
+  include_context 'Rails app pg database', "spec/fixtures/rails6_users_app" unless use_existing_data?
+  include_context 'rails integration test setup'
+
+  def run_spec(spec_name)
+    cmd = <<~CMD.gsub "\n", ' '
+      docker-compose run --rm -e RAILS_ENV=test -e APPMAP=true
+      -v #{File.absolute_path tmpdir}:/app/tmp app ./bin/rspec #{spec_name}
+    CMD
+    run_cmd cmd, chdir: fixture_dir
+  end
+
+  def generate_swagger
+    cmd = <<~CMD.gsub "\n", ' '
+      docker-compose run --rm -v #{File.absolute_path tmpdir}:/app/tmp app ./bin/rake appmap:swagger
+    CMD
+    run_cmd cmd, chdir: fixture_dir
+  end
+
+  unless use_existing_data?
+    before(:all) do
+      generate_swagger
+    end
+  end
+
+  # The swagger-building logic is mostly in the JS code. So what we are really testing here
+  # is the Rails integration - the rake task and integration with the appmap.yml.
+  # And of course the bundling of the JS code by the appmap gem.
+  it 'generates openapi_stable.yml' do
+    swagger = YAML.load(File.read(File.join(tmpdir, 'swagger', 'openapi_stable.yaml'))).deep_symbolize_keys
+
+    expect(swagger).to match(
+      hash_including(
+        openapi: /^\d\.\d\.\d$/,
+        info: {
+          title: 'Usersapp API',
+          version: '1.1.0'
+        },
+        paths: hash_including(
+          :'/api/users' => an_instance_of(Hash)
+        )
+      )
+    )
+  end
+end

data/test/{agent_setup_cli_test.rb → agent_setup_init_test.rb}

@@ -3,7 +3,7 @@
 
 require 'test_helper'
 
-class AgentSetupCLITest < Minitest::Test
+class AgentSetupInitTest < Minitest::Test
   CONFIG_FILENAME = '123.yml'
   SUBFOLDER_CONFIG_FILEPATH = 'conf/123.yml'
   EXPECTED_CONFIG_CONTENT = %(name: appmap-ruby
@@ -12,13 +12,13 @@ packages:
 )
 
   def test_init_when_config_exists
-    output = `./exe/appmap-agent-setup init`
+    output = `./exe/appmap-agent-init`
     assert_equal 0, $CHILD_STATUS.exitstatus
     assert_includes output, 'The AppMap config file appmap.yml already exists.'
   end
 
   def test_init_with_custom_config_filename
-    output = `./exe/appmap-agent-setup -c #{CONFIG_FILENAME} init`
+    output = `./exe/appmap-agent-init -c #{CONFIG_FILENAME}`
     assert_equal 0, $CHILD_STATUS.exitstatus
     assert_includes output, "The following AppMap config file #{CONFIG_FILENAME} has been created:"
     assert_equal EXPECTED_CONFIG_CONTENT, File.read(CONFIG_FILENAME)
@@ -27,7 +27,7 @@ packages:
   end
 
   def test_init_with_custom_config_file_in_subfolder
-    output = `./exe/appmap-agent-setup -c #{SUBFOLDER_CONFIG_FILEPATH} init`
+    output = `./exe/appmap-agent-init --config=#{SUBFOLDER_CONFIG_FILEPATH}`
     assert_equal 0, $CHILD_STATUS.exitstatus
     assert_includes output, "The following AppMap config file #{SUBFOLDER_CONFIG_FILEPATH} has been created:"
     assert_equal EXPECTED_CONFIG_CONTENT, File.read(SUBFOLDER_CONFIG_FILEPATH)

data/test/gem_test.rb

@@ -3,6 +3,7 @@
 
 require 'test_helper'
 require 'English'
+require 'json'
 
 class GemTest < Minitest::Test
   def perform_gem_test(test_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.52.1
+  version: 0.54.3
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: gli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
@@ -290,11 +276,25 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - kgilpin@gmail.com
 executables:
-- appmap-agent-setup
+- appmap-agent-init
 - appmap-inspect
 extensions:
 - ext/appmap/extconf.rb
@@ -323,11 +323,12 @@ files:
 - examples/mock_webapp/lib/mock_webapp/controller.rb
 - examples/mock_webapp/lib/mock_webapp/request.rb
 - examples/mock_webapp/lib/mock_webapp/user.rb
-- exe/appmap-agent-setup
+- exe/appmap-agent-init
 - exe/appmap-inspect
 - ext/appmap/appmap.c
 - ext/appmap/extconf.rb
 - lib/appmap.rb
+- lib/appmap/agent.rb
 - lib/appmap/class_map.rb
 - lib/appmap/command/agent_setup/init.rb
 - lib/appmap/command/inspect.rb
@@ -351,6 +352,11 @@ files:
 - lib/appmap/record.rb
 - lib/appmap/rspec.rb
 - lib/appmap/service/guesser.rb
+- lib/appmap/swagger.rb
+- lib/appmap/swagger/configuration.rb
+- lib/appmap/swagger/markdown_descriptions.rb
+- lib/appmap/swagger/rake_tasks.rb
+- lib/appmap/swagger/stable.rb
 - lib/appmap/trace.rb
 - lib/appmap/util.rb
 - lib/appmap/version.rb
@@ -358,6 +364,13 @@ files:
 - release.sh
 - spec/class_map_spec.rb
 - spec/config_spec.rb
+- spec/fixtures/hook/.gitignore
+- spec/fixtures/hook/app/controllers/api/api_keys_controller.rb
+- spec/fixtures/hook/app/controllers/organizations_controller.rb
+- spec/fixtures/hook/app/models/api_key.rb
+- spec/fixtures/hook/app/models/configuration.rb
+- spec/fixtures/hook/app/models/show.rb
+- spec/fixtures/hook/app/models/user.rb
 - spec/fixtures/hook/attr_accessor.rb
 - spec/fixtures/hook/compare.rb
 - spec/fixtures/hook/constructor.rb
@@ -365,9 +378,14 @@ files:
 - spec/fixtures/hook/exception_method.rb
 - spec/fixtures/hook/exclude.rb
 - spec/fixtures/hook/instance_method.rb
+- spec/fixtures/hook/kwargs.rb
 - spec/fixtures/hook/labels.rb
 - spec/fixtures/hook/method_named_call.rb
+- spec/fixtures/hook/revoke_api_key.appmap.json
 - spec/fixtures/hook/singleton_method.rb
+- spec/fixtures/hook/spec/api_spec.rb
+- spec/fixtures/hook/spec/user_spec.rb
+- spec/fixtures/hook/user_page_scenario.appmap.json
 - spec/fixtures/rack_users_app/.dockerignore
 - spec/fixtures/rack_users_app/.gitignore
 - spec/fixtures/rack_users_app/Dockerfile
@@ -510,6 +528,7 @@ files:
 - spec/fixtures/rails6_users_app/features/support/hooks.rb
 - spec/fixtures/rails6_users_app/features/support/steps.rb
 - spec/fixtures/rails6_users_app/lib/tasks/.keep
+- spec/fixtures/rails6_users_app/lib/tasks/appmap.rake
 - spec/fixtures/rails6_users_app/log/.keep
 - spec/fixtures/rails6_users_app/public/robots.txt
 - spec/fixtures/rails6_users_app/spec/controllers/users_controller_api_spec.rb
@@ -527,8 +546,9 @@ files:
 - spec/record_sql_rails_pg_spec.rb
 - spec/remote_recording_spec.rb
 - spec/spec_helper.rb
+- spec/swagger/swagger_spec.rb
 - spec/util_spec.rb
-- test/agent_setup_cli_test.rb
+- test/agent_setup_init_test.rb
 - test/bundle_vendor_test.rb
 - test/cucumber_test.rb
 - test/expectations/openssl_test_key_sign1.json

data/exe/appmap-agent-setup

@@ -1,47 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'gli'
-
-require 'appmap'
-
-class App
-  extend GLI::App
-
-  program_desc 'CLI tool to be used by code editor plugins for AppMap setup and configuration'
-
-  version AppMap::VERSION
-
-  subcommand_option_handling :normal
-  arguments :strict
-  preserve_argv true
-
-  desc 'AppMap configuration file name'
-  default_value ENV['APPMAP_CONFIG'] || AppMap::DEFAULT_CONFIG_FILE_PATH
-  arg_name 'filename'
-  flag %i[c config]
-
-  desc 'Creates base configuration file for the current project'
-  command :init do |c|
-    c.action do
-      require 'appmap/command/agent_setup/init'
-      AppMap::Command::AgentSetup::Init.new(@config_file).perform
-    end
-  end
-
-  pre do |global, _, _, _|
-    @config_file = global[:config]
-    @config = interpret_config_option(@config_file) if File.exist?(@config_file)
-    true
-  end
-
-  class << self
-    protected
-
-    def interpret_config_option(fname)
-      AppMap::Config.load_from_file fname
-    end
-  end
-end
-
-exit App.run(ARGV)