kontena-cli 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16045824a8737f120ba0e57060bc936312d24c49
-  data.tar.gz: 8e71615acaa226eef9abb0c4dc2248e0b707a049
+  metadata.gz: efd68ade38b20ae04c82f0a2e8f8e46a89246c37
+  data.tar.gz: 99e574e391c502e13d546fe93b11c44c325435f0
 SHA512:
-  metadata.gz: c2da530ae315278855bbb2c3e95c5acb29977f2f27ecac14eb3cf7834c4d08fb31a47da836b0e7d22b451b49896c46f8a328d4b6a4931350fd668e9dddbd8232
-  data.tar.gz: c8cba0fcfab582c66dc604b660680a3625b939e0f55e5bdfebada0be318c26615716e917452e40fb61ff3ec28c985853f55ffa1c0af8640db198d147924270f0
+  metadata.gz: ad488d3b1d339f22bad5c7f873139c690ad6e46461cc45c6e78c778ccf9062698fb6619c6ddc8cf36ec271274b415a58a45b8b6e8516f6865f67d12ef195f9cd
+  data.tar.gz: 4638b07f4a4f45112fc1d1a4e4874500ecb3978496bc85a5e4a9cdf48485d9baef774461da07c048ae4a87de7555ffb9932c8502fe2ed5b91617ce9016129544

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/lib/kontena/cli/registry/create_command.rb

@@ -36,27 +36,27 @@ module Kontena::Cli::Registry
         abort('--s3-secret-key is missing') if s3_secret_key.nil?
         abort('--s3-bucket is missing') if s3_bucket.nil?
         env = [
-          "REGISTRY_STORAGE=s3",
-          "REGISTRY_STORAGE_S3_ACCESSKEY=#{opts.s3_access_key}",
-          "REGISTRY_STORAGE_S3_SECRETKEY=#{opts.s3_secret_key}",
-          "REGISTRY_STORAGE_S3_REGION=#{s3_region}",
-          "REGISTRY_STORAGE_S3_BUCKET=#{opts.s3_bucket}",
-          "REGISTRY_STORAGE_S3_ENCRYPT=#{s3_encrypt}",
-          "REGISTRY_STORAGE_S3_SECURE=#{s3_secure}",
+            "REGISTRY_STORAGE=s3",
+            "REGISTRY_STORAGE_S3_ACCESSKEY=#{s3_access_key}",
+            "REGISTRY_STORAGE_S3_SECRETKEY=#{s3_secret_key}",
+            "REGISTRY_STORAGE_S3_REGION=#{s3_region}",
+            "REGISTRY_STORAGE_S3_BUCKET=#{s3_bucket}",
+            "REGISTRY_STORAGE_S3_ENCRYPT=#{s3_encrypt?}",
+            "REGISTRY_STORAGE_S3_SECURE=#{s3_secure?}",
         ]
       elsif azure_account_name || azure_account_key
         abort('--azure-account-name is missing') if azure_account_name.nil?
         abort('--azure-account-key is missing') if azure_account_key.nil?
         abort('--azure-container-name is missing') if azure_container_name.nil?
         env = [
-          "REGISTRY_STORAGE=azure",
-          "REGISTRY_STORAGE_AZURE_ACCOUNTNAME=#{opts.azure_account_name}",
-          "REGISTRY_STORAGE_AZURE_ACCOUNTKEY=#{opts.azure_account_key}",
-          "REGISTRY_STORAGE_AZURE_CONTAINERNAME=#{opts.azure_container_name}"
+            "REGISTRY_STORAGE=azure",
+            "REGISTRY_STORAGE_AZURE_ACCOUNTNAME=#{azure_account_name}",
+            "REGISTRY_STORAGE_AZURE_ACCOUNTKEY=#{azure_account_key}",
+            "REGISTRY_STORAGE_AZURE_CONTAINERNAME=#{azure_container_name}"
         ]
       else
         env = [
-          "REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/registry"
+            "REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/registry"
         ]
       end
 
@@ -64,12 +64,12 @@ module Kontena::Cli::Registry
       env << "AUTH_PASSWORD=#{auth_password}" if auth_password
 
       data = {
-        name: 'registry',
-        stateful: true,
-        image: 'kontena/registry:2.1',
-        volumes: ['/registry'],
-        env: env,
-        affinity: ["node==#{node['name']}"]
+          name: 'registry',
+          stateful: true,
+          image: 'kontena/registry:2.1',
+          volumes: ['/registry'],
+          env: env,
+          affinity: ["node==#{node['name']}"]
       }
       client(token).post("grids/#{current_grid}/services", data)
       result = client(token).post("services/#{current_grid}/registry/deploy", {})

data/lib/kontena/cli/services/create_command.rb

@@ -41,21 +41,21 @@ module Kontena::Cli::Services
     # @return [Hash]
     def parse_service_data_from_options
       data = {}
-      data[:ports] = parse_ports(ports_list) if ports_list
-      data[:links] = parse_links(link_list) if link_list
-      data[:volumes] = volume_list if volume_list
-      data[:volumes_from] = volumes_from_list if volumes_from_list
+      data[:ports] = parse_ports(ports_list) unless ports_list.empty?
+      data[:links] = parse_links(link_list) unless link_list.empty?
+      data[:volumes] = volume_list unless volume_list.empty?
+      data[:volumes_from] = volumes_from_list unless volumes_from_list.empty?
       data[:memory] = parse_memory(memory) if memory
       data[:memory_swap] = parse_memory(memory_swap) if memory_swap
       data[:cpu_shares] = cpu_shares if cpu_shares
-      data[:affinity] = affinity_list if affinity_list
-      data[:env] = env_list if env_list
+      data[:affinity] = affinity_list unless affinity_list.empty?
+      data[:env] = env_list unless env_list.empty?
       data[:container_count] = instances if instances
       data[:cmd] = cmd.split(" ") if cmd
       data[:user] = user if user
       data[:image] = image if image
-      data[:cap_add] = cap_add_list if cap_add_list
-      data[:cap_drop] = cap_drop_list if cap_drop_list
+      data[:cap_add] = cap_add_list unless cap_add_list.empty?
+      data[:cap_drop] = cap_drop_list unless cap_drop_list.empty?
       data
     end
   end

data/lib/kontena/cli/services/update_command.rb

@@ -33,18 +33,18 @@ module Kontena::Cli::Services
     # @return [Hash]
     def parse_service_data_from_options
       data = {}
-      data[:ports] = parse_ports(ports_list) if ports_list
+      data[:ports] = parse_ports(ports_list) unless ports_list.empty?
       data[:memory] = parse_memory(memory) if memory
       data[:memory_swap] = parse_memory(memory_swap) if memory_swap
       data[:cpu_shares] = cpu_shares if cpu_shares
-      data[:affinity] = affinity_list if affinity_list
-      data[:env] = env_list if env_list
+      data[:affinity] = affinity_list unless affinity_list.empty?
+      data[:env] = env_list unless env_list.empty?
       data[:container_count] = instances if instances
       data[:cmd] = cmd.split(" ") if cmd
       data[:user] = user if user
       data[:image] = image if image
-      data[:cap_add] = cap_add_list if cap_add_list
-      data[:cap_drop] = cap_drop_list if cap_drop_list
+      data[:cap_add] = cap_add_list unless cap_add_list.empty?
+      data[:cap_drop] = cap_drop_list unless cap_drop_list.empty?
       data
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler