appmap 0.72.2 → 0.72.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87322a2d5ba58dfc1fb69259af06c59077d3897f1e37e91e5a94dd2cbba1478b
-  data.tar.gz: ace21bbbd53fa487b27339e2af8fb16f4f8ec7b3ca7bbe218ba205b8ff7fc94b
+  metadata.gz: c7d208fd0b861c7e7c3f75dfe12111441f450d8f65a75fb34cca032ff2272c43
+  data.tar.gz: 4ab7ee1e0b724a2dab5428836d6ff585bf9d06f90c5e6356d07f7b9d1c86cc4c
 SHA512:
-  metadata.gz: 9eaebd3dbb1bf74880eeafc2379a78e73d747f4a41a507152c0d3840eefff1b4f8ae3c6cdecfb15bb08e44b5f3d19779b1c265746148ddb569715ace6c17a834
-  data.tar.gz: 4569886b26db0d49d06fd0bb649997fc29d9fea665c59495448e0b1669581757003f3034536392bf8e4e5cb16955ce12b4ca3e2ffd90cb8af8057a8edb4f093a
+  metadata.gz: e3fa641617f40905dfd821f0d47ea2f2459caf768390b9891a01e9bd3ea94a78c0d304cc2580fbaffda1d42d3518351a5cce9673b01369ccbff3af366bc77f03
+  data.tar.gz: b417bdef218555f14bf82e3aba7606b33479eeddade41288d2e7694f5990cbe3a99f2de4f7d467d56798ccdaf798254a262bff79efe8ab615b900cae4e713baa

data/.travis.yml

@@ -36,7 +36,6 @@ jobs:
     env:
       # GEM_ALTERNATIVE_NAME only needed for deployment 
       - GEM_ALTERNATIVE_NAME=''
-    script: bundle exec rake
 
 before_deploy:
   - |
@@ -51,4 +50,4 @@ deploy:
     script: ./release.sh
     on:
       branch: master
-      condition: "$TRAVIS_RUBY_VERSION = 2.7"
+      condition: "$TRAVIS_RUBY_VERSION = 3.0"

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.72.3](https://github.com/applandinc/appmap-ruby/compare/v0.72.2...v0.72.3) (2022-02-14)
+
+
+### Bug Fixes
+
+* No longer bundle @appland/appmap with this gem ([7bbad49](https://github.com/applandinc/appmap-ruby/commit/7bbad49c04df5a6d6e1fcfc4812f5e0d0cd84899))
+
 ## [0.72.2](https://github.com/applandinc/appmap-ruby/compare/v0.72.1...v0.72.2) (2022-02-11)
 
 

data/Rakefile

@@ -13,21 +13,6 @@ Rake::ExtensionTask.new("appmap") do |ext|
   ext.lib_dir = "lib/appmap"
 end
 
-namespace 'gem' do
-  require 'bundler/gem_tasks'
-  
-  module Bundler
-    class GemHelper
-      # A handy tip - find the location of any Rake task using `rake -W`.
-      # rake -W build
-      # ~/.rbenv/versions/2.6.6/lib/ruby/gems/2.6.0/gems/bundler-2.1.4/lib/bundler/gem_helper.rb:39:in `install'
-      def build_gem
-        raise "Don't use 'rake gem:build' - use 'yarn install --prod && gem build <gemspec>', because that's what ./release.sh does"
-      end
-    end
-  end
-end
-
 RUBY_VERSIONS=%w[2.6 2.7 3.0].select do |version|
   travis_ruby_version = ENV['TRAVIS_RUBY_VERSION']
   next true unless travis_ruby_version
@@ -72,6 +57,11 @@ def build_app_image(app, ruby_version)
   end
 end
 
+desc 'Install non-Ruby dependencies'
+task :install do
+  system 'yarn install' or raise 'yarn install failed'
+end
+
 namespace :build do
   namespace :base do
     RUBY_VERSIONS.each do |ruby_version|
@@ -80,7 +70,6 @@ namespace :build do
         run_system = ->(cmd) { system(cmd) or raise "Command failed: #{cmd}" }
 
         run_system.call 'mkdir -p pkg'
-        run_system.call 'yarn install --prod'
         run_system.call "gem build appmap.gemspec --output pkg/appmap-#{GEM_VERSION}.gem"
         build_base_image(ruby_version)
       end.tap do |t|
@@ -139,7 +128,7 @@ end
 namespace :spec do
   RUBY_VERSIONS.each do |ruby_version|
     desc ruby_version
-    task ruby_version, [:specs] => ["compile", "build:fixtures:#{ruby_version}:all"] do |_, task_args|
+    task ruby_version, [:specs] => ["install", "compile", "build:fixtures:#{ruby_version}:all"] do |_, task_args|
       run_specs(ruby_version, task_args)
     end.tap do |t|
       desc "Run all specs"

data/appmap.gemspec

@@ -23,12 +23,6 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
-  strip_dir = ->(file) { file.index(Dir.pwd) == 0 ? file[Dir.pwd.length+1...file.length] : file }
-  Dir.glob(File.join(__dir__, 'node_modules/**/*')).map(&strip_dir).each do |filename|
-    next if File.directory?(filename) || filename.length > 100
-    spec.files << filename
-  end
-
   spec.extensions << "ext/appmap/extconf.rb"
   spec.require_paths = ['lib']
 

data/lib/appmap/command/index.rb

@@ -16,7 +16,7 @@ module AppMap
 
         arguments.unshift 'index'
         arguments.unshift APPMAP_JS
-        arguments.unshift 'node'
+        arguments.unshift 'npx'
 
         exec(*arguments)
       end

data/lib/appmap/command/inspect.rb

@@ -16,7 +16,7 @@ module AppMap
 
         arguments.unshift 'inspect'
         arguments.unshift APPMAP_JS
-        arguments.unshift 'node'
+        arguments.unshift 'npx'
 
         exec(*arguments)
       end

data/lib/appmap/node_cli.rb

@@ -6,7 +6,7 @@ require 'appmap/command_error'
 module AppMap
   # Utilities for invoking the +@appland/appmap+ CLI.
   class NodeCLI
-    APPMAP_JS = Pathname.new(__dir__).join('../../node_modules/@appland/appmap/src/cli.js').expand_path.to_s
+    APPMAP_JS = '@appland/appmap'
 
     attr_reader :verbose
     # Directory to scan for AppMaps.
@@ -32,7 +32,7 @@ module AppMap
     def command(command, options = {})
       command.unshift << '--verbose' if verbose
       command.unshift APPMAP_JS
-      command.unshift 'node'
+      command.unshift 'npx'
 
       warn command.join(' ') if verbose
       stdout, stderr, status = Open3.capture3({ 'NODE_OPTIONS' => '--trace-warnings' }, *command.map(&:shellescape), options)

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.72.2'
+  VERSION = '0.72.3'
 
   APPMAP_FORMAT_VERSION = '1.5.1'
 

data/package.json

@@ -17,6 +17,6 @@
   },
   "homepage": "https://github.com/applandinc/appmap-ruby#readme",
   "dependencies": {
-    "@appland/appmap": "^3.0.0"
+    "@appland/appmap": "^3.18.3"
   }
 }

data/release.sh

@@ -13,5 +13,4 @@ else
 fi
 
 set -ex
-yarn install --prod
 exec semantic-release $RELEASE_FLAGS

data/spec/fixtures/depends/revoke_api_key.appmap.json

@@ -74,7 +74,7 @@
       {
         "appmap_digest": "7fecdd763d47626364364da02387f1fcbfe805123e806f08bacde96636cfc91d",
         "canonicalization_algorithm": "info",
-        "digest": "bd63ed674a87494c9565d4bf7ecad797683528b8b83bbb66f27b334b6e303f67",
+        "digest": "2226ec6817a89e479e2c5c05a929b66325dce33ed58ce27f88be73269f6609c8",
         "fingerprint_algorithm": "sha256"
       },
       {
@@ -110,13 +110,13 @@
       {
         "appmap_digest": "7fecdd763d47626364364da02387f1fcbfe805123e806f08bacde96636cfc91d",
         "canonicalization_algorithm": "trace",
-        "digest": "464056ee79400cf881d31e4db167cf12caadfffdc814bc89ed01b89f746dcbd1",
+        "digest": "77cea3a57ab3ec42453d3317fdab874cff7948c9eb5786a098d9a76a04ac38b0",
         "fingerprint_algorithm": "sha256"
       },
       {
         "appmap_digest": "7fecdd763d47626364364da02387f1fcbfe805123e806f08bacde96636cfc91d",
         "canonicalization_algorithm": "update",
-        "digest": "a78760f0ae6eabb20403b812101d86c609294e36fff53be54dec71b1244076b0",
+        "digest": "7ee75bda36b126736c56f44209b03e949e7504fa78c3777582f537b2805a2bb6",
         "fingerprint_algorithm": "sha256"
       }
     ]

data/spec/fixtures/depends/user_page_scenario.appmap.json

@@ -68,7 +68,7 @@
       {
         "appmap_digest": "4a2f6e28befc256c3cdc3ad05f3e51156e0fb805300f095a74f7719cc2bcb650",
         "canonicalization_algorithm": "info",
-        "digest": "e09798c3872822cd6aee88e0de2b54d06e05bf1f4c1bb3c21ca5d422e1938980",
+        "digest": "19a3423b0e356861454bfe9f5d70663c65c26bc5cac2345bb87d4feef2db9e5b",
         "fingerprint_algorithm": "sha256"
       },
       {
@@ -104,7 +104,7 @@
       {
         "appmap_digest": "4a2f6e28befc256c3cdc3ad05f3e51156e0fb805300f095a74f7719cc2bcb650",
         "canonicalization_algorithm": "trace",
-        "digest": "5bccf2aaf6b511d84e297cd882d998927bfdcfb24b2baa63c897a87ab08878cd",
+        "digest": "e81230cac63d25a6dfbf24c113964a661044dd01ed661e3cffeb943b41cfc213",
         "fingerprint_algorithm": "sha256"
       },
       {

data/spec/fixtures/rails6_users_app/Dockerfile

@@ -13,13 +13,20 @@ RUN curl -fsSL https://fnm.vercel.app/install | bash \
     && source /root/.bashrc \
     && fnm install --lts \
     && echo 'fnm default $(fnm current)' >> ~/.bashrc \
-    && ln -s $(which node) /usr/local/bin/node
+    && ln -s $(which node) /usr/local/bin/ \
+    && ln -s $(which npx) /usr/local/bin/ \
+    && npm install -g yarn \
+    && ln -s $(which yarn) /usr/local/bin/
 
 RUN mkdir /app
 WORKDIR /app
 
 RUN gem install -N bundler
 
+COPY package.json .
+
+RUN yarn install
+
 COPY Gemfile .
 
 RUN bundle

data/spec/fixtures/rails6_users_app/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "rails6_users_app",
+  "version": "1.0.0",
+  "license": "MIT",
+  "devDependencies": {
+    "@appland/appmap": "^3.18.3"
+  }
+}