simple_deploy 0.7.2 → 0.7.3

data/lib/simple_deploy/cli/environments.rb

@@ -19,7 +19,7 @@ EOS
           opt :help, "Display Help"
         end
 
-        Config.new.environments.keys.each { |e| puts e }
+        SimpleDeploy.environments.keys.each { |e| puts e }
       end
 
       def command_summary

data/lib/simple_deploy/cli/events.rb

@@ -26,22 +26,16 @@ EOS
         valid_options? :provided => @opts,
                        :required => [:environment, :name]
 
-        config = Config.new.environment @opts[:environment]
+        SimpleDeploy.create_config @opts[:environment]
+        SimpleDeploy.logger @opts[:log_level]
+        stack = Stack.new :name        => @opts[:name],
+                          :environment => @opts[:environment]
 
-        stack = Stack.new :environment => @opts[:environment],
-                          :name        => @opts[:name],
-                          :config      => config,
-                          :logger      => logger
-
-        rescue_stackster_exceptions_and_exit do
+        rescue_exceptions_and_exit do
           jj stack.events @opts[:count]
         end
       end
 
-      def logger
-        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
-      end
-
       def command_summary
         "Show events for a stack"
       end

data/lib/simple_deploy/cli/execute.rb

@@ -39,14 +39,15 @@ EOS
         valid_options? :provided => @opts,
                        :required => [:environment, :name]
 
+        SimpleDeploy.create_config @opts[:environment]
+        logger = SimpleDeploy.logger @opts[:log_level]
+
         @opts[:name].each do |name|
           notifier = Notifier.new :stack_name  => name,
-                                  :environment => @opts[:environment],
-                                  :logger      => logger
+                                  :environment => @opts[:environment]
 
-          stack = Stack.new :environment => @opts[:environment],
-                            :name        => name,
-                            :logger      => logger,
+          stack = Stack.new :name        => name,
+                            :environment => @opts[:environment],
                             :internal    => @opts[:internal]
 
           begin
@@ -61,10 +62,6 @@ EOS
         end
       end
 
-      def logger
-        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
-      end
-
       def command_summary
         'Execute command on given stack(s)'
       end

data/lib/simple_deploy/cli/instances.rb

@@ -25,12 +25,11 @@ EOS
         valid_options? :provided => @opts,
                        :required => [:environment, :name]
 
-        config = Config.new.environment @opts[:environment]
+        SimpleDeploy.create_config @opts[:environment]
+        logger = SimpleDeploy.logger @opts[:log_level]
 
-        stack = Stack.new :environment => @opts[:environment],
-                          :name        => @opts[:name],
-                          :config      => config,
-                          :logger      => logger,
+        stack = Stack.new :name        => @opts[:name],
+                          :environment => @opts[:environment],
                           :internal    => @opts[:internal]
 
         exit 1 unless stack.exists?
@@ -44,10 +43,6 @@ EOS
         end
       end
 
-      def logger
-        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
-      end
-
       def command_summary
         'List instances for stack'
       end

data/lib/simple_deploy/cli/list.rb

@@ -1,5 +1,7 @@
 require 'trollop'
 
+require 'simple_deploy/stack/stack_lister'
+
 module SimpleDeploy
   module CLI
 
@@ -25,20 +27,13 @@ EOS
         valid_options? :provided => @opts,
                        :required => [:environment]
 
-        config = Config.new.environment @opts[:environment]
-        stacks = Stackster::StackLister.new(:config => config).all.sort
+        SimpleDeploy.create_config @opts[:environment]
+        SimpleDeploy.logger @opts[:log_level]
 
-        stack = Stack.new :environment => @opts[:environment],
-                          :name        => @opts[:name],
-                          :config      => config,
-                          :logger      => logger
+        stacks = SimpleDeploy::StackLister.new.all.sort
         puts stacks
       end
 
-      def logger
-        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
-      end
-
       def command_summary
         'List stacks in an environment'
       end

data/lib/simple_deploy/cli/outputs.rb

@@ -28,14 +28,12 @@ EOS
         valid_options? :provided => @opts,
                        :required => [:environment, :name]
 
-        config = Config.new.environment @opts[:environment]
+        SimpleDeploy.create_config @opts[:environment]
+        logger = SimpleDeploy.logger @opts[:log_level]
+        stack = Stack.new :name        => @opts[:name],
+                          :environment => @opts[:environment]
 
-        stack = Stack.new :environment => @opts[:environment],
-                          :name        => @opts[:name],
-                          :config      => config,
-                          :logger      => logger
-
-        rescue_stackster_exceptions_and_exit do
+        rescue_exceptions_and_exit do
           @outputs = stack.outputs
 
           logger.info "No outputs." unless @outputs.any?
