Skip to content

Commit

Permalink
[Fixed] conan install & info commands
Browse files Browse the repository at this point in the history
[finish #154377322]

Signed-off-by: Shane Lattanzio <[email protected]>
  • Loading branch information
Daniil Kouznetsov authored and xtreme-shane-lattanzio committed Jan 16, 2018
1 parent b133d0f commit 322e64c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion features/support/testing_dsl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ def add_dep
end

def install
shell_out('conan install')
shell_out('conan install .')
end
end

Expand Down
4 changes: 2 additions & 2 deletions lib/license_finder/package_managers/conan.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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) }

Expand Down
4 changes: 2 additions & 2 deletions spec/lib/license_finder/package_managers/conan_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 322e64c

Please sign in to comment.