ciinabox-ecs 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 602691115c440d23c67e6765a0860a35f6bb0824
-  data.tar.gz: 4bdf78250830dc865e5185bfbde985377a5a8d95
+  metadata.gz: 9e19ba0dabb22593de7d70d0c146242d04aee642
+  data.tar.gz: 66172b230241522c4b851b84481dc2d34503d6c3
 SHA512:
-  metadata.gz: 6cece34d071f2f6798545ad7410926bbadf19b390f3833e46b6dc0452fa55ff8e9af44b2a96e6be0412584239caea2cc8ce8f34ab72ef7aa23b0b29daf2e4608
-  data.tar.gz: b883427bce1dc6cc2165f44fa22c5845e12b5150106a15454bea5caaa7be30a896849f9a11cb503743ef1b546173630929672608fd82bc65b74033802bdb71a2
+  metadata.gz: 56ed09c4564f1299b6ca17d8d4b18930c25fda2d32b4bd4745afc36551af02fc8a6ee5bcafb783dd3bff911ea7f7b5ac0588a97689a7f8f38eaf29ad3844ded2
+  data.tar.gz: c2b7d1cd2dee089cafc0596e5d706652532503a6a1ae3bd61c6cd59c2977266cd76ffa9956e2679022957320587024bc65e0552b453dcbd1e0aa1736771f2f74

data/Rakefile

@@ -11,6 +11,8 @@ require 'tempfile'
 require 'json'
 require_relative './ext/common_helper'
 require_relative './ext/zip_helper'
+require 'ciinabox-ecs' if Gem::Specification::find_all_by_name('ciinabox-ecs').any?
+
 namespace :ciinabox do
 
   #load config
@@ -44,6 +46,13 @@ namespace :ciinabox do
   config['lambdas'] = {} unless config.key? 'lambdas'
   config['lambdas'].extend(config['default_lambdas'])
 
+  # ciinabox binary version
+  if Gem.loaded_specs['ciinabox-ecs'].nil?
+    config['ciinabox_binary_version'] = `git rev-parse --short HEAD`.gsub("\n",'')
+  else
+    config['ciinabox_binary_version'] = Gem.loaded_specs['ciinabox-ecs'].version.to_s
+  end
+
   File.write('debug-ciinabox.config.yaml',config.to_yaml) if ENV['DEBUG']
 
   stack_name = config["stack_name"] || "ciinabox"

data/bin/ciinabox-ecs.rb

@@ -18,8 +18,10 @@ class CiinaboxEcsCli
 
     actions = app.tasks.map { |t| t.name.gsub('ciinabox:', '') }
 
+    required_args_size = ENV.key?('CIINABOX') ? 1 : 2
+
     if (args.size() ==0) or
-        (args.size() < 2 and (not %w(init full_install).include? args[0])) or
+        (args.size() < required_args_size and (not %w(init full_install).include? args[0])) or
         (args[0] == 'help') or
         (not actions.include? args[0])
       STDERR.puts("Usage: ciinabox-ecs action1 action2 action3 ciinabox_name")
@@ -33,9 +35,11 @@ class CiinaboxEcsCli
     end
 
     methods = args[0..args.size()-2]
-    ciinabox_name = args[args.size()-1]
 
-    ENV['CIINABOX'] = ciinabox_name
+    unless ENV.key? 'CIINABOX'
+      ciinabox_name = args[args.size()-1]
+      ENV['CIINABOX'] = ciinabox_name
+    end
 
     if ENV.key? 'CIINABOXES_DIR'
       ENV['CIINABOXES_DIR'] = File.expand_path(ENV['CIINABOXES_DIR'])

data/lib/ciinabox-ecs.rb

@@ -0,0 +1,5 @@
+module CiinaboxEcs
+
+
+
+end

data/templates/ciinabox.rb

@@ -1,10 +1,11 @@
 require_relative '../ext/policies'
-
 CloudFormation do
 
+  ciinabox_binary_version = config['ciinabox_binary_version']
+
   # Template metadata
   AWSTemplateFormatVersion '2010-09-09'
-  Description "ciinabox ECS #{Gem.latest_spec_for('ciinabox-ecs').version.to_s} - v#{ciinabox_version}"
+  Description "ciinabox ECS #{ciinabox_binary_version} - v#{ciinabox_version}"
 
   Resource(cluster_name) {
     Type 'AWS::ECS::Cluster'
@@ -156,4 +157,12 @@ CloudFormation do
     Value(FnGetAtt('ECSServicesStack','Outputs.DefaultSSLCertificate'))
   }
 
+  Output('CiinaboxBinaryVersion'){
+    Value(ciinabox_binary_version)
+  }
+
+  Output('CiinaboxName'){
+    Value(ciinabox_name)
+  }
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ciinabox-ecs
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Base2Services
@@ -106,6 +106,7 @@ files:
 - ext/zip_helper.rb
 - lambdas/acm_issuer_validator/install.sh
 - lambdas/acm_issuer_validator/lib/install.sh
+- lib/ciinabox-ecs.rb
 - templates/bastion.rb
 - templates/ciinabox.rb
 - templates/ecs-cluster.rb