ufo 2.3.0 → 3.0.0

data/spec/lib/core_spec.rb

@@ -0,0 +1,16 @@
+describe Ufo::Core do
+  before(:all) do
+    create_starter_project_fixture
+  end
+
+  it "finds the first env that contains the aws profile" do
+    env = Ufo.send(:env_from_profile, "dev_profile1")
+    expect(env).to eq "development"
+    env = Ufo.send(:env_from_profile, "dev_profile2")
+    expect(env).to eq "development"
+    env = Ufo.send(:env_from_profile, "prod_profile")
+    expect(env).to eq "production"
+    env = Ufo.send(:env_from_profile, "does_not_exist")
+    expect(env).to be nil
+  end
+end

data/spec/lib/ecr_auth_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
 describe Ufo::Ecr::Auth do
-  let(:repo_domain) { "https://123456789.dkr.ecr.us-east-1.amazonaws.com" }
+  let(:repo_domain) { "123456789.dkr.ecr.us-east-1.amazonaws.com" }
   let(:auth) { Ufo::Ecr::Auth.new(repo_domain) }
   before(:each) do
     allow(auth).to receive(:fetch_auth_token).and_return("opensesame")

data/spec/lib/ecr_cleaner_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
 describe Ufo::Ecr::Cleaner do
   let(:docker_image_name) { "123456789.dkr.ecr.us-east-1.amazonaws.com/my-name" }
-  let(:repo_domain) { "https://123456789.dkr.ecr.us-east-1.amazonaws.com" }
+  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",

data/spec/lib/setting_spec.rb

@@ -0,0 +1,12 @@
+describe Ufo::Setting do
+  before(:all) do
+    create_starter_project_fixture
+  end
+
+  let(:setting) { Ufo::Setting.new }
+
+  it "includes base into other environments automatically" do
+    count = setting.data["new_service"]["desired_count"]
+    expect(count).to eq 1
+  end
+end

data/spec/lib/ship_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ufo::Ship do
   let(:project_root) { File.expand_path("../../fixtures/hi", __FILE__) }
   let(:options) do
@@ -21,11 +19,11 @@ describe Ufo::Ship do
 
   context "hi-web-prod service" do
     it "should create or update service" do
-      allow(ship).to receive(:process_single_service)
+      allow(ship).to receive(:process_deployment)
 
       ship.deploy
 
-      expect(ship).to have_received(:process_single_service)
+      expect(ship).to have_received(:process_deployment)
     end
 
     context "0 services found" do

data/spec/lib/task_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ufo::Ship do
   let(:project_root) { File.expand_path("../../fixtures/hi", __FILE__) }
   let(:options) do

data/spec/spec_helper.rb

@@ -11,10 +11,20 @@ require "byebug"
 root = File.expand_path("../", File.dirname(__FILE__))
 require "#{root}/lib/ufo"
 
+$dest = "tmp/project"
+ENV['DEST_ROOT'] = $dest
+ENV['UFO_ROOT'] = $dest
+
 module Helpers
   def create_starter_project_fixture
-    FileUtils.rm_rf("spec/fixtures/hi")
-    execute("exe/ufo init --app hi --image tongueroo/hi --project-root spec/fixtures/hi")
+    FileUtils.rm_rf($dest)
+    execute("exe/ufo init --app hi --image tongueroo/hi")
+    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", "#{$dest}/.ufo/settings.yml")
   end
 
   def execute(cmd)

data/ufo.gemspec

@@ -29,6 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "plissken"
   spec.add_dependency "thor"
 
+  spec.add_dependency "activesupport" # render_me_pretty submodule dependency
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-11 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatchlogs
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -200,7 +214,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
+- ".gitmodules"
 - ".rspec"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -216,6 +232,7 @@ files:
 - docs/LICENSE
 - docs/README.md
 - docs/_config.yml
+- docs/_docs/auto-completion.md
 - docs/_docs/automated-cleanup.md
 - docs/_docs/commands.md
 - docs/_docs/conventions.md
@@ -233,11 +250,13 @@ files:
 - docs/_docs/tutorial-ufo-ships.md
 - docs/_docs/tutorial-ufo-tasks-build.md
 - docs/_docs/tutorial.md
+- docs/_docs/ufo-deploy.md
 - docs/_docs/ufo-destroy.md
 - docs/_docs/ufo-docker-base.md
 - docs/_docs/ufo-docker-build.md
 - docs/_docs/ufo-docker-clean.md
 - docs/_docs/ufo-docker-name.md
+- docs/_docs/ufo-docker-push.md
 - docs/_docs/ufo-env.md
 - docs/_docs/ufo-help.md
 - docs/_docs/ufo-init.md
@@ -311,15 +330,15 @@ files:
 - docs/quick-start.md
 - docs/style.css
 - exe/ufo
-- lib/starter_project/.env
-- lib/starter_project/Dockerfile
-- lib/starter_project/bin/deploy
-- lib/starter_project/ufo/settings.yml
-- lib/starter_project/ufo/task_definitions.rb
-- lib/starter_project/ufo/templates/main.json.erb
-- lib/starter_project/ufo/variables/base.rb
-- lib/starter_project/ufo/variables/development.rb
-- lib/starter_project/ufo/variables/production.rb
+- lib/template/.env
+- lib/template/.ufo/settings.yml.tt
+- lib/template/.ufo/task_definitions.rb.tt
+- lib/template/.ufo/templates/main.json.erb
+- lib/template/.ufo/variables/base.rb
+- lib/template/.ufo/variables/development.rb
+- lib/template/.ufo/variables/production.rb
+- lib/template/Dockerfile
+- lib/template/bin/deploy.tt
 - lib/ufo.rb
 - lib/ufo/aws_service.rb
 - lib/ufo/cli.rb
@@ -328,13 +347,16 @@ files:
 - lib/ufo/completer/script.rb
 - lib/ufo/completer/script.sh
 - lib/ufo/completion.rb
+- lib/ufo/core.rb
 - lib/ufo/default.rb
 - lib/ufo/default/settings.yml
+- lib/ufo/deploy.rb
 - lib/ufo/destroy.rb
 - lib/ufo/docker.rb
 - lib/ufo/docker/builder.rb
 - lib/ufo/docker/cleaner.rb
 - lib/ufo/docker/dockerfile.rb
+- lib/ufo/docker/pusher.rb
 - lib/ufo/dsl.rb
 - lib/ufo/dsl/helper.rb
 - lib/ufo/dsl/outputter.rb
@@ -342,24 +364,26 @@ files:
 - lib/ufo/ecr.rb
 - lib/ufo/ecr/auth.rb
 - lib/ufo/ecr/cleaner.rb
-- lib/ufo/env.rb
+- lib/ufo/ecs.rb
+- lib/ufo/ecs/service.rb
 - lib/ufo/help.rb
 - lib/ufo/help/completion.md
 - lib/ufo/help/completion_script.md
 - lib/ufo/help/completions.md
 - lib/ufo/help/completions_script.md
+- lib/ufo/help/deploy.md
 - lib/ufo/help/destroy.md
 - lib/ufo/help/docker.md
 - lib/ufo/help/docker/base.md
 - lib/ufo/help/docker/build.md
 - lib/ufo/help/docker/clean.md
 - lib/ufo/help/docker/name.md
+- lib/ufo/help/docker/push.md
 - lib/ufo/help/hello.md
 - lib/ufo/help/init.md
 - lib/ufo/help/scale.md
 - lib/ufo/help/ship.md
 - lib/ufo/help/ships.md
-- lib/ufo/help/sub/goodbye.md
 - lib/ufo/help/task.md
 - lib/ufo/help/tasks.md
 - lib/ufo/help/tasks/build.md
@@ -367,6 +391,7 @@ files:
 - lib/ufo/init.rb
 - lib/ufo/log_group.rb
 - lib/ufo/scale.rb
+- lib/ufo/sequence.rb
 - lib/ufo/setting.rb
 - lib/ufo/ship.rb
 - lib/ufo/sub.rb
@@ -375,13 +400,18 @@ files:
 - lib/ufo/tasks/builder.rb
 - lib/ufo/tasks/register.rb
 - lib/ufo/templates/default.json.erb
+- lib/ufo/upgrade3.rb
 - lib/ufo/util.rb
 - lib/ufo/version.rb
 - spec/fixtures/home_existing/.aws/config
 - spec/fixtures/home_existing/.docker/config.json
+- spec/fixtures/settings.yml
 - spec/lib/cli_spec.rb
+- spec/lib/completion_spec.rb
+- spec/lib/core_spec.rb
 - spec/lib/ecr_auth_spec.rb
 - spec/lib/ecr_cleaner_spec.rb
+- spec/lib/setting_spec.rb
 - spec/lib/ship_spec.rb
 - spec/lib/task_spec.rb
 - spec/spec_helper.rb
@@ -413,9 +443,13 @@ summary: Build Docker Containers and Ship Them to AWS ECS
 test_files:
 - spec/fixtures/home_existing/.aws/config
 - spec/fixtures/home_existing/.docker/config.json
+- spec/fixtures/settings.yml
 - spec/lib/cli_spec.rb
+- spec/lib/completion_spec.rb
+- spec/lib/core_spec.rb
 - spec/lib/ecr_auth_spec.rb
 - spec/lib/ecr_cleaner_spec.rb
+- spec/lib/setting_spec.rb
 - spec/lib/ship_spec.rb
 - spec/lib/task_spec.rb
 - spec/spec_helper.rb

data/lib/starter_project/ufo/settings.yml

@@ -1,18 +0,0 @@
-# More info: http://ufoships.com/docs/ufo-settings/
-image: <%= @image %>
-# clean_keep: 30
-# ecr_keep: 30
-
-# aws_profile_ufo_env_map:
-#   default: staging
-#   # More examples:
-#   aws_profile1: production
-#   aws_profile2: staging
-#   aws_profile3: development
-
-# ufo_env_cluster_map:
-#   default: prod
-#   # More examples:
-#   production: prod
-#   staging: stag
-#   development: dev

data/lib/ufo/env.rb

@@ -1,18 +0,0 @@
-class Ufo::Env
-  def self.setup!(project_root='.')
-    # Ensures that  UFO_ENV is always set to a default value.
-    # For Ufo::Env.setup! we do not need to check if we're in a ufo project
-    # Because we could not be at first. For example when: ufo init is first called.
-    # Other uses of Ufo::Setting assumes that we should be in a ufo project.
-    setting = Ufo::Setting.new(project_root, false).data
-    map = setting['aws_profile_ufo_env_map']
-
-    if map
-      ufo_env = map[ENV['AWS_PROFILE']] || map['default']
-    end
-    ufo_env ||= 'development' # defaults to development
-    ufo_env = ENV['UFO_ENV'] if ENV['UFO_ENV'] # highest precedence
-
-    Kernel.const_set(:UFO_ENV, ufo_env)
-  end
-end

data/lib/ufo/help/sub/goodbye.md

@@ -1,5 +0,0 @@
-Examples:
-
-  ufo sub:goodbye
-  ufo sub:goodbye NAME
-  ufo sub:goodbye NAME --from me