egads 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGVkZTJjMDhlOWI1MTNiMzgyYzBiOWE2ZmM0ZDUwMzQ1YTAxNjk3Ng==
+    NWY0MDIwNDgxMGQ3ZTRmYjYwZjI2NmUwNmZhOGUxZjdiZGQ4NTI2MQ==
   data.tar.gz: !binary |-
-    ZTA2MzAwYjUwNDRhMTI0YjFjYjkxYjY2ZTdhMzI5ZDFmOWY5NzMxNQ==
+    NTNlYTZhNGUyNjkxY2JlOTUxZTgxZmM2YjcwOTMwNDFmOGRkNGZkNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmVlNDg5MDRmM2JkZjc4YzA4Mjc0MzZlMWUzNjU0ZWY3NWVmY2RkOWM4Y2Fi
-    MDI3NjQyNTk5YTA1ZDRiZGQ0Y2JkNWU4NTRhNWQwYmY2MzRiZThhNzVkNzVj
-    NjlhMzE2NDgyOWJlNGQ1YzQ2ZTJjMGY0ZmJkNzJmZDgwZGNkMzk=
+    NDAwNDBlMTE1NTZmY2RiMWVlMDlhYzU0Zjc5NGI2OGM1NTQ4YzViZmEzZmU1
+    YTM2MTYyOWQ2ODYwMTc0N2RlNzE3ZGNjYjYwZDM1YjdlYzgwNzZiMzIwMjJk
+    NWMzN2Q4NzQwZWFkNDcyZjczNWFmYzg2NTI3NTcwZGM5ZmUzODA=
   data.tar.gz: !binary |-
-    YzhmODc0OWQ1MDRkNjE1ZTY1NmIwOWRhNzJiNTA3YzI5YmZmZGJmZDg5Njk0
-    NDM0YmExZGMwNWFjNzNmNzBhZDUxNmZkNWFmN2ZkNTg2MDA3ZjI0ZTE3OGRl
-    MzVlMjlmMjNjODZhZWVmN2UyNmU4M2EzOWE1ZjAxYzBiZDA3ZTE=
+    YzMxZWU1ZjkzNjdiYmYwYTI3NTVlNjQ1NzVhZmE1YTg5NTU5YjMyNzFlMTMw
+    MTMwNmQ4NDI2ZThlZjMxOGQ1OWQxNGQ4ZTE2YzNhMWE4YjgwMmZiZmFiMDRh
+    MThhYzY4YmZkMWQ2MDc5NWFkMTA3NDdjNDQ3ODA4MjVjOTM5ODk=

data/lib/egads/cli.rb

@@ -124,6 +124,16 @@ module Egads
           if shared_path = ENV['SHARED_PATH']
             symlink_directory File.join(shared_path, 'system'), File.join(dir, 'public', 'system')
             symlink_directory File.join(shared_path, 'log'), File.join(dir, 'log')
+
+            # Symlink config files
+            shared_config = File.join(shared_config, 'config')
+            if File.directory?(shared_config)
+              Dir.glob("#{shared_config}/*").each do |source|
+                basename = File.basename(source)
+                destination = File.join(dir, 'config', basename)
+                symlink(source, destination)
+              end
+            end
           end
 
           run_hooks_for(:stage, :after)
@@ -144,23 +154,30 @@ module Egads
         run_hooks_for(:release, :before)
       end
 
-      symlink_directory(dir, RemoteConfig.release_to) unless RemoteConfig.release_to == File.readlink(dir)
+      # destination of the current symlink
+      current_release = File.readlink(RemoteConfig.release_to) rescue nil
+      unless dir == current_release
+        # Symlink this release to the release_to
+        symlink_directory(dir, RemoteConfig.release_to) unless dir == current_release
+      end
+
       inside RemoteConfig.release_to do
         # Restart services
         run_or_die(RemoteConfig.restart_command)
         run_hooks_for(:release, :after)
       end
-      invoke(:clean)
 
+      FileUtils.touch(dir) # Ensure this release isn't trimmed
+      invoke(:trim, [4])
     end
 
-    desc "clean N", "[remote, plumbing] Deletes old releases, keeping the N most recent (by mtime)"
-    def clean(n=4)
+    desc "trim N", "[remote, plumbing] Deletes old releases, keeping the N most recent (by mtime)"
+    def trim(n=4)
       inside RemoteConfig.extract_to do
         dirs = Dir.glob('*').sort_by{|path| File.mtime(path) }
         dirs.slice!(n..-1)
         dirs.each do |dir|
-          say_status :clean, "Deleting #{dir}"
+          say_status :trim, "Deleting #{dir}"
           FileUtils.rm_rf(dir)
         end
       end
@@ -186,5 +203,12 @@ module Egads
       FileUtils.rm_rf(dest)
       FileUtils.ln_s(src, dest)
     end
+
+    def symlink(src, dest)
+      raise ArgumentError.new("#{src} is not a file") unless File.file?(src)
+      say_status :symlink, "from #{src} to #{dest}"
+      FileUtils.ln_sf(src, dest)
+    end
+
   end
 end

data/lib/egads/version.rb

@@ -1,3 +1,3 @@
 module Egads
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egads
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Aaron Suggs