From 322e64c402f4e45d97c6f3bf67c3ffdaabbb359f Mon Sep 17 00:00:00 2001 From: Daniil Kouznetsov Date: Tue, 16 Jan 2018 15:43:25 -0500 Subject: [PATCH] [Fixed] conan install & info commands [finish #154377322] Signed-off-by: Shane Lattanzio --- features/support/testing_dsl.rb | 2 +- lib/license_finder/package_managers/conan.rb | 4 ++-- spec/lib/license_finder/package_managers/conan_spec.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/features/support/testing_dsl.rb b/features/support/testing_dsl.rb index 8fa93de23..28d59f663 100644 --- a/features/support/testing_dsl.rb +++ b/features/support/testing_dsl.rb @@ -343,7 +343,7 @@ def add_dep end def install - shell_out('conan install') + shell_out('conan install .') end end diff --git a/lib/license_finder/package_managers/conan.rb b/lib/license_finder/package_managers/conan.rb index 62b4d6fbd..787b4ce4c 100644 --- a/lib/license_finder/package_managers/conan.rb +++ b/lib/license_finder/package_managers/conan.rb @@ -7,8 +7,8 @@ def possible_package_paths end def current_packages - install_command = 'conan install' - info_command = 'conan info' + install_command = 'conan install .' + info_command = 'conan info .' Dir.chdir(project_path) { Cmd.run(install_command) } info_output, _stderr, _status = Dir.chdir(project_path) { Cmd.run(info_command) } diff --git a/spec/lib/license_finder/package_managers/conan_spec.rb b/spec/lib/license_finder/package_managers/conan_spec.rb index ab9f268db..7e9ef32a6 100644 --- a/spec/lib/license_finder/package_managers/conan_spec.rb +++ b/spec/lib/license_finder/package_managers/conan_spec.rb @@ -86,8 +86,8 @@ module LicenseFinder File.write('/fake/path/licenses/zlib/license/LICENSE', 'zlib license') File.write('/fake/path/licenses/OpenSSL/LICENSE', 'OpenSSL license') File.write('/fake/path/licenses/Poco/license/LICENSE', 'Poco license') - expect(SharedHelpers::Cmd).to receive(:run).with('conan install').ordered - expect(SharedHelpers::Cmd).to receive(:run).with('conan info').ordered.and_return([conaninfo, '', cmd_success]) + expect(SharedHelpers::Cmd).to receive(:run).with('conan install .').ordered + expect(SharedHelpers::Cmd).to receive(:run).with('conan info .').ordered.and_return([conaninfo, '', cmd_success]) end it 'should list all the current packages name and version' do