aptly_cli 0.2.9 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGQ1MWI0M2I3NGRmZDU1NDZlOTIwZWI4N2JlN2VlZThlMjhiZDdlZQ==
+    OTlmNzM3YjU0YzFkYjVmYTNjOWZmNWZiMmIzNjgxNDZiYzNmOGM1MQ==
   data.tar.gz: !binary |-
-    NTdjODhiYTBjOGRjNjYyZmJhZjgyN2U4ZWEzYzJkYmUzMjVkOTA2Ng==
+    MjZhOTk4NmYwYzQ0NTYwODcyYTNlMzIxZmI0NTViMDRhMTRlOTJkOA==
 SHA512:
   metadata.gz: !binary |-
-    MmRiMjMzYTc1NTg2NjE3MjdmMjRkMjI2ZmMzOWE3YjU2ZTljZjAwZDI0MWM1
-    OWRiYjM4ZGY5YTQ4YzRjODRhNzdiNzQzYjJlOTg0ZWMwOWE2YTI0MDhhNjNk
-    ZDUxYWU4NDQ4ZTI2NDhjYmQ2MDA1MGEyNzI0ZmUwNjUwNzAyYzE=
+    NzIwNmZiNjI1NmYzMTc3NmU3ODIyYTQxNDY2MTY4YmQ4MjY3MGRmYmQzNjcz
+    YjRlNDM4NDEwNTdkYTY3ZWUwNzQ4ZmQ3ZDg2ZjQ4OTdhYjU3NzQyMzhiOGMy
+    NDhiYTlmZWE4NmYzMDFiZjRjODVmZjYyMDIwYWQ0MjJlZDBjOGI=
   data.tar.gz: !binary |-
-    ZTE1MTQwOTNhMjU3NmUwY2I5M2FkYzgzMDgyMzQ4MWU4YTNiOWRiZDA4NWVm
-    MWRlOGNjMTcxNmNkMTgzNjkyN2MxMTAwYzgwZWE2NjhkNDcxMzU4MGVlYzhm
-    ZTZmODE5MzlhYmVlMzQwNTRkM2M5ZjQ2OGIwZTY5ZDdhYjYxY2E=
+    MmZiZTBiYjFjZTg0NTMzZTM3NWQyZWYyMWFhNDZlOGZkZDdkZmU5OWJiODY3
+    MTI0ZDI5OTY4NGQwZDcxYjU4ZTQ4ODVmMzlkZDMwYWJiNjhlYTM1MzAwNjYy
+    NjdmZjcxOGMzNmI0OGY1OGY4Y2IxZjA3NjMzYzcyNzUzYjUzMDQ=

data/Dockerfile

@@ -1,19 +1,29 @@
-FROM debian:jessie
+FROM ruby:2.3
+MAINTAINER Zane Williamson <zane.williamson@gmail.com>
 
-EXPOSE 8080
+# Install apt packages
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update -qq && \
+    apt-get install -y -qq \
+        less \
+        locales && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
-RUN echo "deb http://repo.aptly.info/ squeeze main" > /etc/apt/sources.list.d/aptly.list; \
-apt-key adv --keyserver keys.gnupg.net --recv-keys 2A194991; \
-apt-get update; \
-apt-get install aptly curl xz-utils bzip2 gnupg wget graphviz -y --force-yes; \
-wget --quiet http://mirror.as24220.net/pub/ubuntu-archive/pool/main/z/zeitgeist/zeitgeist_0.9.0-1_all.deb -O /tmp/zeitgeist_0.9.0-1_all.deb; \
-wget --quiet http://mirror.as24220.net/pub/ubuntu-archive/pool/main/z/zsh/zsh_5.1.1-1ubuntu1_i386.deb -O /tmp/zsh_5.1.1-1ubuntu1_i386.deb
+# Configure locale
+ARG LOCALE="C.UTF-8"
+RUN locale-gen "$LOCALE" && \
+    dpkg-reconfigure locales
+ENV LANG="$LOCALE" LC_ALL="$LOCALE"
 
-ADD ./test/fixtures/aptly.conf /etc/aptly.conf
+ADD . /app/
+ADD lib /app/lib
 
-RUN aptly repo create testrepo
-RUN aptly repo create testrepo20
-RUN aptly repo add testrepo /tmp/zeitgeist_0.9.0-1_all.deb
-RUN aptly repo add testrepo20 /tmp/zsh_5.1.1-1ubuntu1_i386.deb
+VOLUME /app
+WORKDIR /app
 
-CMD /usr/bin/aptly api serve
+RUN gem install bundler && \
+    bundle install && \
+    rake install
+
+ENTRYPOINT ["aptly-cli"]

