theme-juice 0.16.7 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b21cd2378118629f5450467ad72c81faea56e8a
-  data.tar.gz: 72b6f5e45b7207b864baceab6795a51e258c2daf
+  metadata.gz: 39f80f4b6db54e005e45e62ccad706ac2e740761
+  data.tar.gz: 7f5136693cd24c83ab29c7d42010cf9285976976
 SHA512:
-  metadata.gz: 2dabcb802d165f3e375a0d4af3bdf65e2fe39f7272fbf3462cf65044a14c0a725a530ed05de402c7b792d07247b27ca9eafbb66b4fe25643cf3e55219163f9c4
-  data.tar.gz: 5d46600a75655bed860146654d7d8cd2e06cd944fde8f46747b694c71a379333b84ab85db7939c18393af661c00e0a4fdceaf3d623492a4dd2969ed8447aa28a
+  metadata.gz: 833ee941d9bccccfe98be2bcebf66635d778badc49b95f56e08ed9154bc8f67696a9408597ce39653730282bf91e8d120461e6f57fe3a611e2a5efa433a2aeea
+  data.tar.gz: 9223ad305b744e2579ed60f854e47fac7166ed5401e5e323150f564b7da6fecc863f9c4b7674fd2102af5ee899633f00d6fa475e66255c44315a61a2adbbb2e8

data/lib/theme-juice/cli.rb

@@ -135,6 +135,7 @@ module ThemeJuice
     end
 
     desc "deploy STAGE [,ARGS]", "Deploy a project"
+    method_option :archive, :type => :boolean, :aliases => %w[--tar --gzip --zip], :desc => ""
     def deploy(stage, *args)
       @deploy.new(options).send(stage, *args).execute
     end

data/lib/theme-juice/commands/deploy.rb

@@ -9,8 +9,9 @@ module ThemeJuice
 
         @config.deployment.stages.keys.each do |stage|
           self.class.send :define_method, stage do |*args|
-            @env.cap   = Capistrano::Application.new
-            @env.stage = stage.to_sym
+            @env.cap     = Capistrano::Application.new
+            @env.stage   = stage.to_sym
+            @env.archive = opts[:archive]
 
             runner do |tasks|
               tasks << Tasks::Settings.new

data/lib/theme-juice/env.rb

@@ -22,6 +22,7 @@ module ThemeJuice
     attr_accessor :nginx
     attr_accessor :stage
     attr_accessor :cap
+    attr_accessor :archive
 
     def vm_box=(val)
       @vm_box = val || ENV.fetch("TJ_VM_BOX") { "git@github.com:ezekg/theme-juice-vvv.git" }

data/lib/theme-juice/man/tj-deploy

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "TJ\-DEPLOY" "1" "September 2015" "" "Theme Juice Manual"
+.TH "TJ\-DEPLOY" "1" "November 2015" "" "Theme Juice Manual"
 .
 .SH "NAME"
 \fBtj\-deploy\fR \- Deploy a project
@@ -35,6 +35,12 @@ Deploy!
 .
 .IP "" 0
 .
+.SH "GLOBAL OPTIONS"
+.
+.TP
+\fB\-\-archive\fR, \fB\-\-tar\fR, \fB\-\-gzip\fR, \fB\-\-zip\fR
+Archive directories when performing file transfers with tar(1)
+.
 .SH "PRIMARY COMMANDS"
 If no command is passed, the default task to be executed is \fBdeploy\fR
 .

data/lib/theme-juice/man/tj-deploy.txt

@@ -31,6 +31,10 @@ SETUP
 
 
 
+GLOBAL OPTIONS
+       --archive, --tar, --gzip, --zip
+	      Archive directories when performing file transfers with tar(1)
+
 PRIMARY COMMANDS
        If no command is passed, the default task to be executed is deploy
 
@@ -177,4 +181,4 @@ CONFIG FILE
 
 
 
-				September 2015			  TJ-DEPLOY(1)
+				 November 2015			  TJ-DEPLOY(1)

data/lib/theme-juice/tasks/capistrano/dir.rb

@@ -1,24 +1,87 @@
 namespace :dir do
 
+  desc "Initialize transfer variables"
+  task :init do
+    set :dir_archive, "archive.tar.gz"
+
+    run_locally do
+      execute :mkdir, "-p", fetch(:vm_tmp_dir)
+    end
+
+    on roles(:app) do
+      within release_path do
+        execute :mkdir, "-p", fetch(:tmp_dir)
+      end
+    end
+  end
+
   desc "Recursively push directory to remote"
   task :push, [:dir] do |t, args|
+    invoke "dir:init"
+
+    error "Could not locate local directory '#{args[:dir]}'" unless File.exist? args[:dir]
+
     on roles(:app) do
-      if File.exist? args[:dir]
+      within release_path do
+        execute :mkdir, "-p", args[:dir]
+      end
+    end
+
+    if fetch(:archive)
+      on roles(:dev) do
+        within fetch(:dev_path) do
+          execute :tar, "-zcf", "#{fetch(:vm_tmp_dir)}/#{fetch(:dir_archive)}", "#{args[:dir]}/*"
+        end
+      end
+
+      on release_roles(:app) do
+        upload! "#{fetch(:vm_tmp_dir)}/#{fetch(:dir_archive)}", release_path
+          .join("#{fetch(:tmp_dir)}/#{fetch(:dir_archive)}")
+
+        within release_path do
+          execute :tar, "--no-overwrite-dir -zxf", "#{fetch(:tmp_dir)}/#{fetch(:dir_archive)}", "#{args[:dir]}/"
+          execute :rm,"#{fetch(:tmp_dir)}/#{fetch(:dir_archive)}"
+        end
+      end
+    else
+      on roles(:app) do
         upload! args[:dir], release_path.join(Pathname.new(args[:dir]).parent), {
           recursive: true
         }
-      else
-        error "Could not locate local directory '#{args[:dir]}'"
       end
     end
   end
 
   desc "Recursively pull directory from remote"
   task :pull, [:dir] do |t, args|
-    on roles(:app) do
-      download! release_path.join(args[:dir]), Pathname.new(args[:dir]).parent, {
-        recursive: true
-      }
+    invoke "dir:init"
+
+    run_locally do
+      execute :mkdir, "-p", args[:dir]
+    end
+
+    if fetch(:archive)
+      on release_roles(:app) do
+        within release_path do
+          execute :tar, "-hzcf", "#{fetch(:tmp_dir)}/#{fetch(:dir_archive)}", "#{args[:dir]}/*"
+          download! release_path.join("#{fetch(:tmp_dir)}/#{fetch(:dir_archive)}"),
+            "#{fetch(:vm_tmp_dir)}/#{fetch(:dir_archive)}"
+          execute :rm,"#{fetch(:tmp_dir)}/#{fetch(:dir_archive)}"
+        end
+      end
+
+      on roles(:dev) do
+        within fetch(:dev_path) do
+          execute :tar, "--no-overwrite-dir -zxf", "#{fetch(:vm_tmp_dir)}/#{fetch(:dir_archive)}", "#{args[:dir]}/"
+          execute :rm,"#{fetch(:vm_tmp_dir)}/#{fetch(:dir_archive)}"
+        end
+      end
+    else
+      on roles(:app) do
+        download! release_path.join(args[:dir]), Pathname.new(args[:dir]).parent, {
+          recursive: true
+        }
+      end
     end
   end
 end

data/lib/theme-juice/tasks/capistrano/uploads.rb

@@ -4,19 +4,21 @@ namespace :uploads do
 
   desc "Push local uploads to remote"
   task :push do
-    on roles(:app) do
-      upload! fetch(:vm_uploads_dir), shared_path.join(Pathname.new(fetch(:uploads_dir)).parent), {
-        recursive: true
-      }
-    end
+    invoke "dir:push", fetch(:uploads_dir)
+    # on roles(:app) do
+    #   upload! fetch(:vm_uploads_dir), shared_path.join(Pathname.new(fetch(:uploads_dir)).parent), {
+    #     recursive: true
+    #   }
+    # end
   end
 
   desc "Pull remote uploads to local"
   task :pull do
-    on roles(:app) do
-      download! shared_path.join(fetch(:uploads_dir)), Pathname.new(fetch(:vm_uploads_dir)).parent, {
-        recursive: true
-      }
-    end
+    invoke "dir:pull", fetch(:uploads_dir)
+    # on roles(:app) do
+    #   download! shared_path.join(fetch(:uploads_dir)), Pathname.new(fetch(:vm_uploads_dir)).parent, {
+    #     recursive: true
+    #   }
+    # end
   end
 end

data/lib/theme-juice/tasks/settings.rb

@@ -1,14 +1,14 @@
-# encoding: UTF-8
-
-module ThemeJuice
-  module Tasks
-    class Settings < Task
-      include Capistrano::DSL
-
-      def initialize
-        super
-      end
-
+# encoding: UTF-8
+
+module ThemeJuice
+  module Tasks
+    class Settings < Task
+      include Capistrano::DSL
+
+      def initialize
+        super
+      end
+
       def execute
         @io.log "Configuring Capistrano"
 
@@ -18,19 +18,20 @@ module ThemeJuice
           configure_required_settings
           configure_optional_settings
         end
-      end
-
-      private
-
-      # Required global settings
+      end
+
+      private
+
+      # Required global settings
       def configure_required_settings
         begin
           set :application,  @config.deployment.application.name
-
+          set :archive,      @env.archive
+
           set :linked_files, fetch(:linked_files, []).concat(fetch(:shared_files, []))
           set :linked_dirs,  fetch(:linked_dirs, []).concat(fetch(:shared_dirs, []))
              .push(fetch(:uploads_dir, ""))
-
+
           %w[settings repository].each do |task|
             @config.deployment.send(task).symbolize_keys.each do |key, value|
               set key, proc { value }
@@ -41,9 +42,9 @@ module ThemeJuice
             puts err
           end
         end
-      end
-
-      # Optional namespaced settings
+      end
+
+      # Optional namespaced settings
       def configure_optional_settings
         %w[rsync slack].each do |task|
           if @config.deployment.key? task
@@ -52,7 +53,7 @@ module ThemeJuice
             end
           end
         end
-      end
-    end
-  end
-end
+      end
+    end
+  end
+end

data/lib/theme-juice/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module ThemeJuice
-  VERSION = "0.16.7"
+  VERSION = "0.17.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.16.7
+  version: 0.17.0
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor