Make repo_package_query work w/ multiple options

instead of one at a time.
sepulworld · Jul 23, 2016 · f62c207 · f62c207
1 parent e0b3638
commit f62c207
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/lib/aptly_repo.rb b/lib/aptly_repo.rb
@@ -3,6 +3,7 @@
 require 'aptly_load'
 require 'httmultiparty'
 require 'json'
+require 'uri'
 
 module AptlyCli
   # Aptly class to work with Repo API
@@ -58,15 +59,12 @@ def repo_package_query(repo_options = { name: nil, query: nil,
       else
         uri = '/repos/' + repo_options[:name] + '/packages'
       end
-      uri += if repo_options[:query]
-               "?q=#{repo_options[:query]}"
-             elsif repo_options[:format]
-               "?format=#{repo_options[:format]}"
-             elsif repo_options[:with_deps]
-               '?withDeps=1'
-             else
-               ''
-             end
+
+      qs_hash = {}
+      qs_hash['q'] = repo_options[:query] if repo_options[:query]
+      qs_hash['format'] = repo_options[:format] if repo_options[:format]
+      qs_hash['withDeps'] = 1 if repo_options[:with_deps]
+      uri += '?' + URI.encode_www_form(qs_hash) if qs_hash
       self.class.get uri
     end
 

diff --git a/test/test_aptly_repo.rb b/test/test_aptly_repo.rb
@@ -79,9 +79,16 @@ def test_package_query_with_name
         name: 'testrepotoquery',
         dir: 'testdir2/',
         file: 'test_1.0_amd64.deb')
-      assert_includes repo_api.repo_package_query(name: 'testrepotoquery',
-                                                  query: 'geoipupdate').to_s,
-                                                  '["Pamd64 geoipupdate 2.0.0'
+      res = repo_api.repo_package_query(
+        name: 'testrepotoquery',
+        query: 'geoipupdate',
+        with_deps: true,
+        format: 'details',
+      )
+      assert_equal res.request.uri.to_s,
+                   'http://127.0.0.1:8082/api/repos/testrepotoquery/packages'\
+                   '?q=geoipupdate&format=details&withDeps=1'
+      assert_includes res.to_s, 'Pamd64 geoipupdate 2.0.0'
     end
   end