simplygenius-atmos 0.7.1 → 0.8.0

data/lib/simplygenius/atmos/ui.rb

@@ -0,0 +1,173 @@
+require_relative '../atmos'
+require 'highline'
+require 'rainbow'
+require 'yaml'
+require 'open3'
+require 'os'
+require 'hashie'
+
+module SimplyGenius
+  module Atmos
+
+    module OSDockerDetection
+      refine OS.singleton_class do
+        def docker?
+          @docker ||= File.exist?('/.dockerenv')
+        end
+      end
+    end
+
+    module UI
+      extend ActiveSupport::Concern
+      include GemLogger::LoggerSupport
+      using OSDockerDetection
+
+      def self.color_enabled=(val)
+        Rainbow.enabled = val
+      end
+
+      def self.color_enabled
+        Rainbow.enabled
+      end
+
+      class Markup
+
+        def initialize(color = nil)
+          @color = color
+          @atmos_ui = HighLine.new
+        end
+
+        def say(statement)
+          statement = @color ? Rainbow(statement).send(@color) : statement
+          @atmos_ui.say(statement)
+        end
+
+        def ask(question, answer_type=nil, &details)
+          question = @color ? Rainbow(question).send(@color) : question
+          @atmos_ui.ask(question, answer_type, &details)
+        end
+
+        def agree(question, character=nil, &details)
+          question = @color ? Rainbow(question).send(@color) : question
+          @atmos_ui.agree(question, character, &details)
+        end
+
+        def choose(*items, &details)
+          # TODO: figure out how to color menu
+          return @atmos_ui.choose(*items, &details)
+        end
+
+      end
+
+      def warn
+        return Markup.new(:yellow)
+      end
+
+      def error
+        return Markup.new(:red)
+      end
+
+      def say(statement)
+        return Markup.new().say(statement)
+      end
+
+      def ask(question, answer_type=nil, &details)
+        return Markup.new().ask(question, answer_type, &details)
+      end
+
+      def agree(question, character=nil, &details)
+        return Markup.new().agree(question, character, &details)
+      end
+
+      def choose(*items, &details)
+        return Markup.new().choose(*items, &details)
+      end
+
+      # Pretty display of hashes
+      def display(data)
+        data = Hashie.stringify_keys(data)
+        display = YAML.dump(data).sub(/\A---\n/, "").gsub(/^/, "  ")
+      end
+
+      def notify(message:nil, title: nil, modal: false, **opts)
+
+        result = {
+            'stdout' => '',
+            'success' => ''
+        }
+
+        message = message.to_s
+        title = title.present? ? title.to_s : "Atmos Notification"
+        modal = ["true", "1"].include?(modal.to_s)
+        modal = false if Atmos.config["ui.notify.disable_modal"]
+
+        return result if Atmos.config["ui.notify.disable"].to_s == "true"
+
+        force_inline = opts[:inline].to_s == "true" || Atmos.config["ui.notify.force_inline"].to_s == "true"
+
+        command = Atmos.config["ui.notify.command"]
+
+        if command.present? && ! force_inline
+
+          raise ArgumentError.new("notify command must be a list") if ! command.is_a?(Array)
+
+          command = command.collect do |c|
+            c = c.gsub("{{title}}", title)
+            c = c.gsub("{{message}}", message)
+            c = c.gsub("{{modal}}", modal.to_s)
+          end
+          result.merge! run_ui_process(*command)
+
+        elsif OS.mac? && ! force_inline
+          display_method = modal ? "displayDialog" : "displayNotification"
+
+          dialogScript = <<~EOF
+            var app = Application.currentApplication();
+            app.includeStandardAdditions = true;
+            app.#{display_method}(
+              #{JSON.generate(message)}, {
+                withTitle: #{JSON.generate(title)},
+                buttons: ['OK'],
+                defaultButton: 1
+            })
+          EOF
+
+          result.merge! run_ui_process("osascript", "-l", "JavaScript", "-e", dialogScript)
+
+        elsif OS.linux? && ! OS.docker? && ! force_inline
+          # TODO: add a modal option
+          result.merge! run_ui_process("notify-send", title, message)
+
+        # TODO windows notifications?
+        # elseif OS.windows? && ! force_inline
+
+        else
+
+          logger.debug("Notifications are unsupported on this OS") unless force_inline
+          logger.info(Rainbow("\n***** #{title} *****\n#{message}\n").orange)
+          if modal
+            logger.info(Rainbow("Hit enter to continue\n").orange)
+            $stdin.gets
+          end
+
+        end
+
+        return result
+      end
+
+      private
+
+      def run_ui_process(*args)
+        stdout, status = Open3.capture2e(*args)
+        result = {'stdout' => stdout, 'success' => status.success?.to_s}
+        if ! status.success?
+          result['error'] = "Notification process failed"
+          logger.debug("Failed to run notification utility: #{stdout}")
+        end
+        return result
+      end
+
+    end
+
+  end
+end

