aptly_cli 0.0.2 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzYwM2FhMDFmMTM2YWI5NjFkY2JmMDE4YjY4Yzk0Y2VmNDRmMmExOA==
+    ZWUyN2Q1NGNjNGY5MDNlMTcwNDI5ODdjMjg5ODcyMDY5NmFlOTY0Yg==
   data.tar.gz: !binary |-
-    ZjQ5NjZlYTJkZGYxYzcxOWMwZjlkZTAxNjZjMTA1NmEyNDFiOGQ5ZQ==
+    MTFkNTg3MmU0NWI0ZTA5OTAxN2ZkZmJlYTVmZDY2ZTEzZDI0ZWYyMw==
 SHA512:
   metadata.gz: !binary |-
-    MTk3YTY3ODc2NWVjZjk1ZTRiYjZhODgzOTA3NjlhMTZlYmZlMWMzZDRmZTg4
-    NzJmYzM2MDExMjEzODkwMWQ0MTI2NTlmNjllZTVlMzBkNmY5ZTQxMGQxMjY3
-    NWZjNDMxNGViMTc5NzBiY2I4MGE2NzY4ZWViNDRiY2Y1Zjk4ZjE=
+    MDNmNDU0NGU1YTczYTc1NGNkNmEwMTA2ZmY4NzFkMWNiMmU2ZTVlMjJmZjg4
+    N2RiNTQ1MjQzOTRjMjFlNzZjZGZiNTQ3MWM3NDBkOTZmOWFjMmI1YTk2OTI2
+    MjUzYmIxODhiNzAxM2U1YTNhYTkyYzRjOWZiMjc4MmM3NTM4MWE=
   data.tar.gz: !binary |-
-    M2QzOWUyZjdjNDZlNjZjOWJlMDFmNTlmZWNkNWFjODVlY2I5OTkxZjY0OTcx
-    ZGM0M2RhYmNlMzNhZGMwMjNiNmNkOWQ4MTVmMmIxY2RjYmZmMDNkMDA5ZWM2
-    OTk0M2EwZWY4N2Q4ZWZhNDEzYmZlMDZiOTg2NjNiODRkYzQzZjE=
+    NzdmZjI0N2M5NzFlMTdiNzI2MDBjNjFiNWYyNTExYjI2OGI0YWY2YTZjMjVm
+    NWI4ZGI2OTE5ZWUzZjg3NWUzMjQ4MjBhYTgwNDI2NzY5YzkwYjRhMWY0ZTgy
+    M2M5NDkxNjJjYjFlMDI2YjE0Nzk1YjFlZDI3OWRmNjk1NTk1Mjk=

data/README.md

@@ -2,15 +2,13 @@
 
 [![Build Status](https://travis-ci.org/sepulworld/aptly_cli.svg)](https://travis-ci.org/sepulworld/aptly_cli)
 
-A command line interace to execute Aptly commands againts a remote Aptly API server.  Aptly-cli will allow you to interact with the repo, snapshot, publish, packages, graph and version API endpoints of your Aptly server.
+A command line interace to execute Aptly 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:
 
-```ruby
-gem 'aptly_cli'
-```
+    $ ruby gem 'aptly_cli'
 
 And then execute:
 
@@ -22,62 +20,121 @@ Or install it yourself as:
 
 ## Usage
 
-###    aptly-cli file [options]
+###    aptly-cli file_list [options]
+  
+  NAME:
+
+    file_list
+
+  SYNOPSIS:
+
+    aptly-cli file_list [options]
 
   DESCRIPTION:
 
-All uploaded files are stored under rootDir/upload directory (see your Aptly configuration). This directory would be created automatically if it doesn’t exist. Uploaded files are grouped by directories to support concurrent uploads from multiple package sources. Local repos add API can operate on directory (adding all files from directory) or on individual package files. By default, all successfully added package files would be removed.
+List all directories that contain uploaded files
 
   EXAMPLES:
 
-    # List of directories or files
-    aptly-cli file --list /
-    geoipupdate_2.0.0_amd64.deb
-    geoipupdate_2.0.0_i386.deb
-    mongo
-    mongodb-mms-monitoring-agent_latest_i386.deb
-    redis
-    redis-server_2.8.3_amd64-cc1.deb
-    test
-    xsp_2.11.0.0-git-master-04062013_i386.deb     
-
-    # Upload file to a directory
-    aptly-cli file --upload /tmp/redis/test_1.0_amd64.deb --dest_uri /redis
-    test/test_1.0_amd64.deb
-
-    # Delete file or directory
-    aptly-cli file --delete /redis/test_1.0_amd64.deb
-    {}
+    # List all directories for file uploads
+    aptly-cli file_list
+    # List all files in redis directory
+    aptly-cli file_list --directory redis
 
   OPTIONS:
 
-    --list URI_FILE_PATH
-        URI path to list files
+    --directory DIRECTORY
+        Directory to list on server
 
-    --upload LOCAL_FILE_PATH/PACKAGE
-        Path to package to upload
+###    aptly-cli file_upload [options]
+ 
+  NAME:
 
-    --dest_uri URI_FILE_PATH
-        URI path to directory to upload into
+    file_upload
 
-    --delete URI_FILE_PATH/PACKAGE
-        URI path to directory to delete or specific package
+  SYNOPSIS:
 
-###     aptly-cli repo [options]
+    aptly-cli file_upload [options]
 
-TODO
+  DESCRIPTION:
 
-###     aptly-cli snapshot [options]
+    File upload
 
-TODO
+  EXAMPLES:
 
-###     aptly-cli publish [options]
+    # upload file package.deb to apt server inside directory /aptlyserver_directory/
+    aptly-cli file_upload --upload /local/copy/of/package.deb --directory /aptlyserver_directory/
 
-TODO
+  OPTIONS:
+
+    --directory DIRECTORY
+        Directory to load packages into
+
+    --upload UPLOAD
+        Package(s) to upload
+
+###     aptly-cli file_delete [options]
+
+  NAME:
+
+    file_delete
+
+  SYNOPSIS:
+
+    aptly-cli file_delete [options]
+
+  DESCRIPTION:
+
+    File delete
+
+  EXAMPLES:
 
+    # Delete package redis-server found in redis upload directory
+    aptly-cli file_delete --target /redis/redis-server_2.8.3_i386-cc1.deb
+
+  OPTIONS:
+
+    --target TARGET
+        Path to directory or specific package to delete
+
+###     aptly-cli repo_create [options]
+
+  NAME:
+
+    repo_create
+
+  SYNOPSIS:
+
+    aptly-cli repo_create [options]
+
+  DESCRIPTION:
+
+    Create a new repository, requires --name
+    
+  EXAMPLES:
+
+    # creat repo
+    aptly-cli repo_create --name megatronsoftware
+    # creat repo with distribution set to 'trusty'
+    aptly-cli repo_create --name megatronsoftware --default_distribution trusty
+
+  OPTIONS:
+
+    --name NAME
+        Local repository name, required
+
+    --comment COMMENT
+        Text describing local repository for the user
+
+    --default_distribution DISTRIBUTION
+        Default distribution when publishing from this local repo
+
+
+    --default_component COMPONENT
+        Default component when publishing from this local repo
 ###     aptly-cli package [options]
 
-TODO
+functions, fixtures, tests done.  Need to add to bin/aptly-cli and document
 
 ###     aptly-cli graph [options]
 

data/bin/aptly-cli

@@ -4,82 +4,271 @@ require 'rubygems'
 require 'commander/import'
 require 'aptly_cli'
 
-program :version, '0.0.1'
+program :version, '0.1.1'
 program :description, 'Aptly repository API client'
 
-command :file do |c|
-  c.syntax = 'aptly-cli file [options]'
-  c.summary = 'Upload package files temporarily to aptly service'
-  
-  c.description = 'All uploaded files are stored under <rootDir>/upload directory (see configuration). This directory would be created automatically if it doesn’t exist. Uploaded files are grouped by directories to support concurrent uploads from multiple package sources. Local repos add API can operate on directory (adding all files from directory) or on individual package files. By default, all successfully added package files would be removed.'
+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.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
+    if options.directory
+      puts aptly_command.file_get(options.directory)
+    else
+      puts aptly_command.file_dir()
+    end
+  end
+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.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
+    puts aptly_command.file_post(:file_uri => options.directory, :package => options.upload, :local_file => options.upload)
+  end
+end
 
-  c.example 'List of directories or files', 'aptly-cli file --list / or aptly-cli file --list /redis'
-  c.example 'Upload file to a directory', 'aptly-cli file --upload /tmp/redis/test_1.0_amd64.deb --dest_uri /redis'
-  c.example 'Delete file or directory', 'aptly-cli file --delete /test/test_1.0_amd64.deb'
-  c.option '--list URI_FILE_PATH', String, 'URI path to list files'
-  c.option '--upload LOCAL_FILE_PATH/PACKAGE', String, 'Path to package to upload'
-  c.option '--dest_uri URI_FILE_PATH', String, 'URI path to directory to upload into'
-  c.option '--delete URI_FILE_PATH/PACKAGE', String, 'URI path to directory to delete or specific package'
+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.option '--target TARGET', String, 'Path to directory or specific package to delete'
   c.action do |args, options|
     aptly_command = AptlyCli::AptlyFile.new
-    puts aptly_command.file_get(options.list) if options.list
-    puts aptly_command.file_post(:file_uri => options.dest_uri, :package => options.upload, :local_file => options.upload) if options.upload and options.dest_uri
-    puts aptly_command.file_delete(options.delete) if options.delete
+    puts aptly_command.file_delete(options.target)
+  end
+end
+
+command :repo_create do |c|
+  c.syntax = 'aptly-cli repo_create [options]'
+  c.summary = 'Create a new repository, requires --name'
+  c.description = 'Create a new repository, requires --name'
+  c.example 'create repo', 'aptly-cli repo_create --name meagasoftware'
+  c.example 'creat repo with distribution set to "trusty"', 'aptly-cli repo_create --name megatronsoftware --default_distribution trusty'
+  c.option '--name NAME', String, 'Local repository name, required'
+  c.option '--comment COMMENT', String, 'Text describing local repository for the user'
+  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
+    aptly_command = AptlyCli::AptlyRepo.new
+    repo_options = { :name => options.name.to_s, 
+                     :comment => options.comment.to_s, 
+                     :DefaultDistribution => options.default_distribution.to_s,
+                     :DefaultComponent => options.default_component.to_s }
+    puts aptly_command.repo_create(repo_options)
+  end
+end
+
+command :repo_delete do |c|
+  c.syntax = 'aptly-cli repo_delete [options]'
+  c.summary = 'Delete a local repository, requires --name'
+  c.description = 'Delete a local repository, requires --name'
+  c.example 'description', 'aptly-cli repo_delete --name megatronsoftware'
+  c.option '--name NAME', String, 'Local repository name, required'
+  c.option '--force'
+  c.action do |args, options|
+    aptly_command = AptlyCli::AptlyRepo.new
+    repo_options = { :name => options.name.to_s, 
+                     :force => options.force.to_s }
+    puts aptly_command.repo_delete(repo_options)
+  end
+end
+
+command :repo_edit do |c|
+  c.syntax = 'aptly-cli repo_edit [options]'
+  c.summary = 'Edit a local repository metadata, requires --name'
+  c.description = 'Edit a local repository metadata, requires --name'
+  c.example 'description', 'aptly-cli repo_edit --name megatronsoftware --default_distribution trusty'
+  c.option '--name NAME', String, 'Local repository name, required'
+  c.option '--comment COMMENT', String, 'Edit repository comment'
+  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
+    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)
+  end
+end
+
+command :repo_list do |c|
+  c.syntax = 'aptly-cli repo_list [options]'
+  c.summary = 'Show list of currently available local repositories'
+  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
+    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.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
+    if options.query
+      repo_options = { :name => options.name.to_s, :query => options.query.to_s }
+    elsif options.with_deps and options.query.nil?
+      repo_options = { :name => options.name.to_s, :with_deps => options.with_deps.to_s }
+    elsif options.format and options.query.nil?
+      repo_options = { :name => options.name.to_s, :format => options.format.to_s }
+    else
+      repo_options = { :name => options.name.to_s }
+    end
+    puts aptly_command.repo_package_query(repo_options)
+  end
+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.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'
+  c.option '--file FILE', String, 'Specific file to upload, if not provided the entire directory of files will be uploaded'
+  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
+    puts aptly_command.repo_upload({ :name => options.name, :dir => options.dir,
+                                     :file => options.file, :noremove => options.noremove,
+                                     :forcereplace => options.forcereplace })
+  end
+end
+
+command :repo_show do |c|
+  c.syntax = 'aptly-cli repo_show [options]'
+  c.summary = 'Returns basic information about local repository'
+  c.description = 'Returns basic information about local repository, require --name'
+  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
+    puts aptly_command.repo_show(options.name)
   end
 end
 
-command :repo do |c|
-  c.syntax = 'aptly-cli repo [options]'
-  c.summary = ''
-  c.description = ''
-  c.example 'description', 'command example'
-  c.option '--some-switch', 'Some switch that does something'
+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.example 'Delete publish repository called ', 'aptly-cli repo_list'
+  c.option '--prefix', String, 'prefix, optional'
+  c.option '--distribution', String, 'distribution'
+  c.option '--force', 'force published repository removal even if component cleanup fails'
   c.action do |args, options|
-    # Do something or c.when_called Aptly-cli::Commands::Repo
+    aptly_command = AptlyCli::AptlyPublish.new
+    puts aptly_command.publish_drop({ :prefix => options.prefix, :distribution => options.distribution, :force => options.force })
   end
 end
 
-command :snapshot do |c|
-  c.syntax = 'aptly-cli snapshot [options]'
-  c.summary = ''
-  c.description = ''
-  c.example 'description', 'command example'
-  c.option '--some-switch', 'Some switch that does something'
+command :publish_list do |c|
+  c.syntax = 'aptly-cli publish_list [options]'
+  c.summary = 'List published repositories.'
+  c.description = 'List published repositories.'
+  c.example 'List published repositories', 'aptly-cli publish_list'
   c.action do |args, options|
-    # Do something or c.when_called Aptly-cli::Commands::Snapshot
+    aptly_command = AptlyCli::AptlyPublish.new
+    puts aptly_command.publish_list()
   end
 end
 
-command :publish do |c|
-  c.syntax = 'aptly-cli publish [options]'
-  c.summary = ''
-  c.description = ''
-  c.example 'description', 'command example'
-  c.option '--some-switch', 'Some switch that does something'
+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.example 'description', 'aptly-cli publish_repo --sourcekind local --name precise/megatronsoftware trusty/rocksoftware22 --architectures i386 amd64'
+  c.example 'description', 'aptly-cli publish_repo --sourcekind local --name megatronsoftware --architectures i386 amd64 --forceoverwrite true'
+  c.example 'description', 'aptly-cli publish_repo --sourcekind snapshot --name precise/rocksoftware300 --label test_snap'
+  c.example 'description', 'aptly-cli publish_repo --sourcekind snapshot --name precise/rocksoftware300 --origin testorigin'
+  c.example 'publish repo with signing keyring', 'aptly-cli publish_repo --sourcekind snapshot --name precise/rocksoftware300 --origin testorigin --gpg_keyring /etc/apt/trustdb.gpg'
+  c.option '--name NAME', String, 'Local repository name with optional component, required'
+  c.option '--sourcekind SOURCEKIND', String, 'Local for local repositories and snapshot for snapshots, required'
+  c.option '--distribution DISTRIBUTION', String, 'Distribution name, if missing aptly would try to guess from sources'
+  c.option '--label LABEL', String, 'value of Label: field in published repository stanza'
+  c.option '--origin ORIGIN', String, 'value of Origin: field in published repository stanza'
+  c.option '--forceoverwrite FORCEOVERWRITE', String, 'when publishing, overwrite files in pool/ directory without notice'
+  c.option '--architectures ARCHITECTURES', String, 'override list of published architectures'
+  c.option '--gpg_skip', 'Don’t sign published repository'
+  c.option '--gpg_batch', 'should be set if passing passphrase'
+  c.option '--gpg_key GPGKEY', String, 'gpg key name (local to aptly server/user)'
+  c.option '--gpg_keyring GPGKEYRING', String, 'gpg keyring filename (local to aptly server/user)'
+  c.option '--gpg_secret_keyring GPGSECRET', String, 'gpg secret keyring filename (local to aptly server/user)'
+  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|
-    # Do something or c.when_called Aptly-cli::Commands::Publish
+    aptly_command = AptlyCli::AptlyPublish.new
+    puts aptly_command.publish_repo(options.name, { :sourcekind => options.sourcekind, :label => options.label, :distribution => options.distribution,
+                                                    :origin => options.origin, :forceoverwrite => options.forceoverwrite,
+                                                    :architectures => options.architectures, :skip => options.gpg_skip, :batch => options.gpg_batch,
+                                                    :gpgKey => options.gpg_key, :keyring => options.gpg_keyring, :secretKeyring => options.gpg_secret_keyring,
+                                                    :passphrase => options.gpg_passphrase, :passphraseFile => options.gpg_passphrase_file })
   end
 end
 
-command :package do |c|
-  c.syntax = 'aptly-cli package [options]'
-  c.summary = ''
-  c.description = ''
-  c.example 'description', 'command example'
-  c.option '--some-switch', 'Some switch that does something'
+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.example 'description', 'aptly-cli publish_update --sourcekind snapshot --name precise/rocksoftware300 --origin testorigin'
+  c.option '--prefix PREFIX', String, 'Publishing prefix, default root'
+  c.option '--distribution DISTRIBUTION', String, 'Distribution name'
+  c.option '--snapshots SNAPSHOTS', String, 'When updating published snapshots, list of objects component/name seperated by space'
+  c.option '--forceoverwrite FORCEOVERWRITE', String, 'When publishing, overwrite files in pool/ directory without notice'
+  c.option '--gpg_skip', 'Don’t sign published repository'
+  c.option '--gpg_batch', 'should be set if passing passphrase'
+  c.option '--gpg_key GPGKEY', String, 'gpg key name (local to aptly server/user)'
+  c.option '--gpg_keyring GPGKEYRING', String, 'gpg keyring filename (local to aptly server/user)'
+  c.option '--gpg_secret_keyring GPGSECRET', String, 'gpg secret keyring filename (local to aptly server/user)'
+  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|
-    # Do something or c.when_called Aptly-cli::Commands::Package
+    aptly_command = AptlyCli::AptlyPublish.new
+    puts aptly_command.publish_update(options.snapshots, { :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,
+                                                    :passphrase => options.gpg_passphrase, :passphraseFile => options.gpg_passphrase_file })
   end
 end
 
 command :graph do |c|
   c.syntax = 'aptly-cli graph [options]'
-  c.summary = ''
-  c.description = ''
-  c.example 'description', 'command example'
-  c.option '--some-switch', 'Some switch that does something'
+  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.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|
-    # Do something or c.when_called Aptly-cli::Commands::Graph
+    aptly_command = AptlyCli::AptlyMisc.new
+    puts aptly_command.get_graph(options.type)
   end
 end
 
@@ -88,7 +277,8 @@ command :version do |c|
   c.description = 'Display aptly server version'
   c.example 'description', 'aptly-cli version'
   c.action do |args, options|
-    # Do something or c.when_called Aptly-cli::Commands::Version
+    aptly_command = AptlyCli::AptlyMisc.new
+    puts aptly_command.get_version() 
   end
 end
 

data/lib/aptly_cli/version.rb

@@ -1,3 +1,3 @@
 module AptlyCli
-  VERSION = "0.0.2"
+  VERSION = "0.1.1"
 end

data/lib/aptly_file.rb

@@ -15,11 +15,16 @@ module AptlyCli
     def initialize(file_uri=nil, package=nil, local_file_path=nil)
     end
 
+    def file_dir()
+      uri = "/files"
+      self.class.get uri
+    end
+
     def file_get(file_uri)
       if file_uri == "/"
         uri = "/files"
       else
-        uri = "/files" + file_uri
+        uri = "/files/" + file_uri
       end
       
       self.class.get uri 

data/lib/aptly_misc.rb

@@ -0,0 +1,26 @@
+require "aptly_cli/version"
+require "aptly_load"
+require "httmultiparty"
+require "json"
+
+module AptlyCli
+  class AptlyMisc
+
+    include HTTMultiParty
+
+    # Load aptly-cli.conf and establish base_uri
+    config = AptlyCli::AptlyLoad.new.configure_with("/etc/aptly-cli.conf")
+    base_uri "http://#{config[:server]}:#{config[:port]}/api"
+
+    def get_graph(extension)
+      uri = "/graph.#{extension}"
+      self.class.get(uri)
+    end
+
+    def get_version()
+      uri = "/version"
+      self.class.get(uri)
+    end
+
+  end
+end

data/lib/aptly_package.rb

@@ -0,0 +1,21 @@
+require "aptly_cli/version"
+require "aptly_load"
+require "httmultiparty"
+require "json"
+
+module AptlyCli
+  class AptlyPackage
+
+    include HTTMultiParty
+
+    # Load aptly-cli.conf and establish base_uri
+    config = AptlyCli::AptlyLoad.new.configure_with("/etc/aptly-cli.conf")
+    base_uri "http://#{config[:server]}:#{config[:port]}/api"
+
+    def package_show(package_key)
+      uri = "/packages/#{package_key}"
+      self.class.get(uri)
+    end
+
+  end
+end

data/lib/aptly_publish.rb

@@ -0,0 +1,137 @@
+require "aptly_cli/version"
+require "aptly_load"
+require "httmultiparty"
+require "json"
+
+module AptlyCli
+  class AptlyPublish
+
+    include HTTMultiParty
+
+    # Load aptly-cli.conf and establish base_uri
+    config = AptlyCli::AptlyLoad.new.configure_with("/etc/aptly-cli.conf")
+    base_uri "http://#{config[:server]}:#{config[:port]}/api"
+
+    @@available_gpg_options = [ :skip, :batch, :gpgKey, :keyring, :secretKeyring, 
+                               :passphrase, :passphraseFile ]
+
+    @@available_options_for_repo   = [ :distribution, :label, :origin, :forceoverwrite, :architectures, ]
+    @@available_options_for_update = [ :prefix, :distribution, :forceoverwrite, ]
+
+    def publish_drop(publish_options={})
+      uri = "/publish"
+      
+      if publish_options[:prefix]
+        uri = uri + "/#{publish_options[:prefix]}"
+      end
+      
+      uri = uri + "/#{publish_options[:distribution]}"
+
+      if publish_options[:force] == true 
+        uri = uri + "?force=1"
+      end
+      
+      self.class.delete(uri)
+    end
+
+    def publish_list()
+      uri = "/publish"
+      self.class.get(uri)
+    end
+    
+    def parse_names(names, label_type)
+      repos_to_publish = Array.new
+      if names.is_a? String
+        names = [names] 
+      end
+
+      names.each do |k|
+        if k.include? "/"
+          repo, component = k.split("/")
+          repos_to_publish << {"#{label_type}" => component, "Component" => repo }
+        else
+          repos_to_publish << {"#{label_type}" => k}
+        end
+      end
+      
+      return repos_to_publish
+    end
+    
+    def parse_gpg_options(available_gpg_options, publish_options)
+      gpg_options = {}
+      available_gpg_options.each do |option|
+        if publish_options.has_key?(option)
+          unless publish_options[option].nil?
+            gpg_options.merge!("#{option.capitalize}" => "#{publish_options[option]}")
+          end
+        end
+      end
+
+      return gpg_options
+    end
+    
+    def build_body(available_options_for_func, publish_options, body)
+      available_options_for_func.each do |option|
+        if publish_options.has_key?(option)
+          body[option.capitalize] = publish_options[option]
+        end
+      end
+
+      return body
+    end
+
+    def publish_repo(names, publish_options={})
+      uri = "/publish"
+      label_type = "Name"
+      repos = self.parse_names(names, label_type)
+      gpg_options = self.parse_gpg_options(@@available_gpg_options, publish_options)
+
+      @body = {}
+      @body[:SourceKind] = publish_options[:sourcekind]
+      @body[:Sources] = repos
+      build_body(@@available_options_for_repo, publish_options, @body)
+      
+      unless gpg_options.empty?
+        @body[:Signing] = gpg_options
+      end
+      
+      if publish_options[:prefix]
+        uri = uri + publish_options[:prefix]
+      end
+     
+      @body_json = @body.to_json
+
+      self.class.post(uri, :headers => { 'Content-Type'=>'application/json' }, :body => @body_json)
+
+    end
+
+    def publish_update(snapshots=[], publish_options={})
+      uri = "/publish"
+      label_type = "Snapshots"
+      gpg_options = self.parse_gpg_options(@@available_gpg_options, publish_options)
+      @body = {}
+      
+      unless snapshots.nil?
+        snapshots = self.parse_names(snapshots, label_type)
+        @body[:Snapshots] = snapshots
+      end
+
+      build_body(@@available_options_for_update, publish_options, @body)
+      
+      if publish_options[:prefix]
+        uri = uri + "/#{publish_options[:prefix]}"
+      else 
+        uri = uri + "/"
+      end
+      
+      uri = uri + "/#{publish_options[:distribution]}"
+
+      @body_json = @body.to_json
+
+      self.class.put(uri, :headers => { 'Content-Type'=>'application/json' }, :body => @body_json)
+
+    end
+
+
+  end
+end

data/lib/aptly_repo.rb

@@ -0,0 +1,144 @@
+require "aptly_cli/version" 
+require "aptly_load"
+require "httmultiparty"
+require "json"
+
+module AptlyCli
+  class AptlyRepo
+  
+    include HTTMultiParty
+    
+    # Load aptly-cli.conf and establish base_uri
+    config = AptlyCli::AptlyLoad.new.configure_with("/etc/aptly-cli.conf")
+    base_uri "http://#{config[:server]}:#{config[:port]}/api"
+
+    def repo_create(repo_options = {:name => nil, :comment => nil, :DefaultDistribution => nil, :DefaultComponent => nil})
+      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 => { 'Name' => name, 'Comment' => comment, 'DefaultDistribution' => default_distribution, 'DefaultComponent' => default_component }.to_json, :headers => {'Content-Type'=>'application/json'}) 
+    end
+
+    def repo_delete(repo_options = {:name => nil, :force => nil})
+      uri = "/repos/" + repo_options[:name]
+      
+      if repo_options[:force] == true 
+        uri = uri + "?force=1"
+      end
+
+      self.class.delete(uri)
+    end
+
+    def repo_edit(name, repo_options = { k => v })
+      repo_option = String.new
+      repo_value = String.new 
+      
+      if name == nil
+        raise ArgumentError.new('Must pass a repository name')
+      else
+        uri = "/repos/" + name
+      end
+
+      repo_options.each do |k, v|
+        repo_option = k
+        repo_value = v
+      end
+
+      self.class.put(uri, :query => { repo_option => repo_value }.to_json, :headers => {'Content-Type'=>'application/json'})
+    end
+
+    def repo_list()
+      uri = "/repos"
+      
+      self.class.get(uri)
+    end
+    
+    def repo_package_query(repo_options = {:name => nil, :query => nil, :withdeps => false, :format => nil})
+      if repo_options[:name] == nil
+        raise ArgumentError.new('Must pass a repository name')
+      else
+        uri = "/repos/" + repo_options[:name] + "/packages"
+      end
+
+      if repo_options[:query]
+        uri = uri + "?q=" + repo_options[:query]
+        if repo_options[:withdeps] or repo_options[:format]
+          puts "When specifiying specific package query, other options are invalid."
+        end 
+      elsif repo_options[:format]
+        uri = uri + "?format=#{repo_options[:format]}"
+      elsif repo_options[:withdeps] == true
+        uri = uri + "?withDeps=1"
+      end
+
+      self.class.get uri 
+
+    end
+
+    def repo_show(name)
+      if name == nil
+        uri = "/repos"
+      else
+        uri = "/repos/" + name 
+      end
+      
+      self.class.get uri 
+    end
+
+    def repo_upload(repo_options = {:name => nil, :dir => nil, :file => nil, 
+                                    :noremove => false, :forcereplace => false})
+
+      name = repo_options[:name]
+      dir  = repo_options[:dir]
+      file = repo_options[:file]
+      noremove = repo_options[:noremove]
+      forcereplace = repo_options[:forcereplace]
+
+      if file == nil 
+        uri = "/repos/#{name}/file/#{dir}"
+      else
+        uri = "/repos/#{name}/file/#{dir}/#{file}"
+      end
+
+      if forcereplace == true 
+        uri = uri + "?forceReplace=1"
+      end
+      
+      if noremove == true 
+        uri = uri + "?noRemove=1"
+      end
+      
+      response = self.class.post(uri)
+      
+      case response.code
+        when 404
+          puts 'repository with such name does not exist'
+      end
+
+      json_response = JSON.parse(response.body)
+      
+      unless json_response["failedFiles"].empty?
+        begin
+        rescue StandardError => e
+          puts "Files that failed to upload... #{json_response["failedFiles"]}"
+          puts e
+        end
+      end
+
+      unless json_response["report"]["warnings"].empty?
+        begin
+        rescue StandardError => e
+          puts "File upload warning message[s]...#{json_response["report"]["warnings"]}"
+          puts e
+        end
+      end
+      
+      return response
+
+    end 
+
+  end
+end

data/lib/aptly_snapshot.rb

@@ -0,0 +1,100 @@
+require "aptly_cli/version"
+require "aptly_load"
+require "httmultiparty"
+require "json"
+
+module AptlyCli
+  class AptlySnapshot
+
+    include HTTMultiParty
+
+    # Load aptly-cli.conf and establish base_uri
+    config = AptlyCli::AptlyLoad.new.configure_with("/etc/aptly-cli.conf")
+    base_uri "http://#{config[:server]}:#{config[:port]}/api"
+
+    def snapshot_delete(name, force=0)
+      uri = "/snapshots/#{name}"
+
+      if force == 1
+        uri = uri + "?force=1"
+      end
+
+      self.class.delete(uri)
+    end
+
+    def snapshot_list(sort=nil)
+      uri = "/snapshots"
+
+      if sort 
+        uri = uri + "?sort=#{sort}"
+      end
+
+      self.class.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 => { 'Name' => name, 'Description' => description }.to_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, 
+                                         'SourceSnapshots' => sourcesnapshots,
+                                         'PackageRefs' => packagerefs }.to_json,
+                             :headers => {'Content-Type'=>'application/json'})
+      rescue HTTParty::Error => e
+        return e
+      end
+
+    end
+
+    def snapshot_diff(name, with_snapshot)
+      uri = "/snapshots/#{name}/diff/#{with_snapshot}"
+      self.class.get(uri)
+    end
+
+    def snapshot_search(name, search_options={})
+      uri = "/snapshots/#{name}/packages"
+      @options = { query: {} } 
+
+      if search_options.has_key?(:format)
+        @options[:query] = {format: "#{search_options[:format]}" }
+      end
+
+      if search_options.has_key?(:q)
+        @options[:query] = {q: "Name (~ #{search_options[:q]})" }
+      end
+
+      if search_options[:withDeps] == 1
+        @options[:query] = {withDeps:  "1" }
+      end
+
+      self.class.get(uri, @options)
+
+    end
+
+    def snapshot_show(name)
+      uri = "/snapshots/#{name}"
+      self.class.get(uri)
+    end
+
+    def snapshot_update(name, name_update, description=nil)
+      uri = "/snapshots/#{name}"
+
+      begin
+        self.class.put(uri, :query => { 'Name' => name_update,
+                                        'Description' => description }.to_json,
+                            :headers => {'Content-Type'=>'application/json'})
+      rescue HTTPary::Error => e
+        puts e 
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptly_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - Zane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,6 +130,11 @@ files:
 - lib/aptly_cli/version.rb
 - lib/aptly_file.rb
 - lib/aptly_load.rb
+- lib/aptly_misc.rb
+- lib/aptly_package.rb
+- lib/aptly_publish.rb
+- lib/aptly_repo.rb
+- lib/aptly_snapshot.rb
 homepage: https://github.com/sepulworld/aptly_cli
 licenses:
 - MIT