mina-rsync 1.0.0 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDNmYTkyYWQyYzAxMjhjOWNjNTY1YWNiOWExZWEyODBlMGE5MTAxZQ==
+    ZjJhYTZhMzUwMmVlNTk5NWI2N2MyMWUzMjc3MTUyMGI4ZmY1ODFlNA==
   data.tar.gz: !binary |-
-    YzEwNDEyZDZiNTAyYWEzYzY5MGEwMzg2NDY3MDJmZjNjYTc2MjJjMw==
+    YzgxZjNjYzFkYzg4ZWQ5MzdiMTJmODQ0NmE5OTMzOWU4MGE4OTczZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWVkNjFjZDAxOWI1ZWI2MjQyOTQ2ZGU2ZTY0MmMyOWNkODZlZDdmN2M2Yzc5
-    NjgxMGM3NDNmMmFlZWVkN2ZjNjA2OWYyZTc4ODYwNzE1OTUwNDM4YzI5MGIy
-    MzE4YjUzNzNhMWNlZjliOTE4OTZjM2EwNmQ3ZWZhMWI3YzdmNzI=
+    ZDY2MmI5NWFmN2FmZGQzMTM4MGE5MDM4MDBjYWRkMzQyOTQzNDcyNjRmZjkz
+    OGFiM2M1YjRiYTJiZTFhY2Q5NDg5ZGRmMDY5ZThiYWY5NGY5ZDNhZTg0ZWY2
+    ZWIyNWNmMGVkNjQ0Y2E2NTU3ZjM4MDdjNmIwZWQ0MmNmMDQyZmQ=
   data.tar.gz: !binary |-
-    Mjg4ODcxMjBlNzAyOTFjZTRjY2VjMzUwYzEwOTkzZjg2ODE2ZmI5Zjk1N2Uy
-    NGViMjM4MmU1YTRkZmMzYjk1NjNiYTM4ZTI1YWVjMzQ2Mjc1OGNhNDgwOWE3
-    ZWRmM2E0YmJjMDMxNzAwMWU0NTExMzI5ZGZlMWRmZDE3ZTk0NmQ=
+    ZDQ1NGY4ZTA4N2YzYjc5MzU0ZjgzMTdjMjhkNDc5NjhhNWE5Y2E0NzAyNTEy
+    YWU4ZDE4Yjc5YzRlODE1YWY4YWMyMmIxNGE0NmE2MDRlODU3ZWRlZTNlYjg1
+    ZWY2OWYxZDFmMDFmNjZlZTc3YTJkYmViZTA1MjJiMGMwYTNhYTI=

data/CHANGELOG.md

@@ -1,2 +1,6 @@
+## 1.1.0 (Sep 2, 2013)
+- Prints progress messages like Mina does it and with color.
+- Supports `--verbose` running to see what commands get executed.
+
 ## 1.0.0 (Sep 2, 2013)
 - First release. Let's get syncing!

data/lib/mina/rsync.rb

@@ -1,9 +1,9 @@
 require File.expand_path("../rsync/version", __FILE__)
 
-# NOTE: Please don't depend on tasks without a description (`desc`) remaining
-# as they are between minor or patch version releases. They make up the private
-# API and internalas of Mina::Rsync. If you think something should be public
-# for extending, please let me know!
+# NOTE: Please don't depend on tasks without a description (`desc`) as they
+# might change between minor or patch version releases. They make up the
+# private API and internals of Mina::Rsync. If you think something should be
+# public for extending and hooking, please let me know!
 
 set_default :repository, "."
 set_default :branch, "master"
@@ -18,11 +18,9 @@ set_default :rsync_stage, "tmp/deploy"
 set_default :rsync_cache, "shared/deploy"
 
 run = lambda do |*cmd|
-  if simulate_mode?
-    puts "$ #{cmd.join(" ")}"
-  else
-    Kernel.system *cmd
-  end
+  cmd = cmd[0] if cmd[0].is_a?(Array)
+  print_command cmd.join(" ") if simulate_mode? || verbose_mode?
+  Kernel.system *cmd unless simulate_mode?
 end
 
 rsync_cache = lambda do
@@ -34,7 +32,7 @@ end
 
 desc "Stage and rsync to the server (or its cache)."
 task :rsync => %w[rsync:stage] do
-  puts "Rsyncing to #{rsync_cache.call}..."
+  print_status "Rsyncing to #{rsync_cache.call}..."
 
   rsync = %w[rsync]
   rsync.concat settings.rsync_options
@@ -44,34 +42,37 @@ task :rsync => %w[rsync:stage] do
   host = settings.domain
   rsync << "#{user}#{host}:#{rsync_cache.call}"
 
-  run.call *rsync
+  run.call rsync
 end
 
 namespace :rsync do
   task :create_stage do
     next if File.directory?(settings.rsync_stage)
-    puts "Cloning repository for the first time..."
+    print_status "Cloning repository for the first time..."
 
-    clone = %W[git clone]
+    clone = %w[git clone]
     clone << settings.repository
     clone << settings.rsync_stage
-    run.call *clone
+    run.call clone
   end
 
   desc "Stage the repository in a local directory."
   task :stage => %w[create_stage] do
-    puts "Staging..."
-
-    puts "$ cd #{settings.rsync_stage}" if simulate_mode?
-    Dir.chdir settings.rsync_stage do
-      run.call *%W[git fetch --quiet --all --prune]
-      print "Git checkout: "
-      run.call *%W[git reset --hard origin/#{settings.branch}]
-    end
+    print_status "Staging..."
+
+    stage = settings.rsync_stage
+    git = %W[git --git-dir #{stage}/.git --work-tree #{stage}]
+    run.call git + %w[fetch --quiet --all --prune]
+
+    # Prefix the Git "HEAD is now at" message, but only if verbose is unset,
+    # because then the #print_command called by #run prints its own prefix.
+    print "Git checkout: " unless simulate_mode? || verbose_mode?
+    run.call git + %W[reset --hard origin/#{settings.branch}]
   end
 
   task :build do
-    queue %(#{settings.rsync_copy} "#{rsync_cache.call}/" ".")
+    queue %(echo "-> Copying from cache directory to build path")
+    queue! %(#{settings.rsync_copy} "#{rsync_cache.call}/" ".")
   end
 
   desc "Stage, rsync and copy to the build path."

data/lib/mina/rsync/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Rsync
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mina-rsync
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Andri Möll