ufo 5.0.7 → 6.0.0

data/lib/ufo/yaml.rb

@@ -0,0 +1,13 @@
+module Ufo
+  class Yaml
+    class << self
+      def load(text)
+        path = "/tmp/ufo/temp.yml"
+        FileUtils.mkdir_p(File.dirname(path))
+        IO.write(path, text)
+        Validator.new(path).validate!
+        Loader.new(text).load
+      end
+    end
+  end
+end

data/lib/ufo.rb

@@ -1,20 +1,30 @@
 $stdout.sync = true unless ENV["UFO_STDOUT_SYNC"] == "0"
 
-$:.unshift(File.expand_path('../', __FILE__))
 require 'active_support'
 require 'active_support/core_ext/class'
+require 'active_support/core_ext/hash'
+require 'active_support/core_ext/module/delegation'
+require 'cli-format'
 require 'deep_merge/rails_compat'
+require 'dsl_evaluator'
 require 'fileutils'
 require 'memoist'
 require 'rainbow/ext/string'
 require 'render_me_pretty'
+require 'ufo/ext'
 require 'ufo/version'
+require 'yaml'
 
 require "ufo/autoloader"
 Ufo::Autoloader.setup
 
 module Ufo
+  class UfoError < RuntimeError; end
+  class ShipmentOverridden < UfoError; end
+
   extend Core
 end
 
-Ufo.set_aws_profile!
+CliFormat.default_format = "table"
+
+Ufo::Booter.boot

data/spec/spec_helper.rb

@@ -1,42 +1,20 @@
-ENV["TEST"] = "1"
+ENV["UFO_TEST"] = "1"
 # Ensures aws api never called. Fixture home does not contain ~/.aws/credentials
 ENV['HOME'] = "spec/fixtures/home"
 
-# CodeClimate test coverage: https://docs.codeclimate.com/docs/configuring-test-coverage
-# require 'simplecov'
-# SimpleCov.start
-
 require "pp"
 require "byebug"
 root = File.expand_path("../", File.dirname(__FILE__))
 require "#{root}/lib/ufo"
 
-ENV['UFO_ROOT'] = "tmp/project"
-
 module Helpers
-  def create_ufo_project
-    FileUtils.rm_rf(Ufo.root)
-    execute("exe/ufo init --app demo --image tongueroo/demo-ufo")
-    create_test_settings
-  end
-
-  # modify the generated settings so we can spec the settings themselves
-  def create_test_settings
-    FileUtils.cp("spec/fixtures/settings.yml", "#{Ufo.root}/.ufo/settings.yml")
-  end
-
   def execute(cmd)
-    puts "Running: #{cmd}" if show_command?
+    show_command = ENV['DEBUG'] || ENV['SHOW_COMMAND']
+    puts "Running: #{cmd}" if show_command
     out = `#{cmd}`
-    puts out if show_command?
+    puts out if show_command
     out
   end
-
-  # Added SHOW_COMMAND because DEBUG is also used by other libraries like
-  # bundler and it shows its internal debugging logging also.
-  def show_command?
-    ENV['DEBUG'] || ENV['SHOW_COMMAND']
-  end
 end
 
 RSpec.configure do |c|

data/spec/{lib → ufo}/ecr_cleaner_spec.rb

@@ -3,9 +3,7 @@ describe Ufo::Ecr::Cleaner do
   let(:repo_domain) { "123456789.dkr.ecr.us-east-1.amazonaws.com" }
   let(:cleaner) do
     Ufo::Ecr::Cleaner.new(docker_image_name,
-      project_root: "spec/fixtures/hi",
       ecr_keep: 3, # using 3 to test, default is 30
-      mute: true
     )
   end
   before(:each) do

data/spec/{lib/role → ufo/iam_role}/builder_spec.rb

@@ -1,25 +1,25 @@
-describe Ufo::Role::Builder do
+describe Ufo::IamRole::Builder do
   let(:builder) { described_class.new(role_type) }
   let(:role_type) { "task_role" }
 
   before(:each) do