@@ -63,10 +61,6 @@ EOS
         end
       end
 
-      def logger
-        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
-      end
-
     end
   end
 end

data/lib/simple_deploy/cli/parameters.rb

@@ -26,22 +26,16 @@ EOS
         valid_options? :provided => @opts,
                        :required => [:environment, :name]
 
-        config = Config.new.environment @opts[:environment]
+        SimpleDeploy.create_config @opts[:environment]
+        SimpleDeploy.logger @opts[:log_level]
+        stack = Stack.new :name        => @opts[:name],
+                          :environment => @opts[:environment]
 
-        stack = Stack.new :environment => @opts[:environment],
-                          :name        => @opts[:name],
-                          :config      => config,
-                          :logger      => logger
-
-        rescue_stackster_exceptions_and_exit do
+        rescue_exceptions_and_exit do
           puts stack.parameters.sort
         end
       end
 
-      def logger
-        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
-      end
-
       def command_summary
         'Show parameters of a stack'
       end

data/lib/simple_deploy/cli/protect.rb

@@ -29,23 +29,18 @@ EOS
         valid_options? :provided => @opts,
                        :required => [:environment, :name]
 
-        config = Config.new.environment @opts[:environment]
+        SimpleDeploy.create_config @opts[:environment]
+        SimpleDeploy.logger @opts[:log_level]
 
         @opts[:name].each do |name|
-          stack = Stack.new :environment => @opts[:environment],
-                            :name        => name,
-                            :config      => config,
-                            :logger      => logger
-          rescue_stackster_exceptions_and_exit do
+          stack = Stack.new :name        => name,
+                            :environment => @opts[:environment]
+          rescue_exceptions_and_exit do
             stack.update :attributes => [{ 'protection' => @opts[:protection] }]
           end
         end
       end
 
-      def logger
-        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
-      end
-
       def command_summary
         'Protect/Unprotect one or more stacks'
       end

data/lib/simple_deploy/cli/resources.rb

@@ -27,22 +27,16 @@ EOS
         valid_options? :provided => @opts,
                        :required => [:environment, :name]
 
-        config = Config.new.environment @opts[:environment]
+        SimpleDeploy.create_config @opts[:environment]
+        SimpleDeploy.logger @opts[:log_level]
+        stack = Stack.new :name        => @opts[:name],
+                          :environment => @opts[:environment]
 
-        stack = Stack.new :environment => @opts[:environment],
-                          :name        => @opts[:name],
-                          :config      => config,
-                          :logger      => logger
-
-        rescue_stackster_exceptions_and_exit do
+        rescue_exceptions_and_exit do
           jj stack.resources
         end
       end
 
-      def logger
-        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
-      end
-
       def command_summary
         'Show resources of a stack'
       end

data/lib/simple_deploy/cli/shared.rb

@@ -10,7 +10,7 @@ module SimpleDeploy
         attributes.each do |attribs|
           key   = attribs.split('=').first.gsub(/\s+/, "")
           value = attribs.gsub(/^.+?=/, '')
-          logger.info "Read #{key}=#{value}"
+          SimpleDeploy.logger.info "Read #{key}=#{value}"
           attrs << { key => value }
         end
         attrs
@@ -22,14 +22,14 @@ module SimpleDeploy
 
         required.each do |opt|
           unless provided[opt]
-            logger.error "Option '#{opt} (-#{opt[0]})' required but not specified."
+            SimpleDeploy.logger.error "Option '#{opt} (-#{opt[0]})' required but not specified."
             exit 1
           end
         end
 
         if required.include? :environment
-          unless Config.new.environments.keys.include? provided[:environment]
-            logger.error "Environment '#{provided[:environment]}' does not exist."
+          unless SimpleDeploy.environments.keys.include? provided[:environment]
+            SimpleDeploy.logger.error "Environment '#{provided[:environment]}' does not exist."
             exit 1
           end
         end
@@ -39,9 +39,9 @@ module SimpleDeploy
         self.class.name.split('::').last.downcase
       end
 
-      def rescue_stackster_exceptions_and_exit
+      def rescue_exceptions_and_exit
         yield
-      rescue Stackster::Exceptions::Base
+      rescue SimpleDeploy::Exceptions::Base
         exit 1
       end
 

data/lib/simple_deploy/cli/status.rb

@@ -24,22 +24,16 @@ EOS
         valid_options? :provided => @opts,
                        :required => [:environment, :name]
 
-        config = Config.new.environment @opts[:environment]
+        SimpleDeploy.create_config @opts[:environment]
+        SimpleDeploy.logger @opts[:log_level]
+        stack = Stack.new :name        => @opts[:name],
+                          :environment => @opts[:environment]
 
