engineyard-serverside 2.2.1 → 2.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzFmNmZjYjI5NjVmN2Q2NDRhMjA1NGFkM2YzYTZiMmE0YzhkZmVkNA==
+    ZTMyNDZmY2M5YmMyN2RjN2I3OWM1MGRlNjlhN2NjY2FkODExYjVmMg==
   data.tar.gz: !binary |-
-    NjYyZGRmMmI0NTgxNTVmYzQyM2FjODY4ZjAwOGQyM2M5NDRjYTVjYg==
+    M2ZmMWQ0Y2E5MDE5NTkzNjQ0ODFmYTJkZGJlYjlhMDc0NDMyMWQxYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWJjNGI2ZWIwOWVmNDJlZjQ0NjAwOGQ5YTBjMzdhMTQwM2QwMmZiOTA1Zjcx
-    NjFjYTE5ZjYwMTBhNGEyOTAzODIzZTE2OGRjNjI4ZDczMDJiMTk3YjJiMTIx
-    NTgxODAxN2RkNDE1MTI1ZjUwY2IyNWExYzcwZjBjNjIxOTNlN2M=
+    MzA1YWVmMDUxMjhjNjdkNzhhN2FhOWU3NTJmZjYzNTJmNjk0MDUxYmJiYTY4
+    ZWQ0YTg0OGEyYTg5M2Y5MmRkMmM1YzIwNzhhZmY5NjhiYTMwY2RkMWFhMWFk
+    MmIzNmY3ZjU1YjQxNzU4NTE4MDg4YzUzMGQxYjY5MDk2MDAyYTM=
   data.tar.gz: !binary |-
-    NmFhYjBjNDM3NmJlYWNlOGMxZDFjMDU1OWQ4NDI2MzI1MjNmZmE5MmM2ZmQw
-    YWJjZjg1ZTZmMDE5MzhjMmIzYmU1Zjc3NWUwNTI5MTE2NjZkMmUzNDE4NjFi
-    YjQ2ZWRiYTJkMTlmZTkxNWNlY2FjY2M5ZmYwZjIxYTdhODkxOWY=
+    YzQyZTQzZGEyNGQ0MmU2MWZkOTJmNTdjNzM0MmJhOWYxZjllMGE1NWE3OWRi
+    ZTFiNDMxZDJlNTJhZjU2OTdiNjU4MzIxOTIyNDYwZjNjMzVjODc4NzQzNDBh
+    YmExMzE0NzA0N2QxMDNjMDE3Yjk1NDc1NzI3ZWI0MTNjZjJhNTU=

data/lib/engineyard-serverside.rb

