egads 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzVkZmVlZjU0OWJmMWYwOWI0OWY3ODA5ZjJhNzMzODM3YmI3MTYxZg==
+    NTUwYTQ0MTFjOTlhNDhkYTIxMWFiYTE1ZmJlMjk2NTI5OTgxYTViMg==
   data.tar.gz: !binary |-
-    YzU1NzMyMjdmZjZmODg1ZjU4NTIyZjgwMmIxZDlmMTg3M2U1ZDFlMQ==
+    M2EyZWFmNWY0NTdlNDgxMTJiNDQ1NTI1NjRhY2YxMTUwYzJmYzIxNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjFiYzY2YWRhMDVkZjEyNTIxZDY0M2MxYTU3NmVjYTgyNjA3MmU0ZDlhNmFk
-    OTg1ZmI4YmNkN2ZiNjgzNDQ1M2JhODU0NzkzODk4MmM0M2E2YmMyYTIyOTE4
-    ZGNkYzUzMThkODcyMmExZDU1NjEwOGQ2OGI1YTQ2OWVmNjM2YTQ=
+    NjdiMmRhOTM3YWE4Mzc5OTQ5MTQ1MDcxMmVjM2Q3NzZkNmVlOTA3N2E4YTdm
+    YjNjZmEzMzdhYWQyYjhiZGE2MmVjNjhiZTBlMGE5YmE2YmQ1ZWQzNTc0ZDRm
+    ODkzMzEyYjE0ZDI4NTZjNTYwN2ViY2Q2NjU4YmE5ZjgzN2Q1YmQ=
   data.tar.gz: !binary |-
-    ZWNlNjY4YTA0NzlhMzc4MzYyYTY4MWE0MmFjMmM0NDZlMDcwZWEyOGUxNWI0
-    Zjc3NmVjYzk0YmIyMjhhZDMyNWRiMzQ5NWE0ZTA1ZGEwZmE4NDg0ZTg2NjQ4
-    NzA2NDU0YWQ3MGI0NmJhYjRhMDI5YWEwOThmMThiY2I3Y2ZkOTc=
+    ZjFkMDhjZjhjYTIyOWM5MmU0MmMwN2MwYjg1MjYyMmViYjU3ZTBlM2Q1OGVi
+    ZjAwMjM0ZGM2YzkyYWMxYThkNjM0MmZlOWRhYzZmYzFhMzQ4NzkwNjE4YWYx
+    YjMxYWQ0MDZiOWU3MjhiN2VhY2MxN2NmZWNhMmU0MGM2NTdhNGE=

data/lib/egads/cli.rb

@@ -41,7 +41,7 @@ module Egads
       File.open('REVISION', 'w') {|f| f << sha + "\n" }
       run_or_die "tar -uf #{tarball.local_tar_path} REVISION"
 
-      run_hooks_for(:build, :post)
+      run_hooks_for(:build, :after)
 
       extra_paths = Config.build_extra_paths
       if extra_paths.any?
@@ -85,19 +85,19 @@ module Egads
       tarball = S3Tarball.new(sha, true)
 
       inside dir do
-        if options[:force] || !File.exists?(path)
+        if options[:force] || File.zero?(path) || !File.exists?(path)
           say "Downloading tarball"
           duration = Benchmark.realtime do
-            File.open(path, 'w') {|f| f << tarball.body }
+            File.open(path, 'w') {|f| f << tarball.contents }
           end
           size = File.size(path)
           say "Downloaded in %.1f seconds (%.1f KB/s)" % [duration, (size.to_f / 2**10) / duration]
         else
-          say "Tarball already downloads. Use --force to overwrite"
+          say "Tarball already downloaded. Use --force to overwrite"
         end
 
         # Check revision file to see if tarball is already extracted
-        extract_flag_path File.join(dir, '.egads-extract-success')
+        extract_flag_path = File.join(dir, '.egads-extract-success')
         if options[:force] || !File.exists?(extract_flag_path)
           say "Extracting tarball"
           run_or_die "tar -zxf #{path}"
@@ -118,7 +118,7 @@ module Egads
         inside dir do
           run_hooks_for(:stage, :before)
 
-          run_or_die("bundle install --deployment --quiet") if File.readable?("GEMFILE")
+          run_or_die("bundle install --deployment --quiet") if File.readable?("Gemfile")
           if ENV['SHARED_PATH']
             symlinked_dirs = %w(public/system tmp/pids log)
             symlinked_dirs.each do |d|
@@ -169,7 +169,7 @@ module Egads
 
     private
     # Run command hooks from config file
-    # E.g. run_hooks_for(:build, :post)
+    # E.g. run_hooks_for(:build, :after)
     def run_hooks_for(cmd, hook)
       say_status :hooks, "Running #{cmd} #{hook} hooks"
       Config.hooks_for(cmd, hook).each do |command|

data/lib/egads/config.rb

@@ -22,7 +22,7 @@ module Egads
     extend CommonConfig
 
     def self.config_path
-      path = ENV['EGADS_CONFIG'] || File.join(ENV['PWD'], 'egads.yml')
+      path = ENV['EGADS_CONFIG'] || File.join(Dir.pwd, 'egads.yml')
       unless path && File.readable?(path)
         raise ArgumentError.new("Could not read config file. Set either EGADS_CONFIG, or create egads.yml in the current directory")
       end

data/lib/egads/s3_tarball.rb

@@ -6,8 +6,12 @@ module Egads
       @remote = remote
     end
 
+    def config
+      remote ? RemoteConfig : Config
+    end
+
     def key
-      [Config.s3_prefix, "#{sha}.tar.gz"].compact * '/'
+      [config.s3_prefix, "#{sha}.tar.gz"].compact * '/'
     end
 
     def exists?
@@ -30,11 +34,11 @@ module Egads
 
     # Load the file contents from S3
     def contents
-      bucket.files.get(key: key).body
+      bucket.files.get(key).body
     end
 
     def bucket
-      remote ? RemoteConfig.s3_bucket : Config.s3_bucket
+      config.s3_bucket
     end
   end
 end

data/lib/egads/version.rb

@@ -1,3 +1,3 @@
 module Egads
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

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