codebuild 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57f656279e8afad7619113d3834b6af34c1dd7d583934b2829f7a621e8a07c60
-  data.tar.gz: e72dcd6f7db6f3b9569074e41f0c478aaf808def00360a00eabf7eea4aeee4fc
+  metadata.gz: 6bcfea57ca3fcb04bc2f1f79e5bbd6ccb8a69cb736b4be4c4c10cd8bebc422db
+  data.tar.gz: 141de3012147451070013d00cfe3ec4d67d8ed3289f143fe37d4d1f7ff57d3cc
 SHA512:
-  metadata.gz: 64c0580f8f1dfdfefc7494cdb33a4d7805d2867158b76334f5725cc5f5fdf1103e116b160b912c1a60a8da6dcec39a2a8e6a8fd0d372e57e367e55c073028378
-  data.tar.gz: 856cf81c1c5c6eda69a87933727c9924ae9548c398adefed1c12503fd6f92bcc67518dfaa23b0f9c04ba80d269a75db3f800297cd9bf1258133c0e67f41dafe7
+  metadata.gz: dec4e8ba192c051d5b23ab9ca9069e0ea6cfd134fcdb5db210f6cf2d056f5e8a65d0b58d4a92f5ec24b61ed270f0e7d3396ef43b10d18bd12e24979ce32e6921
+  data.tar.gz: 416cb5263cfd06c4691e5f67f016854dca5b3e88fa7342c59358eee8d06ec65d7ee9971382bec3064db6b35aa5e9d2b31d950b57984abd24a4674a7c235b840a

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vendor/cfn-status"]
+	path = vendor/cfn-status
+	url = https://github.com/tongueroo/cfn-status

data/.ruby-version

@@ -0,0 +1 @@
+2.5.3

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 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.
 
+## [0.3.0]
+* rework cb cli interface
+* project_name as cli main parameter
+* type option for subprojects in .codebuild folder
+* update to zeitwerk for autoloading
+
 ## [0.2.0]
 - First good release.
 - Project and Role DSL

data/README.md

@@ -2,13 +2,19 @@
 
 ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoidHFFaithL1pLZWFEUzBXbk5LY05Mc0FrZW56NDVJWTArbUlOdzBUalVPWWZ5a1ZYUEFtTkhlbFBjeURRZEd1Q292WTI1RUJwWkcvdEgxUXhSYnBqVU9VPSIsIml2UGFyYW1ldGVyU3BlYyI6IjJ0dnpqMC9XMzQ4VExCMGgiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
 
-Tool creates a CodeBuild project with some reasonable defaults. It provides a DSL that can be used to create and override setting if required.
+The codebuild tool provides a DSL to create a CodeBuild project with some reasonable defaults.
+
+The codebuild tool installs `cb` and `codebuild` executables. Both of them do the same thing, `cb` is just shorter to type.
 
 ## Quick Start
 
