Just use rsync

gjtorikian · gjtorikian · commit 2b88d0b416b7 · 2015-11-12T11:19:52.000-08:00
diff --git a/Rakefile b/Rakefile
@@ -52,48 +52,15 @@ end
 
 desc "Publish to http://developer.github.com"
 task :publish, [:no_commit_msg] => [:remove_tmp_dir, :remove_output_dir] do |t, args|
-  mesg = commit_message(args[:no_commit_msg])
-  sh "nanoc compile"
+  message = commit_message(args[:no_commit_msg])
 
-  # save precious files
-  if ENV['IS_HEROKU']
-    `git fetch origin gh-pages`
-    `git checkout origin/gh-pages`
-  else
-    `git checkout gh-pages`
-  end
-  tmpdir = Dir.mktmpdir
-  FileUtils.cp_r("enterprise", tmpdir)
-  FileUtils.cp("robots.txt", tmpdir)
-  `git checkout master`
-
-  ENV['GIT_DIR'] = File.expand_path(`git rev-parse --git-dir`.chomp)
-  ENV['RUBYOPT'] = nil
-  old_sha = `git rev-parse refs/remotes/origin/gh-pages`.chomp
-  Dir.chdir('output') do
-    ENV['GIT_INDEX_FILE'] = gif = '/tmp/dev.gh.i'
-    ENV['GIT_WORK_TREE'] = Dir.pwd
-    File.unlink(gif) if File.file?(gif)
-    # restore precious files
-    FileUtils.cp_r("#{tmpdir}/enterprise", ".")
-    FileUtils.cp("#{tmpdir}/robots.txt", ".")
-    FileUtils.rm_rf(tmpdir) if File.exists?(tmpdir)
-    `git add -A`
-    tsha = `git write-tree`.strip
-    puts "Created tree   #{tsha}"
-    # Heroku runs git@1.7, we don't have the luxury of -m
-    if ENV['IS_HEROKU']
-      `echo #{mesg} > changelog`
-      csha = `git commit-tree #{tsha} -p #{old_sha} < changelog`.strip
-    elsif old_sha.size == 40
-      csha = `git commit-tree #{tsha} -p #{old_sha} -m '#{mesg}'`.strip
-    else
-      csha = `git commit-tree #{tsha} -m '#{mesg}'`.strip
-    end
-    puts "Created commit #{csha}"
-    puts `git show #{csha} --stat`
-    puts "Updating gh-pages from #{old_sha}"
-    `git update-ref refs/heads/gh-pages #{csha}`
-    `git push origin gh-pages`
+  Dir.mktmpdir do |tmp|
+    system "mv output/* #{tmp}"
+    system 'git checkout not-gh-pages'
+    system "rsync -av #{tmp}/ ."
+    system 'git add .'
+    system "git commit -am #{message.shellescape}"
+    system 'git push origin not-gh-pages --force'
+    system 'git checkout master'
   end
 end
