engineyard-serverside 2.6.14 → 2.6.15.alpha1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: daf0775ec8f386926ac69282acc20526c6445450
-  data.tar.gz: 543f54a3d09da38fb25703c483a67f92c4452ea3
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDkwNDUzZDIwOTQxYzhkZjdkODljNWNkZmMxNTZjMmVhNzc4NzJlNA==
+  data.tar.gz: !binary |-
+    NjZhZGU5MmI3NThmZTJiNDVkNTcwNjg0NDZlZWNlOGM1OWJmMzU2Yg==
 SHA512:
-  metadata.gz: e189f38af56de382a3975588ee02ed95ea2ae87f713429cc904afa24075f0be19185050678bce699e52d8552d65015d68d606aab1b574a0fb54d2ad032bd8509
-  data.tar.gz: a7aa22faa8818b7acc73813220e1d1812488d83552bb53aaa26ae7d8b856da2001fa0052bb04a4660cfd634b8a15c24215a5ac6b07d3d8097906df14af80178a
+  metadata.gz: !binary |-
+    MzZhNDVmMGEwMjA2NjA2MjlhZGNiNzc1NmE0Y2FhZTUxMDdhNmQ5NTRiZTM5
+    ZTc0MmM5MzE0NGVlYjM2YjA5MWFjZjc4MGZhNWVlOGQ3MjU0MWRhY2UzYzNj
+    MjdmYmI4Y2I4MTMwMzU4YmE3Y2Y1ZjY5MWNiN2Y2YTA4MTcwZjA=
+  data.tar.gz: !binary |-
+    ZjZjZjkzNzRiODE4MzhkNzhkNTdkZjljYmM5MDJkNzk1NDVhNjk4NTIwN2Y0
+    NDBmY2FmYzQ5NGUzMDM5OWVkNjgwMjk4M2NiYmFjYTVkNzQ1OGIyOWNjNDQw
+    ZGIyNjU3YTg0NGE4MzcyOTkyZWQwZTNkZmY5ZWE3MGY3MTBlYjY=

data/bin/engineyard-serverside

@@ -8,4 +8,4 @@ $LOAD_PATH.push(File.expand_path("../lib", File.dirname(__FILE__)))
 
 require 'engineyard-serverside'
 
-EY::Serverside::CLI.start
+EY::Serverside::CLI::App.start

data/lib/engineyard-serverside/cli.rb

@@ -1,232 +1,11 @@
-require 'thor'
-require 'pathname'
-require 'engineyard-serverside/about'
-require 'engineyard-serverside/deploy'
-require 'engineyard-serverside/shell'
-require 'engineyard-serverside/servers'
-require 'engineyard-serverside/cli_helpers'
+require 'engineyard-serverside/cli/app'
 
 module EY
   module Serverside
-    class CLI < Thor
-
-      extend CLIHelpers
-
-      method_option :migrate,         :type     => :string,
-                                      :desc     => "Run migrations with this deploy",
-                                      :aliases  => ["-m"]
-
-      method_option :branch,          :type     => :string,
-                                      :desc     => "Git ref to deploy, defaults to master. May be a branch, a tag, or a SHA",
-                                      :aliases  => %w[-b --ref --tag]
-
-      method_option :repo,            :type     => :string,
-                                      :desc     => "Remote repo to deploy",
-                                      :aliases  => ["-r"]
-
-
-      # Archive source strategy
-      method_option :archive,        :type     => :string,
-                                     :desc     => "Remote URI for archive to download and unzip"
-
-      # Git source strategy
-      method_option :git,            :type     => :string,
-                                     :desc     => "Remote git repo to deploy"
-
-      method_option :clean,          :type     => :boolean,
-                                     :desc     => "Run deploy without relying on existing files"
-
-
-      account_app_env_options
-      config_option
-      framework_env_option
-      instances_options
-      stack_option
-      verbose_option
-
-      desc "deploy", "Deploy code to /data/<app>"
-      def deploy(default_task=:deploy)
-        init_and_propagate(options, default_task.to_s) do |servers, config, shell|
-          EY::Serverside::Deploy.new(servers, config, shell).send(default_task)
-        end
-      end
-
-      account_app_env_options
-      config_option
-      instances_options
-      verbose_option
-      desc "enable_maintenance", "Enable maintenance page (disables web access)"
-      def enable_maintenance
-        init_and_propagate(options, 'enable_maintenance') do |servers, config, shell|
-          EY::Serverside::Maintenance.new(servers, config, shell).manually_enable
-        end
-      end
-
-      account_app_env_options
-      config_option
-      instances_options
-      verbose_option
-      desc "maintenance_status", "Maintenance status"
-      def maintenance_status
-        init(options, "maintenance-status") do |servers, config, shell|
-          EY::Serverside::Maintenance.new(servers, config, shell).status
-        end
-      end
-
-      account_app_env_options
-      config_option
-      instances_options
-      verbose_option
-      desc "disable_maintenance", "Disable maintenance page (enables web access)"
-      def disable_maintenance
-        init_and_propagate(options, 'disable_maintenance') do |servers, config, shell|
-          EY::Serverside::Maintenance.new(servers, config, shell).manually_disable
-        end
-      end
-
-      method_option :release_path,  :type     => :string,
-                                    :desc     => "Value for #release_path in hooks (mostly for internal coordination)",
-                                    :aliases  => ["-r"]
-
-      method_option :current_roles, :type     => :array,
-                                    :desc     => "Value for #current_roles in hooks"
-
-      method_option :current_name,  :type     => :string,
-                                    :desc     => "Value for #current_name in hooks"
-      account_app_env_options
-      config_option
-      framework_env_option
-      verbose_option
-      desc "hook [NAME]", "Run a particular deploy hook"
-      def hook(hook_name)
-        init(options, "hook-#{hook_name}") do |servers, config, shell|
-          EY::Serverside::DeployHook.new(config, shell, hook_name).call
-        end
-      end
-
-      method_option :ignore_existing, :type     => :boolean,
-                                      :desc     => "When syncing /data/app directory, don't overwrite destination files"
-      account_app_env_options
-      config_option
-      framework_env_option
-      instances_options
-      stack_option
-      verbose_option
-      desc "integrate", "Integrate other instances into this cluster"
-      def integrate
-        app_dir = Pathname.new "/data/#{options[:app]}"
-        current_app_dir = app_dir.join("current")
-
-        # so that we deploy to the same place there that we have here
-        integrate_options = options.dup
-        integrate_options[:release_path] = current_app_dir.realpath.to_s
-
-        # we have to deploy the same SHA there as here
-        integrate_options[:branch] = current_app_dir.join('REVISION').read.strip
-
-        # always rebundle gems on integrate to make sure the instance comes up correctly.
-        integrate_options[:clean] = true
-
-        logname = "integrate-#{options[:instances].join('-')}".gsub(/[^-.\w]/,'')
-
-        init_and_propagate(integrate_options, logname) do |servers, config, shell|
-
-          # We have to rsync the entire app dir, so we need all the permissions to be correct!
-          chown_command = %|find #{app_dir} \\( -not -user #{config.user} -or -not -group #{config.group} \\) -exec chown -h #{config.user}:#{config.group} "{}" +|
-          shell.logged_system("sudo sh -l -c '#{chown_command}'", servers.detect {|s| s.local?})
-
-          servers.run_for_each! do |server|
-            chown = server.command_on_server('sudo sh -l -c', chown_command)
-            sync  = server.sync_directory_command(app_dir, options[:ignore_existing])
-            clean = server.command_on_server('sh -l -c', "rm -rf #{current_app_dir}")
-            "(#{chown}) && (#{sync}) && (#{clean})"
-          end
-
-          # deploy local-ref to other instances into /data/$app/local-current
-          EY::Serverside::Deploy.new(servers, config, shell).cached_deploy
-        end
-      end
-
-      account_app_env_options
-      instances_options
-      stack_option
-      verbose_option
-      desc "restart", "Restart app servers, conditionally enabling maintenance page"
-      def restart
-        options = self.options.dup
-        options[:release_path] = Pathname.new("/data/#{options[:app]}/current").realpath.to_s
-
-        init_and_propagate(options, 'restart') do |servers, config, shell|
-          EY::Serverside::Deploy.new(servers, config, shell).restart_with_maintenance_page
-        end
-      end
-
-      private
-
-      def init_and_propagate(*args)
-        init(*args) do |servers, config, shell|
-          propagate(servers, shell)
-          yield servers, config, shell
-        end
-      end
-
-      def init(options, action)
-        config = EY::Serverside::Deploy::Configuration.new(options)
-        shell  = EY::Serverside::Shell.new(
-          :verbose  => config.verbose,
-          :log_path => File.join(ENV['HOME'], "#{config.app}-#{action}.log")
-        )
-        shell.debug "Initializing #{About.name_with_version}."
-        servers = load_servers(config, shell)
-        begin
-          yield servers, config, shell
-        rescue EY::Serverside::RemoteFailure => e
-          shell.fatal e.message
-          raise
-        rescue Exception => e
-          shell.fatal "#{e.backtrace[0]}: #{e.message} (#{e.class})"
-          raise
-        end
-      end
-
-      def propagate(servers, shell)
-        shell.status "Verifying and propagating #{About.name_with_version} to all servers."
-
-        gem_binary = About.gem_binary
-        remote_gem_file = File.join(Dir.tmpdir, About.gem_filename)
-
-        # the [,)] is to stop us from looking for e.g. 0.5.1, seeing
-        # 0.5.11, and mistakenly thinking 0.5.1 is there
-        check_command = %{#{gem_binary} list #{About.gem_name} | grep "#{About.gem_name}" | egrep -q "#{About.version.gsub(/\./, '\.')}[,)]"}
-        install_command = "#{gem_binary} install --no-rdoc --no-ri '#{remote_gem_file}'"
-
-        servers.remote.run_for_each! do |server|
-          check   = server.command_on_server('sh -l -c', check_command)
-          scp     = server.scp_command(About.gem_file, remote_gem_file)
-          install = server.command_on_server('sudo sh -l -c', install_command)
-
-          "(#{check}) || ((#{scp}) && (#{install}))"
-        end
-      end
-
-      def load_servers(config, shell)
-        EY::Serverside::Servers.from_hashes(assemble_instance_hashes(config), shell)
-      end
-
-      def assemble_instance_hashes(config)
-        if options[:instances]
-          options[:instances].collect { |hostname|
-            { :hostname => hostname,
-              :roles => options[:instance_roles][hostname].to_s.split(','),
-              :name => options[:instance_names][hostname],
-              :user => config.user,
-            }
-          }
-        else
-          []
-        end
-      end
 
+    # CLI is a namespace that encompasses all concepts around command-line
+    # interactions with EY::Serverside
+    module CLI
     end
   end
 end

data/lib/engineyard-serverside/cli/app.rb

@@ -0,0 +1,136 @@
+require 'thor'
+require 'pathname'
+require 'engineyard-serverside/about'
+require 'engineyard-serverside/deploy'
+require 'engineyard-serverside/propagator'
+require 'engineyard-serverside/shell'
+require 'engineyard-serverside/cli/server_hash_extractor'
+require 'engineyard-serverside/servers'
+require 'engineyard-serverside/cli/helpers'
+require 'engineyard-serverside/cli/workflows'
+
+module EY
+  module Serverside
+    module CLI
+
+      # App is the actual Thor-based entry point for the engineyard-serverside
+      # CLI application
+      class App < Thor
+
+        extend Helpers
+
+        method_option :migrate,         :type     => :string,
+                                        :desc     => "Run migrations with this deploy",
+                                        :aliases  => ["-m"]
+
+        method_option :branch,          :type     => :string,
+                                        :desc     => "Git ref to deploy, defaults to master. May be a branch, a tag, or a SHA",
+                                        :aliases  => %w[-b --ref --tag]
+
+        method_option :repo,            :type     => :string,
+                                        :desc     => "Remote repo to deploy",
+                                        :aliases  => ["-r"]
+
+
+        # Archive source strategy
+        method_option :archive,        :type     => :string,
+                                       :desc     => "Remote URI for archive to download and unzip"
+
+        # Git source strategy
+        method_option :git,            :type     => :string,
+                                       :desc     => "Remote git repo to deploy"
+
+        method_option :clean,          :type     => :boolean,
+                                       :desc     => "Run deploy without relying on existing files"
+
+
+        account_app_env_options
+        config_option
+        framework_env_option
+        instances_options
+        stack_option
+        verbose_option
+
+        desc "deploy", "Deploy code to /data/<app>"
+        def deploy(default_task=:deploy)
+
+          # By default, we'll want to perform the :deploy workflow, but this
+          # method is also the entry point for the rollback workflow. So,
+          # we'll just let the workflow system figure out what to do based on
+          # the task passed in from the command line.
+          Workflows.perform(default_task, options)
+        end
+
+        account_app_env_options
+        config_option
+        instances_options
+        verbose_option
+        desc "enable_maintenance", "Enable maintenance page (disables web access)"
+        def enable_maintenance
+          Workflows.perform(:enable_maintenance, options)
+        end
+
+        account_app_env_options
+        config_option
+        instances_options
+        verbose_option
+        desc "maintenance_status", "Maintenance status"
+        def maintenance_status
+          Workflows.perform(:maintenance_status, options)
+        end
+
+        account_app_env_options
+        config_option
+        instances_options
+        verbose_option
+        desc "disable_maintenance", "Disable maintenance page (enables web access)"
+        def disable_maintenance
+          Workflows.perform(:disable_maintenance, options)
+        end
+
+        method_option :release_path,  :type     => :string,
+                                      :desc     => "Value for #release_path in hooks (mostly for internal coordination)",
+                                      :aliases  => ["-r"]
+
+        method_option :current_roles, :type     => :array,
+                                      :desc     => "Value for #current_roles in hooks"
+
+        method_option :current_name,  :type     => :string,
+                                      :desc     => "Value for #current_name in hooks"
+        account_app_env_options
+        config_option
+        framework_env_option
+        verbose_option
+        desc "hook [NAME]", "Run a particular deploy hook"
+        def hook(hook_name)
+          Workflows.perform(
+            :hook,
+            options.merge(:hook_name => hook_name)
+          )
+        end
+
+        method_option :ignore_existing, :type     => :boolean,
+                                        :desc     => "When syncing /data/app directory, don't overwrite destination files"
+        account_app_env_options
+        config_option
+        framework_env_option
+        instances_options
+        stack_option
+        verbose_option
+        desc "integrate", "Integrate other instances into this cluster"
+        def integrate
+          Workflows.perform(:integrate, :options => options)
+        end
+
+        account_app_env_options
+        instances_options
+        stack_option
+        verbose_option
+        desc "restart", "Restart app servers, conditionally enabling maintenance page"
+        def restart
+          Workflows.perform(:restart, options)
+        end
+      end
+    end
+  end
+end

data/lib/engineyard-serverside/cli/helpers.rb

@@ -0,0 +1,58 @@
+module EY
+  module Serverside
+    module CLI
+
+      # Helpers is a set of methods that define options and such for an App
+      # task
+      module Helpers
+        def account_app_env_options
+          method_option :app,              :type     => :string,
+                                           :required => true,
+                                           :desc     => "Application to deploy",
+                                           :aliases  => %w[-a --app-name]
+          method_option :environment_name, :type     => :string,
+                                           :required => true,
+                                           :desc     => "Environment name"
+          method_option :account_name,     :type     => :string,
+                                           :required => true,
+                                           :desc     => "Account name"
+        end
+
+        def framework_env_option
+          method_option :framework_env,    :type     => :string,
+                                           :required => true,
+                                           :desc     => "Ruby web framework environment",
+                                           :aliases  => ["-e"]
+        end
+
+        def stack_option
+          method_option :stack,            :type     => :string,
+                                           :desc     => "Web stack (so we can restart it correctly)"
+        end
+
+
+        def config_option
+          method_option :config,           :type     => :string,
+                                           :desc     => "Additional configuration"
+        end
+
+        def instances_options
+          method_option :instances,        :type     => :array,
+                                           :desc     => "Hostnames of instances to deploy to, e.g. --instances localhost app1 app2"
+          method_option :instance_roles,   :type     => :hash,
+                                           :default  => {},
+                                           :desc     => "Roles of instances, keyed on hostname, comma-separated. e.g. instance1:app_master,etc instance2:db,memcached ..."
+          method_option :instance_names,   :type     => :hash,
+                                           :default  => {},
+                                           :desc     => "Instance names, keyed on hostname. e.g. instance1:name1 instance2:name2"
+        end
+
+        def verbose_option
+          method_option :verbose,          :type     => :boolean,
+                                           :desc     => "Verbose output",
+                                           :aliases  => ["-v"]
+        end
+      end
+    end
+  end
+end