appmap 0.52.1 → 0.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ea77b709360095bcd2ee1333a2380e777a85c51856a13d603095be08649e5da
-  data.tar.gz: d1ba48dec0628ae81be4527371b20dcbc334ea59c925cc866f97ec6f73f5dc93
+  metadata.gz: 69fc6d5fce636d669cb33a9564a3c504eb255cb13a81985154589eb7cc6f9879
+  data.tar.gz: f2400bbda425b4e0f8d72b52d7edfcf761c8356638691074c79b72fdbca9f086
 SHA512:
-  metadata.gz: db175f34a2d019a010e2675184b216e339524f82508464d85468dac83cc259f8bd1df4a5ce9a4ff2bf17ab66fbce17da3609e3b7c387771918192a901b4c98a8
-  data.tar.gz: b48df26af2811d428107256326a1f4477857c2c151f3a1d6235054a3028f95ceb4fe25b78b2b90173522846b43d9f92ac71492e3bb7378b3f67899bf3441605e
+  metadata.gz: 17016392e9b2931c961bf1cdb3c7f832af15896201b395995c124befb7de1987ee43997f9186c329f9fe6474101158c06a0772e8bf0bd6bbd9b9b4ddd84defeb
+  data.tar.gz: 29fe408c9a44ec5cf8ffd410f732d6cc5959e045480c94406a4f9cc4abc2badbc1843f449bba0b8cd5e2b6269c71f8e5d603b9e99a902e63e6692d16af0e4c6f

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [0.53.0](https://github.com/applandinc/appmap-ruby/compare/v0.52.1...v0.53.0) (2021-06-23)
+
+
+### Features
+
+* appmap-agent-setup as a separate command not using GLI library ([f0eedb7](https://github.com/applandinc/appmap-ruby/commit/f0eedb7451368ea0399872f3be680e1581ac6200))
+
 ## [0.52.1](https://github.com/applandinc/appmap-ruby/compare/v0.52.0...v0.52.1) (2021-06-23)
 
 

data/appmap.gemspec

@@ -33,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'gli'
   spec.add_dependency 'method_source'
   spec.add_dependency 'rack'
   spec.add_dependency 'reverse_markdown'

data/exe/appmap-agent-init

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'optparse'
+require 'appmap'
+require 'appmap/command/agent_setup/init'
+
+@options = {:config_file => AppMap::DEFAULT_CONFIG_FILE_PATH}
+
+OptionParser.new do |parser|
+  parser.banner = 'Usage: bundle exec exe/appmap-agent-init [options]'
+
+  description = "AppMap configuration file path (default: #{AppMap::DEFAULT_CONFIG_FILE_PATH})"
+  parser.on('-c', '--config=FILEPATH', description) do |filepath|
+    @options[:config_file] = filepath
+  end
+end.parse!
+
+AppMap::Command::AgentSetup::Init.new(@options[:config_file]).perform

data/lib/appmap/version.rb

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

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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.52.1
+  version: 0.53.0
 platform: ruby
 authors:
 - Kevin Gilpin
@@ -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
@@ -294,7 +280,7 @@ description:
 email:
 - kgilpin@gmail.com
 executables:
-- appmap-agent-setup
+- appmap-agent-init
 - appmap-inspect
 extensions:
 - ext/appmap/extconf.rb
@@ -323,7 +309,7 @@ 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
@@ -528,7 +514,7 @@ files:
 - spec/remote_recording_spec.rb
 - spec/spec_helper.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)