aptly_cli 0.3.3 → 0.3.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDdjMWRhNTU5YjMwOGZmNzMxYmE4ZGQ2ODUyMWJlY2U1NmQxN2RlNA==
+    Yzc1NGY3OGE5NjE5Y2YwMWE1YjQ2MTI4NWNlZDllZDQ5ODBkZjRjYw==
   data.tar.gz: !binary |-
-    ZTE2YTJiMzJhMjQzMTQ1Zjg1MGIyYThjOTg4ODhiN2FlNWU0ODBjNQ==
+    Zjc5ZjU5ZWU4ZGM5NjlkNmQwMTk3NmQxY2IyNGVmZjY4MDJhNWJhZQ==
 SHA512:
   metadata.gz: !binary |-
-    YmU4M2ExNmY4ODI0NmVmYjNjMTc2MzYxNWFmYmM3ZmQ3MzI0MzUyZWY5OWFk
-    YWYyZjg2NDgwMDQxODlhYWUwMWNlODkwNzIxYzA2Y2Q2N2Y0ZjliZDcyYmJi
-    YzhjMGM3OGE0NzY4NWNjNTZmZDkzYmY0YzJjMjQ5NTlmYWQyNDg=
+    OWE1NTM2YWNhMTViMzg0YTBhMGM2MGEyNzI2ZjM2NzhmNmY2OGZjMzI3ZDA3
+    MjVhMTJiMzRhZDY4Y2EzYTRlMDBjNjdmNGNkN2ZlNGJlOTdjZjA5YzkzMzNk
+    MmMzY2I5MDk4MDZiODNmOGQ5M2E5NDQ0MzU3NjUxM2UzODM5ZmE=
   data.tar.gz: !binary |-
-    YjE3YWE0YWMzNTJhYjk2MzI1ZDU3M2M4ZjdhZmMwN2E0ZjBiMTAwNGU1ZDEz
-    MzUwNzZmZDI2MjlkMWU0YjRlMzc2OGZkMWY3NWExMTI3ODY1YmIxZTBlNGM2
-    YmQ5YzM5OGQyNjc5ZTQ5NTM2MGM2YTcwZGRmNzliZmQ2MWMzODE=
+    NDY3MWQ2OWY3NGMzMzg4OGFjMmU5M2ZkOWFiMGE1NzNiMjVjMDExOWRkZWZj
+    OTI4MjQ1OGQwZmE2M2NmYjU1NWFhNGJmNTkzZmM0YzIzMWUzOWY3YzA1ZDJm
+    ZjM2M2Q4NDEyMGM0NTFiYTVmY2MyMGFmMDk3YzE1ODVlYjBkMTc=

data/bin/aptly-cli

@@ -18,7 +18,9 @@ $debug = false
 global_option('-c', '--config FILE', 'Path to YAML config file') do |config_file|
   $config_file = config_file
 end
-
+global_option('--no-config', 'Don\'t try to read YAML config file') do |config_file|
+  $config_file = nil
+end
 global_option('-s', '--server SERVER', 'Host name or IP address of Aptly API server') do |server|
   $server = server
 end

data/lib/aptly_cli/version.rb

@@ -1,3 +1,3 @@
 module AptlyCli
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.3.4'.freeze
 end

data/lib/aptly_load.rb

@@ -34,18 +34,23 @@ module AptlyCli
 
     # Configure through yaml file
     def configure_with(path_to_yaml_file)
-      begin
-        config = YAML.load(IO.read(path_to_yaml_file))
-      rescue Errno::ENOENT
-        @log.warn(
-          "YAML configuration file couldn\'t be found at " \
-           "#{path_to_yaml_file}. Using defaults.")
-        return @config
-      rescue Psych::SyntaxError
-        @log.warn(
-          'YAML configuration file contains invalid syntax. Using defaults.')
-        return @config
+      if path_to_yaml_file
+        begin
+          config = YAML.load(IO.read(path_to_yaml_file))
+        rescue Errno::ENOENT
+          @log.warn(
+            "YAML configuration file couldn\'t be found at " \
+             "#{path_to_yaml_file}. Using defaults.")
+          return @config
+        rescue Psych::SyntaxError
+          @log.warn(
+            'YAML configuration file contains invalid syntax. Using defaults.')
+          return @config
+        end
+      else
+        config = {}
       end
+
       configure(config)
     end
   end

data/lib/aptly_repo.rb

@@ -3,6 +3,7 @@ require 'aptly_command'
 require 'aptly_load'
 require 'httmultiparty'
 require 'json'
+require 'uri'
 
 module AptlyCli
   # Aptly class to work with Repo API
@@ -58,15 +59,12 @@ module AptlyCli
       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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aptly_cli
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Zane