-    Ufo::Role::Registry.register_policy("task_role",
+    Ufo::IamRole::Registry.register_policy("task_role",
       "AmazonS3ReadOnlyAccess",
       {:Action=>["s3:Get*", "s3:List*"], :Effect=>"Allow", :Resource=>"*"}
     )
-    Ufo::Role::Registry.register_policy("task_role",
+    Ufo::IamRole::Registry.register_policy("task_role",
       "CloudwatchWrite",
       {:Action=>["cloudwatch:PutMetricData"], :Effect=>"Allow", :Resource=>"*"}
     )
     # Called twice on purpose to show that duplicated items in the set wont create doubles.
     # This allows the DSL evaluate to be ran multiple times.
-    Ufo::Role::Registry.register_policy("task_role",
+    Ufo::IamRole::Registry.register_policy("task_role",
       "CloudwatchWrite",
       {:Action=>["cloudwatch:PutMetricData"], :Effect=>"Allow", :Resource=>"*"}
     )
 
 
-    Ufo::Role::Registry.register_managed_policy("task_role",
+    Ufo::IamRole::Registry.register_managed_policy("task_role",
       "AmazonS3ReadOnlyAccess", "AmazonEC2ReadOnlyAccess"
     )
   end

data/spec/{lib/role → ufo/iam_role}/dsl_spec.rb

@@ -1,12 +1,12 @@
-describe Ufo::Role::DSL do
+describe Ufo::IamRole::DSL do
   let(:dsl) { described_class.new(path) }
   let(:path) { "spec/fixtures/iam_roles/task_role.rb" }
 
   context "evaluate" do
     it "registers policies from role DSL" do
       dsl.evaluate
-      expect(Ufo::Role::Registry.policies).not_to be_empty
-      expect(Ufo::Role::Registry.managed_policies).not_to be_empty
+      expect(Ufo::IamRole::Registry.policies).not_to be_empty
+      expect(Ufo::IamRole::Registry.managed_policies).not_to be_empty
     end
   end
 end

data/spec/{lib → ufo}/logs_spec.rb

@@ -1,6 +1,6 @@
-describe Ufo::Logs do
+describe Ufo::CLI::Logs do
   let(:logs) do
-    logs = Ufo::Logs.new("test-web", {})
+    logs = Ufo::CLI::Logs.new
     allow(logs).to receive(:exit).and_return(null)
     allow(logs).to receive(:info).and_return(null)
     allow(logs).to receive(:ecs).and_return(ecs)

data/ufo.gemspec

@@ -19,21 +19,27 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "aws-logs"
-  spec.add_dependency "aws-mfa-secure", "~> 0.4.3"
+  spec.add_dependency "aws-mfa-secure", ">= 0.4.3"
+  spec.add_dependency "aws-sdk-applicationautoscaling"
   spec.add_dependency "aws-sdk-cloudformation"
   spec.add_dependency "aws-sdk-cloudwatchlogs"
   spec.add_dependency "aws-sdk-ec2"
   spec.add_dependency "aws-sdk-ecr"
   spec.add_dependency "aws-sdk-ecs"
+  spec.add_dependency "aws-sdk-ssm"
   spec.add_dependency "aws-sdk-elasticloadbalancingv2"
   spec.add_dependency "aws_data"
-  spec.add_dependency "rainbow"
+  spec.add_dependency "cfn-status"
+  spec.add_dependency "cli-format"
   spec.add_dependency "deep_merge"
+  spec.add_dependency "dsl_evaluator"
   spec.add_dependency "memoist"
   spec.add_dependency "plissken"
+  spec.add_dependency "rainbow"
   spec.add_dependency "render_me_pretty"
-  spec.add_dependency "text-table"
+  spec.add_dependency "rexml"
   spec.add_dependency "thor"
+  spec.add_dependency "tty-screen"
   spec.add_dependency "zeitwerk"
 
   spec.add_development_dependency "bundler"