ufo 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1894588cde21064b0558cbe90861eddc03879b7ff874906f39a6375998d5667
-  data.tar.gz: b613a20c65a8d7c8e9bb7b436c923fcf19f3a0514d054dc5e5a4919d03c4890d
+  metadata.gz: 2cd2207a0617cee46aeb0459643f5fcd3fa2605ea7e0052020bd310e987dc38b
+  data.tar.gz: f3bf371e109599f6ea57418abbd3b87dba06400144c97028af46d32ad7a2fd0c
 SHA512:
-  metadata.gz: 36c17e42e5a9f317058565338bde9e0c5cfd249152df58271554e8303378fd559687f348c1a5134e027d29842d9473489e7b45db937950f23a5e455578637c3c
-  data.tar.gz: 9e57675fbf2129208255cefeecc94849968d56aa1c868a30837fc813a710d7a0d2c7c0d7f5d85bf8e067662fd6c03e90e2cc9729ee70717ba5d47a227e079fe6
+  metadata.gz: 0d391674506d0f5b68cd4e403a6a6d14141c52069244f991a4b280e69d013c0d7ce6be8a8a66b6a05bedb4600d2b28b171ec9aab6820113e2c00aaf1208368d5
+  data.tar.gz: 3c857cfabc2c40297f40271c75fc728fe4a556f35534b4b9451b650c81d7216b6e6bf87ac1861e210322e06c4a179e0114fbde4ef158a120838033a5254c6a0d

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [3.2.1]
+- ensure settings is always a hash even when settings.yml has nil
+- move cli_markdown as development dependency
+
 ## [3.2.0]
 - pr #23 from tongueroo/cli_markdown: http://ufoships.com/reference/ section now available
 - pr #24 from tongueroo/circleci

data/docs/_reference/ufo-completion.md

@@ -20,8 +20,8 @@ Prints words for TAB auto-completion.
 ## Examples
 
     ufo completion
-    ufo completion hello
-    ufo completion hello name
+    ufo completion ship
+    ufo completion docker
 
 To enable, TAB auto-completion add the following to your profile:
 
@@ -30,9 +30,9 @@ To enable, TAB auto-completion add the following to your profile:
 Auto-completion example usage:
 
     ufo [TAB]
-    ufo hello [TAB]
-    ufo hello name [TAB]
-    ufo hello name --[TAB]
+    ufo ship [TAB]
+    ufo docker build [TAB]
+    ufo docker build --[TAB]
 
 
 ## Options

data/lib/ufo/help/completion.md

@@ -7,8 +7,8 @@ Prints words for TAB auto-completion.
 ## Examples
 
   ufo completion
-  ufo completion hello
-  ufo completion hello name
+  ufo completion ship
+  ufo completion docker
 
 To enable, TAB auto-completion add the following to your profile:
 
@@ -17,6 +17,6 @@ To enable, TAB auto-completion add the following to your profile:
 Auto-completion example usage:
 
   ufo [TAB]
-  ufo hello [TAB]
-  ufo hello name [TAB]
-  ufo hello name --[TAB]
+  ufo ship [TAB]
+  ufo docker build [TAB]
+  ufo docker build --[TAB]

data/lib/ufo/setting.rb

@@ -9,7 +9,7 @@ module Ufo
     # data contains the settings.yml config.  The order or precedence for settings
     # is the project ufo/settings.yml and then the ~/.ufo/settings.yml.
     def data
-      return @settings_yaml if @settings_yaml
+      return @data if @data
 
       if @check_ufo_project && !File.exist?(project_settings_path)
         puts "ERROR: No settings file at #{project_settings_path}.  Are you sure you are in a project with ufo setup?"
@@ -24,24 +24,36 @@ module Ufo
       user = File.exist?(user_file) ? YAML.load_file(user_file) : {}
 
       default_file = File.expand_path("../default/settings.yml", __FILE__)
-      default = YAML.load_file(default_file)
+      default = load_file(default_file)
 
-      @settings_yaml = default.deep_merge(user.deep_merge(project))[Ufo.env]
+      all_envs = default.deep_merge(user.deep_merge(project))
+      all_envs = merge_base(all_envs)
+      @@data = all_envs[Ufo.env] || all_envs["base"] || {}
     end
 
   private
     def load_file(path)
+      return Hash.new({}) unless File.exist?(path)
+
       content = RenderMePretty.result(path)
-      data = File.exist?(path) ? YAML.load(content) : {}
-      # automatically add base settings to the rest of the environments
+      data = YAML.load(content)
+      # If key is is accidentally set to nil it screws up the merge_base later.
+      # So ensure that all keys with nil value are set to {}
       data.each do |ufo_env, _setting|
-        base = data["base"] || {}
-        env = data[ufo_env] || {}
-        data[ufo_env] = base.merge(env) unless ufo_env == "base"
+        data[ufo_env] ||= {}
       end
       data
     end
 
+    # automatically add base settings to the rest of the environments
+    def merge_base(all_envs)
+      base = all_envs["base"]
+      all_envs.each do |ufo_env, env_settings|
+        all_envs[ufo_env] = base.merge(env_settings) unless ufo_env == "base"
+      end
+      all_envs
+    end
+
     def project_settings_path
       "#{Ufo.root}/.ufo/settings.yml"
     end

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end

data/ufo.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk-ecr"
   spec.add_dependency "aws-sdk-ecs"
   spec.add_dependency "aws-sdk-elasticloadbalancingv2"
-  spec.add_dependency "cli_markdown"
   spec.add_dependency "colorize"
   spec.add_dependency "deep_merge"
   spec.add_dependency "plissken"
@@ -32,6 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"
+  spec.add_development_dependency "cli_markdown"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatchlogs
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cli_markdown
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: deep_merge
+  name: plissken
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: plissken
+  name: render_me_pretty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: render_me_pretty
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,13 +151,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: cli_markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="