aptly_cli 0.4.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c07bb5de71febaa4b92b293a1504859557992aea80f47ae90df6e91c36332b7d
-  data.tar.gz: 6912c3b56d952f6a308194b79ccb389cfad82331dedc77ec07b0c912506f4572
+  metadata.gz: 631a350ac41c500d10dbd41f2f220cbba0e94982aded5c0c4d086e462f8cfbd8
+  data.tar.gz: 4e60257f19662245279baae1b61b62e53339b8852554c3a86b73cffe8156495f
 SHA512:
-  metadata.gz: 89267b4c87aa2ed9297f14720bcff9808d2a2c845c911740a133aabbe15575e7474822a9c2b5ef6c30edf0c514acfed4f56527a320d039a762c0e6214c6d929e
-  data.tar.gz: 20d4da75a869a5ba0087e0bc48fc6ceb9a01f8526aea2e7d17bfe023fcaa5703d7a5dcb0dca8409f73c655380ee3fefe939d258c70384e5fec7bcba28238470a
+  metadata.gz: c0e03eea787a49f9ac8b1fd1b24ca5b3b636c880ced22f86bf7e84ca6c51c142df68dbfa3bb2d0aa8625d5f8a1fe1802ac2e4162d0d52d65d6d85b3f188eaa03
+  data.tar.gz: 2ca87e8d833e77ee657a09c19160c73c6c016609dead38e2070eb0bb8707516301a905d7023cd8bbcdcad96fa6a12223128260d9555365756905ff23416fb982

data/.github/workflows/publish.yml

@@ -0,0 +1,42 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Ruby Gem
+
+on:
+  # Manually publish
+  workflow_dispatch:
+  # Alternatively, publish whenever changes are merged to the `main` branch.
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby 2.6
+        uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
+        with:
+          ruby-version: 2.6
+      - run: bundle install
+
+      - name: Publish to RubyGems
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          gem build *.gemspec
+          gem push *.gem
+        env:
+          GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/.travis.yml

@@ -17,9 +17,10 @@ after_script:
 - rake docker_show_logs
 
 rvm:
-- 2.1.10
-- 2.2.5
-- 2.3.1
+- 2.3.8
+- 2.4.5
+- 2.5.3
+- 2.6.1
 
 deploy:
   provider: rubygems

data/README.md

@@ -257,4 +257,3 @@ rake test                  # Run tests
 
 - [ruby-aptly](https://github.com/ryanuber/ruby-aptly) - Ruby client library
 - [aptly-web-ui](https://github.com/sdumetz/aptly-web-ui) - Web interface for aptly (JavaScript, React, Redux)
-- [debweb](https://github.com/AutogrowSystems/debweb) - Another web interface (Ruby on Rails)

data/aptly_cli.gemspec

@@ -26,13 +26,12 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "rubocop"
 
-  spec.add_dependency "httmultiparty", "~> 0.3.16"
-  spec.add_dependency "httparty", "~> 0.13.0"
+  spec.add_dependency('httparty', '>= 0.16.2')
   spec.add_dependency "commander", "~> 4.3"
 end

data/bin/aptly-cli

@@ -115,7 +115,6 @@ command :repo_create do |c|
   c.option '--default_distribution DISTRIBUTION', String, 'Default distribution when publishing from this local repo'
   c.option '--default_component COMPONENT', String, 'Default component when publishing from this local repo'
   c.action do |args, options|
-    puts options.name
     config = AptlyCli::AptlyLoad.new.configure_with($config_file)
     handle_global_options options
     aptly_command = AptlyCli::AptlyRepo.new(config, options)
@@ -157,15 +156,12 @@ 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
+
+    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
@@ -501,7 +497,7 @@ command :graph do |c|
   c.syntax = 'aptly-cli graph [options]'
   c.summary = 'Download an svg or png graph of repository layout'
   c.description = 'Download a graph of repository layout.  Current options are "svg" and "png"'
-  c.example 'description', 'aptly-cli graph png > ~/repo_graph.png'
+  c.example 'description', 'aptly-cli graph --type png > ~/repo_graph.png'
   c.option '--type GRAPH_TYPE', String, 'Type of graph to download, present options are png or svg'
   c.action do |args, options|
     config = AptlyCli::AptlyLoad.new.configure_with($config_file)

data/lib/aptly_cli/version.rb

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

data/lib/aptly_cli.rb

@@ -1,5 +1,5 @@
 require 'aptly_cli/version'
-require 'httmultiparty'
+require 'httparty'
 
 # Initializing
 module AptlyCli

data/lib/aptly_command.rb

@@ -1,6 +1,10 @@
 module AptlyCli
+  class HttpError < StandardError; end
+  class HttpNotFoundError < HttpError; end
+  class HttpInternalServerError < HttpError; end
+
   class AptlyCommand
-    include HTTMultiParty
+    include HTTParty
 
     attr_accessor :config
     def initialize(config, options = nil)
@@ -64,5 +68,41 @@ module AptlyCli
 
       self.class.debug_output @config[:debug] ? $stdout : nil
     end
+
+    def delete(path, options = {})
+      response = self.class.delete(path, options)
+      process_response(response)
+    end
+
+    def get(path, options = {})
+      response = self.class.get(path, options)
+      process_response(response)
+    end
+
+    def post(path, options = {})
+      response = self.class.post(path, options)
+      process_response(response)
+    end
+
+    def put(path, options = {})
+      response = self.class.put(path, options)
+      process_response(response)
+    end
+
+    def process_response(response)
+      json_response = JSON.parse response.body
+
+      raise "[Server] #{json_response['error']}" unless !json_response.is_a?(Hash) || json_response.dig('error').nil?
+
+      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, "[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
   end
 end

data/lib/aptly_file.rb

@@ -1,7 +1,7 @@
 require 'aptly_cli/version'
 require 'aptly_command'
 require 'aptly_load'
-require 'httmultiparty'
+require 'httparty'
 
 module AptlyCli
   # Uploading file into Aptly
@@ -10,7 +10,8 @@ module AptlyCli
 
     def file_dir
       uri = '/files'
-      self.class.get uri
+      response = get uri
+      response.parsed_response
     end
 
     def file_get(file_uri)
@@ -19,20 +20,24 @@ module AptlyCli
             else
               '/files/' + file_uri
             end
-      self.class.get uri
+      response = get uri
+      response.parsed_response
     end
 
     def file_delete(file_uri)
       uri = '/files' + file_uri
-      self.class.delete uri
+      response = delete uri
+      response.parsed_response
     end
 
     def file_post(post_options = {})
       api_file_uri = '/files' + post_options[:file_uri].to_s
-      self.class.post(api_file_uri,
-                      query: {
+      response = post(api_file_uri,
+                      body: {
                         package: post_options[:package],
-                        file: File.new(post_options[:local_file]) })
+                        file: File.new(post_options[:local_file])
+                      })
+      response.parsed_response
     end
   end
 end

data/lib/aptly_misc.rb

@@ -1,22 +1,23 @@
 require 'aptly_cli/version'
 require 'aptly_command'
 require 'aptly_load'
-require 'httmultiparty'
+require 'httparty'
 require 'json'
 
 module AptlyCli
   # Misc Aptly Class
   class AptlyMisc < AptlyCommand
-    include HTTMultiParty
+    include HTTParty
 
     def get_graph(extension)
       uri = "/graph.#{extension}"
-      self.class.get(uri)
+      get(uri)
     end
 
     def get_version
       uri = '/version'
-      self.class.get(uri)
+      response = get(uri)
+      response.parsed_response
     end
   end
 end

data/lib/aptly_package.rb

@@ -1,17 +1,17 @@
 require 'aptly_cli/version'
 require 'aptly_command'
 require 'aptly_load'
-require 'httmultiparty'
+require 'httparty'
 require 'json'
 
 module AptlyCli
   # Aptly Package API
   class AptlyPackage < AptlyCommand
-    include HTTMultiParty
+    include HTTParty
 
     def package_show(package_key)
       uri = "/packages/#{package_key}"
-      self.class.get(uri)
+      get(uri)
     end
   end
 end

data/lib/aptly_publish.rb

@@ -1,13 +1,13 @@
 require 'aptly_cli/version'
 require 'aptly_command'
 require 'aptly_load'
-require 'httmultiparty'
+require 'httparty'
 require 'json'
 
 module AptlyCli
   # :nodoc:
   class AptlyPublish < AptlyCommand
-    include HTTMultiParty
+    include HTTParty
 
     @@available_gpg_options = [:skip, :batch, :gpgKey, :keyring, :secretKeyring,
                               :passphrase, :passphraseFile]
@@ -26,12 +26,12 @@ module AptlyCli
 
       uri += "/#{publish_options[:distribution]}"
       uri += '?force=1' if publish_options[:force] == true
-      self.class.delete(uri)
+      delete(uri)
     end
 
     def publish_list
       uri = '/publish'
-      self.class.get(uri)
+      get(uri)
     end
 
     def _parse_snapshots(names)
@@ -92,8 +92,8 @@ module AptlyCli
 
       @body_json = @body.to_json
 
-      self.class.post(uri, headers: { 'Content-Type' => 'application/json' },
-                           body: @body_json)
+      post(uri, :headers => { 'Content-Type' => 'application/json' },
+                           :body => @body_json)
     end
 
     def publish_update(publish_options={})
@@ -112,14 +112,14 @@ module AptlyCli
       uri += if publish_options[:prefix]
                "/#{publish_options[:prefix]}"
              else
-               '/'
+               '/:.'
              end
 
       uri += "/#{publish_options[:distribution]}"
 
       @body_json = @body.to_json
-      self.class.put(uri, headers: { 'Content-Type' => 'application/json' },
-                          body: @body_json)
+      put(uri, :headers =>  { 'Content-Type' => 'application/json' },
+                          :body => @body_json)
     end
   end
 end

data/lib/aptly_repo.rb

@@ -1,97 +1,93 @@
 require 'aptly_cli/version'
 require 'aptly_command'
 require 'aptly_load'
-require 'httmultiparty'
+require 'httparty'
 require 'json'
 require 'uri'
 
 module AptlyCli
   # Aptly class to work with Repo API
   class AptlyRepo < AptlyCommand
-    include HTTMultiParty
+    include HTTParty
 
     def repo_create(repo_options = { name: nil,
                                      comment: nil,
                                      DefaultDistribution: nil,
                                      DefaultComponent: nil })
+      raise ArgumentError, 'Repository name is required' if repo_options[:name].nil? || repo_options[:name].empty?
+
       uri = '/repos'
       name = repo_options[:name]
       comment = repo_options[:comment]
       default_distribution = repo_options[:DefaultDistribution]
       default_component = repo_options[:DefaultComponent]
-      self.class.post(uri,
-                      query:
+      post(uri,
+                      :body => 
                       { 'Name' => name, 'Comment' => comment,
                         'DefaultDistribution' => default_distribution,
                         'DefaultComponent' => default_component }.to_json,
-                      headers: { 'Content-Type' => 'application/json' })
+                      :headers => { 'Content-Type' => 'application/json' })
     end
 
     def repo_delete(repo_options = { name: nil, force: nil })
+      raise ArgumentError, 'Repository name is required' if repo_options[:name].nil? || repo_options[:name].empty?
+
       uri = '/repos/' + repo_options[:name]
       uri += '?force=1' if repo_options[:force] == true
-      self.class.delete(uri)
+      delete(uri)
     end
 
-    def repo_edit(name, repo_options = { k => v })
-      repo_option = ''
-      repo_value = ''
-      uri = '/repos/' + name unless name.nil?
-      repo_options.each do |k, v|
-        repo_option = k
-        repo_value = v
-      end
+    def repo_edit(name, repo_options)
+      raise ArgumentError, 'Repository name is required' if name.nil? || name.empty?
 
-      self.class.put(uri, query: { repo_option => repo_value }.to_json,
-                          headers: { 'Content-Type' => 'application/json' })
+      uri = "/repos/#{name}"
+
+      put(uri, :body => repo_options.to_json,
+                          :headers => { 'Content-Type' => 'application/json' })
     end
 
     def repo_list
       uri = '/repos'
-      self.class.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)
-      if !repo_options.is_a?(Hash) || repo_options[:name].nil?
-        raise ArgumentError.new('Must pass a repository name')
-      end
+      raise ArgumentError, 'Repository name is required' if repo_options[:name].nil? || repo_options[:name].empty?
 
       uri = '/repos/' + repo_options[:name] + '/packages'
-      self.class.post(
+      post(
         uri,
-        body: { PackageRefs: packages }.to_json,
-        headers: { 'Content-Type' => 'application/json' }
+        :body => { PackageRefs: packages }.to_json,
+        :headers => { 'Content-Type' => 'application/json' }
       )
     end
 
     def repo_package_delete(repo_options, packages)
-      if !repo_options.is_a?(Hash) || repo_options[:name].nil?
-        raise ArgumentError.new('Must pass a repository name')
-      end
+      raise ArgumentError, 'Repository name is required' if repo_options[:name].nil? || repo_options[:name].empty?
 
       uri = '/repos/' + repo_options[:name] + '/packages'
-      self.class.delete(
+      delete(
         uri,
-        body: { PackageRefs: packages }.to_json,
-        headers: { 'Content-Type' => 'application/json' }
+        :body => { PackageRefs: packages }.to_json,
+        :headers => { 'Content-Type' => 'application/json' }
       )
     end
 
     def repo_package_query(repo_options = { name: nil, query: nil,
                                             with_deps: false,
                                             format: nil })
-      if repo_options[:name].nil?
-        raise ArgumentError.new('Must pass a repository name')
-      else
-        uri = '/repos/' + repo_options[:name] + '/packages'
-      end
+      raise ArgumentError, 'Repository name is required' if repo_options[:name].nil? || repo_options[:name].empty?
+
+      uri = '/repos/' + repo_options[:name] + '/packages'
 
       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
+      get uri
     end
 
     def repo_show(name)
@@ -100,11 +96,13 @@ module AptlyCli
             else
               '/repos/' + name
             end
-      self.class.get uri
+      get uri
     end
 
     def repo_upload(repo_options = { name: nil, dir: nil, file: nil,
                                      noremove: false, forcereplace: false })
+      raise ArgumentError, 'Repository name is required' if repo_options[:name].nil? || repo_options[:name].empty?
+
       name = repo_options[:name]
       dir  = repo_options[:dir]
       file = repo_options[:file]

data/lib/aptly_snapshot.rb

@@ -1,45 +1,45 @@
 require 'aptly_cli/version'
 require 'aptly_command'
 require 'aptly_load'
-require 'httmultiparty'
+require 'httparty'
 require 'json'
 
 module AptlyCli
   # Aptly class to work with Snapshot API
   class AptlySnapshot < AptlyCommand
-    include HTTMultiParty
+    include HTTParty
 
     def snapshot_delete(name, force=nil)
       uri = "/snapshots/#{name}"
       uri += '?force=1' if force == true
-      self.class.delete(uri)
+      delete(uri)
     end
 
     def snapshot_list(sort=nil)
       uri = '/snapshots'
       uri += "?sort=#{sort}" if sort
-      self.class.get(uri)
+      get(uri)
     end
 
     def snapshot_create(name, repo, description=nil)
       # Build uri to create snapshot, requires name of snap and name of repo
       uri = "/repos/#{repo}/" + 'snapshots'
 
-      self.class.post(uri, query:
+      post(uri, :body =>
                       { 'Name' => name,
                         'Description' => description }.to_json,
-                           headers: { 'Content-Type' => 'application/json' })
+                           :headers => { 'Content-Type' => 'application/json' })
     end
 
     def snapshot_create_ref(name, description=nil,
                             sourcesnapshots=[], packagerefs=[])
       uri = '/snapshots'
       begin
-        self.class.post(uri,
-                        query: { 'Name' => name, 'Description' => description,
+        post(uri,
+                        :body => { 'Name' => name, 'Description' => description,
                                  'SourceSnapshots' => sourcesnapshots,
                                  'PackageRefs' => packagerefs }.to_json,
-                        headers: { 'Content-Type' => 'application/json' })
+                        :headers => { 'Content-Type' => 'application/json' })
       rescue HTTParty::Error => e
         return e
       end
@@ -47,7 +47,7 @@ module AptlyCli
 
     def snapshot_diff(name, with_snapshot)
       uri = "/snapshots/#{name}/diff/#{with_snapshot}"
-      self.class.get(uri)
+      get(uri)
     end
 
     def snapshot_search(name, search_options={})
@@ -63,12 +63,12 @@ module AptlyCli
       end
 
       @options[:query] = { withDeps:  '1' } if search_options[:withDeps] == true
-      self.class.get(uri, @options)
+      get(uri, @options)
     end
 
     def snapshot_show(name)
       uri = "/snapshots/#{name}"
-      self.class.get(uri)
+      get(uri)
     end
 
     def snapshot_update(name, new_name, description=nil)
@@ -83,7 +83,7 @@ module AptlyCli
       @query[:Description] = description unless description.nil?
       @query_json = @query.to_json
       begin
-        self.class.put(uri, query: @query_json, headers:
+        put(uri, :body => @query_json, :headers =>
                        { 'Content-Type' => 'application/json' })
       rescue HTTParty::Error => e
         puts e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptly_cli
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.6.1
 platform: ruby
 authors:
 - Zane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-26 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -94,34 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: httmultiparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.16
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.16
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.16.2
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +130,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/publish.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -191,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Command line client to interact with Aptly package management system