-    codebuild init
-    codebuild deploy
-    codebuild start
+    cb init
+    cb deploy
+    cb start
+
+## Private Repo
+
+IMPORTANT: Before deploying, if you are using a private repo, use [aws codebuild import-source-credentials](https://docs.aws.amazon.com/cli/latest/reference/codebuild/import-source-credentials.html) to add credentials so that codebuild can clone down the repo.  Refer to [github_oauth.md](readme/github_oauth.md) for more info.
 
 ## Usage
 
@@ -29,37 +35,37 @@ First, run `codebuild init` to generate a starter .codebuild structure.
 File | Description
 --- | ---
 buildspec.yml | The build commands to run.
-project.rb | The codebuild project defined as a DSL.
-role.rb | The IAM role assocaited with the codebuild project defined as a DSL.
+project.rb | The codebuild project written as a DSL.
+role.rb | The IAM role associated with the codebuild project written as a DSL.
 
 ### Deploy
 
 Adjust the files in `.codebuild` to fit your needs. When you're ready, deploy the CodeBuild project with:
 
-    codebuild deploy STACK_NAME
+    cb deploy STACK_NAME
 
 More examples:
 
-    codebuild deploy # infers the CloudFormation name from the parent folder
-    codebuild deploy stack-name # explicitly specify stack name
+    cb deploy # infers the CloudFormation name from the parent folder
+    cb deploy stack-name # explicitly specify stack name
 
 It is useful to just see the generated CloudFormation template with `--noop` mode:
 
-    codebuild deploy --noop # see generated CloudFormation template
+    cb deploy --noop # see generated CloudFormation template
 
 For more help:
 
-    codebuild deploy -h
+    cb deploy -h
 
 ### Start
 
 When you are ready to start a codebuild project run, you can use `codebuild start`. Examples:
 
-    codebuild start # infers the name from the parent folder
-    codebuild start stack-name # looks up project via CloudFormation stack
-    codebuild start demo-project # looks up project via CodeBuild project name
+    cb start # infers the name from the parent folder
+    cb start stack-name # looks up project via CloudFormation stack
+    cb start demo-project # looks up project via CodeBuild project name
 
-The `codebuild start` command understands multiple identifiers. It will look up the codebuild project either via CloudFormation or the CodeBuild project name.
+The `cb start` command understands multiple identifiers. It will look up the codebuild project either via CloudFormation or the CodeBuild project name.
 
 ## Project DSL
 
@@ -68,12 +74,12 @@ The tool provides a DSL to create a codebuild project.  Here's an example.
 .codebuild/project.rb:
 
 ```ruby
-name("demo")
+# name("demo") # recommended to leave unset and use the conventional name that cb tool sets
 github_url("https://github.com/tongueroo/demo-ufo")
 linux_image("aws/codebuild/ruby:2.5.3-1.7.0")
 environment_variables(
   UFO_ENV: "development",
-  API_KEY: "ssm:/codebuild/demo/api_key"
+  API_KEY: "ssm:/codebuild/demo/api_key" # ssm param example
 )
 ```
 
@@ -119,9 +125,9 @@ iam_policy(
 
 The convenience DSL methods shown above are short and clean.  They merely wrap a DSL that map to the properties of CloudFormation resources like [AWS::CodeBuild::Project](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html) and [AWS::IAM::Role](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html). Refer the [Full DSL docs](readme/full_dsl.md) for more info.
 
-## Lookup Paths
+## Type Option
 
-By default, the codebuild tool looks up files in the `.codebuild` folder.  You can affect the behavior of the lookup logic with the `--lookup` option.  More info [Lookup docs](readme/lookup.md).
+By default, the codebuild tool looks up files in the `.codebuild` folder.  You can affect the behavior of the Type logic with the `--Type` option.  More info [Type docs](readme/type.md).
 
 ## Installation
 

data/codebuild.gemspec

@@ -23,7 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk-codebuild"
   spec.add_dependency "aws-sdk-ssm"
   spec.add_dependency "cfn_camelizer"
+  spec.add_dependency "memoist"
   spec.add_dependency "rainbow"
+  spec.add_dependency "render_me_pretty"
   spec.add_dependency "thor"
 
   spec.add_development_dependency "bundler"

data/exe/cb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+# Trap ^C
+Signal.trap("INT") {
+  puts "\nCtrl-C detected. Exiting..."
+  sleep 1
+  exit
+}
+
+$:.unshift(File.expand_path("../../lib", __FILE__))
+require "codebuild"
+require "codebuild/cli"
+
+Codebuild::CLI.start(ARGV)

data/lib/codebuild/autoloader.rb

@@ -0,0 +1,21 @@
+require "zeitwerk"
+
+module Codebuild
+  class Autoloader
+    class Inflector < Zeitwerk::Inflector
+      def camelize(basename, _abspath)
+        map = { cli: "CLI", version: "VERSION" }
+        map[basename.to_sym] || super
+      end
+    end
+
+    class << self
+      def setup
+        loader = Zeitwerk::Loader.new
+        loader.inflector = Inflector.new
+        loader.push_dir(File.dirname(__dir__)) # lib
+        loader.setup
+      end
+    end
+  end
+end

data/lib/codebuild/aws_services/helpers.rb

@@ -25,8 +25,25 @@ module Codebuild::AwsServices
       exist
     end
 
-    def inferred_stack_name
-      File.basename(Dir.pwd).gsub('_','-').gsub(/[^0-9a-zA-Z,-]/, '')
+    def project_name_convention(name_base)
+      [@project_name, @options[:type], Codebuild.env, Codebuild.env_extra].reject(&:blank?).compact.join("-")
+    end
+
+    def inferred_project_name
+      # Essentially the project's parent folder
+      File.basename(Dir.pwd).gsub('_','-').gsub(/\.+/,'-').gsub(/[^0-9a-zA-Z,-]/, '')
+    end
+
+    # Examples:
+    #
+    #     myapp-ci-deploy # with Settings stack_naming append_env set to false.
+    #     myapp-ci-deploy-development
+    #     myapp-ci-deploy-development-2
+    #
+    def inferred_stack_name(project_name)
+      items = [project_name, "cb", @options[:type], Codebuild.env_extra]
+      items.insert(3, Codebuild.env) if Codebuild.settings.dig(:stack_naming, :append_env)
+      items.reject(&:blank?).compact.join("-")
     end
 
     def are_you_sure?(stack_name, action)

data/lib/codebuild/aws_services.rb

@@ -3,7 +3,6 @@ require "aws-sdk-cloudformation"
 
 module Codebuild
   module AwsServices
-    autoload :Helpers, "codebuild/aws_services/helpers"
     include Helpers
 
     def codebuild

data/lib/codebuild/cli.rb

@@ -10,49 +10,33 @@ module Codebuild
     end
     register(Init, "init", "init", "Set up initial ufo files.")
 
-    desc "evaluate", "Evaluate the .codebuild/project.rb DSL."
-    long_desc Help.text(:evaluate)
-    def evaluate
-      Dsl.new(options).evaluate
-    end
-
-    deploy_options = Proc.new do
-      option :lookup, desc: "folder to use within .codebuild folder for extra lookups of files"
-    end
-
-    desc "create", "Create codebuild project."
-    long_desc Help.text(:create)
-    deploy_options.call
-    def create(stack_name=nil)
-      Create.new(options.merge(stack_name: stack_name)).run
-    end
-
-    desc "update", "Update codebuild project."
-    long_desc Help.text(:update)
-    deploy_options.call
-    def update(stack_name=nil)
-      Update.new(options.merge(stack_name: stack_name)).run
+    common_options = Proc.new do
+      option :type, desc: "folder to use within .codebuild folder for different build types"
+      option :stack_name, desc: "Override the generated stack name. If you use this you must always specify it"
     end
 
     desc "deploy", "Deploy codebuild project."
     long_desc Help.text(:deploy)
-    deploy_options.call
-    def deploy(stack_name=nil)
-      Deploy.new(options.merge(stack_name: stack_name)).run
+    common_options.call
+    def deploy(project_name=nil)
+      Deploy.new(options.merge(project_name: project_name)).run
     end
 
     desc "delete", "Delete codebuild project."
     long_desc Help.text(:delete)
     option :sure, desc: "Bypass are you sure prompt"
-    def delete(stack_name=nil)
-      Delete.new(options.merge(stack_name: stack_name)).run
+    common_options.call
+    def delete(project_name=nil)
+      Delete.new(options.merge(project_name: project_name)).run
     end
 
     desc "start", "start codebuild project."
     long_desc Help.text(:start)
     option :source_version, default: "master", desc: "git branch"
-    def start(identifier=nil)
-      Start.new(options.merge(identifier: identifier)).run
+    option :branch, aliases: "b", default: "master", desc: "git branch"
+    common_options.call
+    def start(project_name=nil)
+      Start.new(options.merge(project_name: project_name)).run
     end
 
     desc "completion *PARAMS", "Prints words for auto-completion."

data/lib/codebuild/completer.rb

@@ -70,8 +70,6 @@ Auto-completion accounts for each of these type of commands.
 =end
 module Codebuild
   class Completer
-    autoload :Script, 'codebuild/completer/script'
-
     def initialize(command_class, *params)
       @params = params
       @current_command = @params[0]

data/lib/codebuild/core.rb

@@ -0,0 +1,61 @@
+require 'pathname'
+require 'yaml'
+
+module Codebuild
+  module Core
+    extend Memoist
+
+    def root
+      path = ENV['CB_ROOT'] || '.'
+      Pathname.new(path)
+    end
+
+    def env
+      # 2-way binding
+      cb_env = env_from_profile || 'development'
+      cb_env = ENV['CB_ENV'] if ENV['CB_ENV'] # highest precedence
+      cb_env
+    end
+    memoize :env
+
+    def env_extra
+      env_extra = ENV['CB_ENV_EXTRA'] if ENV['CB_ENV_EXTRA'] # highest precedence
+      return if env_extra&.empty?
+      env_extra
+    end
+    memoize :env_extra
+
+    # Overrides AWS_PROFILE based on the Codebuild.env if set in configs/settings.yml
+    # 2-way binding.
+    def set_aws_profile!
+      return if ENV['TEST']
+      return unless File.exist?("#{Codebuild.root}/.codebuild/settings.yml") # for rake docs
+      return unless settings # Only load if within Codebuild project and there's a settings.yml
+      data = settings[Codebuild.env] || {}
+      if data["aws_profile"]
+        puts "Using AWS_PROFILE=#{data["aws_profile"]} from CB_ENV=#{Codebuild.env} in config/settings.yml"
+        ENV['AWS_PROFILE'] = data["aws_profile"]
+      end
+    end
+
+    def settings
+      Setting.new.data
+    end
+    memoize :settings
+
+    def check_codebuild_project!
+      check_path = "#{Codebuild.root}/.codebuild/settings.yml"
+      unless File.exist?(check_path)
+        puts "ERROR: No settings file at #{check_path}.  Are you sure you are in a project with codebuild setup?".color(:red)
+        puts "Current directory: #{Dir.pwd}"
+        puts "If you want to set up codebuild for this prjoect, please create a settings file via: codebuild init"
+        exit 1 unless ENV['TEST']
+      end
+    end
+
+  private
+    def env_from_profile
+      Codebuild::Setting.new.cb_env
+    end
+  end
+end

data/lib/codebuild/default/settings.yml

@@ -0,0 +1,3 @@
+base:
+  stack_naming:
+    append_env: true

data/lib/codebuild/delete.rb

@@ -4,7 +4,8 @@ module Codebuild
 
     def initialize(options)
       @options = options
-      @stack_name = options[:stack_name] || inferred_stack_name
+      @project_name = options[:project_name] || inferred_project_name
+      @stack_name = options[:stack_name] || inferred_stack_name(@project_name)
     end
 
     def run

data/lib/codebuild/dsl/project.rb

@@ -1,6 +1,5 @@
 module Codebuild::Dsl
   module Project
-    autoload :Ssm, "codebuild/dsl/project/ssm"
     include Ssm
 
     PROPERTIES = %w[

data/lib/codebuild/evaluate.rb

@@ -41,12 +41,7 @@ module Codebuild
     end
 
     def lookup_codebuild_file(name)
-      folder_path = [".codebuild", @options[:lookup], name].compact.join("/")
-      if File.exist?(folder_path)
-        folder_path
-      else
-        ".codebuild/#{name}" # default
-      end
+      [".codebuild", @options[:type], name].compact.join("/")
     end
   end
 end

data/lib/codebuild/init.rb

@@ -20,7 +20,7 @@ module Codebuild
     def set_source_path
       return unless @options[:template]
 
-      custom_template = "#{ENV['HOME']}/.codebuild/templates/#{@options[:template]}"
+      custom_template = "#{ENV['HOME']}/.codebuild/templates/#{full_repo_name}"
 
       if @options[:template_mode] == "replace" # replace the template entirely
         override_source_paths(custom_template)
@@ -69,7 +69,9 @@ module Codebuild
         end
       end
       versions = versions.select { |v| v =~ pattern }
-      versions.sort.last # IE: aws/codebuild/ruby:2.5.3-1.7.0
+      # IE: aws/codebuild/ruby:2.5.3-1.7.0
+      # Falls back to hard-coded image name since the API changed and looks like it's returning no ruby images
+      versions.sort.last || "aws/codebuild/ruby:2.5.3-1.7.0"
     end
   end
 end

data/lib/codebuild/project.rb

@@ -5,13 +5,20 @@ module Codebuild
     include Dsl::Project
     include Evaluate
 
+    attr_reader :project_name, :full_project_name, :project_path
     def initialize(options={})
       @options = options
+      @project_name = options[:project_name]
+      @full_project_name = options[:full_project_name] # includes -development at the end
       @project_path = options[:project_path] || get_project_path
       # These defaults make it the project.rb simpler
       @properties = default_properties
     end
 
+    def exist?
+      File.exist?(@project_path)
+    end
+
     def run
       evaluate(@project_path)
       resource = {
@@ -25,6 +32,8 @@ module Codebuild
 
     def default_properties
       {
+        name: @full_project_name,
+        description: @full_project_name,
         artifacts: { type: "NO_ARTIFACTS" },
         service_role: { ref: "IamRole" },
         badge_enabled: true,
@@ -38,7 +47,7 @@ module Codebuild
         source: {
           type: "GITHUB",
           # location: "", # required
-          git_clone_depth: 1,
+          # git_clone_depth: 1,
           git_submodules_config: { fetch_submodules: true },
           build_spec: build_spec,
           # auth doesnt seem to work, refer to https://github.com/tongueroo/codebuild/blob/master/readme/github_oauth.md

data/lib/codebuild/sequence.rb

@@ -29,7 +29,7 @@ module Codebuild
         abort "Unable to detect git installation on your system.  Git needs to be installed in order to use the --template option."
       end
 
-      template_path = "#{ENV['HOME']}/.codebuild/templates/#{options[:template]}"
+      template_path = "#{ENV['HOME']}/.codebuild/templates/#{full_repo_name}"
       if File.exist?(template_path)
         sh("cd #{template_path} && git pull")
       else
@@ -38,6 +38,12 @@ module Codebuild
       end
     end
 
+    def full_repo_name
+      full_repo = options[:template].split("/")[-2..-1].join("/")
+      full_repo = full_repo.split(":").last
+      full_repo.sub(".git", "")
+    end
+
     # normalize repo_url
     def repo_url
       template = options[:template]

data/lib/codebuild/setting.rb

@@ -0,0 +1,80 @@
+require 'yaml'
+require 'render_me_pretty'
+
+module Codebuild
+  class Setting
+    extend Memoist
+    def initialize(check_codebuild_project=true)
+      @check_codebuild_project = check_codebuild_project
+    end
+
+    # data contains the settings.yml config.  The order or precedence for settings
+    # is the project ufo/settings.yml and then the ~/.codebuild/settings.yml.
+    def data
+      if @check_codebuild_project && !File.exist?(project_settings_path)
+        Codebuild.check_codebuild_project!
+      end
+
+      # project based settings files
+      project = load_file(project_settings_path)
+
+      user_file = "#{ENV['HOME']}/.codebuild/settings.yml"
+      user = File.exist?(user_file) ? YAML.load_file(user_file) : {}
+
+      default_file = File.expand_path("default/settings.yml", __dir__)
+      default = load_file(default_file)
+
+      all_envs = default.deep_merge(user.deep_merge(project))
+      all_envs = merge_base(all_envs)
+      data = all_envs[cb_env] || all_envs["base"] || {}
+      data.deep_symbolize_keys
+    end
+    memoize :data
+
+    # Resolves infinite problem since Codebuild.env can be determined from CB_ENV or settings.yml files.
+    # When ufo is determined from settings it should not called Codebuild.env since that in turn calls
+    # Settings.new.data which can then cause an infinite loop.
+    def cb_env
+      settings = YAML.load_file("#{cb_root}/.codebuild/settings.yml")
+      env = settings.find do |_env, section|
+        section ||= {}
+        ENV['AWS_PROFILE'] && ENV['AWS_PROFILE'] == section['aws_profile']
+      end
+
+      cb_env = env.first if env
+      cb_env = ENV['CB_ENV'] if ENV['CB_ENV'] # highest precedence
+      cb_env || 'development'
+    end
+
+  private
+    def load_file(path)
+      return Hash.new({}) unless File.exist?(path)
+
+      content = RenderMePretty.result(path)
+      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 |env, _setting|
+        data[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 |env, settings|
+        all_envs[env] = base.merge(settings) unless env == "base"
+      end
+      all_envs
+    end
+
+    def project_settings_path
+      "#{cb_root}/.codebuild/settings.yml"
+    end
+
+    def cb_root
+      ENV["CODEBUILD_ROOT"] || Dir.pwd
+    end
+  end
+end

data/lib/codebuild/stack.rb

@@ -6,12 +6,28 @@ module Codebuild
 
     def initialize(options)
       @options = options
-      @stack_name = options[:stack_name] || inferred_stack_name
-      @template = {"Resources" => {} }
+      @project_name = @options[:project_name] || inferred_project_name
+      @stack_name = options[:stack_name] || inferred_stack_name(@project_name)
+
+      @full_project_name = project_name_convention(@project_name)
+      @template = {
+        "Description" => "CodeBuild Project: #{@full_project_name}",
+        "Resources" => {}
+      }
     end
 
     def run
-      project = Project.new(@options).run
+      options = @options.merge(
+        project_name: @project_name,
+        full_project_name: @full_project_name,
+      )
+      project_builder = Project.new(options)
+      unless project_builder.exist?
+        puts "ERROR: Codebuild project does not exist: #{project_builder.project_path}".color(:red)
+        exit 1
+        return
+      end
+      project = project_builder.run
       @template["Resources"].merge!(project)
 
       if project["CodeBuild"]["Properties"]["ServiceRole"] == {"Ref"=>"IamRole"}
@@ -19,16 +35,39 @@ module Codebuild
         @template["Resources"].merge!(role)
       end
 
-      puts "Generated CloudFormation template:"
-      puts YAML.dump(@template)
+      template_path = "/tmp/codebuild.yml"
+      FileUtils.mkdir_p(File.dirname(template_path))
+      IO.write(template_path, YAML.dump(@template))
+      puts "Generated CloudFormation template at #{template_path.color(:green)}"
       return if @options[:noop]
+      puts "Deploying stack #{@stack_name.color(:green)} with CodeBuild project #{@full_project_name.color(:green)}"
 
       begin
         perform
+        url_info
+        status.wait
+        exit 2 unless status.success?
       rescue Aws::CloudFormation::Errors::ValidationError => e
-        puts "ERROR: #{e.message}".color(:red)
-        exit 1
+        if e.message.include?("No updates") # No updates are to be performed.
+          puts "WARN: #{e.message}".color(:yellow)
+        else
+          puts "ERROR: #{e.message}".color(:red)
+          exit 1
+        end
       end
     end
+
+  private
+    def url_info
+      stack = cfn.describe_stacks(stack_name: @stack_name).stacks.first
+      region = `aws configure get region`.strip rescue "us-east-1"
+      url = "https://console.aws.amazon.com/cloudformation/home?region=#{region}#/stacks"
+      puts "Stack name #{@stack_name.color(:yellow)} status #{stack["stack_status"].color(:yellow)}"
+      puts "Here's the CloudFormation url to check for more details #{url}"
+    end
+
+    def status
+      @status ||= Cfn::Status.new(@stack_name)
+    end
   end
 end

data/lib/codebuild/start.rb

@@ -4,26 +4,31 @@ module Codebuild
 
     def initialize(options)
       @options = options
-      @identifier = options[:identifier] || inferred_stack_name # CloudFormation stack or CodeBuild project name
+      @project_name = options[:project_name] || inferred_project_name
+      @full_project_name = project_name_convention(@project_name)
     end
 
     def run
+      source_version = @options[:branch] || @options[:source_version] || 'master'
       resp = codebuild.start_build(
         project_name: project_name,
-        source_version: @options[:source_version] || 'master'
+        source_version: source_version
       )
       puts "Build started for project: #{project_name}"
+      puts "Please check the CodeBuild console for the status."
+      puts "Codebuild Log Url:"
+      puts codebuild_log_url(resp.build.id)
     end
 
     def project_name
-      if stack_exists?(@identifier)
-        resp = cfn.describe_stack_resources(stack_name: @identifier)
+      if project_exists?(@full_project_name)
+        @full_project_name
+      elsif stack_exists?(@project_name) # allow `cb start STACK_NAME` to work too
+        resp = cfn.describe_stack_resources(stack_name: @project_name)
         resource = resp.stack_resources.find do |r|
           r.logical_resource_id == "CodeBuild"
         end
         resource.physical_resource_id # codebuild project name
-      elsif project_exists?(@identifier)
-        @identifier
       else
         puts "ERROR: Unable to find the codebuild project with identifier #@identifier".color(:red)
         exit 1
@@ -31,6 +36,12 @@ module Codebuild
     end
 
   private
+    def codebuild_log_url(build_id)
+      build_id = build_id.split(':').last
+      region = `aws configure get region`.strip rescue "us-east-1"
+      "https://#{region}.console.aws.amazon.com/codesuite/codebuild/projects/#{project_name}/build/#{project_name}%3A#{build_id}/log"
+    end
+
     def project_exists?(name)
       resp = codebuild.batch_get_projects(names: [name])
       resp.projects.size > 0

data/lib/codebuild/version.rb

@@ -1,3 +1,3 @@
 module Codebuild
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/codebuild.rb

@@ -2,26 +2,19 @@ $:.unshift(File.expand_path("../", __FILE__))
 require "cfn_camelizer"
 require "codebuild/version"
 require "rainbow/ext/string"
+require "yaml"
+
+require "codebuild/autoloader"
+Codebuild::Autoloader.setup
+
+gem_root = File.dirname(__dir__)
+$:.unshift("#{gem_root}/vendor/cfn-status/lib")
+require "cfn/status"
 
 module Codebuild
   class Error < StandardError; end
-
-  autoload :AwsServices, "codebuild/aws_services"
-  autoload :CLI, "codebuild/cli"
-  autoload :Command, "codebuild/command"
-  autoload :Completer, "codebuild/completer"
-  autoload :Completion, "codebuild/completion"
-  autoload :Create, "codebuild/create"
-  autoload :Delete, "codebuild/delete"
-  autoload :Deploy, "codebuild/deploy"
-  autoload :Dsl, "codebuild/dsl"
-  autoload :Evaluate, "codebuild/evaluate"
-  autoload :Help, "codebuild/help"
-  autoload :Init, "codebuild/init"
-  autoload :Project, "codebuild/project"
-  autoload :Role, "codebuild/role"
-  autoload :Sequence, "codebuild/sequence"
-  autoload :Stack, "codebuild/stack"
-  autoload :Start, "codebuild/start"
-  autoload :Update, "codebuild/update"
+  extend Core
 end
+
+
+Codebuild.set_aws_profile!

data/lib/template/.codebuild/buildspec.yml

@@ -4,12 +4,12 @@ version: 0.2
 # Edit to fit your needs
 
 phases:
-  pre_build:
+  install:
     commands:
       - uname -a
       - pwd
       - ls
-      - env
+      - env | sort
       - ls /etc/*release*
       - cat /etc/*release*
       - whoami

data/lib/template/.codebuild/project.rb.tt

@@ -1,7 +1,7 @@
 # For methods, refer to the properties of the CloudFormation CodeBuild::Project https://amzn.to/2UTeNlr
 # For convenience methods, refer to the source https://github.com/tongueroo/codebuild/blob/master/lib/codebuild/dsl/project.rb
 
-name("<%= project_name %>")
+# name("example-project-name") # recommend leaving unset and codebuild will use a conventional name
 github_url("<%= project_github_url %>")
 linux_image("<%= lookup_managed_image(/ruby:/) %>")
 environment_variables(
@@ -9,6 +9,10 @@ environment_variables(
   # API_KEY: "ssm:/codebuild/demo/api_key" # Example of ssm parameter
 )
 
+# Some useful helpers:
+# puts "project_name #{project_name}" # IE: demo-web
+# puts "full_project_name #{full_project_name}" # demo-web-development
+
 # Uncomment to enable github webhook, the GitHub oauth token needs admin:repo_hook permissions
 # Refer to https://github.com/tongueroo/codebuild/blob/master/readme/github_oauth.md
 # triggers(webhook: true)

data/lib/template/.codebuild/role.rb

@@ -1 +1,2 @@
-iam_policy("logs", "ssm")
+# Example:
+# iam_policy("logs", "ssm")

data/readme/github_oauth.md

@@ -4,9 +4,22 @@ Thought that we need to set the oauth token as part of the CloudFormation templa
 
 Instead this guide [Using Access Tokens with Your Source Provider in CodeBuild](https://docs.aws.amazon.com/codebuild/latest/userguide/sample-access-tokens.html) with [aws codebuild import-source-credentials](https://docs.aws.amazon.com/cli/latest/reference/codebuild/import-source-credentials.html) worked.
 
+## Create the GitHub Oauth Token
+
+One way to create an GitHub oauth token:
+
+1. Go to GitHub
+2. Settings
+3. Developer Settings
+4. Personal access tokens
+
+IMPORTANT: If using webhook, the oauth token needs `admin:repo_hook` also.  To check this, you can log into the github, go to the repo, and see if you have access to the "Settings" tab.
+
+![](https://raw.githubusercontent.com/tongueroo/codebuild/master/img/github-admin-settings-tab.png)
+
 ## Commands
 
-Here are the commands for posterity.
+Here are the import-source-credentials commands for posterity.
 
 Save the GitHub oauth token to parameter store, in case we need it in the future.
 
@@ -24,14 +37,3 @@ Import the source credential into codebuild.
     EOL
     aws codebuild import-source-credentials --cli-input-json file:///tmp/codebuild-source-credentials.json
     aws codebuild list-source-credentials
-
-## Creating the GitHub Oauth Token
-
-One way to create an GitHub oauth token:
-
-1. Go to GitHub
-2. Settings
-3. Developer Settings
-4. Personal access tokens
-
-If using webhook, the oauth token needs `admin:repo_hook` also.

data/readme/type.md

@@ -0,0 +1,33 @@
+# Type Option
+
+By default, the codebuild tool looks up files in the `.codebuild` folder.  You can affect the behavior of the lookup logic with the `--type` option.
+
+## Examples
+
+    cb deploy --type deploy
+
+This will look up buildspec.yml, project.rb, and role.rb files in the `.codebuild/deploy` folder. So:
+
+    .codebuild/deploy/buildspec.yml
+    .codebuild/deploy/project.rb
+    .codebuild/deploy/role.rb
+
+Likewise `cb deploy --type unit` would result in:
+
+    .codebuild/unit/buildspec.yml
+    .codebuild/unit/project.rb
+    .codebuild/unit/role.rb
+
+## Type Stack Name
+
+The CloudFormation stack name is appended with the name of the type option. So if you project folder is `demo` and the type option is `unit`.
+
+    cd demo # project folder
+    cb deploy --type deploy
+
+It produces an inferred stack name of `demo-cb-deploy-development`.  You can override the CloudFormation stack name by specifying the project name explicitly.  The project name is an optional first argument. Here's an example:
+
+    cd demo # project folder
+    cb deploy demo-web --type deploy # stack name: demo-web-cb-deploy-development
+
+You can also override the stack name with the `--stack-name` option.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebuild
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: memoist
+  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: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: render_me_pretty
+  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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +210,7 @@ description:
 email:
 - tongueroo@gmail.com
 executables:
+- cb
 - codebuild
 extensions: []
 extra_rdoc_files: []
@@ -189,7 +218,9 @@ files:
 - ".codebuild/buildspec.yml"
 - ".codebuild/project.rb"
 - ".gitignore"
+- ".gitmodules"
 - ".rspec"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -197,8 +228,11 @@ files:
 - README.md
 - Rakefile
 - codebuild.gemspec
+- exe/cb
 - exe/codebuild
+- img/github-admin-settings-tab.png
 - lib/codebuild.rb
+- lib/codebuild/autoloader.rb
 - lib/codebuild/aws_services.rb
 - lib/codebuild/aws_services/helpers.rb
 - lib/codebuild/cli.rb
@@ -206,10 +240,11 @@ files:
 - lib/codebuild/completer.rb
 - lib/codebuild/completer/script.rb
 - lib/codebuild/completer/script.sh
+- lib/codebuild/core.rb
 - lib/codebuild/create.rb
+- lib/codebuild/default/settings.yml
 - lib/codebuild/delete.rb
 - lib/codebuild/deploy.rb
-- lib/codebuild/dsl.rb
 - lib/codebuild/dsl/project.rb
 - lib/codebuild/dsl/project/ssm.rb
 - lib/codebuild/dsl/role.rb
@@ -224,6 +259,7 @@ files:
 - lib/codebuild/project.rb
 - lib/codebuild/role.rb
 - lib/codebuild/sequence.rb
+- lib/codebuild/setting.rb
 - lib/codebuild/stack.rb
 - lib/codebuild/start.rb
 - lib/codebuild/update.rb
@@ -233,7 +269,7 @@ files:
 - lib/template/.codebuild/role.rb
 - readme/full_dsl.md
 - readme/github_oauth.md
-- readme/lookup.md
+- readme/type.md
 - spec/fixtures/app/.codebuild/project.rb
 - spec/fixtures/app/.codebuild/role.rb
 - spec/lib/cli_spec.rb
@@ -259,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: CodeBuild DSL Tool to Quickly Create CodeBuild Project

data/lib/codebuild/dsl.rb

@@ -1,8 +0,0 @@
-require "yaml"
-
-module Codebuild
-  module Dsl
-    autoload :Project, "codebuild/dsl/project"
-    autoload :Role, "codebuild/dsl/role"
-  end
-end

data/readme/lookup.md

@@ -1,34 +0,0 @@
-# Lookup Paths
-
-By default, the codebuild tool looks up files in the `.codebuild` folder.  You can affect the behavior of the lookup logic with the `--lookup` option.
-
-## Example 1
-
-    codebuild deploy --lookup unit
-
-This will look up buildspec.yml, project.rb, and role.rb files in the `.codebuild/unit` folder first. If files are found, then it will use those files in that folder. If not found, it'll fall back to the `.codebuild` parent folder.
-
-Lookup order with `--lookup unit` for `buildspec.yml`:
-
-1. .codebuild/unit/buildspec.yml
-2. .codebuild/buildspec.yml
-
-Lookup order with `--lookup unit` for `project.rb`:
-
-1. .codebuild/unit/project.rb
-2. .codebuild/project.rb
-
-The same goes other files in the `.codebuild` like `role.rb`.
-
-## Example 2
-
-Here's another example:
-
-    codebuild deploy --lookup deploy
-
-Lookup order with `--lookup deploy` for `buildspec.yml`:
-
-1. .codebuild/deploy/buildspec.yml
-2. .codebuild/buildspec.yml
-
-The same goes other files in the `.codebuild` like `project.rb` and `role.rb`.