theme-juice 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7421466f9dc3caee5e2cd12f6e01518dac7be839
-  data.tar.gz: 822cc6b7da40e44f5cbbc373abb0b524622fdabd
+  metadata.gz: 2daf93c3af67ac83117ca46ba72e8d1fc6c02b41
+  data.tar.gz: 1ecd546f8da3c3305bf21314f704bfe45b04cb50
 SHA512:
-  metadata.gz: 5ee0fa822732ceacc3beb7c10487c650723e6dac58d3baf28b31af12b286f2c66df0e3ce64f36bf769b9e8030d4b0760886dba1c46fe50a1cd0ae0660afecf52
-  data.tar.gz: 516002babd0e054c857a5b557777d9fc68bcc9a2f0d0d177c1bd2e90d48ad271f93cdbcd97ab2bdfe15e1ba367f35a66bf6311bf17ea2ee474e4ad922f7744d0
+  metadata.gz: 30c03563416e26d5241e19d9ebc0060d77ba7e651da18b3103e5562a2d561cfc5fd15c2a99df84b63538c037bab7893f04719e96a12918fdcb48c64e60734fa5
+  data.tar.gz: 56f8a3348b4c08fed0314568252b8fd5d9c52d38f0c1b1d26d6bfe2c949bd80f76537af08c91ae930723bc365a544a1c3d59acc40fe6d89e99143cb7a4c12fd0

data/README.md

@@ -244,8 +244,7 @@ deployment:
 
   slack:
     url: https://hooks.slack.com/services/your-token
-    subdomain: example
-    user: deploybot
+    username: Deploybot
     channel: "#devops"
     emoji: ":rocket:"
 

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

@@ -9,8 +9,9 @@ namespace :rsync do
   end
 
   after :precompile, :ignore do
-    Dir.chdir fetch(:rsync_stage) do
-      fetch(:rsync_ignore, []).each { |f| system "rm #{f}" }
+    run_locally do
+      fetch(:rsync_ignore, []).each { |f|
+        execute :rm, Pathname.new(fetch(:rsync_stage)).join(f) }
     end
   end
 
@@ -36,13 +37,15 @@ namespace :rsync do
 
     before "deploy:check:linked_files", :files do
       on roles(:app) do
-        fetch(:linked_files).each { |f| execute :touch, shared_path.join(f) }
+        fetch(:linked_files).each { |f|
+          execute :touch, shared_path.join(f) }
       end
     end
 
     before "deploy:check:linked_dirs", :dirs do
       on roles(:app) do
-        fetch(:linked_dirs).each { |f| execute :mkdir, "-p", shared_path.join(f) }
+        fetch(:linked_dirs).each { |f|
+          execute :mkdir, "-p", shared_path.join(f) }
       end
     end
   end

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

@@ -45,9 +45,6 @@ module ThemeJuice
 
       # 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|

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

@@ -1,30 +1,30 @@
 # encoding: UTF-8
 
-module ThemeJuice
-  module Tasks
-    class Stage < Task
-      include Capistrano::DSL
-
-      def initialize
-        super
-
-        @stage = @config.deployment.stages.send(@env.stage)
-      end
-
+module ThemeJuice
+  module Tasks
+    class Stage < Task
+      include Capistrano::DSL
+
+      def initialize
+        super
+
+        @stage = @config.deployment.stages.send(@env.stage)
+      end
+
       def execute
-        configure_stage
-      end
-
-      private
-
-      def configure_stage
+        configure_stage
+      end
+
+      private
+
+      def configure_stage
         @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 }
@@ -32,7 +32,8 @@ module ThemeJuice
         set :shared_dirs,  -> { @stage.shared.select { |f| f.end_with? "/" }.map { |f| f.chomp "/" } }
         set :tmp_dir,      -> { @stage.tmp }
         set :stage,        -> { @env.stage }
+        set :rsync_ignore, -> { @stage.symbolize_keys.fetch(:ignore, []) }
       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.1"
+  VERSION = "0.16.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor