aptly-cli in aptly_cli-0.2.7

- old
+ new

@@ -87,11 +87,11 @@
 
 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.example 'Change default distribution', '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|
@@ -180,11 +180,11 @@
 
 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.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
@@ -205,23 +205,23 @@
 
 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 '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'
   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 '--name NAME', Array, 'Local repository name with optional component, required'
   c.option '--sourcekind SOURCEKIND', String, 'Local for local repositories and snapshot for snapshots, required'
   c.option '--prefix PREFIX', String, 'prefix'
   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', 'when publishing, overwrite files in pool/ directory without notice'
-  c.option '--architectures ARCHITECTURES', String, 'override list of published architectures'
+  c.option '--architectures ARCHITECTURES', Array, '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)'
@@ -254,13 +254,14 @@
   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|
     aptly_command = AptlyCli::AptlyPublish.new
-    puts aptly_command.publish_update(options.snapshots, { :prefix => options.prefix, :distribution => options.distribution, :forceoverwrite => options.forceoverwrite,
+    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,
-                                                    :passphrase => options.gpg_passphrase, :passphraseFile => options.gpg_passphrase_file })
+                                                    :passphrase => options.gpg_passphrase, :passphraseFile => options.gpg_passphrase_file,
+                                                    :snapshots => options.snapshots})
   end
 end
 
 command :snapshot_create do |c|
   c.syntax = 'aptly-cli snapshot_create [options]'