data/README.md

@@ -4,36 +4,48 @@
 [![Gem Version](https://badge.fury.io/rb/aptly_cli.svg)](http://badge.fury.io/rb/aptly_cli)
 [![Coverage Status](https://coveralls.io/repos/github/sepulworld/aptly_cli/badge.svg?branch=master)](https://coveralls.io/github/sepulworld/aptly_cli?branch=master)
 
-A command line interace to execute [Aptly](http://aptly.info) commands againts remote Aptly API servers.  Aptly-cli will allow you to interact with the file, repo, snapshot, publish, packages, graph and version API endpoints of your Aptly server.
+A command line interface to execute [Aptly](http://aptly.info) commands againts remote Aptly API servers.  Aptly-cli will allow you to interact with the file, repo, snapshot, publish, packages, graph and version API endpoints of your Aptly server.
 
 
 ## Installation
 
-Add this line to your application's Gemfile:
+### Install Gem:
 
-    $ ruby gem 'aptly_cli'
+    $ gem install aptly_cli
+    
+or...    
+    
+### Install and run aptly-cli from Docker:
 
-And then execute:
+    # Optional: If you don't pull explicitly, `docker run` will do it for you
+    $ docker pull sepulworld/aptly-cli
 
-    $ bundle
+    $ alias aptly-cli='\
+      docker run \
+        -v /etc/aptly-cli.conf:/etc/aptly-cli.conf \
+        -it --rm --name=aptly-cli \
+        sepulworld/aptly-cli'
 
-Or install it yourself as:
+(Depending on how your system is set up, you might have to add `sudo` in front of the above `docker` commands or add your user to the `docker` group).
 
-    $ gem install aptly_cli
-    
+If you don't do the `docker pull`, the first time you run `aptly-cli`, the `docker run` command will automatically pull [the `sepulworld/aptly-cli` image on the Docker Hub](https://hub.docker.com/r/sepulworld/aptly-cli/). Subsequent runs will use a locally cached copy of the image and will not have to download anything.
 
-Create a configuration file with aptly server and port, /etc/aptly-cli.conf (YAML syntax):
+Create a configuration file with aptly server and port, `/etc/aptly-cli.conf` (YAML syntax):
 
-    ---
-    :proto: http
-    :server: 127.0.0.1
-    :port: 8082
-    :debug: false
+```yaml
+---
+:proto: http
+:server: 127.0.0.1
+:port: 8082
+:debug: false
+```
 
 If you use Basic Authentication to protect your API, add username and password:
 
-    :username: api-user
-    :password: api-password
+```yaml
+:username: api-user
+:password: api-password
+```
 
 Also make sure that your config file isn't world readable (```chmod o-rw /etc/aptly-cli.conf```)
 
@@ -79,7 +91,7 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-Ruby Minitest are impleneted using Docker container for functional tests
+Ruby Minitest are implemented using a Docker container for functional tests.
 
 Rake tasks available:
 

data/Rakefile

@@ -13,37 +13,37 @@ task default: :test
 
 desc "Docker build image"
 task :docker_build do
-  sh %{docker build -t sepulworld/aptly_api .}
+  sh %{docker build -t sepulworld/aptly_api_test ./test/}
 end
 
 desc "Push Docker image to Docker Hub"
 task :docker_push do
-  sh %{docker push sepulworld/aptly_api}
+  sh %{docker push sepulworld/aptly_api_test}
 end
 
 desc "Pull Docker image to Docker Hub"
 task :docker_pull do
-  sh %{docker pull sepulworld/aptly_api}
+  sh %{docker pull sepulworld/aptly_api_test}
 end
 
 desc "List Docker Aptly running containers"
 task :docker_list_aptly do
-  sh %{docker ps --filter ancestor='sepulworld/aptly_api' --format="{{.ID}}"}
+  sh %{docker ps --filter ancestor='sepulworld/aptly_api_test' --format="{{.ID}}"}
 end
 
 desc "Stop running Aptly Docker containers"
 task :docker_stop do
-  sh %{docker stop $(docker ps --filter ancestor='sepulworld/aptly_api' --format="{{.ID}}")}
+  sh %{docker stop $(docker ps --filter ancestor='sepulworld/aptly_api_test' --format="{{.ID}}")}
 end
 
 desc "Start Aptly Docker container on port 8082"
 task :docker_run do
-  sh %{docker run -d -p 8082:8080 sepulworld/aptly_api /bin/sh -c "aptly api serve"}
+  sh %{docker run -d -p 8082:8080 sepulworld/aptly_api_test /bin/sh -c "aptly api serve"}
 end
 
 desc "Show running Aptly process Docker stdout logs"
 task :docker_show_logs do
-  sh %{docker logs $(docker ps --filter ancestor='sepulworld/aptly_api' --format="{{.ID}}")}
+  sh %{docker logs $(docker ps --filter ancestor='sepulworld/aptly_api_test' --format="{{.ID}}")}
 end
 
 desc "Restart Aptly docker container"

data/bin/aptly-cli

@@ -8,14 +8,54 @@ require 'aptly_cli'
 program :version, AptlyCli::VERSION 
 program :description, 'Aptly repository API client'
 
+$config_file = '/etc/aptly-cli.conf'
+$server = nil
+$username = nil
+$password = nil
+$debug = false
+
+global_option('-c', '--config FILE', 'Path to YAML config file') do |config_file|
+  $config_file = config_file
+end
+
+global_option('-s', '--server SERVER', 'Host name or IP address') do |server|
+  $server = server
+end
+global_option('--username USERNAME', 'User name') do |username|
+  $username = username
+end
+global_option('--password PASSWORD', 'Password') do |password|
+  $password = password
+end
+global_option('--debug', 'Enable debug output') do
+  $debug = true
+end
+
+def handle_global_options(options)
+  if $server
+    options.server = $server
+  end
+  if $username
+    options.username = $username
+  end
+  if $password
+    options.password = $password
+  end
+  if $debug
+    options.debug = $debug
+  end
+end
+
 command :file_list do |c|
   c.syntax  = 'aptly-cli file_list [options]'
-  c.summary = 'List all directories that contain uploaded files'
-  c.description = 'List all directories'
+  c.summary = 'List all directories'
+  c.description = 'List all directories that contain uploaded files'
   c.example 'List all directories for file uploads', 'aptly-cli file_list'
   c.option '--directory DIRECTORY', String, 'Directory to list packages on server'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlyFile.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlyFile.new(config, options)
     if options.directory
       puts aptly_command.file_get(options.directory)
     else
@@ -26,25 +66,31 @@ end
 
 command :file_upload do |c|
   c.syntax  = 'aptly-cli file_upload [options]'
-  c.summary = 'Parameter --directory is upload directory name. Directory would be created if it doesn’t exist.'
-  c.description = 'File upload'
+  c.summary = 'File upload'
+  c.description = 'Parameter --directory is upload directory name. Directory would be created if it doesn’t exist.'
   c.example 'description', 'aptly-cli file_upload --upload /local/copy/of/package.deb --directory /aptlyserver_directory/'
   c.option '--directory DIRECTORY', String, 'Directory to load packages into'
   c.option '--upload UPLOAD', String, 'Package(s) to upload'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlyFile.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlyFile.new(config, options)
     puts aptly_command.file_post(:file_uri => options.directory, :package => options.upload, :local_file => options.upload)
   end
 end
 
 command :file_delete do |c|
   c.syntax  = 'aptly-cli file_delete [options]'
-  c.summary = 'Deletes all files in upload directory and directory itself. Or delete just a file'
-  c.description = 'File delete'
-  c.example 'Delete package redis-server found in redis upload directory', 'aptly-cli file_delete --target /redis/redis-server_2.8.3_i386-cc1.deb'
+  c.summary = 'File delete'
+  c.description = 'Deletes all files in upload directory and directory itself. Or delete just a file'
+  c.example(
+    'Delete package redis-server found in redis upload directory',
+    'aptly-cli file_delete --target /redis/redis-server_2.8.3_i386-cc1.deb')
   c.option '--target TARGET', String, 'Path to directory or specific package to delete'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlyFile.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlyFile.new(config, options)
     puts aptly_command.file_delete(options.target)
   end
 end
@@ -61,7 +107,9 @@ command :repo_create do |c|
   c.option '--default_component COMPONENT', String, 'Default component when publishing from this local repo'
   c.action do |args, options|
     puts options.name
-    aptly_command = AptlyCli::AptlyRepo.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlyRepo.new(config, options)
     repo_options = { :name => options.name.to_s, 
                      :comment => options.comment.to_s, 
                      :DefaultDistribution => options.default_distribution.to_s,
@@ -78,7 +126,9 @@ command :repo_delete do |c|
   c.option '--name NAME', String, 'Local repository name, required'
   c.option '--force'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlyRepo.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlyRepo.new(config, options)
     repo_options = { :name => options.name.to_s, 
                      :force => options.force.to_s }
     puts aptly_command.repo_delete(repo_options)
@@ -95,7 +145,9 @@ command :repo_edit do |c|
   c.option '--default_distribution DISTRIBUTION', String, 'Edit DefaultDistribution for repo'
   c.option '--default_component COMPONENT', String, 'Edit DefaultComponent for repo'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlyRepo.new
+    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
@@ -115,22 +167,26 @@ command :repo_list do |c|
   c.description = 'Show list of currently available local repositories'
   c.example 'description', 'aptly-cli repo_list'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlyRepo.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlyRepo.new(config, options)
     puts aptly_command.repo_list()
   end
 end
 
 command :repo_package_query do |c|
   c.syntax = 'aptly-cli repo_package_query [options]'
-  c.summary = 'List all packages in local repository or perform search on repository contents and return result., requires --name'
-  c.description = 'List all packages or search on repo contents, requires --name'
+  c.summary = 'List all packages or search on repo contents, requires --name'
+  c.description = 'List all packages in local repository or perform search on repository contents and return result., requires --name'
   c.example 'description', 'aptly-cli repo_package_query --name megatronsoftware -query geoipupdate'
   c.option '--name NAME', String, 'Local repository name, required'
   c.option '--query QUERY', String, 'Package to query'
   c.option '--with_deps', 'Return results with dependencies'
   c.option '--format FORMAT', String, 'Format type to return, compact by default. "details" is an option'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlyRepo.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlyRepo.new(config, options)
     if options.query
       repo_options = { :name => options.name.to_s, :query => options.query.to_s }
     elsif options.with_deps and options.query.nil?
@@ -146,12 +202,14 @@ end
 
 command :repo_upload do |c|
   c.syntax = 'aptly-cli repo_upload [options]'
-  c.summary = 'Import packages from files (uploaded using File Upload API) to the local repository. If directory specified, aptly would discover package files automatically.
-  
-  Adding same package to local repository is not an error.
-  
-  By default aptly would try to remove every successfully processed file and directory :dir (if it becomes empty after import).'
-  c.description = 'Import packages from files'
+  c.summary = 'Import packages from files'
+  c.description = [
+    'Import packages from files (uploaded using File Upload API) to the',
+    'local repository. If directory specified, aptly would discover package',
+    'files automatically. Adding same package to local repository is not an',
+    'error. By default aptly would try to remove every successfully',
+    'processed file and directory :dir (if it becomes empty after import).'
+  ].join(' ')
   c.example 'description', 'aptly-cli repo_upload --name rocksoftware --dir rockpackages --noremove'
   c.option '--name NAME', String, 'Local repository name, required'
   c.option '--dir DIR', String, 'Directory where packages are stored via File API'
@@ -159,7 +217,9 @@ command :repo_upload do |c|
   c.option '--noremove', 'Flag to not remove any files that were uploaded via File API after repo upload'
   c.option '--forcereplace', 'flag to replace file(s) already in the repo'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlyRepo.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlyRepo.new(config, options)
     puts aptly_command.repo_upload({ :name => options.name, :dir => options.dir,
                                      :file => options.file, :noremove => options.noremove,
                                      :forcereplace => options.forcereplace })
@@ -173,40 +233,46 @@ command :repo_show do |c|
   c.example 'description', 'aptly-cli repo_show --name megatronsoftware'
   c.option '--name NAME', String, 'Local repository name, required'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlyRepo.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlyRepo.new(config, options)
     puts aptly_command.repo_show(options.name)
   end
 end
 
 command :publish_drop do |c|
   c.syntax = 'aptly-cli publish_drop [options]'
-  c.summary = 'Delete published repository, clean up files in published directory.'
-  c.description = 'Delete published repository' 
+  c.summary = 'Delete published repository'
+  c.description = 'Delete published repository, clean up files in published directory.'
   c.example 'Delete publish repository prefix precisetest', 'aptly-cli publish_drop --distribution precisetest'
   c.option '--prefix PREFIX', String, 'prefix, optional'
   c.option '--distribution DISTRIBUTION', String, 'distribution'
   c.option '--force', 'force published repository removal even if component cleanup fails'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlyPublish.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlyPublish.new(config, options)
     puts aptly_command.publish_drop({ :prefix => options.prefix, :distribution => options.distribution, :force => options.force })
   end
 end
 
 command :publish_list do |c|
   c.syntax = 'aptly-cli publish_list [options]'
-  c.summary = 'List published repositories.'
+  c.summary = 'List published repositories'
   c.description = 'List published repositories.'
   c.example 'List published repositories', 'aptly-cli publish_list'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlyPublish.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlyPublish.new(config, options)
     puts aptly_command.publish_list()
   end
 end
 
 command :publish_repo do |c|
   c.syntax = 'aptly-cli publish_repo [options]'
-  c.summary = 'Publish local repository or snapshot under specified prefix. Storage might be passed in prefix as well, e.g. s3:packages/. To supply empty prefix, just remove last part (POST /api/publish/:prefix/<:repos>or<:snapshots>'
-  c.description = 'Publish local repository or snapshot under specified prefix'
+  c.summary = 'Publish local repository or snapshot under specified prefix'
+  c.description = 'Publish local repository or snapshot under specified prefix. Storage might be passed in prefix as well, e.g. s3:packages/. To supply empty prefix, just remove last part (POST /api/publish/:prefix/<:repos>or<:snapshots>'
   c.example 'publish multiple repos as source', 'aptly-cli publish_repo --sourcekind local --name precise/megatronsoftware,trusty/rocksoftware22 --architectures i386 amd64'
   c.example 'publish one repo, two archs, forceoverwrite', 'aptly-cli publish_repo --sourcekind local --name megatronsoftware --architectures i386 amd64 --forceoverwrite true'
   c.example 'publish 2 snapshots into one publish point', 'aptly-cli publish_repo --sourcekind snapshot --name precise/rocksoftware300,main/rocksoftware200 --label test_snap'
@@ -228,7 +294,9 @@ command :publish_repo do |c|
   c.option '--gpg_passphrase GPGPASS', String, 'gpg key passphrase (if using over http, would be transmitted in clear text!)'
   c.option '--gpg_passphrase_file GPGPASSFILE', String, 'gpg passphrase file (local to aptly server/user)'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlyPublish.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlyPublish.new(config, options)
     puts aptly_command.publish_repo(options.name, { :sourcekind => options.sourcekind, :prefix => options.prefix,
                                                     :label => options.label, :distribution => options.distribution,
                                                     :origin => options.origin, :forceoverwrite => options.forceoverwrite,
@@ -240,8 +308,8 @@ end
 
 command :publish_update do |c|
   c.syntax = 'aptly-cli publish_update [options]'
-  c.summary = 'Update published repository. If local repository has been published, published repository would be updated to match local repository contents. If snapshots have been been published, it is possible to switch each component to new snapshot'
-  c.description = 'Update published repository'
+  c.summary = 'Update published repository'
+  c.description = 'Update published repository. If local repository has been published, published repository would be updated to match local repository contents. If snapshots have been been published, it is possible to switch each component to new snapshot'
   c.example 'description', 'aptly-cli publish_update --forceoverwrite --distribution precise'
   c.option '--prefix PREFIX', String, 'Publishing prefix, default root'
   c.option '--distribution DISTRIBUTION', String, 'Distribution name'
@@ -255,7 +323,9 @@ command :publish_update do |c|
   c.option '--gpg_passphrase GPGPASS', String, 'gpg key passphrase (if using over http, would be transmitted in clear text!)'
   c.option '--gpg_passphrase_file GPGPASSFILE', String, 'gpg passphrase file (local to aptly server/user)'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlyPublish.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlyPublish.new(config, options)
     puts aptly_command.publish_update({ :prefix => options.prefix, :distribution => options.distribution, :forceoverwrite => options.forceoverwrite,
                                                     :skip => options.gpg_skip, :batch => options.gpg_batch, :gpgKey => options.gpg_key,
                                                     :keyring => options.gpg_keyring, :secretKeyring => options.gpg_secret_keyring,
@@ -266,41 +336,47 @@ end
 
 command :snapshot_create do |c|
   c.syntax = 'aptly-cli snapshot_create [options]'
-  c.summary = 'Create snapshot of current local repository :name contents as new snapshot with name :snapname'
-  c.description = 'Create snapshot, require --name'
+  c.summary = 'Create snapshot, require --name'
+  c.description = 'Create snapshot of current local repository :name contents as new snapshot with name :snapname'
   c.example 'Creating new snapshot megasoftware22-snap from megasoftware22 repo', 'aptly-cli snapshot_create --name megasoftware22-snap --repo meagsoftware22'
   c.option '--name NAME', String, 'Name of new snapshot, required'
   c.option '--repo REPO', String, 'Name of repo to snapshot'
   c.option '--description DESCRIPTION', String, 'Set description for snapshot'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlySnapshot.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlySnapshot.new(config, options)
     puts aptly_command.snapshot_create(options.name, options.repo, options.description)
   end
 end
 
 command :snapshot_delete do |c|
   c.syntax = 'aptly-cli snapshot_delete [options]'
-  c.summary = 'Delete snapshot. Snapshot can’t be deleted if it is published. aptly would refuse to delete snapshot if it has been used as source to create other snapshots, but that could be overridden with force parameter'
-  c.description = 'Delete snapshot, require --name'
+  c.summary = 'Delete snapshot, require --name'
+  c.description = 'Delete snapshot. Snapshot can’t be deleted if it is published. aptly would refuse to delete snapshot if it has been used as source to create other snapshots, but that could be overridden with force parameter'
   c.example 'Deleting the snapshot megasoftware22', 'aptly-cli snapshot_delete --name megatronsoftware22'
   c.example 'Deleting the snapshot megasoftware22 with force option', 'aptly-cli snapshot_delete --name megatronsoftware22 --force'
   c.option '--name NAME', String, 'Local snapshot name, required'
   c.option '--force', 'Force'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlySnapshot.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlySnapshot.new(config, options)
     puts aptly_command.snapshot_delete(options.name, options.force)
   end
 end
 
 command :snapshot_diff do |c|
   c.syntax = 'aptly-cli snapshot_diff [options]'
-  c.summary = 'Calculate difference between two snapshots --name (left) and --withsnapshot (right).'
+  c.summary = 'Calculate difference between two snapshots'
   c.description = 'Calculate difference between two snapshots, require --name, require --withsnapshot'
   c.example 'Show difference between megatronsoftware and rocksoftware snapshots', 'aptly-cli snapshot_diff --name megatronsoftware --withsnapshot rocksoftware'
   c.option '--name NAME', String, 'Local snapshot name (left)'
   c.option '--withsnapshot WITHSNAPSHOT', String, 'Snapshot to diff against (right)'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlySnapshot.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlySnapshot.new(config, options)
     puts aptly_command.snapshot_diff(options.name, options.withsnapshot)
   end
 end
@@ -313,15 +389,17 @@ command :snapshot_list do |c|
   c.example 'Return list sorted by time', 'aptly-cli snapshot_list --sort time'
   c.option '--sort', String, 'Set sort by'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlySnapshot.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlySnapshot.new(config, options)
     puts aptly_command.snapshot_list(options.sort)
   end
 end
 
 command :snapshot_search do |c|
   c.syntax = 'aptly-cli snapshot_search [options]'
-  c.summary = 'List all packages in snapshot or perform search on snapshot contents and return result'
-  c.description = 'List all packages in snapshot or perform search'
+  c.summary = 'List all packages in snapshot or perform search'
+  c.description = 'List all packages in snapshot or perform search on snapshot contents and return result'
   c.example 'List all packages in snapshot megasoftware22-snap', 'aptly-cli snapshot_search --name megasoftware22-snap'
   c.example 'List all packages in snapshot megasoftware22-snap with format set to details', 'aptly-cli snapshot_search --name megasoftware22-snap --format details'
   c.example 'Search for package called nginx in snapshot megasoftware22-snap', 'aptly-cli snapshot_search --name megasoftware22-snap --query nginx'
@@ -330,7 +408,9 @@ command :snapshot_search do |c|
   c.option '--withdeps', 'Include package dependencies'
   c.option '--format FORMAT', String, 'Format the respone of the snapshot search results, compact by default.'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlySnapshot.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlySnapshot.new(config, options)
     puts aptly_command.snapshot_search(options.name, { :query => options.query, :format => options.format, :withdeps => options.withdeps })
   end
 end
@@ -342,7 +422,9 @@ command :snapshot_show do |c|
   c.example 'Show snapshot information for repo named megatronsoftware', 'aptly-cli snapshot_show --name megatronsoftware'
   c.option '--name NAME', String, 'Local snapshot name, required'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlySnapshot.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlySnapshot.new(config, options)
     puts aptly_command.snapshot_show(options.name)
   end
 end
@@ -356,19 +438,23 @@ command :snapshot_update do |c|
   c.option '--new_name NEWNAME', String, 'New name for the snapshot'
   c.option '--description DESCRIPTION', String, 'Update description for snapshot'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlySnapshot.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlySnapshot.new(config, options)
     puts aptly_command.snapshot_update(options.name, options.new_name, options.description)
   end
 end
 
 command :graph do |c|
   c.syntax = 'aptly-cli graph [options]'
-  c.summary = 'Download a graph of repository layout.  Current options are "svg" and "png"'
-  c.description = 'Download an svg or png graph of repository layout'
+  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.option '--type GRAPH_TYPE', String, 'Type of graph to download, present options are png or svg'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlyMisc.new
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlyMisc.new(config, options)
     puts aptly_command.get_graph(options.type)
   end
 end
@@ -378,8 +464,10 @@ command :version do |c|
   c.description = 'Display aptly server version'
   c.example 'description', 'aptly-cli version'
   c.action do |args, options|
-    aptly_command = AptlyCli::AptlyMisc.new
-    puts aptly_command.get_version() 
+    config = AptlyCli::AptlyLoad.new.configure_with($config_file)
+    handle_global_options options
+    aptly_command = AptlyCli::AptlyMisc.new(config, options)
+    puts aptly_command.get_version()
   end
 end
 

data/lib/aptly_cli/version.rb

@@ -1,3 +1,3 @@
 module AptlyCli
-  VERSION = '0.2.9'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/aptly_command.rb

@@ -0,0 +1,55 @@
+class AptlyCommand
+  def initialize(config, options = nil)
+    @config = config
+    options ||= Options.new
+
+    if options.server
+      @config[:server] = options.server
+    end
+
+    if options.username
+      @config[:username] = options.username
+    end
+
+    if options.password
+      @config[:password] = options.password
+    end
+
+    if options.debug
+      @config[:debug] = options.debug
+    end
+
+    @config.each do |k, v|
+      if v == '${PROMPT}'
+        @config[k.to_sym] = ask("Enter a value for #{k}:")
+      elsif v == '${PROMPT_PASSWORD}'
+        @config[k.to_sym] = password("Enter a value for #{k}:")
+      elsif v == '${KEYRING}'
+        require 'keyring'
+
+        keyring = Keyring.new
+        value = keyring.get_password(@config[:server], @config[:username])
+
+        unless value
+          # Prompt for password...
+          value = password("Enter a value for #{k}:")
+
+          # ... and store in keyring
+          keyring.set_password(@config[:server], @config[:username], value)
+        end
+
+        @config[k.to_sym] = value
+      end
+    end
+
+    base_uri = "#{@config[:proto]}://#{@config[:server]}:#{@config[:port]}/api"
+    self.class.base_uri base_uri
+
+    if @config[:username]
+      if @config[:password]
+        self.class.basic_auth @config[:username].to_s, @config[:password].to_s
+      end
+    end
+    debug_output $stdout if @config[:debug] == true
+  end
+end

data/lib/aptly_file.rb

@@ -1,28 +1,14 @@
 require 'aptly_cli/version'
+require 'aptly_command'
 require 'aptly_load'
 require 'httmultiparty'
 
 module AptlyCli
   # Uploading file into Aptly
-  class AptlyFile
+  class AptlyFile < AptlyCommand
     include HTTMultiParty
     attr_accessor :file_uri, :package, :local_file_path
 
-    # Load aptly-cli.conf and establish base_uri
-    @config = AptlyCli::AptlyLoad.new.configure_with('/etc/aptly-cli.conf')
-    base_uri "#{@config[:proto]}://#{@config[:server]}:#{@config[:port]}/api"
-
-    if @config[:username]
-      if @config[:password]
-        basic_auth @config[:username].to_s, @config[:password].to_s
-      end
-    end
-
-    debug_output $stdout if @config[:debug] == true
-
-    def initialize(file_uri=nil, package=nil, local_file_path=nil)
-    end
-
     def file_dir
       uri = '/files'
       self.class.get uri

data/lib/aptly_load.rb

@@ -20,7 +20,7 @@ module AptlyCli
         port: 8082
       }
 
-      @valid_config_keys = @config.keys
+      @valid_config_keys = @config.keys + [:username, :password, :debug]
     end
 
     # Configure through hash
@@ -28,6 +28,8 @@ module AptlyCli
       opts.each do |k, v|
         config[k.to_sym] = v if @valid_config_keys.include? k.to_sym
       end
+
+      @config
     end
 
     # Configure through yaml file
@@ -36,7 +38,8 @@ module AptlyCli
         config = YAML.load(IO.read(path_to_yaml_file))
       rescue Errno::ENOENT
         @log.warn(
-          'YAML configuration file couldn\'t be found at /etc/aptly-cli.conf. Using defaults.')
+          "YAML configuration file couldn\'t be found at " \
+           "#{path_to_yaml_file}. Using defaults.")
         return @config
       rescue Psych::SyntaxError
         @log.warn(

data/lib/aptly_misc.rb

@@ -1,25 +1,14 @@
 require 'aptly_cli/version'
+require 'aptly_command'
 require 'aptly_load'
 require 'httmultiparty'
 require 'json'
 
 module AptlyCli
   # Misc Aptly Class
-  class AptlyMisc
+  class AptlyMisc < AptlyCommand
     include HTTMultiParty
 
-    # Load aptly-cli.conf and establish base_uri
-    @config = AptlyCli::AptlyLoad.new.configure_with('/etc/aptly-cli.conf')
-    base_uri "#{@config[:proto]}://#{@config[:server]}:#{@config[:port]}/api"
-
-    if @config[:username]
-      if @config[:password]
-        basic_auth @config[:username].to_s, @config[:password].to_s
-      end
-    end
-
-    debug_output $stdout if @config[:debug] == true
-
     def get_graph(extension)
       uri = "/graph.#{extension}"
       self.class.get(uri)

data/lib/aptly_package.rb

@@ -1,25 +1,14 @@
 require 'aptly_cli/version'
+require 'aptly_command'
 require 'aptly_load'
 require 'httmultiparty'
 require 'json'
 
 module AptlyCli
   # Aptly Package API
-  class AptlyPackage
+  class AptlyPackage < AptlyCommand
     include HTTMultiParty
 
-    # Load aptly-cli.conf and establish base_uri
-    @config = AptlyCli::AptlyLoad.new.configure_with('/etc/aptly-cli.conf')
-    base_uri "#{@config[:proto]}://#{@config[:server]}:#{@config[:port]}/api"
-
-    if @config[:username]
-      if @config[:password]
-        basic_auth @config[:username].to_s, @config[:password].to_s
-      end
-    end
-
-    debug_output $stdout if @config[:debug] == true
-
     def package_show(package_key)
       uri = "/packages/#{package_key}"
       self.class.get(uri)

data/lib/aptly_publish.rb

@@ -1,25 +1,14 @@
 require 'aptly_cli/version'
+require 'aptly_command'
 require 'aptly_load'
 require 'httmultiparty'
 require 'json'
 
 module AptlyCli
   # :nodoc:
-  class AptlyPublish
+  class AptlyPublish < AptlyCommand
     include HTTMultiParty
 
-    # Load aptly-cli.conf and establish base_uri
-    @config = AptlyCli::AptlyLoad.new.configure_with('/etc/aptly-cli.conf')
-    base_uri "#{@config[:proto]}://#{@config[:server]}:#{@config[:port]}/api"
-
-    if @config[:username]
-      if @config[:password]
-        basic_auth @config[:username].to_s, @config[:password].to_s
-      end
-    end
-
-    debug_output $stdout if @config[:debug] == true
-
     @@available_gpg_options = [:skip, :batch, :gpgKey, :keyring, :secretKeyring,
                               :passphrase, :passphraseFile]
     @@available_options_for_repo   = [:distribution, :label, :origin,

data/lib/aptly_repo.rb

@@ -1,22 +1,13 @@
 require 'aptly_cli/version'
+require 'aptly_command'
 require 'aptly_load'
 require 'httmultiparty'
 require 'json'
 
 module AptlyCli
-  # Aplty class to work with Repo API
-  class AptlyRepo
+  # Aptly class to work with Repo API
+  class AptlyRepo < AptlyCommand
     include HTTMultiParty
-    # Load aptly-cli.conf and establish base_uri
-    @config = AptlyCli::AptlyLoad.new.configure_with('/etc/aptly-cli.conf')
-    base_uri "#{@config[:proto]}://#{@config[:server]}:#{@config[:port]}/api"
-
-    if @config[:username]
-      if @config[:password]
-        basic_auth @config[:username].to_s, @config[:password].to_s
-      end
-    end
-    debug_output $stdout if @config[:debug] == true
 
     def repo_create(repo_options = { name: nil,
                                      comment: nil,

data/lib/aptly_snapshot.rb

@@ -1,25 +1,14 @@
 require 'aptly_cli/version'
+require 'aptly_command'
 require 'aptly_load'
 require 'httmultiparty'
 require 'json'
 
 module AptlyCli
-  # Aplty class to work with Snapshot API
-  class AptlySnapshot
+  # Aptly class to work with Snapshot API
+  class AptlySnapshot < AptlyCommand
     include HTTMultiParty
 
-    # Load aptly-cli.conf and establish base_uri
-    @config = AptlyCli::AptlyLoad.new.configure_with('/etc/aptly-cli.conf')
-    base_uri "#{@config[:proto]}://#{@config[:server]}:#{@config[:port]}/api"
-
-    if @config[:username]
-      if @config[:password]
-        basic_auth @config[:username].to_s, @config[:password].to_s
-      end
-    end
-
-    debug_output $stdout if @config[:debug] == true
-
     def snapshot_delete(name, force=nil)
       uri = "/snapshots/#{name}"
       uri += '?force=1' if force == true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptly_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Zane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,7 @@ files:
 - bin/setup
 - lib/aptly_cli.rb
 - lib/aptly_cli/version.rb
+- lib/aptly_command.rb
 - lib/aptly_file.rb
 - lib/aptly_load.rb
 - lib/aptly_misc.rb