-        stack = Stack.new :environment => @opts[:environment],
-                          :name        => @opts[:name],
-                          :config      => config,
-                          :logger      => logger
-
-        rescue_stackster_exceptions_and_exit do
+        rescue_exceptions_and_exit do
           puts stack.status
         end
       end
 
-      def logger
-        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
-      end
-
       def command_summary
         'Show status of a stack'
       end

data/lib/simple_deploy/cli/template.rb

@@ -24,22 +24,17 @@ EOS
         valid_options? :provided => @opts,
                        :required => [:environment, :name]
 
-        config = Config.new.environment @opts[:environment]
-
-        stack = Stack.new :environment => @opts[:environment],
-                          :name        => @opts[:name],
-                          :config      => config,
-                          :logger      => logger
-
-        rescue_stackster_exceptions_and_exit do
-          jj stack.template
+        SimpleDeploy.create_config @opts[:environment]
+        SimpleDeploy.logger @opts[:log_level]
+        stack = Stack.new :name        => @opts[:name],
+                          :environment => @opts[:environment]
+
+        rescue_exceptions_and_exit do
+          raw_json = JSON.parse stack.template
+          puts JSON.pretty_generate raw_json
         end
       end
 
-      def logger
-        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
-      end
-
       def command_summary
         'Show current template for stack'
       end

data/lib/simple_deploy/cli/update.rb

@@ -30,25 +30,21 @@ EOS
         valid_options? :provided => @opts,
                        :required => [:environment, :name]
 
-        config = Config.new.environment @opts[:environment]
+        SimpleDeploy.create_config @opts[:environment]
+        SimpleDeploy.logger @opts[:log_level]
 
         attributes = parse_attributes :attributes => @opts[:attributes]
 
         @opts[:name].each do |name|
-          stack = Stack.new :environment => @opts[:environment],
-                            :name        => name,
-                            :config      => config,
-                            :logger      => logger
-          rescue_stackster_exceptions_and_exit do
+          stack = Stack.new :name        => name,
+                            :environment => @opts[:environment]
+
+          rescue_exceptions_and_exit do
             stack.update :force => @opts[:force], :attributes => attributes
           end
         end
       end
 
-      def logger
-        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
-      end
-
       def command_summary
         'Update the attributes for one more stacks'
       end

data/lib/simple_deploy/configuration.rb

@@ -0,0 +1,102 @@
+
+module SimpleDeploy
+  module Configuration
+    extend self
+
+    def configure(environment, custom_config = {})
+      raw_config = custom_config.fetch(:config) { load_config_file }
+      Config.new raw_config['environments'][environment],
+                 raw_config['notifications']
+    end
+
+    def environments(custom_config = {})
+      raw_config = custom_config.fetch(:config) { load_config_file }
+      raw_config['environments']
+    end
+
+    private
+
+    def load_config_file
+      begin
+        YAML::load File.open(config_file)
+      rescue Errno::ENOENT
+        raise "#{config_file} not found"
+      rescue ArgumentError, Psych::SyntaxError => e
+        raise "#{config_file} is corrupt"
+      end
+    end
+
+    def config_file
+      env_config_file || default_config_file
+    end
+
+    def env_config_file
+      env.load 'SIMPLE_DEPLOY_CONFIG_FILE'
+    end
+
+    def default_config_file
+      "#{env.load 'HOME'}/.simple_deploy.yml"
+    end
+
+    def env
+      @env ||= SimpleDeploy::Env.new
+    end
+
+    class Config
+      attr_reader :environment, :notifications
+
+      def initialize(environment, notifications)
+        raise ArgumentError.new("environment must be defined") unless environment
+
+        @environment = environment
+        @notifications = notifications
+      end
+
+      def artifacts
+        ['chef_repo', 'cookbooks', 'app']
+      end
+
+      def artifact_deploy_variable(artifact)
+        name_to_variable_map = { 'chef_repo' => 'CHEF_REPO_URL',
+                                 'app'       => 'APP_URL',
+                                 'cookbooks' => 'COOKBOOKS_URL' }
+        name_to_variable_map[artifact]
+      end
+
+      def artifact_cloud_formation_url(artifact)
+        name_to_url_map = { 'chef_repo' => 'ChefRepoURL',
+                            'app'       => 'AppArtifactURL',
+                            'cookbooks' => 'CookbooksURL' }
+        name_to_url_map[artifact]
+      end
+
+      def deploy_script
+        '/opt/intu/admin/bin/configure.sh'
+      end
+
+      def access_key
+        @environment['access_key']
+      end
+
+      def secret_key
+        @environment['secret_key']
+      end
+
+      def region
+        @environment['region']
+      end
+
+      private
+
+      def env_home
+        env.load 'HOME'
+      end
+
+      def env_user
+        env.load 'USER'
+      end
+
+
+    end
+  end
+end