@@ -19,10 +19,11 @@ $LOAD_PATH.unshift File.expand_path('vendor/multi_json/lib', File.dirname(__FILE
 
 require 'escape'
 require 'multi_json'
+require 'uri'
 
 require 'engineyard-serverside/version'
 require 'engineyard-serverside/about'
-require 'engineyard-serverside/strategies/git'
+
 require 'engineyard-serverside/task'
 require 'engineyard-serverside/server'
 require 'engineyard-serverside/deploy'

data/lib/engineyard-serverside/cli.rb

@@ -23,6 +23,17 @@ module EY
       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"
+
+
       account_app_env_options
       config_option
       framework_env_option

data/lib/engineyard-serverside/configuration.rb

@@ -3,6 +3,9 @@ require 'thor'
 require 'pp'
 require 'yaml'
 require 'engineyard-serverside/paths'
+require 'engineyard-serverside/source'
+require 'engineyard-serverside/source/git'
+require 'engineyard-serverside/source/archive'
 
 module EY
   module Serverside
@@ -47,6 +50,19 @@ module EY
         end
       end
 
+      def fetch_deprecated(attr, replacement, default)
+        called = false
+        result = fetch(attr) { called = true; default }
+        if !called # deprecated attr was found
+          @deprecation_warning ||= {}
+          @deprecation_warning[attr] ||= begin
+                                           EY::Serverside.deprecation_warning "The configuration key '#{attr}' is deprecated in favor of '#{replacement}'."
+                                           true
+                                         end
+        end
+        result
+      end
+
       def_required_option :app
       def_required_option :environment_name
       def_required_option :account_name
@@ -55,14 +71,15 @@ module EY
       def_required_option :instance_roles
       def_required_option :instance_names
 
-      def_option :repo,              nil
+      def_option(:git)               { fetch(:repo, nil) } # repo is deprecated
+      def_option :archive,           nil
       def_option :migrate,           nil
       def_option :precompile_assets, 'detect'
       def_option :precompile_assets_task, 'assets:precompile'
       def_option :asset_strategy,    'shifting'
       def_option :asset_dependencies, %w[app/assets lib/assets vendor/assets Gemfile.lock config/routes.rb config/application.rb]
       def_option :stack,             nil
-      def_option :strategy,          'Git'
+      def_option(:source_class)      { fetch_deprecated(:strategy, :source_class, nil) } # strategy is deprecated
       def_option :branch,            'master'
       def_option :current_roles,     []
       def_option :current_name,      nil
@@ -85,6 +102,7 @@ module EY
       alias app_name app
       alias environment framework_env # legacy because it would be nice to have less confusion around "environment"
       alias migration_command migrate
+      alias repo git
 
       def initialize(options)
         opts = string_keys(options)
@@ -180,8 +198,33 @@ module EY
         EY::Serverside.node
       end
 
-      def strategy_class
-        EY::Serverside::Strategies.const_get(strategy)
+      # Infer the deploy source strategy to use based on flag or
+      # default to specified strategy.
+      #
+      # Returns a Source object.
+      def source(shell)
+        if archive && git
+          shell.fatal "Both --git and --archive specified. Precedence is not defined. Aborting"
+          raise "Both --git and --archive specified. Precedence is not defined. Aborting"
+        end
+        if archive
+          load_source(EY::Serverside::Source::Archive, shell, archive)
+        elsif source_class
+          load_source(EY::Serverside::Source.const_get(source_class), shell, git)
+        else # git can be nil for integrate or rollback
+          load_source(EY::Serverside::Source::Git, shell, git)
+        end
+      end
+
+      def load_source(klass, shell, uri)
+        klass.new(
+          shell,
+          :verbose          => verbose,
+          :repository_cache => paths.repository_cache,
+          :app              => app,
+          :uri              => uri,
+          :ref              => branch
+        )
       end
 
       def paths

data/lib/engineyard-serverside/deploy.rb

@@ -58,19 +58,23 @@ module EY
       end
 
       def update_repository_cache
-        strategy.update_repository_cache
+        source.update_repository_cache
       end
 
       def gc_repository_cache
-        strategy.gc_repository_cache
+        source.gc_repository_cache
       end
 
       def create_revision_file_command
-        strategy.create_revision_file_command(paths.active_release)
+        source.create_revision_file_command(paths.active_revision)
       end
 
       def short_log_message(revision)
-        strategy.short_log_message(revision)
+        source.short_log_message(revision)
+      end
+
+      def unchanged_diff_between_revisions?(previous_revision, active_revision, asset_dependencies)
+        source.same?(previous_revision, active_revision, asset_dependencies)
       end
 
       def check_repository
@@ -186,12 +190,27 @@ chmod 0700 #{path}
         @cleanup_failed = false
       end
 
+      def abort_on_bad_paths_in_release_directory
+        shell.substatus "Checking for disruptive files in #{paths.releases}"
+
+        bad_paths = paths.all_releases.reject do |path|
+          path.basename.to_s =~ /^[\d]+$/
+        end
+
+        if bad_paths.any?
+          shell.fatal "Bad paths found in #{paths.releases}:\n\t#{bad_paths.join("\n\t")}\nStoring files in this directory will disrupt latest_release, diff detection, rollback, and possibly other features."
+          raise
+        end
+      end
+
+
       # task
       def rollback
         if config.rollback_paths!
           begin
             rolled_back_release = paths.latest_release
             shell.status "Rolling back to previous release: #{short_log_message(config.active_revision)}"
+            abort_on_bad_paths_in_release_directory
             run_with_callbacks(:symlink)
             sudo "rm -rf #{rolled_back_release}"
             bundle
@@ -362,25 +381,17 @@ YML
         end
       end
 
-      protected
-
       # Use [] to access attributes instead of calling methods so
       # that we get nils instead of NoMethodError.
       #
       # Rollback doesn't know about the repository location (nor
       # should it need to), but it would like to use #short_log_message.
-      def strategy
+      def source
         ensure_git_ssh_wrapper
-        @strategy ||= config.strategy_class.new(
-          shell,
-          :verbose          => config.verbose,
-          :repository_cache => paths.repository_cache.to_s,
-          :app              => config.app,
-          :repo             => config[:repo],
-          :ref              => config[:branch]
-        )
-      end
-      public :strategy
+        @source ||= config.source(shell)
+      end
+
+      protected
 
       def base_callback_command_for(what)
         cmd =  [About.binary, 'hook', what.to_s]

data/lib/engineyard-serverside/deprecation.rb

@@ -1,4 +1,6 @@
 require 'engineyard-serverside/shell/helpers'
+require 'engineyard-serverside/dependency_manager/bundler'
+require 'engineyard-serverside/source/git'
 
 module EY
   module Serverside
@@ -12,14 +14,15 @@ module EY
       end
     end
 
+    DEPRECATED_CLASSES = {
+      :LoggedOutput   => EY::Serverside::Shell::Helpers,
+      :LockfileParser => EY::Serverside::DependencyManager::Bundler::Lockfile,
+      :Strategies     => EY::Serverside::Source::Git
+    }
     def self.const_missing(const)
-      case const
-      when :LoggedOutput
-        EY::Serverside.deprecation_warning("EY::Serverside::LoggedOutput has been deprecated. Use EY::Serverside::Shell::Helpers instead.")
-        EY::Serverside::Shell::Helpers
-      when :LockfileParser
-        EY::Serverside.deprecation_warning("EY::Serverside::LockfileParser has been deprecated. Use EY::Serverside::DependencyManager::Bundler::Lockfile instead.")
-        EY::Serverside::DependencyManager::Bundler::Lockfile
+      if klass = DEPRECATED_CLASSES[const]
+        deprecation_warning("EY::Serverside::#{const} has been deprecated. Please use: #{klass}")
+        klass
       else
         super
       end

data/lib/engineyard-serverside/rails_assets.rb

@@ -75,7 +75,7 @@ module EY
         asset_strategy.reusable? &&
           previous_revision &&
           active_revision &&
-          runner.strategy.same?(previous_revision, active_revision, asset_dependencies)
+          runner.unchanged_diff_between_revisions?(previous_revision, active_revision, asset_dependencies)
       end
 
       def precompile_detected_assets

data/lib/engineyard-serverside/source.rb

@@ -0,0 +1,73 @@
+require 'pathname'
+require 'engineyard-serverside/spawner'
+
+class EY::Serverside::Source
+  attr_reader :uri, :opts, :source_cache, :ref, :shell
+  alias repository_cache source_cache
+
+  class << self
+    attr_reader :required_opts
+    def require_opts(*names)
+      @required_opts ||= []
+      @required_opts += names
+    end
+  end
+
+  def initialize(shell, opts={})
+    @shell = shell
+    @opts = opts
+
+    missing = self.class.required_opts && self.class.required_opts.reject {|name| @opts[name] }
+    if missing and missing.any?
+      raise ArgumentError,
+        "Internal error: Missing keys #{missing.join(',')}. Required: #{self.class.required_opts.join(', ')}"
+    end
+
+    @ref = @opts[:ref]
+    @uri = @opts[:uri].to_s if @opts[:uri]
+    @source_cache = Pathname.new(@opts[:repository_cache]) if @opts[:repository_cache]
+  end
+
+  protected
+
+  def in_source_cache(&block)
+    raise ArgumentError, "Block required" unless block
+    source_cache.mkpath
+    Dir.chdir(source_cache, &block)
+  end
+
+  def escape(*shell_commands)
+    Escape.shell_command(shell_commands)
+  end
+
+  def runner
+    EY::Serverside::Spawner
+  end
+
+  # Internal: Run a command.
+  #
+  # cmd - A string command.
+  #
+  # Returns an instance of Spawner.
+  def run(cmd)
+    runner.run(cmd, shell, nil)
+  end
+
+  # Internal: Run a command and return the output.
+  #
+  # cmd - A string command.
+  #
+  # Returns the output of the command.
+  def run_and_output(cmd)
+    run(cmd).output
+  end
+
+  # Internal: Run a command and check if it was successful.
+  #
+  # cmd - A string command.
+  #
+  # Returns success.
+  def run_and_success?(cmd)
+    run(cmd).success?
+  end
+end

data/lib/engineyard-serverside/source/archive.rb

@@ -0,0 +1,58 @@
+require 'engineyard-serverside/source'
+
+# Deploy source for archive sourced deploy.
+class EY::Serverside::Source::Archive < EY::Serverside::Source
+  require_opts :uri, :repository_cache
+
+  def create_revision_file_command(revision_file_path)
+    "echo #{escape(@checksum || filename)} > #{escape(revision_file_path.to_s)}"
+  end
+
+  def gc_repository_cache
+    # If files are uploaded to the server, we should clean them up here probably.
+  end
+
+  def same?(previous_rev, current_rev, paths=nil)
+    previous_rev == current_rev
+  end
+
+  def short_log_message(rev)
+    rev
+  end
+
+  def update_repository_cache
+    clean_cache
+    in_source_cache do
+      fetch && checksum && unarchive
+    end
+  end
+
+  protected
+
+  def checksum
+    @checksum = run_and_output("shasum #{escape(File.join(source_cache, filename))}").strip
+  end
+
+  def clean_cache
+    run "rm -rf #{source_cache} && mkdir -p #{source_cache}"
+  end
+
+  def fetch_command
+    "curl --location --silent --show-error -O --user-agent #{escape("EngineYardDeploy/#{EY::Serverside::VERSION}")} #{escape(uri)}"
+  end
+
+  def fetch
+    run_and_success?(fetch_command)
+  end
+
+  def filename
+    @filename ||= File.basename(URI.parse(uri).path)
+  end
+
+  def unarchive
+    case File.extname(filename)
+    when '.zip', '.war'
+      run "unzip #{filename} && rm #{filename}"
+    end
+  end
+end

data/lib/engineyard-serverside/source/git.rb

@@ -0,0 +1,104 @@
+require 'engineyard-serverside/source'
+
+# Deploy source for git repository sourced deploy.
+class EY::Serverside::Source::Git < EY::Serverside::Source
+  require_opts :uri, :ref, :repository_cache
+
+  def create_revision_file_command(revision_file_path)
+    %Q{#{git} show --pretty=format:"%H" | head -1 > "#{revision_file_path}"}
+  end
+
+  def gc_repository_cache
+    shell.status "Garbage collecting cached git repository to reduce disk usage."
+    run("#{git} gc")
+  end
+
+  # Check if there have been changes.
+  # git diff --exit-code returns
+  # - 0 when nothing has changed
+  # - 1 when there are changes
+  #
+  # previous_revision - The previous ref string.
+  # active_revision - The current ref string.
+  #
+  #
+  # Returns a boolean whether there has been a change.
+  def same?(previous_revision, active_revision, paths=nil)
+    run_and_success?("#{git} diff '#{previous_revision}'..'#{active_revision}' --exit-code --name-only -- #{Array(paths).join(' ')} >/dev/null 2>&1")
+  end
+
+  # Get most recent commit message for revision.
+  def short_log_message(revision)
+    run_and_output("#{git} log --pretty=oneline --abbrev-commit -n 1 '#{revision}'").strip
+  end
+
+  def update_repository_cache
+    unless fetch && checkout
+      shell.fatal "git checkout #{to_checkout} failed."
+      raise "git checkout #{to_checkout} failed."
+    end
+  end
+
+  protected
+
+  # Internal:
+  # Returns .
+  def checkout
+    shell.status "Deploying revision #{short_log_message(to_checkout)}"
+    q = opts[:verbose] ? '' : '-q'
+    in_source_cache do
+      (run_and_success?("git checkout -f #{q} '#{to_checkout}'") ||
+        run_and_success?("git reset --hard #{q} '#{to_checkout}'")) &&
+        run_and_success?("git submodule sync") &&
+        run_and_success?("git submodule update --init") &&
+        run_and_success?("git clean -dfq")
+    end
+  end
+
+  # Internal:
+  #
+  # Returns .
+  def clean_local_branch
+    run_and_success?("#{git} show-branch #{ref} > /dev/null 2>&1 && #{git} branch -D #{ref} > /dev/null 2>&1")
+  end
+
+  # Internal:
+  def fetch
+    run_and_success?(fetch_command)
+  end
+
+  def fetch_command
+    if usable_repository?
+      "#{git} fetch -q origin 2>&1"
+    else
+      "rm -rf #{repository_cache} && git clone -q #{uri} #{repository_cache} 2>&1"
+    end
+  end
+
+  def git
+    @git ||= "git --git-dir #{repository_cache}/.git --work-tree #{repository_cache}"
+  end
+
+  # Internal: Check for valid git repository.
+  #
+  # Returns a boolean.
+  def usable_repository?
+    repository_cache.directory? &&
+      run_and_output("#{git} remote -v | grep origin").include?(uri)
+  end
+
+  # Internal: .
+  #
+  # Returns .
+  def to_checkout
+    @to_checkout ||= begin
+      clean_local_branch
+      remote_branch? ? "origin/#{ref}" : ref
+    end
+  end
+
+  def remote_branch?
+    run_and_success?("#{git} show-branch origin/#{ref} > /dev/null 2>&1")
+  end
+
+end

data/lib/engineyard-serverside/source_strategy.rb

@@ -0,0 +1,77 @@
+require 'pathname'
+require 'engineyard-serverside/spawner'
+require 'escape'
+
+class EY::Serverside::Source
+  attr_reader :uri, :opts, :source_cache, :ref, :shell
+  alias repository_cache source_cache
+
+  class << self
+    attr_reader :required_opts
+    def require_opts(*names)
+      @required_opts ||= []
+      @required_opts += names
+    end
+
+    def for(type)
+      const_get(type)
+    end
+  end
+
+  def initialize(shell, opts={})
+    @shell = shell
+    @opts = opts
+
+    if self.class.required_opts && !self.class.required_opts.all? {|name| @opts[name] }
+      raise ArgumentError,
+        "Missing required key(s) (#{self.class.required_opts.join(', ')} required)"
+    end
+
+    @ref = @opts[:ref]
+    @uri = @opts[:uri].to_s if @opts[:uri]
+    @source_cache = Pathname.new(@opts[:repository_cache]) if @opts[:repository_cache]
+  end
+
+  protected
+
+  def in_source_cache(&block)
+    raise ArgumentError, "Block required" unless block
+    source_cache.mkpath
+    Dir.chdir(source_cache, &block)
+  end
+
+  def escape(*shell_commands)
+    Escape.shell_command(shell_commands)
+  end
+
+  def runner
+    EY::Serverside::Spawner
+  end
+
+  # Internal: Run a command.
+  #
+  # cmd - A string command.
+  #
+  # Returns an instance of Spawner.
+  def run(cmd)
+    runner.run(cmd, shell, nil)
+  end
+
+  # Internal: Run a command and return the output.
+  #
+  # cmd - A string command.
+  #
+  # Returns the output of the command.
+  def run_and_output(cmd)
+    run(cmd).output
+  end
+
+  # Internal: Run a command and check if it was successful.
+  #
+  # cmd - A string command.
+  #
+  # Returns success.
+  def run_and_success?(cmd)
+    run(cmd).success?
+  end
+end

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.2.1'
+    VERSION = '2.3.0'
   end
 end

data/spec/archive_deploy_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+class EY::Serverside::Source::Archive
+  def fetch_command
+    "cp #{uri} #{source_cache}"
+  end
+end
+
+describe "Deploying a simple application" do
+  let(:adapter) {
+    EY::Serverside::Adapter.new do |args|
+      args.account_name = "account"
+      args.app = "application_name"
+      args.stack = "nginx_unicorn"
+      args.environment_name = "environment_name"
+      args.framework_env = "production"
+      args.archive = FIXTURES_DIR.join('retwisj.war')
+      args.verbose = true
+      args.instances = [{ :hostname => "localhost", :roles => ["solo"], :name => "single" }]
+      args.config = {
+        "deploy_to" => deploy_dir,
+        "release_path"     => release_path.to_s,
+        "group"            => GROUP
+      }
+    end
+  }
+
+  let(:binpath) {
+    File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
+  }
+
+  before(:all) do
+    argv = adapter.deploy.commands.last.to_argv[2..-1]
+    with_mocked_commands do
+      capture do
+        EY::Serverside::CLI.start(argv)
+      end
+    end
+  end
+
+  it "exploded the war" do
+    %w(META-INF WEB-INF).each {|dir|
+      File.exists?(deploy_dir.join('current', dir))
+    }
+  end
+
+  it "creates a REVISION file" do
+    path = deploy_dir.join('current', 'REVISION')
+    expect(path).to exist
+    checksum = File.read(path).strip
+    expect(checksum).to match(/7400dc058376745c11a98f768b799c6651428857\s+.*retwisj.war$/)
+  end
+
+  it "restarts the app servers" do
+    restart = deploy_dir.join('current', 'restart')
+    restart.should exist
+    expect(restart.read.chomp).to eq(%|LANG="en_US.UTF-8" /engineyard/bin/app_application_name deploy|)
+  end
+end

data/spec/configuration_spec.rb

@@ -15,7 +15,6 @@ describe EY::Serverside::Deploy::Configuration do
       @config.migrate.should == nil
       @config.migrate?.should == false
       @config.branch.should == "master"
-      @config.strategy_class.should == EY::Serverside::Strategies::Git
       @config.maintenance_on_migrate.should == true
       @config.maintenance_on_restart.should == true
       @config.required_downtime_stack?.should == true
@@ -43,6 +42,43 @@ describe EY::Serverside::Deploy::Configuration do
     end
   end
 
+  context "strategies" do
+    let(:options) {
+      { "app" => "serverside" }
+    }
+    it "uses strategy if set" do
+      @config = EY::Serverside::Deploy::Configuration.new(
+        options.merge({'strategy' => 'IntegrationSpec', 'git' => 'git@github.com:engineyard/todo.git'})
+      )
+      capture do # deprecation warning
+        expect(@config.source(test_shell)).to be_a_kind_of(EY::Serverside::Source::IntegrationSpec)
+      end
+      read_output.should include("DEPRECATION WARNING: The configuration key 'strategy' is deprecated in favor of 'source_class'.")
+    end
+
+    it "uses source_class if set" do
+      @config = EY::Serverside::Deploy::Configuration.new(
+        options.merge({'source_class' => 'IntegrationSpec', 'git' => 'git@github.com:engineyard/todo.git'})
+      )
+      expect(@config.source(test_shell)).to be_a_kind_of(EY::Serverside::Source::IntegrationSpec)
+    end
+
+    it "infers a git source" do
+      @config = EY::Serverside::Deploy::Configuration.new(
+        options.merge({ 'git' => 'git@github.com:engineyard/todo.git' })
+      )
+      expect(@config.source(test_shell)).to be_a_kind_of(EY::Serverside::Source::Git)
+    end
+
+    it "infers a archive source" do
+      @config = EY::Serverside::Deploy::Configuration.new(
+        options.merge({'archive' => 'https://github.com/engineyard/todo/archive/master.zip'})
+      )
+
+      expect(@config.source(test_shell)).to be_a_kind_of(EY::Serverside::Source::Archive)
+    end
+  end
+
   context "command line options" do
     before do
       @config = EY::Serverside::Deploy::Configuration.new({

data/spec/git_strategy_spec.rb

@@ -1,29 +1,34 @@
 require 'spec_helper'
 
-describe "the git deploy strategy" do
-  subject do
-    fixtures_dir = Pathname.new(__FILE__).dirname.join("fixtures")
-    gitrepo_dir = tmpdir.join("gitrepo-#{Time.now.utc.strftime("%Y%m%d%H%M%S")}#{Time.now.tv_usec}-#{$$}")
-    gitrepo_dir.mkdir
-    system "tar xzf #{fixtures_dir.join('gitrepo.tar.gz')} --strip-components 1 -C #{gitrepo_dir}"
+class EY::Serverside::Source::Git
+  def fetch_command
+    "mkdir -p #{source_cache} && tar xzf #{FIXTURES_DIR.join('gitrepo.tar.gz')} --strip-components 1 -C #{source_cache}"
+  end
+end
 
-    EY::Serverside::Strategies::Git.new(
-      test_shell,
-      :repo => FIXTURES_DIR.join('repos','default'),
-      :repository_cache => gitrepo_dir,
-      :ref => "master"
-    )
+describe EY::Serverside::Source::Git do
+  before do
+    @source_cache = tmpdir.join("gitrepo-#{Time.now.utc.strftime("%Y%m%d%H%M%S")}#{Time.now.tv_usec}-#{$$}")
   end
 
-  before { subject.checkout }
 
-  it "#checkout returns true for branches that exist" do
-    subject.opts[:ref] = "somebranch"
-    subject.checkout.should be_true
+  it "#update_repository_cache returns true for branches that exist" do
+    git = EY::Serverside::Source::Git.new(
+      test_shell,
+      :uri => FIXTURES_DIR.join('repos','default'),
+      :repository_cache => @source_cache,
+      :ref => "somebranch"
+    )
+    git.update_repository_cache
   end
 
-  it "#checkout returns false for branches that do not exist" do
-    subject.opts[:ref] = "notabranch"
-    subject.checkout.should be_false
+  it "#update_repository_cache returns false for branches that do not exist" do
+    git = EY::Serverside::Source::Git.new(
+      test_shell,
+      :uri => FIXTURES_DIR.join('repos','default'),
+      :repository_cache => @source_cache,
+      :ref => "notabranch"
+    )
+    expect { git.update_repository_cache }.to raise_error
   end
 end

data/spec/rollback_spec.rb

@@ -30,6 +30,38 @@ describe "Rolling back" do
     end
   end
 
+  context "with a problematic file in the releases dir" do
+    before(:all) do
+      deploy_test_application('not_bundled', 'migrate' => nil)
+      @good_revision = deploy_dir.join('current', 'REVISION').read.strip
+      deploy_dir.join('current', 'REVISION').should exist
+      deploy_dir.join('current', 'restart').delete
+      deploy_test_application('not_bundled', 'migrate' => nil)
+      deploy_dir.join('current', 'REVISION').should exist
+      deploy_dir.join('current', 'restart').delete
+    end
+
+    it "rolls back to the older deploy" do
+      releases = @deployer.config.paths.all_releases
+      releases.size.should == 2
+      good_release = releases.first
+      bad_release = releases.last
+
+      @deployer.config.paths.releases.join('tmp').mkpath
+
+      expect { @deployer.rollback }.to raise_error
+      out = read_output
+      expect(out).to include("Bad paths found in #{@deployer.config.paths.releases}:")
+      expect(out).to include(@deployer.config.paths.releases.join('tmp').to_s)
+      expect(out).to include("Storing files in this directory will disrupt latest_release, diff detection, rollback, and possibly other features.")
+      expect(out).to_not include("Restarting with previous release.")
+
+      deploy_dir.join('current', 'restart').should_not exist
+      bad_release.should exist
+      good_release.should exist
+    end
+  end
+
   context "with complex config" do
     before(:all) do
       deploy_test_application('ey_yml', 'migrate' => nil)

data/spec/source/archive_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe EY::Serverside::Source::Archive do
+  before do
+    described_class.any_instance.stub(:runner) { RunnerDouble }
+  end
+
+  context "source" do
+    let(:shell) { ShellDouble.new }
+    subject {
+      described_class.new(shell,
+        :uri => "http://server.com/app.war",
+        :repository_cache => TMPDIR)
+    }
+
+    it "cleans cache" do
+      expect(subject).to respond_to(:gc_repository_cache)
+    end
+
+    it "compares revisions" do
+      expect(subject.same?("1", "1")).to be
+    end
+
+    it "understands short log message" do
+      expect(subject).to respond_to(:short_log_message)
+    end
+
+    it "updates the cache" do
+      last_output = subject.update_repository_cache.output
+      expect(last_output).to eq("unzip app.war && rm app.war")
+    end
+
+  end
+end

data/spec/source/git_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe EY::Serverside::Source::Git do
+  before do
+    described_class.any_instance.stub(:runner) { RunnerDouble }
+  end
+
+  it "errors when required options are not used" do
+    expect { described_class.new(nil, {}) }.to raise_error(ArgumentError)
+  end
+
+  context "source" do
+    let(:shell) { ShellDouble.new }
+    subject {
+      described_class.new(shell,
+        :uri => "engineyard/engineyard-serverside.git",
+        :ref => "",
+        :repository_cache => "cache_dir")
+    }
+
+    it "creates the correct reivison file command" do
+      expect(subject.create_revision_file_command("directory/REVISION")).to eq(
+        "git --git-dir cache_dir/.git --work-tree cache_dir show --pretty=format:\"%H\" | head -1 > \"directory/REVISION\""
+      )
+    end
+
+    it "runs gc" do
+      expect(subject.gc_repository_cache.output).to eq("git --git-dir cache_dir/.git --work-tree cache_dir gc")
+      expect(shell.messages.last).to eq("Garbage collecting cached git repository to reduce disk usage.")
+    end
+
+    it "checks if it is the same revision" do
+      expect(subject.same?("", "")).to be
+    end
+
+    it "runs a short log message" do
+      expect(subject.short_log_message("rev")).to eq(
+        "git --git-dir cache_dir/.git --work-tree cache_dir log --pretty=oneline --abbrev-commit -n 1 'rev'"
+      )
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -15,7 +15,8 @@ end
 require 'pp'
 require 'engineyard-serverside'
 require 'engineyard-serverside-adapter'
-require File.expand_path('../support/integration', __FILE__)
+require 'support/integration'
+require 'support/source_doubles'
 
 FIXTURES_DIR = Pathname.new(__FILE__).dirname.join("fixtures")
 TMPDIR = Pathname.new(__FILE__).dirname.parent.join('tmp')
@@ -28,11 +29,6 @@ module EY
       @dna_json = j
       @node = nil
     end
-
-    class Strategies::Git
-      def short_log_message(_) "" end
-    end
-
   end
 end
 
@@ -232,7 +228,7 @@ exec "$@"
   # spec/fixtures/repos dir are copied into the test github repository.
   def deploy_test_application(repo_fixture_name = 'default', extra_config = {}, &block)
     options = {
-      "strategy"         => "IntegrationSpec",
+      "source_class"     => "IntegrationSpec",
       "deploy_to"        => deploy_dir.to_s,
       "release_path"     => release_path.to_s,
       "group"            => GROUP,
@@ -244,7 +240,7 @@ exec "$@"
       "framework_env"    => 'staging',
       "branch"           => 'somebranch',
       "verbose"          => true,
-      "repo"             => FIXTURES_DIR.join('repos', repo_fixture_name),
+      "git"              => FIXTURES_DIR.join('repos', repo_fixture_name),
     }.merge(extra_config)
 
     # pretend there is a shared bundled_gems directory
@@ -260,11 +256,11 @@ exec "$@"
       args.account_name     = options['account_name']
       args.migrate          = options['migrate']
       args.ref              = options['branch']
-      args.repo             = options['repo']
+      args.git              = options['git']
       args.config           = {
         "services_check_command" => "which echo",
         "services_setup_command" => "echo 'services setup command'",
-        "strategy"               => options["strategy"],
+        "source_class"           => options["source_class"],
         "deploy_to"              => options["deploy_to"],
         "release_path"           => options["release_path"],
         "group"                  => options["group"]

data/spec/support/integration.rb

@@ -51,18 +51,12 @@ class EY::Serverside::Deploy
   end
 end
 
-class EY::Serverside::Strategies::IntegrationSpec
-  attr_reader :shell, :source_repo, :repository_cache
+class EY::Serverside::Source::IntegrationSpec < EY::Serverside::Source
+  attr_reader :source_repo
 
-  def initialize(shell, opts)
-    unless opts[:repository_cache] && opts[:repo]
-      raise ArgumentError, "Option :repository_cache and :repo are required"
-    end
-
-    @shell = shell
-    @ref = opts[:ref]
-    @source_repo = Pathname.new(opts[:repo])
-    @repository_cache = Pathname.new(opts[:repository_cache])
+  def initialize(*a)
+    super
+    @source_repo = Pathname.new(uri)
   end
 
   def update_repository_cache
@@ -71,8 +65,8 @@ class EY::Serverside::Strategies::IntegrationSpec
     copy_fixture_repo_files
   end
 
-  def create_revision_file_command(dir)
-    "echo '#{@ref}' > #{dir}/REVISION"
+  def create_revision_file_command(revision_path)
+    "echo '#{@ref}' > #{revision_path}"
   end
 
   def short_log_message(revision)
@@ -101,7 +95,7 @@ class EY::Serverside::Strategies::IntegrationSpec
       shell.substatus "Test helpers copying repo fixture from #{source_repo}/ to #{repository_cache}"
       # This uses a ruby method instead of shelling out because I was having
       # trouble getting cp -R to behave consistently between distros.
-      FileUtils.cp_r Dir.glob("#{source_repo}/*"), repository_cache
+      system "rsync -aq #{source_repo}/ #{repository_cache}"
     else
       raise "Mock repo #{source_repo.inspect} does not exist. Path should be absolute. e.g. FIXTURES_DIR.join('repos','example')"
     end

data/spec/support/source_doubles.rb

@@ -0,0 +1,28 @@
+class ShellDouble
+  attr_reader :messages
+  def initialize
+    @messages = []
+  end
+
+  def status(message)
+    @messages << message
+  end
+end
+
+class RunnerDouble
+  def self.run(cmd, shell, server=nil)
+    new(cmd)
+  end
+
+  def initialize(cmd)
+    @cmd = cmd
+  end
+
+  def output
+    @cmd
+  end
+
+  def success?
+    true
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -154,8 +154,11 @@ files:
 - lib/engineyard-serverside/shell/helpers.rb
 - lib/engineyard-serverside/shell/yieldio.rb
 - lib/engineyard-serverside/shell.rb
+- lib/engineyard-serverside/source/archive.rb
+- lib/engineyard-serverside/source/git.rb
+- lib/engineyard-serverside/source.rb
+- lib/engineyard-serverside/source_strategy.rb
 - lib/engineyard-serverside/spawner.rb
-- lib/engineyard-serverside/strategies/git.rb
 - lib/engineyard-serverside/task.rb
 - lib/engineyard-serverside/version.rb
 - lib/engineyard-serverside.rb
@@ -220,6 +223,7 @@ files:
 - lib/vendor/thor/README.md
 - lib/vendor/thor/thor.gemspec
 - LICENSE
+- spec/archive_deploy_spec.rb
 - spec/basic_deploy_spec.rb
 - spec/bundler_deploy_spec.rb
 - spec/configuration_spec.rb
@@ -355,6 +359,7 @@ files:
 - spec/fixtures/repos/sqlite3/Gemfile
 - spec/fixtures/repos/sqlite3/Gemfile.lock
 - spec/fixtures/repos/sqlite3/README
+- spec/fixtures/retwisj.war
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
@@ -367,9 +372,12 @@ files:
 - spec/server_spec.rb
 - spec/services_deploy_spec.rb
 - spec/shell_spec.rb
+- spec/source/archive_spec.rb
+- spec/source/git_spec.rb
 - spec/spec_helper.rb
 - spec/sqlite3_deploy_spec.rb
 - spec/support/integration.rb
+- spec/support/source_doubles.rb
 homepage: http://github.com/engineyard/engineyard-serverside
 licenses:
 - MIT
@@ -395,6 +403,7 @@ signing_key:
 specification_version: 4
 summary: A gem that deploys ruby applications on EY Cloud instances
 test_files:
+- spec/archive_deploy_spec.rb
 - spec/basic_deploy_spec.rb
 - spec/bundler_deploy_spec.rb
 - spec/configuration_spec.rb
@@ -530,6 +539,7 @@ test_files:
 - spec/fixtures/repos/sqlite3/Gemfile
 - spec/fixtures/repos/sqlite3/Gemfile.lock
 - spec/fixtures/repos/sqlite3/README
+- spec/fixtures/retwisj.war
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
@@ -542,6 +552,9 @@ test_files:
 - spec/server_spec.rb
 - spec/services_deploy_spec.rb
 - spec/shell_spec.rb
+- spec/source/archive_spec.rb
+- spec/source/git_spec.rb
 - spec/spec_helper.rb
 - spec/sqlite3_deploy_spec.rb
 - spec/support/integration.rb
+- spec/support/source_doubles.rb

data/lib/engineyard-serverside/strategies/git.rb

@@ -1,104 +0,0 @@
-require 'pathname'
-
-module EY
-  module Serverside
-    module Strategies
-      class Git
-        attr_reader :shell, :opts
-
-        def initialize(shell, opts)
-          @shell = shell
-          @opts = opts
-        end
-
-        def update_repository_cache
-          unless fetch && checkout
-            abort "*** [Error] Git could not checkout (#{to_checkout}) ***"
-          end
-        end
-
-        def usable_repository?
-          repository_cache.directory? && `#{git} remote -v | grep origin`[remote_uri]
-        end
-
-        def fetch
-          if usable_repository?
-            run("#{git} fetch -q origin 2>&1")
-          else
-            run("rm -rf #{repository_cache} && git clone -q #{remote_uri} #{repository_cache} 2>&1")
-          end
-        end
-
-        def checkout
-          shell.status "Deploying revision #{short_log_message(to_checkout)}"
-          q = opts[:verbose] ? '' : '-q'
-          in_repository_cache do
-            (run("git checkout -f #{q} '#{to_checkout}'") ||
-              run("git reset --hard #{q} '#{to_checkout}'")) &&
-              run("git submodule sync") &&
-              run("git submodule update --init") &&
-              run("git clean -dfq")
-          end
-        end
-
-        def to_checkout
-          return @to_checkout if @opts_ref == opts[:ref]
-          @opts_ref = opts[:ref]
-          clean_local_branch(@opts_ref)
-          @to_checkout = remote_branch?(@opts_ref) ? "origin/#{@opts_ref}" : @opts_ref
-        end
-
-        def clean_local_branch(ref)
-          system("#{git} show-branch #{ref} > /dev/null 2>&1 && #{git} branch -D #{ref} > /dev/null 2>&1")
-        end
-
-        def gc_repository_cache
-          shell.status "Garbage collecting cached git repository to reduce disk usage."
-          run("#{git} gc")
-        end
-
-        def create_revision_file_command(dir)
-          %Q{#{git} show --pretty=format:"%H" | head -1 > "#{dir}/REVISION"}
-        end
-
-        def short_log_message(rev)
-          `#{git} log --pretty=oneline --abbrev-commit -n 1 '#{rev}'`.strip
-        end
-
-        # git diff --exit-code returns
-        #   0 when nothing has changed
-        #   1 when there are changes
-        #
-        # Thes method returns true when nothing has changed, fales otherwise
-        def same?(previous_revision, active_revision, paths = nil)
-          run("#{git} diff '#{previous_revision}'..'#{active_revision}' --exit-code --name-only -- #{Array(paths).join(' ')} >/dev/null 2>&1")
-        end
-
-      private
-        def run(cmd)
-          EY::Serverside::Spawner.run(cmd, shell, nil).success?
-        end
-
-        def in_repository_cache
-          Dir.chdir(repository_cache) { yield }
-        end
-
-        def remote_uri
-          opts[:repo]
-        end
-
-        def repository_cache
-          Pathname.new(opts[:repository_cache])
-        end
-
-        def git
-          "git --git-dir #{repository_cache}/.git --work-tree #{repository_cache}"
-        end
-
-        def remote_branch?(ref)
-          system("#{git} show-branch origin/#{ref} > /dev/null 2>&1")
-        end
-      end
-    end
-  end
-end