data/lib/simplygenius/atmos/utils.rb

@@ -0,0 +1,54 @@
+require_relative '../atmos'
+
+module SimplyGenius
+  module Atmos
+
+    module Utils
+
+      extend ActiveSupport::Concern
+      include GemLogger::LoggerSupport
+
+      class SymbolizedMash < ::Hashie::Mash
+        include Hashie::Extensions::Mash::SymbolizeKeys
+      end
+
+      # remove leading whitespace using first non-empty line to determine how
+      # much space to remove from the rest. Skips empty lines
+      def clean_indent(str)
+        first = true
+        first_size = 0
+        str.lines.collect do |line|
+          if line =~ /^(\s*)\S/ # line has at least one non-whitespace character
+            if first
+              first_size = Regexp.last_match(0).size
+              first = false
+            end
+            line[(first_size - 1)..-1]
+          else
+            line
+          end
+        end.join()
+      end
+
+      # wraps to an 80 character limit by adding newlines
+      def wrap(str)
+        result = ""
+        count = 0
+        str.each do |c|
+          result << c
+          if count >= 78
+            result << "\n"
+            count = 0
+          else
+            count += 1
+          end
+        end
+        return result
+      end
+
+      extend self
+
+    end
+
+  end
+end

data/lib/simplygenius/atmos/version.rb

@@ -0,0 +1,5 @@
+module SimplyGenius
+  module Atmos
+    VERSION = "0.8.0"
+  end
+end

data/templates/new/config/atmos.yml

@@ -16,20 +16,10 @@ global_name_prefix: "#{org}-#{atmos_env}-"
 #
 local_name_prefix:
 
-# The recipes to use for all environments, override at environment level if
-# need be.  The recipes to use when bootstrapping each environment will be
-# under the bootstrap key.  These are kept separate to make it easy to tear
-# down an environment without breaking terraform mid-destroy.  Most new
-# deployments will have all recipes under a single key (Default), but the use
-# of multiple keys to segment your infrastructure is useful as it grows larger
-#
-recipes:
-  bootstrap:
-  default:
-
 # Environment specific overrides.  When adding new environments place them
 # after the existing ones so that you don't end up with permission issues when
-# bootstrapping the new account
+# bootstrapping the new account.  You can also add overrides for each
+# environment in their corresponding yml file in config/atmos/environments/<env_name>.yml
 #
 environments:
   ops:
@@ -41,6 +31,13 @@ environments:
 #
 is_dev: "#{ /dev|test|demo/.match?(atmos_env) }"
 
+# A list of glob patterns for finding atmos yml files
+# Patterns can be absolute (beginning with /), but if not are applied relative
+# to the directory containing atmos.yml
+#
+config_sources:
+  - atmos/*.y{,a}ml
+
 # Sources for atmos templates
 # To circumvent the version lock and get the latest git master recipes, use the git
 # location, e.g.:
@@ -50,4 +47,15 @@ template_sources:
 - name: atmos-recipes
   location: https://github.com/simplygenius/atmos-recipes/archive/v#{atmos_version}.zip#atmos-recipes-#{atmos_version}
 #- name: atmos-pro-recipes
-#  location: https://github.com/simplygenius/atmos-pro-recipes/archive/v#{atmos_version}.zip#atmos-pro-recipes-#{atmos_version}
+#  location: https://YOUR_API_KEY@releases.simplygenius.com/recipes/v#{atmos_version}#atmos-pro-recipes-#{atmos_version}
+
+# To get the atmos-pro gem, add the gem source like:
+#   gem sources -a https://YOUR_API_KEY@releases.simplygenius.com/gems/
+# then install the gem:
+#   gem install simplygenius-atmos-pro
+# then add simplygenius-atmos-pro to the plugins key below
+#
+# The list of plugin gems to load when running atmos
+#
+plugins:
+#   - simplygenius-atmos-pro

data/templates/new/config/atmos/recipes.yml

@@ -0,0 +1,16 @@
+# The recipes to use for all environments, override at environment level if
+# need be.  The recipes to use when bootstrapping each environment will be
+# under the bootstrap key.  These are kept separate to make it easy to tear
+# down an environment without breaking terraform mid-destroy.  Most new
+# deployments will have all recipes under a single key (Default), but the use
+# of multiple keys to segment your infrastructure is useful as it grows larger
+#
+recipes:
+  bootstrap:
+  default:
+
+# Environment specific overrides for recipes.  You can also put these where you put other
+# overrides, but they are here as a convenience to keep recipe overrides close
+# to the defaults defined above
+#
+environments:

data/templates/new/config/atmos/runtime.yml

@@ -6,6 +6,10 @@ var_prefix:
 # Disable module fetch from convenience plan/apply commandss
 disable_auto_modules: false
 
+# Allows one to add a custom ruby load path list for extending atmos without
+# having to publish a gem
+load_path:
+
 # Configure the mechanism that allows terraform to callback into atmos
 ipc:
   # Disables all IPC callbacks into atmos from terraform
@@ -20,6 +24,11 @@ otp:
   # The file where otp secrets are stored
   secret_file: ~/.atmos.yml
 
+# Configure the template generator
+generate:
+  # The file storing the record of each generated template
+  state_file: .atmos-templates.yml
+
 # Configure the UI components
 ui:
   # Configures UI notifications

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplygenius-atmos
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -459,45 +459,51 @@ files:
 - TODO.md
 - exe/atmos
 - exe/atmos-docker
-- lib/atmos.rb
-- lib/atmos/cli.rb
-- lib/atmos/commands/account.rb
-- lib/atmos/commands/apply.rb
-- lib/atmos/commands/auth_exec.rb
-- lib/atmos/commands/base_command.rb
-- lib/atmos/commands/bootstrap.rb
-- lib/atmos/commands/container.rb
-- lib/atmos/commands/destroy.rb
-- lib/atmos/commands/generate.rb
-- lib/atmos/commands/init.rb
-- lib/atmos/commands/new.rb
-- lib/atmos/commands/otp.rb
-- lib/atmos/commands/plan.rb
-- lib/atmos/commands/secret.rb
-- lib/atmos/commands/terraform.rb
-- lib/atmos/commands/user.rb
-- lib/atmos/config.rb
-- lib/atmos/exceptions.rb
-- lib/atmos/generator.rb
-- lib/atmos/generator_factory.rb
-- lib/atmos/ipc.rb
-- lib/atmos/ipc_actions/notify.rb
-- lib/atmos/ipc_actions/ping.rb
-- lib/atmos/logging.rb
-- lib/atmos/otp.rb
-- lib/atmos/provider_factory.rb
-- lib/atmos/providers/aws/account_manager.rb
-- lib/atmos/providers/aws/auth_manager.rb
-- lib/atmos/providers/aws/container_manager.rb
-- lib/atmos/providers/aws/provider.rb
-- lib/atmos/providers/aws/s3_secret_manager.rb
-- lib/atmos/providers/aws/user_manager.rb
-- lib/atmos/settings_hash.rb
-- lib/atmos/terraform_executor.rb
-- lib/atmos/ui.rb
-- lib/atmos/utils.rb
-- lib/atmos/version.rb
+- lib/simplygenius/atmos.rb
+- lib/simplygenius/atmos/cli.rb
+- lib/simplygenius/atmos/commands/account.rb
+- lib/simplygenius/atmos/commands/apply.rb
+- lib/simplygenius/atmos/commands/auth_exec.rb
+- lib/simplygenius/atmos/commands/base_command.rb
+- lib/simplygenius/atmos/commands/bootstrap.rb
+- lib/simplygenius/atmos/commands/container.rb
+- lib/simplygenius/atmos/commands/destroy.rb
+- lib/simplygenius/atmos/commands/generate.rb
+- lib/simplygenius/atmos/commands/init.rb
+- lib/simplygenius/atmos/commands/new.rb
+- lib/simplygenius/atmos/commands/otp.rb
+- lib/simplygenius/atmos/commands/plan.rb
+- lib/simplygenius/atmos/commands/secret.rb
+- lib/simplygenius/atmos/commands/terraform.rb
+- lib/simplygenius/atmos/commands/user.rb
+- lib/simplygenius/atmos/config.rb
+- lib/simplygenius/atmos/exceptions.rb
+- lib/simplygenius/atmos/generator.rb
+- lib/simplygenius/atmos/ipc.rb
+- lib/simplygenius/atmos/ipc_actions/notify.rb
+- lib/simplygenius/atmos/ipc_actions/ping.rb
+- lib/simplygenius/atmos/logging.rb
+- lib/simplygenius/atmos/otp.rb
+- lib/simplygenius/atmos/plugin.rb
+- lib/simplygenius/atmos/plugin_manager.rb
+- lib/simplygenius/atmos/plugins/output_filter.rb
+- lib/simplygenius/atmos/plugins/prompt_notify.rb
+- lib/simplygenius/atmos/provider_factory.rb
+- lib/simplygenius/atmos/providers/aws/account_manager.rb
+- lib/simplygenius/atmos/providers/aws/auth_manager.rb
+- lib/simplygenius/atmos/providers/aws/container_manager.rb
+- lib/simplygenius/atmos/providers/aws/provider.rb
+- lib/simplygenius/atmos/providers/aws/s3_secret_manager.rb
+- lib/simplygenius/atmos/providers/aws/user_manager.rb
+- lib/simplygenius/atmos/settings_hash.rb
+- lib/simplygenius/atmos/source_path.rb
+- lib/simplygenius/atmos/template.rb
+- lib/simplygenius/atmos/terraform_executor.rb
+- lib/simplygenius/atmos/ui.rb
+- lib/simplygenius/atmos/utils.rb
+- lib/simplygenius/atmos/version.rb
 - templates/new/config/atmos.yml
+- templates/new/config/atmos/recipes.yml
 - templates/new/config/atmos/runtime.yml
 - templates/new/templates.yml
 homepage: https://github.com/simplygenius/atmos

data/lib/atmos/cli.rb

@@ -1,105 +0,0 @@
-require_relative '../atmos'
-require_relative '../atmos/ui'
-require 'clamp'
-require 'sigdump/setup'
-
-Dir.glob(File.join(File.join(__dir__, 'commands'), '*.rb')) do |f|
-  require_relative "commands/#{File.basename(f).sub(/\.rb$/, "")}"
-end
-
-module Atmos
-
-  # The command line interface to atmos
-  class CLI < Clamp::Command
-
-    include GemLogger::LoggerSupport
-
-    def self.description
-      desc = <<-DESC
-        Atmos version #{Atmos::VERSION}
-
-        Runs The atmos command line application
-
-        e.g.
-
-        atmos --help
-      DESC
-      desc.split("\n").collect(&:strip).join("\n")
-    end
-
-    option ["-d", "--debug"],
-           :flag, "debug output\n",
-           default: false
-
-    option ["-c", "--[no-]color"],
-           :flag, "colorize output (or not)\n (default: $stdout.tty?)"
-
-    option ["-e", "--atmos-env"],
-           'ENV', "The atmos environment\n",
-           environment_variable: 'ATMOS_ENV', default: 'ops'
-
-    def default_color?
-       $stdout.tty?
-    end
-
-    option ["-l", "--[no-]log"],
-           :flag, "log to file in addition to terminal (or not)\n",
-           default: true
-
-
-    subcommand "new", "Sets up a new atmos project",
-               Atmos::Commands::New
-    subcommand "generate", "Generate recipes for the repository",
-               Atmos::Commands::Generate
-    subcommand "bootstrap", "Init cloud provider for use with atmos",
-               Atmos::Commands::Bootstrap
-    subcommand "init", "Run terraform init",
-               Atmos::Commands::Init
-    subcommand "plan", "Run terraform plan",
-               Atmos::Commands::Plan
-    subcommand "apply", "Run terraform apply",
-               Atmos::Commands::Apply
-    subcommand "destroy", "Run terraform destroy",
-               Atmos::Commands::Destroy
-    subcommand "terraform", "Run all other terraform commands",
-               Atmos::Commands::Terraform
-    subcommand "account", "Account management commands",
-               Atmos::Commands::Account
-    subcommand "user", "User management commands",
-               Atmos::Commands::User
-    subcommand "otp", "Otp tools",
-               Atmos::Commands::Otp
-    subcommand "secret", "Secret management commands",
-               Atmos::Commands::Secret
-    subcommand "auth_exec", "Authenticated exec",
-               Atmos::Commands::AuthExec
-    subcommand "container", "Container tools",
-               Atmos::Commands::Container
-
-    subcommand "version", "Display version" do
-      def execute
-        logger.info "Atmos Version #{Atmos::VERSION}"
-      end
-    end
-
-    subcommand "config", "Display expanded config for atmos_env" do
-      def execute
-        logger.info YAML.dump(Atmos.config.to_h)
-      end
-    end
-
-    # hook into clamp lifecycle to force logging setup even when we are calling
-    # a subcommand
-    def parse(arguments)
-      super
-      if Atmos.config.nil?
-        Atmos.config = Atmos::Config.new(atmos_env)
-        log = Atmos.config.is_atmos_repo? && log? ? "atmos.log" : nil
-        Atmos::Logging.setup_logging(debug?, color?, log)
-        Atmos::UI.color_enabled = color?
-      end
-    end
-
-  end
-
-end