aptly_cli 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4fb76b5a05ffe081ad5adac38b250f0566dc13b3f6d4b59d69d5cb9b444c7ad
-  data.tar.gz: 7f70ac81c20310b8b5ac91ad50a2f52e84dc9d028713c15184d612d97ddcc8d6
+  metadata.gz: 631a350ac41c500d10dbd41f2f220cbba0e94982aded5c0c4d086e462f8cfbd8
+  data.tar.gz: 4e60257f19662245279baae1b61b62e53339b8852554c3a86b73cffe8156495f
 SHA512:
-  metadata.gz: c251302d85569e13f307f085a3864ecc706f730ff33438c37c530d08b1373eb196bafe1b5ae7f7172d29765131336893fc17ffaa387ab8eb21e2e2f6958322c1
-  data.tar.gz: dba94fca72f1cb48f6ef051a2d9af5123912435352c3057ad06d9394cf3c2637b0c5d496947b6ff6c73e620088b1aaac9c79d50f637d102cc33e3dd116c07d85
+  metadata.gz: c0e03eea787a49f9ac8b1fd1b24ca5b3b636c880ced22f86bf7e84ca6c51c142df68dbfa3bb2d0aa8625d5f8a1fe1802ac2e4162d0d52d65d6d85b3f188eaa03
+  data.tar.gz: 2ca87e8d833e77ee657a09c19160c73c6c016609dead38e2070eb0bb8707516301a905d7023cd8bbcdcad96fa6a12223128260d9555365756905ff23416fb982

data/bin/aptly-cli

@@ -156,16 +156,13 @@ command :repo_edit do |c|
     config = AptlyCli::AptlyLoad.new.configure_with($config_file)
     handle_global_options options
     aptly_command = AptlyCli::AptlyRepo.new(config, options)
-    if options.default_distribution
-      repo_options = { :DefaultDistribution => options.default_distribution.to_s }
-    end
-    if options.default_component
-      repo_options = { :DefaultComponent => options.default_component.to_s }
-    end
-    if options.comment
-      repo_options = { :Comment => options.comment.to_s }
-    end
-    puts aptly_command.repo_edit(options.name.to_s, repo_options || {})
+
+    repo_options = {}
+    repo_options[:DefaultDistribution] = options.default_distribution.to_s if options.default_distribution
+    repo_options[:DefaultComponent] = options.default_component.to_s if options.default_component
+    repo_options[:Comment] = options.comment.to_s if options.comment
+
+    puts aptly_command.repo_edit(options.name.to_s, repo_options)
   end
 end
 

data/lib/aptly_cli/version.rb

@@ -1,3 +1,3 @@
 module AptlyCli
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

data/lib/aptly_command.rb

@@ -94,13 +94,13 @@ module AptlyCli
 
       raise "[Server] #{json_response['error']}" unless !json_response.is_a?(Hash) || json_response.dig('error').nil?
 
-      raise HttpNotFoundError, "#{json_response}" if response.code == 404
-      raise HttpInternalServerError, "#{json_response}" if response.code == 500
+      raise HttpNotFoundError, "[HTTP Not Found Error] JSON response:\n#{json_response}" if response.code == 404
+      raise HttpInternalServerError, "[HTTP Internal Server Error] JSON response:\n#{json_response}" if response.code == 500
 
       response
     rescue JSON::ParserError
-      raise HttpNotFoundError, "#{json_response}" if response.code == 404
-      raise HttpInternalServerError, "#{json_response}" if response.code == 500
+      raise HttpNotFoundError, "[HTTP Not Found Error] Response:\n#{response.body}" if response.code == 404
+      raise HttpInternalServerError, "[HTTP Internal Server Error] Response:\n#{response.body}" if response.code == 500
 
       response
     end

data/lib/aptly_repo.rb

@@ -48,7 +48,9 @@ module AptlyCli
 
     def repo_list
       uri = '/repos'
-      get(uri)
+      JSON.parse get(uri).body
+    rescue JSON::ParserError
+      raise "Invalid response from '#{self.class.base_uri}#{uri}'"
     end
 
     def repo_package_add(repo_options, packages)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptly_cli
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Zane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-06 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler