Merge branch 'pipe_as_array'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: lib/gitlab_git/repository.rb
gitlabhq · Apr 4, 2014 · 19953db · 19953db
2 parents eb93579 + ed29c4b
commit 19953db
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,23 +2,23 @@ PATH
   remote: .
   specs:
     gitlab_git (5.7.1)
-      activesupport (~> 4.0.0)
-      charlock_holmes (~> 0.6.9)
-      gitlab-grit (~> 2.6.1)
-      gitlab-linguist (~> 3.0.0)
+      activesupport (~> 4.0)
+      charlock_holmes (~> 0.6)
+      gitlab-grit (~> 2.6)
+      gitlab-linguist (~> 3.0)
       rugged (~> 0.19.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.4)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     addressable (2.3.4)
-    atomic (1.1.14)
+    atomic (1.1.16)
     charlock_holmes (0.6.9.4)
     coderay (1.0.9)
     colorize (0.5.8)
@@ -29,15 +29,15 @@ GEM
       simplecov (>= 0.7)
       thor
     crack (0.3.2)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
     escape_utils (0.2.4)
     ffi (1.8.1)
     formatador (0.2.4)
-    gitlab-grit (2.6.4)
-      charlock_holmes (~> 0.6.9)
+    gitlab-grit (2.6.5)
+      charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
+      posix-spawn (~> 0.3)
     gitlab-linguist (3.0.0)
       charlock_holmes (~> 0.6.6)
       escape_utils (~> 0.2.4)
@@ -58,7 +58,7 @@ GEM
       rb-kqueue (>= 0.2)
     lumberjack (1.0.3)
     method_source (0.8.1)
-    mime-types (1.23)
+    mime-types (1.25.1)
     minitest (4.7.5)
     multi_json (1.7.2)
     posix-spawn (0.3.8)
@@ -88,9 +88,9 @@ GEM
     simplecov-html (0.7.1)
     slop (3.4.4)
     thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
+    tzinfo (0.3.39)
     webmock (1.11.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)

diff --git a/gitlab_git.gemspec b/gitlab_git.gemspec
@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.homepage    =
     'http://rubygems.org/gems/gitlab_git'
 
-  s.add_dependency("gitlab-linguist", "~> 3.0.0")
-  s.add_dependency("gitlab-grit", "~> 2.6.1")
-  s.add_dependency("activesupport", "~> 4.0.0")
+  s.add_dependency("gitlab-linguist", "~> 3.0")
+  s.add_dependency("gitlab-grit", "~> 2.6")
+  s.add_dependency("activesupport", "~> 4.0")
   s.add_dependency("rugged", "~> 0.19.0")
-  s.add_dependency("charlock_holmes", "~> 0.6.9")
+  s.add_dependency("charlock_holmes", "~> 0.6")
 end
diff --git a/lib/gitlab_git/repository.rb b/lib/gitlab_git/repository.rb
@@ -141,19 +141,19 @@ def archive_repo(ref, storage_path, format = "tar.gz")
         case format
         when "tar.bz2", "tbz", "tbz2", "tb2", "bz2"
           extension = ".tar.bz2"
-          pipe_cmd = "bzip2"
+          pipe_cmd = %W(bzip2)
         when "tar"
           extension = ".tar"
-          pipe_cmd = "cat"
+          pipe_cmd = %W(cat)
         when "zip"
           extension = ".zip"
           git_archive_format = "zip"
-          pipe_cmd = "cat"
+          pipe_cmd = %W(cat)
         else
           # everything else should fall back to tar.gz
           extension = ".tar.gz"
           git_archive_format = nil
-          pipe_cmd = "gzip -n"
+          pipe_cmd = %W(gzip -n)
         end
 
         # Build file path