appmap 0.25.2 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ee5199f1f1f4c05ba3837f3caf04adb9798bb223c3bf0deb71cdd80216181a0
-  data.tar.gz: 3aeb05be87430862426a25075a236d54d2d20bb0a1d893b71b1eaa63c8c44c01
+  metadata.gz: 75d21c5ea95115ab89fb0dd6674a601d19455473f787344d07f7a935aec58aec
+  data.tar.gz: 9d76905534e5c3277c318376708224f318f6357ab41647a6a14a82edf63cbe54
 SHA512:
-  metadata.gz: fc4042fe8d7f56a87b205145fcd9e520beb946d27f1e17f5134f4a5127f7ca9c2ee8645cf8377339c34cf814b4faf348894d91f20d31a68e743ede3d5d863419
-  data.tar.gz: 3c4dba46e95a77b51030065af14e9987f66294ba396a38ef396b79d86b37540d36229670b170e4f632972b563369184d0fa1a4e5b4c18d99d1deb5243b166014
+  metadata.gz: c6ca34edd66c0cec51119cc2af49ea5824c91023e54ac1507493eebc3ef39d8308db2b013fdd83d9a1102fc3f6f791dbcec5cf7c75a0cda409d4ade695739815
+  data.tar.gz: 3e5ff519cc8ce4964771806f20258590b607a48a497bb4f100a72ce31f0b40305542315ac3ecfdf1ec5b92723c30369041707327fdf2bf0ac35a5f526e77a969

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.26.0
+
+* **appmap upload** is removed. Upload functionality has been moved to
+  the [AppLand CLI](https://github.com/applandinc/appland-cli).
+
 # v0.25.2
 
 * Stop checking a whitelist to see if each SQL query should be recorded. Record

data/README.md

@@ -11,7 +11,7 @@
 
 # About
 
-`appmap-ruby` is a Ruby Gem for recording and uploading
+`appmap-ruby` is a Ruby Gem for recording
 [AppMaps](https://github.com/applandinc/appmap) of your code. 
 "AppMap" is a data format which records code structure (modules, classes, and methods), code execution events
 (function calls and returns), and code metadata (repo name, repo URL, commit
@@ -25,8 +25,10 @@ There are several ways to record AppMaps of your Ruby program using the `appmap`
   browser extension to start, stop, and upload recordings. 
 * Run the command `appmap record <program>` to record the entire execution of a program.
 
-When you record AppMaps on the command line (for example, by running RSpec tests), you use the `appmap upload` command to
-upload them to the AppLand website. On the AppLand website, you'll be able to
+Once you have recorded some AppMaps (for example, by running RSpec tests), you use the `appland upload` command
+to upload them to the AppLand server. This command, and some others, is provided
+by the [AppLand CLI](https://github.com/applandinc/appland-cli/releases), to
+Then, on the [AppLand website](https://app.land), you can
 visualize the design of your code and share links with collaborators.
 
 # Testing
@@ -179,14 +181,7 @@ Note that using this method is kind of a blunt instrument. Recording RSpecs and
 
 # Uploading AppMaps
 
-To upload an AppMap file to AppLand, run the `appmap upload` command. For example (with binstubs installed):
-
-```sh-session
-$ ./bin/appmap upload tmp/appmap/rspec/*
-Uploading "tmp/appmap/rspec/Hello_app_says_hello_when_prompted.appmap.json"
-Scenario Id: 4da4f267-bdea-48e8-bf67-f39463844230
-Batch Id: a116f1df-ee57-4bde-8eef-851af0f3d7bc
-```
+For instructions on uploading, see the documentation of the [AppLand CLI](https://github.com/applandinc/appland-cli).
 
 # Build status
 [![Build Status](https://travis-ci.org/applandinc/appmap-ruby.svg?branch=master)](https://travis-ci.org/applandinc/appmap-ruby)

data/exe/appmap

@@ -125,62 +125,6 @@ module AppMap
       end
     end
 
-    desc 'Upload a scenario file to AppLand.'
-    arg_name 'filename'
-    command :upload do |c|
-      output_file_flag(c, default_value: '-')
-
-      c.desc 'Whether to open the new scenario in the browser'
-      c.default_value true
-      c.switch [:open]
-
-      c.desc 'AppLand website URL'
-      c.default_value ENV['APPLAND_URL'] || 'https://appland-staging.herokuapp.com'
-      c.flag :url
-
-      # TODO: This will be replaced with proper login
-      c.desc 'User id to own the scenario'
-      c.default_value(ENV['APPLAND_USER'])
-      c.flag :user
-
-      c.desc 'Organization id to own the scenario'
-      c.default_value(ENV['APPLAND_ORG'])
-      c.flag :org
-
-      c.action do |_, options, args|
-        require 'appmap/command/upload'
-
-        filenames = args
-        help_now!("'filename' argument is required") if filenames.empty?
-
-        url = options[:url]
-        user = options[:user]
-        org = options[:org]
-
-        batch_id = nil
-        uuids = filenames.map do |filename|
-          appmap = JSON.parse(File.read(filename))
-
-          warn "Uploading #{filename.inspect}"
-          upload = AppMap::Command::Upload.new(appmap, url, user, org)
-          upload.batch_id = batch_id if batch_id
-          upload.perform.tap do |response|
-            batch_id ||= response.batch_id
-            @output_file.puts "Scenario Id: #{response.scenario_uuid}"
-          end.scenario_uuid
-        end
-        @output_file.puts "Batch Id: #{batch_id}"
-
-        if options[:open] && STDIN.tty?
-          if uuids.length == 1
-            system "open #{url}/scenarios/#{uuids.first}"
-          else
-            system "open #{url}/scenario_batches/#{batch_id}"
-          end
-        end
-      end
-    end
-
     pre do |global, _, options, _|
       @config = interpret_config_option(global[:config])
       @output_file = interpret_output_file_option(options[:output])

data/lib/appmap/middleware/remote_recording.rb

@@ -6,7 +6,6 @@ module AppMap
     class RemoteRecording
       def initialize(app)
         require 'appmap/command/record'
-        require 'appmap/command/upload'
         require 'json'
 
         @app = app

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.25.2'
+  VERSION = '0.26.0'
 
   APPMAP_FORMAT_VERSION = '1.2'
 end

data/test/cli_test.rb

@@ -113,17 +113,4 @@ class CLITest < Minitest::Test
     assert_includes output, %("location":"lib/cli_record_test/main.rb:3")
     assert !File.file?(OUTPUT_FILENAME), "#{OUTPUT_FILENAME} should not exist"
   end
-
-  def test_upload
-    Dir.chdir 'test/fixtures/cli_record_test' do
-      `#{File.expand_path '../exe/appmap', __dir__} record -o #{OUTPUT_FILENAME} ./lib/cli_record_test/main.rb`
-    end
-
-    upload_output = `./exe/appmap upload --org default --user admin --no-open #{OUTPUT_FILENAME}`
-    assert_equal 0, $CHILD_STATUS.exitstatus
-    # Example: 93e1e07d-4b39-49ac-82bf-27d63e296cae
-    assert_match(/Scenario Id/, upload_output)
-    assert_match(/Batch Id/, upload_output)
-    assert_match(/[0-9a-f]+\-[0-9a-f\-]+/, upload_output)
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.25.2
+  version: 0.26.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -269,7 +269,6 @@ files:
 - lib/appmap/class_map.rb
 - lib/appmap/command/record.rb
 - lib/appmap/command/stats.rb
-- lib/appmap/command/upload.rb
 - lib/appmap/event.rb
 - lib/appmap/hook.rb
 - lib/appmap/middleware/remote_recording.rb

data/lib/appmap/command/upload.rb

@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-require 'faraday'
-
-module AppMap
-  module Command
-    UploadResponse = Struct.new(:batch_id, :scenario_uuid)
-
-    UploadStruct = Struct.new(:data, :url, :user, :org)
-    class Upload < UploadStruct
-      MAX_DEPTH = 12
-
-      attr_accessor :batch_id
-
-      def initialize(data, url, user, org)
-        super
-
-        # TODO: Make this an option
-        @max_depth = MAX_DEPTH
-      end
-
-      def perform
-        appmap = data.clone
-
-        events = data.delete('events')
-        class_map = data.delete('classMap') || []
-
-        unless events.blank?
-          pruned_events = []
-          stack = []
-          events.each do |evt|
-            if evt['event'] == 'call'
-              stack << evt
-              stack_depth = stack.length
-            else
-              stack_depth = stack.length
-              stack.pop
-            end
-
-            prune = stack_depth > @max_depth
-
-            pruned_events << evt unless prune
-          end
-
-          warn "Pruned events to #{pruned_events.length}" if events.length > pruned_events.length
-
-          appmap[:events] = pruned_events
-          appmap[:classMap] = prune(class_map, events: pruned_events)
-        else
-          appmap[:events] = []
-          appmap[:classMap] = prune(class_map)
-        end
-
-        upload_file = { user: user, org: org, data: appmap }.compact
-
-        conn = Faraday.new(url: url)
-        response = conn.post do |req|
-          req.url '/api/scenarios'
-          req.headers['Content-Type'] = 'application/json'
-          req.headers[AppMap::BATCH_HEADER_NAME] = @batch_id if @batch_id
-          req.body = JSON.generate(upload_file)
-        end
-
-        unless response.body.blank?
-          message = begin
-                      JSON.parse(response.body)
-                    rescue JSON::ParserError => e
-                      warn "Response is not valid JSON (#{e.message})"
-                      nil
-                    end
-        end
-
-        unless response.success?
-          error = [ 'Upload failed' ]
-          error << ": #{message}" if message
-          raise error.join
-        end
-
-        batch_id = @batch_id || response.headers[AppMap::BATCH_HEADER_NAME]
-
-        uuid = message['uuid']
-        UploadResponse.new(batch_id, uuid)
-      end
-
-      protected
-
-      def debug?
-        ENV['DEBUG'] == 'true' || ENV['GLI_DEBUG'] == 'true'
-      end
-
-      def prune(class_map, events: nil)
-        require 'appmap/algorithm/prune_class_map'
-        Algorithm::PruneClassMap.new(class_map).tap do |alg|
-          alg.events = events if events
-          alg.logger = ->(msg) { warn msg } if debug?
-        end.perform
-      end
-    end
-  end
-end