ufo 5.0.5 → 5.0.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ac9da556f0438367ebd761b2f0c90e04b175bee2b7c6d9deb7fd06d4d05fa755
4
- data.tar.gz: a5ae0d961c966ab386981a81e41e184e9a4821e59c8812ec68052a053372123d
3
+ metadata.gz: 0c57c6028e4210f60469d12a9c8fcf7fad4e5b200d8a6fef3b19401323bf612e
4
+ data.tar.gz: 8ccb219639a58f509502b3ed451cb120dfbc83dc4b4fd892e1f82eb0f0fdd40e
5
5
  SHA512:
6
- metadata.gz: 6a679e2f13efe4d64f34b66ba7d2f4a859abe560451fdb722f0e41919fecbddb4ed8d3ef4047fbd1745b7a6dd381af6c075fb95f7355f46a751866bfa3e79f07
7
- data.tar.gz: 4b550246bf57f094add49eaf7171268c8c20f6f6a13d40f7b72f3834c0aa5f023cbff0802f313b8e7c3821ec51da60638d726a92ab6f8ae241cc7f11dfcb22b1
6
+ metadata.gz: 405616d32c0e9d9d6a630497388040df553ac825e64f94f221495401c75c62a02e6df9b820f2d138380c68d2cc2607afee8258ef0cd4503a9a0c68f429c85bc3
7
+ data.tar.gz: 92b2942e8524d8eb760ff43b279c7c41ab8ec02b4381e671a6c2068389966aae14c7dc53aeb663c7d2a43b48672a2e0b1ef6f44e079dc80f2b11c10ac54c87c9
data/CHANGELOG.md CHANGED
@@ -3,6 +3,10 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
5
5
 
6
+ ## [5.0.6] - 2021-12-16
7
+ - [#120](https://github.com/tongueroo/ufo/pull/120) new stack_naming: append_ufo_env default to fix append_env bug
8
+ - [#122](https://github.com/tongueroo/ufo/pull/122) require active_support all
9
+
6
10
  ## [5.0.5] - 2021-01-23
7
11
  - allow base profile without a default profile
8
12
 
data/README.md CHANGED
@@ -10,6 +10,8 @@
10
10
 
11
11
  [![BoltOps Badge](https://img.boltops.com/boltops/badges/boltops-badge.png)](https://www.boltops.com)
12
12
 
13
+ Please **watch/star** this repo to help grow and support the project.
14
+
13
15
  Ufo is a tool that builds Docker images and deploys them to [AWS ECS](https://aws.amazon.com/ecs/). The main command is `ufo ship`. Here's summary of what it does:
14
16
 
15
17
  1. Builds a docker image.
data/docs/.gitignore CHANGED
@@ -2,3 +2,4 @@ _site
2
2
  .sass-cache
3
3
  .jekyll-metadata
4
4
  Gemfile.lock
5
+ _config-dev.yml
data/docs/Gemfile CHANGED
@@ -1,3 +1,4 @@
1
1
  source "https://rubygems.org"
2
2
 
3
3
  gem "jekyll"
4
+ gem "webrick"
data/docs/_config.yml CHANGED
@@ -71,3 +71,5 @@ defaults:
71
71
 
72
72
  plugins_dir:
73
73
  - jekyll-coffeescript
74
+
75
+ ads_url: "https://ads.boltops.com"
@@ -0,0 +1,2 @@
1
+ <div id="foot-banner" class="foot-banner">
2
+ </div>
@@ -0,0 +1,5 @@
1
+ {% assign buildtime = "now" | date: "%Y%m%d%H%M%S" %}
2
+ <link rel="preload" href="{{ site.ads_url }}/ads/{{ site.time | date: '%s' }}.js" as="script" />
3
+ <script data-cfasync="false" async src="{{ site.ads_url }}/ads/{{ site.time | date: '%s' }}.js"></script>
4
+
5
+ <div id="head-banner" class="head-banner"></div>
@@ -42,10 +42,3 @@
42
42
  </div>
43
43
  </div>
44
44
  </footer>
45
-
46
- <!-- Scroll to Top Button (Only visible on small and extra-small screen sizes) -->
47
- <div class="scroll-top page-scroll visible-xs visible-sm">
48
- <a id="next" class="btn btn-primary" href="#page-top">
49
- <i class="fa fa-chevron-up"></i>
50
- </a>
51
- </div>
@@ -2,10 +2,12 @@
2
2
  <html>
3
3
  {% include head.html %}
4
4
  <body id="page-top" class="index">
5
+ {% include banner/head.html %}
5
6
  {% include nav.html %}
6
7
  {% include content.html %}
7
8
  {% include footer.html %}
8
9
  {% include modals.html %}
10
+ {% include banner/foot.html %}
9
11
  {% include js.html %}
10
12
  </body>
11
13
  </html>
data/docs/bin/web CHANGED
@@ -1,4 +1,4 @@
1
1
  #!/bin/bash -ex
2
2
 
3
3
  bundle exec jekyll clean
4
- exec bundle exec jekyll serve --host 0.0.0.0 "$@"
4
+ exec bundle exec jekyll serve --trace --config _config.yml,_config-dev.yml "$@"
@@ -12,8 +12,8 @@ base:
12
12
  # There are some cavaets with this. Updating properties on resources that require
13
13
  # replacment might not work. For example, adding and removing a load balancer.
14
14
  # In these cases, you must delete the entire ecs service and recreate it.
15
- stack_naming: append_env
16
- auto_camelize: false # new default setting in ufo v5
15
+ stack_naming: append_ufo_env # new default setting in ufo v5.0.6
16
+ auto_camelize: false # new default setting in ufo v5
17
17
 
18
18
  development:
19
19
  # cluster: development
@@ -22,12 +22,12 @@ class Ufo::Setting
22
22
  end
23
23
 
24
24
  text = RenderMePretty.result(found)
25
- specific_data = YAML.load(text).deep_symbolize_keys
25
+ specific_data = yaml_load(text)
26
26
 
27
27
  base = "#{Ufo.root}/.ufo/settings/#{@type}/base.yml"
28
28
  base_data = if File.exist?(base)
29
29
  text = RenderMePretty.result(base)
30
- YAML.load(text).deep_symbolize_keys
30
+ yaml_load(text)
31
31
  else
32
32
  {}
33
33
  end
@@ -35,5 +35,10 @@ class Ufo::Setting
35
35
  base_data.deep_merge(specific_data)
36
36
  end
37
37
  memoize :data
38
+
39
+ def yaml_load(text)
40
+ result = YAML.load(text) # yaml file can contain nothing but comments
41
+ result.is_a?(Hash) ? result.deep_symbolize_keys : {}
42
+ end
38
43
  end
39
44
  end
@@ -28,10 +28,17 @@ class Ufo::Stack
28
28
  parts = case settings[:stack_naming]
29
29
  when "prepend_cluster" # ufo v4.3 and below
30
30
  [cluster, service, Ufo.env_extra] # legacy
31
- when "append_env", "append_cluster" # ufo v4.5
31
+ when "append_cluster" # ufo v4.5
32
32
  # append_env will be removed in the next major version in favor of append_cluster to avoid confusion with
33
33
  # append_ufo_env
34
34
  [service, cluster, Ufo.env_extra]
35
+ when "append_env" # ufo v5.0.3 and below: append_env is a bug, it appends cluster name instead of env name
36
+ puts "WARN: Deprecation: The append_env is depreciated .ufo/settings.yaml".color(:yellow)
37
+ puts "It appends the cluster env instead of the UFO_ENV env. This is unexpected behavior. "
38
+ puts "To been fix this, please `stack_naming: append_ufo_env` instead. "
39
+ [service, cluster, Ufo.env_extra] # bug - kept for backward compatibility
40
+ when "append_ufo_env" # v5.1.0 fixes bug where append_env would append cluster name instead
41
+ [service, Ufo.env, Ufo.env_extra]
35
42
  when "append_nothing", "prepend_nothing"
36
43
  [service, Ufo.env_extra]
37
44
  else # new default. ufo v4.5 and above
data/lib/ufo/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Ufo
2
- VERSION = "5.0.5"
2
+ VERSION = "5.0.6"
3
3
  end
data/lib/ufo.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  $stdout.sync = true unless ENV["UFO_STDOUT_SYNC"] == "0"
2
2
 
3
3
  $:.unshift(File.expand_path('../', __FILE__))
4
- require 'active_support/core_ext/class'
4
+ require 'active_support/all'
5
5
  require 'deep_merge/rails_compat'
6
6
  require 'fileutils'
7
7
  require 'memoist'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ufo
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.0.5
4
+ version: 5.0.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tung Nguyen
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-01-23 00:00:00.000000000 Z
11
+ date: 2021-12-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-logs
@@ -398,6 +398,8 @@ files:
398
398
  - docs/_docs/upgrading/upgrade5.md
399
399
  - docs/_docs/variables.md
400
400
  - docs/_includes/about.html
401
+ - docs/_includes/banner/foot.html
402
+ - docs/_includes/banner/head.html
401
403
  - docs/_includes/cfn-customize.md
402
404
  - docs/_includes/commands.html
403
405
  - docs/_includes/contact.html
@@ -715,7 +717,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
715
717
  - !ruby/object:Gem::Version
716
718
  version: '0'
717
719
  requirements: []
718
- rubygems_version: 3.2.5
720
+ rubygems_version: 3.2.32
719
721
  signing_key:
720
722
  specification_version: 4
721
723
  summary: AWS ECS Deploy Tool