appmap 0.56.0 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cfb7d49bd076c0599f8b4866cee8475109553812d13be58a873a288391f9f25
-  data.tar.gz: 2cc00cb780ac948e058ca4742ce3bc52d79b8c08f55bcf964363a9f1fcfc2763
+  metadata.gz: 442ca8673e42cd8bea0db1ba97a533e7a38965f3d27707bd8e4379b578ee85cb
+  data.tar.gz: 1174d299f1446c8c3e16403437682196ce794bad27b7c6dd69d712f9bd59e36a
 SHA512:
-  metadata.gz: acf4df227c1cadc89495c36528eb386f1a09323010dba9869a8a1e7d4b584bf2097a7148a57fe0ca0979560a30cb5f083cf132f799f309a1ef89461025151558
-  data.tar.gz: 628153961f02ad5cb6b34e3ac21432afdce20a61234f3dfa9b57835e33ef5189d9a10c12ba4d361126e820ecd6dd3b89b8b64f2f72a5e1f6d38ee3ea4e5888a9
+  metadata.gz: 73bb23b5ac1401565c57ffbd833fe266ddebfe71271926ca0afaa08b92c88ffd47f5c92f6e91f213b8066729e6607a1b0f99731449eecf7bd68ab125a0f5de3f
+  data.tar.gz: f72d956ed6c6a46aebe12724a910d5cbdec1aee3d8b61f300e8b2a679873b25db245cca4407c02a03df1588fd3734d616472aed69c2741898e60bc04f6d04b33

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [0.57.0](https://github.com/applandinc/appmap-ruby/compare/v0.56.0...v0.57.0) (2021-06-29)
+
+
+### Features
+
+* Update init command to return JSON ([1f93e89](https://github.com/applandinc/appmap-ruby/commit/1f93e8909684e1018f513d69adfde2a5d0bf6bc9))
+
 # [0.56.0](https://github.com/applandinc/appmap-ruby/compare/v0.55.0...v0.56.0) (2021-06-28)
 
 

data/lib/appmap/command/agent_setup/init.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require 'fileutils'
+require 'json'
 require 'appmap/service/guesser'
-require 'appmap/util'
 
 module AppMap
   module Command
@@ -11,32 +10,19 @@ module AppMap
 
       class Init < InitStruct
         def perform
-          if File.exist?(config_file)
-            puts AppMap::Util.color(%(The AppMap config file #{config_file} already exists.), :magenta)
-            return
-          end
-
-          ensure_directory_exists
-
           config = {
             'name' => Service::Guesser.guess_name,
             'packages' => Service::Guesser.guess_paths.map { |path| { 'path' => path } }
           }
-          content = YAML.dump(config).gsub("---\n", '')
 
-          File.write(config_file, content)
-          puts AppMap::Util.color(
-            %(The following AppMap config file #{config_file} has been created:),
-            :green
-          )
-          puts content
-        end
-
-        private
+          result = {
+            configuration: {
+              filename: config_file,
+              contents: YAML.dump(config)
+            }
+          }
 
-        def ensure_directory_exists
-          dirname = File.dirname(config_file)
-          FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+          puts JSON.pretty_generate(result)
         end
       end
     end

data/lib/appmap/version.rb

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

data/test/agent_setup_init_test.rb

@@ -5,8 +5,8 @@ require 'test_helper'
 
 class AgentSetupInitTest < Minitest::Test
   CONFIG_FILENAME = '123.yml'
-  SUBFOLDER_CONFIG_FILEPATH = 'conf/123.yml'
-  EXPECTED_CONFIG_CONTENT = %(name: appmap-ruby
+  EXPECTED_CONFIG_CONTENT = %(---
+name: appmap-ruby
 packages:
 - path: lib
 )
@@ -14,24 +14,24 @@ packages:
   def test_init_when_config_exists
     output = `./exe/appmap-agent-init`
     assert_equal 0, $CHILD_STATUS.exitstatus
-    assert_includes output, 'The AppMap config file appmap.yml already exists.'
+    expected = JSON.pretty_generate({
+      configuration: {
+        filename: 'appmap.yml',
+        contents: EXPECTED_CONFIG_CONTENT
+      }
+    })
+    assert_equal expected, output.strip
   end
 
   def test_init_with_custom_config_filename
     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)
-  ensure
-    File.delete(CONFIG_FILENAME) if File.exist?(CONFIG_FILENAME)
-  end
-
-  def test_init_with_custom_config_file_in_subfolder
-    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)
-  ensure
-    File.delete(SUBFOLDER_CONFIG_FILEPATH) if File.exist?(SUBFOLDER_CONFIG_FILEPATH)
+    expected = JSON.pretty_generate({
+      configuration: {
+        filename: CONFIG_FILENAME,
+        contents: EXPECTED_CONFIG_CONTENT
+      }
+    })
+    assert_equal expected, output.strip
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.56.0
+  version: 0.57.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport