egads 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWY0MDIwNDgxMGQ3ZTRmYjYwZjI2NmUwNmZhOGUxZjdiZGQ4NTI2MQ==
+    ZjFlZmRlNWRmNTUwYmM5MjAxM2Y1NjMzNTFmOGIyMTkxYWM1Njc3YQ==
   data.tar.gz: !binary |-
-    NTNlYTZhNGUyNjkxY2JlOTUxZTgxZmM2YjcwOTMwNDFmOGRkNGZkNA==
+    M2U5MjdmMzc0YWFhMGIzZjM4Y2ViNWIwZTdhYjE3ZjMxZDAyMjBmMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDAwNDBlMTE1NTZmY2RiMWVlMDlhYzU0Zjc5NGI2OGM1NTQ4YzViZmEzZmU1
-    YTM2MTYyOWQ2ODYwMTc0N2RlNzE3ZGNjYjYwZDM1YjdlYzgwNzZiMzIwMjJk
-    NWMzN2Q4NzQwZWFkNDcyZjczNWFmYzg2NTI3NTcwZGM5ZmUzODA=
+    M2VhOWNlMmEwMjI0MTIzNjRkODFjMWYzNTU0YzY3OWIxYWZhNGEzMmI5MTgw
+    MmU3NjdhMTk1Y2FjMDdmODExODMyNjkwOWFjNjVmZjE2YjU3ZWQxZDdjZTA2
+    MjRmN2I3NDJkZGFmZmZiOTI4YzU1MDMzMjg3ODQ0Y2M0Nzg4ZDg=
   data.tar.gz: !binary |-
-    YzMxZWU1ZjkzNjdiYmYwYTI3NTVlNjQ1NzVhZmE1YTg5NTU5YjMyNzFlMTMw
-    MTMwNmQ4NDI2ZThlZjMxOGQ1OWQxNGQ4ZTE2YzNhMWE4YjgwMmZiZmFiMDRh
-    MThhYzY4YmZkMWQ2MDc5NWFkMTA3NDdjNDQ3ODA4MjVjOTM5ODk=
+    NWM4MWQ5ZjQ2YmVkMzg2OTJhYjBhNDZmMTdkZDgxZTkwZjI5NTYwNWU5ZTcw
+    MGM3OGY0ZTFjMzA3MjYzMDQ5OTE1N2U1MzNhMWNiODNiMjJjNjQxZjViMDdi
+    MGI0OWI5ZTlhNWE5YTNiODY3M2NmYTI5OWIzM2I0MjhjZmU0M2Y=

data/lib/egads/cli.rb

@@ -120,13 +120,22 @@ module Egads
         inside dir do
           run_hooks_for(:stage, :before)
 
-          run_or_die("bundle install --deployment --quiet") if File.readable?("Gemfile")
+          # Bundler
+          if File.readable?("Gemfile")
+            bundler_args = %w(--deployment --quiet)
+            # Hack to force bundle options overridden by --deployment
+            bundler_args << "--without #{ENV['BUNDLE_WITHOUT']}" if ENV['BUNDLE_WITHOUT']
+            bundler_args << "--path #{ENV['BUNDLE_PATH']}"       if ENV['BUNDLE_PATH']
+
+            run_or_die("bundle install #{bundler_args * ' '}")
+          end
+
           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')
+            shared_config = File.join(shared_path, 'config')
             if File.directory?(shared_config)
               Dir.glob("#{shared_config}/*").each do |source|
                 basename = File.basename(source)
@@ -172,14 +181,12 @@ module Egads
     end
 
     desc "trim N", "[remote, plumbing] Deletes old releases, keeping the N most recent (by mtime)"
+    method_option :force, type: :boolean, default: false, banner: "No op, compatible with release"
     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 :trim, "Deleting #{dir}"
-          FileUtils.rm_rf(dir)
-        end
+      dirs = Dir.glob('*').sort_by{|path| File.mtime(path) }.reverse[n..-1].to_a
+      dirs.each do |dir|
+        say_status :trim, "Deleting #{dir}"
+        FileUtils.rm_rf(dir)
       end
     end
 

data/lib/egads/version.rb

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

metadata

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