spec/support/integration.rb in engineyard-serverside-2.2.1 vs spec/support/integration.rb in engineyard-serverside-2.3.0

@@ -49,32 +49,26 @@
     @config = cfg
     @deployer = FullTestDeploy.realnew(servers, cfg, shell)
   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
     shell.status "Checking out #{@ref}"
     install_git_base
     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)
     "ref: #{revision} - Short log message"
   end
@@ -99,10 +93,10 @@
   def copy_fixture_repo_files
     if source_repo.exist?
       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
   end
 end