Renamed opensearch sigv4 console to avoid conflict with opensearch ru…

…by console (#124) Signed-off-by: Theo Truong <[email protected]> Signed-off-by: Theo Truong <[email protected]>
opensearch-project · Nov 30, 2022 · 887bd8e · 887bd8e
1 parent dd9549a
commit 887bd8e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - `release/build.sh` now only builds 1 gem at a time, then packages it into an artifact file for release ([#113](https://github.com/opensearch-project/opensearch-ruby/issues/113))
 - Renamed folder for `opensearch-ruby` gem from `opensearch` to `opensearch-ruby` ([#116](https://github.com/opensearch-project/opensearch-ruby/issues/116))
 - Update the public key ([118](https://github.com/opensearch-project/opensearch-ruby/pull/118))
+- Renamed opensearch sigv4 console to avoid conflict with opensearch-ruby when both are installed ([#124](https://github.com/opensearch-project/opensearch-ruby/pull/124))
 
 ### Deprecated
 

diff --git a/...rch-aws-sigv4/bin/opensearch_ruby_console → ...ch-aws-sigv4/bin/opensearch_sigv4_console b/...rch-aws-sigv4/bin/opensearch_ruby_console → ...ch-aws-sigv4/bin/opensearch_sigv4_console
@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
 
 $LOAD_PATH.unshift(File.expand_path('../../opensearch-aws-sigv4/lib', __dir__))
+$LOAD_PATH.unshift(File.expand_path('../../opensearch-ruby/lib', __dir__))
 $LOAD_PATH.unshift(File.expand_path('../../opensearch-transport/lib', __dir__))
 $LOAD_PATH.unshift(File.expand_path('../../opensearch-dsl/lib', __dir__))
 $LOAD_PATH.unshift(File.expand_path('../../opensearch-api/lib', __dir__))
 
 require 'opensearch-aws-sigv4'
-require 'opensearch-transport'
-require 'opensearch-api'
 
 gems_not_loaded = ['opensearch-dsl'].reject do |gem|
   begin
@@ -35,10 +34,10 @@ rescue LoadError
 end
 
 if defined?(Pry)
-  Pry.config.prompt_name = 'opensearch_ruby'
+  Pry.config.prompt_name = 'opensearch_sigv4'
   Pry.start
 elsif defined?(IRB)
   IRB.start
 else
-  abort 'LoadError: opensearch_ruby_console requires Pry or IRB'
+  abort 'LoadError: opensearch_sigv4_console requires Pry or IRB'
 end
diff --git a/opensearch-aws-sigv4/opensearch-aws-sigv4.gemspec b/opensearch-aws-sigv4/opensearch-aws-sigv4.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   }
   s.files         = `git ls-files`.split($/)
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.executables   << 'opensearch_ruby_console'
+  s.executables   << 'opensearch_sigv4_console'
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
 
   if $PROGRAM_NAME.end_with?("gem") && ARGV == ["build", __FILE__] && File.exist?(signing_key_path)