theme-juice 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c6fd4c46c15c5350fc438862375cefa9ee727cf
-  data.tar.gz: f4e00958d8c72788e1b96deca20621c8c41c2eec
+  metadata.gz: 7421466f9dc3caee5e2cd12f6e01518dac7be839
+  data.tar.gz: 822cc6b7da40e44f5cbbc373abb0b524622fdabd
 SHA512:
-  metadata.gz: c060dc006706bf7a3f03627ced4658105eed5967405f7a38428a8aba89f12f995f9bc43f4518dc1f63c6ec1cbf4022577787b6dfb447f42981e55d12d89c252d
-  data.tar.gz: 850dc79e8e571ad4263f300f95052b27f6360c979963d06ca5e394bc925370b67fad2f53d2b77c421ff4d07e54b02590d481f697ed58b05be303df3d1b997fd4
+  metadata.gz: 5ee0fa822732ceacc3beb7c10487c650723e6dac58d3baf28b31af12b286f2c66df0e3ce64f36bf769b9e8030d4b0760886dba1c46fe50a1cd0ae0660afecf52
+  data.tar.gz: 516002babd0e054c857a5b557777d9fc68bcc9a2f0d0d177c1bd2e90d48ad271f93cdbcd97ab2bdfe15e1ba367f35a66bf6311bf17ea2ee474e4ad922f7744d0

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

@@ -13,9 +13,9 @@ module ThemeJuice
             @env.stage = stage.to_sym
 
             runner do |tasks|
+              tasks << Tasks::Settings.new
               tasks << Tasks::Stage.new
               tasks << Tasks::VMStage.new
-              tasks << Tasks::Settings.new
               tasks << Tasks::Load.new
               tasks << Tasks::Invoke.new(args)
             end

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

@@ -2,7 +2,9 @@
 
 module ThemeJuice
   module Tasks
-    class Invoke < Task
+    class Invoke < Task
+      include Capistrano::DSL
+
       attr_reader :args
 
       def initialize(args = [])
@@ -19,16 +21,19 @@ module ThemeJuice
 
       def invoke_capistrano
         @io.log "Invoking Capistrano"
-
+
+        @env.cap.invoke "load:defaults"
+        @env.cap.invoke "load:settings"
+
         case args.last
         when nil
-          @env.cap.invoke "deploy"
+          @env.cap.invoke "deploy"
         when "rollback"
-          @env.cap.invoke "deploy:rollback"
+          @env.cap.invoke "deploy:rollback"
         when "setup", "check"
           @env.cap.invoke "deploy:check"
         else
-          @env.cap.invoke *args
+          @env.cap.invoke *args
         end
       end
     end

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

@@ -9,48 +9,52 @@ module ThemeJuice
         super
       end
 
-      def execute
-        configure_required_settings
-        configure_optional_settings
+      def execute
+        @io.log "Configuring Capistrano"
+
+        # We define this as a Rake task so our settings don't get overridden
+        #  when invoking the 'load:defaults' task before deployment
+        ::Rake::Task.define_task "load:settings" do
+          configure_required_settings
+          configure_optional_settings
+        end
       end
 
       private
 
       # Required global settings
-      def configure_required_settings
-        @io.log "Configuring Capistrano"
-
-        begin
-          set :application,  @config.deployment.application.name
-
-          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 }
-            end
-          end
-        rescue NoMethodError => err
-          @io.error "Oops! It looks like you're missing a few deployment settings" do
-            puts err
-          end
-        end
+      def configure_required_settings
+        begin
+          set :application,  @config.deployment.application.name
+
+          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 }
+            end
+          end
+        rescue NoMethodError => err
+          @io.error "Oops! It looks like you're missing a few deployment settings" do
+            puts err
+          end
+        end
       end
 
       # Optional namespaced settings
-      def configure_optional_settings
-        set :rsync_ignore, @config.deployment.stages.send(@env.stage)
-          .symbolize_keys.fetch(:ignore, []) rescue nil
-
-        %w[rsync slack].each do |task|
-          if @config.deployment.key? task
-            @config.deployment.send(task).each do |key, value|
-              set :"#{task}_#{key}", proc { value }
-            end
-          end
-        end
+      def configure_optional_settings
+        set :rsync_ignore, @config.deployment.stages.send(@env.stage)
+          .symbolize_keys.fetch(:ignore, []) rescue nil
+
+        %w[rsync slack].each do |task|
+          if @config.deployment.key? task
+            @config.deployment.send(task).each do |key, value|
+              set :"#{task}_#{key}", proc { value }
+            end
+          end
+        end
       end
     end
   end

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

@@ -1,5 +1,5 @@
-# encoding: UTF-8
-
+# encoding: UTF-8
+
 module ThemeJuice
   module Tasks
     class Stage < Task
@@ -11,30 +11,28 @@ module ThemeJuice
         @stage = @config.deployment.stages.send(@env.stage)
       end
 
-      def execute
+      def execute
         configure_stage
       end
 
       private
 
       def configure_stage
-        @io.log "Configuring stage '#{@env.stage}'"
-
-        stages = "#{@env.stage}"
-
-        server @stage.server, {
-          :user  => @stage.user,
-          :roles => @stage.roles
-        }
-
-        set :deploy_to,    -> { @stage.path }
-        set :stage_url,    -> { @stage.url }
-        set :uploads_dir,  -> { @stage.uploads }
-        set :shared_files, -> { @stage.shared.select { |f| !f.end_with? "/" } }
-        set :shared_dirs,  -> { @stage.shared.select { |f| f.end_with? "/" }.map { |f| f.chomp "/" } }
-        set :tmp_dir,      -> { @stage.tmp }
-        set :stage,        -> { @env.stage }
-      end
+        @io.log "Configuring stage '#{@env.stage}'"
+
+        server @stage.server, {
+          :user  => @stage.user,
+          :roles => @stage.roles
+        }
+
+        set :deploy_to,    -> { @stage.path }
+        set :stage_url,    -> { @stage.url }
+        set :uploads_dir,  -> { @stage.uploads }
+        set :shared_files, -> { @stage.shared.select { |f| !f.end_with? "/" } }
+        set :shared_dirs,  -> { @stage.shared.select { |f| f.end_with? "/" }.map { |f| f.chomp "/" } }
+        set :tmp_dir,      -> { @stage.tmp }
+        set :stage,        -> { @env.stage }
+      end
     end
   end
 end

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

@@ -18,21 +18,21 @@ module ThemeJuice
       private
 
       def configure_vm_stage
-        @io.log "Configuring VM stage"
-
-        server @vagrant.server, {
-          :user       => @vagrant.user,
-          :password   => @vagrant.pass,
-          :roles      => @vagrant.roles,
-          :no_release => true
-        }
-
-        set :dev_path,       -> { @vagrant.path }
-        set :vm_url,         -> { @vagrant.url }
-        set :vm_uploads_dir, -> { @vagrant.uploads }
-        set :vm_backup_dir,  -> { @vagrant.backup }
-        set :vm_tmp_dir,     -> { @vagrant.tmp }
-      end
+        @io.log "Configuring VM stage"
+
+        server @vagrant.server, {
+          :user       => @vagrant.user,
+          :password   => @vagrant.pass,
+          :roles      => @vagrant.roles,
+          :no_release => true
+        }
+
+        set :dev_path,       -> { @vagrant.path }
+        set :vm_url,         -> { @vagrant.url }
+        set :vm_uploads_dir, -> { @vagrant.uploads }
+        set :vm_backup_dir,  -> { @vagrant.backup }
+        set :vm_tmp_dir,     -> { @vagrant.tmp }
+      end
     end
   end
 end

data/lib/theme-juice/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,20 +66,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: capistrano-slackify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: capistrano-rsync-bladrak
   requirement: !ruby/object:Gem::Requirement