Commit 1e8c8310 authored by Joshua Kalpin's avatar Joshua Kalpin

Merge pull request #1627 from Kapin/search-silent

Fix `pod search` when the silent flag is enabled
parents 0e1d101d e8428112
...@@ -44,6 +44,11 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides ...@@ -44,6 +44,11 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
[Joshua Kalpin](https://github.com/Kapin) [Joshua Kalpin](https://github.com/Kapin)
[Core#39](https://github.com/CocoaPods/Core/pull/39) [Core#39](https://github.com/CocoaPods/Core/pull/39)
[#1610](https://github.com/CocoaPods/CocoaPods/issues/1610) [#1610](https://github.com/CocoaPods/CocoaPods/issues/1610)
* Having the silent flag enabled in the config will no longer cause issues
with `pod search`. In addition the flag `--silent` is no longer supported
for the command.
[Joshua Kalpin](https://github.com/Kapin)
[#1627](https://github.com/CocoaPods/CocoaPods/pull/1627)
## 0.28.0 ## 0.28.0
......
...@@ -17,7 +17,7 @@ module Pod ...@@ -17,7 +17,7 @@ module Pod
["--stats", "Show additional stats (like GitHub watchers and forks)"], ["--stats", "Show additional stats (like GitHub watchers and forks)"],
["--ios", "Restricts the search to Pods supported on iOS"], ["--ios", "Restricts the search to Pods supported on iOS"],
["--osx", "Restricts the search to Pods supported on OS X"] ["--osx", "Restricts the search to Pods supported on OS X"]
].concat(super) ].concat(super.reject { |option, _| option == '--silent' })
end end
def initialize(argv) def initialize(argv)
...@@ -26,6 +26,7 @@ module Pod ...@@ -26,6 +26,7 @@ module Pod
@supported_on_ios = argv.flag?('ios') @supported_on_ios = argv.flag?('ios')
@supported_on_osx = argv.flag?('osx') @supported_on_osx = argv.flag?('osx')
@query = argv.shift_argument @query = argv.shift_argument
config.silent = false
super super
end end
......
...@@ -45,5 +45,10 @@ module Pod ...@@ -45,5 +45,10 @@ module Pod
output = run_command('search', 'BananaLib', '--osx') output = run_command('search', 'BananaLib', '--osx')
output.should.not.include? 'BananaLib' output.should.not.include? 'BananaLib'
end end
it "outputs with the silent parameter" do
output = run_command('search', 'BananaLib', '--silent')
output.should.include? 'BananaLib'
end
end end
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment