ufo 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4cd7a59e7976f154950cf4549762565dc012a5e2a74644ca593e2f9805d46b2
-  data.tar.gz: d3afe20c93b5d3234d71c7fa1be39c76a1274899385237a9338eedfc7d5c0e18
+  metadata.gz: d75643b59e36f0f08c8cbbf2731b6e812609e27ff417055fad1fa549aa454db9
+  data.tar.gz: 146706f8a36243229014cf8a4e09397506efd655284ebe199e79b7c5f3107fc8
 SHA512:
-  metadata.gz: 1a0d229886a6e6fe529f2174f177b7c2956f89b2fcbbfb23b2c7beb7089d220ca5cfa4643e8bcd4129e57aaaa74e2481d05eedc39a6f34ce25dcfef7b37ae86b
-  data.tar.gz: 8ad4894dcaf057160249c6885a7e1afd522707d97f1e280a6dbcd92ec646857410d22399639987349690e0700b711695693b4f911ec29dbd872c03d216432bd3
+  metadata.gz: 4706fcc082ace35482e905c587599fdc2cfbd7e6649c2f4859a51f7ba4a298c994133c8f03e817aa1285a6bb59e839ce4e6ec4ae9e99d4679a367214c34e6203
+  data.tar.gz: bea2d53470126f9005b6ecfe9cb366a7433a510f94cbfc4bc2dfd4f69b3eeac0e7ce6a4c3721326767893b42bd661d686460f526da07b2d087d77fb18e0308da

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.1.1]
+- actually use the cluster value in settings
+- upgrade variables path also #20
+
 ## [3.1.0]
 - fix container_info to refer to .ufo instead of old ufo folder  #20
 - fix ufo upgrade3 #20

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ufo (3.0.1)
+    ufo (3.1.0)
       aws-sdk-cloudwatchlogs
       aws-sdk-ec2
       aws-sdk-ecr

data/lib/ufo/default.rb

@@ -9,16 +9,11 @@ module Ufo
   # So @options must be set
   module Default
     # The default cluster normally defaults to the Ufo.env value.
-    # But it can be overriden by ufo/settings.yml ufo_env_cluster_map
+    # But it can be overriden by ufo/settings.yml cluster
     #
     # More info: http://ufoships.com/docs/settings/
     def default_cluster
-      map = setting.data["ufo_env_cluster_map"]
-      if map
-        ecs_cluster = map[Ufo.env] || map["default"]
-      end
-
-      ecs_cluster || Ufo.env
+      setting.data["cluster"] || Ufo.env
     end
 
     # These default service values only are used when a service is created by `ufo`

data/lib/ufo/upgrade3.rb

@@ -24,8 +24,26 @@ module Ufo
       if File.exist?(user_settings_path)
         upgrade_settings(user_settings_path)
       end
+
+      upgrade_variables
+
       mv("ufo", ".ufo")
       puts "Upgrade complete."
+      new_env_info
+    end
+
+    def upgrade_variables
+      upgrade_variable_path("dev")
+      upgrade_variable_path("stag")
+      upgrade_variable_path("prod")
+    end
+
+    def upgrade_variable_path(old_ufo_env)
+      old_path = "ufo/variables/#{old_ufo_env}.rb"
+      return unless File.exist?(old_path)
+
+      ufo_env = map_env(old_ufo_env)
+      mv(old_path, "ufo/variables/#{ufo_env}.rb")
     end
 
     def upgrade_settings(path)
@@ -56,8 +74,6 @@ module Ufo
       if path.include?(ENV['HOME'])
         puts "NOTE: Your ~/.ufo/settings.yml file was also upgraded to the new format. If you are using ufo in other projects those will have to be upgraded also."
       end
-
-      new_env_info
     end
 
     ENV_MAP = {

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Tung Nguyen