egads 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 431161a40ebda80854346b8bd46f537694014964
-  data.tar.gz: 28ca1289d9fde3eff1ed2036550de908d0df48dd
+  metadata.gz: dc867ae1d568eacba71cb54573d86118074c736a
+  data.tar.gz: 1daa4510795c557445539757673aa69b16cffbda
 SHA512:
-  metadata.gz: e25a1ea500355ff4735d6a360d169676a8ee6bcadf4e4fe90b4361c6c6884fb42101203db7b0fcaff64fd5c0b5fbb641a371142cd942dd8ee08676b22719ac0e
-  data.tar.gz: 2b37800cf6a448dde000c47e7679a249df44356e68621d8fdea4f2f8268f111da93f816e4348f2ce370dfedcfe6b7cfdde704d2a61ae22b3fe8208007bdfe55f
+  metadata.gz: 7a0a749867163a4515e266aa95d7dd06336a193937b560c10d9a4d970d69fd95c502e168a91e55c6ab831e9c63e0f5f26ea8a1430f0c0353e1800272ebe75cfb
+  data.tar.gz: 98edd4c1baa874da8a38dfa25a8d3e895c6d9750957430daad408046a936da6274b9cc1d4e7d2f8ff4a517e34560555617ace14a97df4f8f7e8dcad71ad21146

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 sudo: false # Opt-in to container infrastructure
 rvm:
-  - 1.9.3
-  - 2.1.6
-  - 2.2.2
+  - 2.2.4
+  - 2.3.0

data/lib/egads/command/build.rb

@@ -3,9 +3,8 @@ module Egads
     include Thor::Actions
     include LocalHelpers
 
-    desc "[local] Compiles a deployable patch of the current commit and uploads it to S3"
+    desc "[local] Compiles a deployable tarball of the current commit and uploads it to S3"
     class_option :force, type: :boolean, aliases: '-f', default: false, banner: "Build and overwrite existing tarball on S3"
-    class_option :seed, type: :boolean, default: false, banner: "Builds and tags a complete tarball for more efficient patches"
     class_option 'no-upload', type: :boolean, default: false, banner: "Don't upload the tarball to S3"
     argument :rev, type: :string, default: 'HEAD', desc: 'git revision to build'
 
@@ -15,12 +14,12 @@ module Egads
       say_status :rev, "#{rev} parsed to #{sha}"
 
       unless should_build?
-        say_status :done, "#{build_type} tarball for #{sha} already exists. Pass --force to rebuild."
+        say_status :done, "tarball for #{sha} already exists. Pass --force to rebuild."
         exit 0
       end
 
       exit 1 unless can_build?
-      say_status :build, "Making #{build_type} tarball for #{sha}", :yellow
+      say_status :build, "Making tarball for #{sha}", :yellow
     end
 
     def run_before_build_hooks
@@ -45,21 +44,7 @@ module Egads
     end
 
     def make_tarball
-      if options[:seed]
-        # Seed tarball
-        run_with_code "git archive #{build_sha} --output #{tarball.local_tar_path}"
-      else
-        # Patch tarball
-        seed_ref = "refs/remotes/origin/#{Config.seed_branch}"
-        # NB: the seed tarball is named after the parent of seed tag
-        seed_parent = run_with_code("git rev-parse --verify #{seed_ref}^").strip
-        File.open('egads-seed', 'w') {|f| f << seed_parent + "\n" }
-        patch_files = [patch_path, 'egads-seed']
-        run_with_code "git diff --binary #{seed_ref} #{build_sha} > #{patch_path}"
-        run_with_code "tar -zcf #{tarball.local_tar_path} #{patch_files * ' '}"
-        patch_files.each {|f| File.delete(f) }
-      end
-
+      run_with_code "git archive #{build_sha} --output #{tarball.local_tar_path}"
     end
 
     def run_after_build_hooks
@@ -67,13 +52,7 @@ module Egads
     end
 
     def upload
-      invoke(Egads::Upload, [sha], force: options[:force], seed: options[:seed]) unless options['no-upload']
-    end
-
-    def push_seed
-      if options[:seed]
-        run_with_code "git push -f origin #{build_sha}:refs/heads/#{Config.seed_branch}"
-      end
+      invoke(Egads::Upload, [sha], force: options[:force]) unless options['no-upload']
     end
 
     module BuildHelpers
@@ -106,10 +85,6 @@ module Egads
         "#{sha}.patch"
       end
 
-      def build_type
-        options[:seed] ? 'seed' : 'patch'
-      end
-
       def error(message)
         lines = Array(message)
         say_status :error, lines.shift, :red

data/lib/egads/command/extract.rb

@@ -19,14 +19,22 @@ module Egads
 
         do_extract patch_path
 
-        # Download seed
-        self.seed_sha = Pathname.new(patch_dir).join("egads-seed").read.strip
-        self.seed_path = File.join(RemoteConfig.seed_dir, "#{seed_sha}.tar.gz")
-        do_download(seed_sha, seed_path, 'seed')
-
-        do_extract seed_path
+        # If the seed path exists, the patch was build w/ egads <= 4.0
+        # Newer patch files include the seed
+        seed_pointer = Pathname.new(patch_dir).join("egads-seed")
+        if seed_pointer.exist?
+          # Download seed
+          self.seed_sha = seed_pointer.read.strip
+          self.seed_path = File.join(RemoteConfig.seed_dir, "#{seed_sha}.tar.gz")
+          do_download(seed_sha, seed_path, 'seed')
+
+          do_extract seed_path
+
+          apply_patch
+        else
+          say_status :done, 'Patch tarball is complete, no seed to extract.'
+        end
 
-        apply_patch
         finish_extraction
       else
         say_status :done, "#{sha} already extracted. Use --force to overwrite"

data/lib/egads/command/upload.rb

@@ -4,14 +4,12 @@ module Egads
 
     desc "[local, plumbing] Uploads a tarball for SHA to S3"
     argument :sha, type: :string, required: true, desc: 'git SHA to upload'
-    class_option :seed, type: :boolean, default: false, banner: "Uploads a seed tarball"
-
 
     attr_reader :sha
     def upload
       @sha = sha
       size = File.size(path)
-      type = options[:seed] ? 'seed' : 'patch'
+      type = 'patch'
 
       say_status :upload, "Uploading #{type} tarball (%.1f MB)" % (size.to_f / 2**20), :yellow
       duration = Benchmark.realtime do
@@ -24,7 +22,7 @@ module Egads
 
     private
     def tarball
-      @tarball ||= S3Tarball.new(sha, seed: options[:seed])
+      @tarball ||= S3Tarball.new(sha, seed: false)
     end
 
     def path

data/lib/egads/config.rb

@@ -8,7 +8,7 @@ module Egads
     def s3_bucket
       return @bucket if @bucket
       client = Aws::S3::Client.new(access_key_id: config['s3']['access_key'], secret_access_key: config['s3']['secret_key'], region: 'us-east-1')
-      @bucket ||= Aws::S3::Bucket.new(config['s3']['bucket'], client: client)
+      @bucket = Aws::S3::Bucket.new(config['s3']['bucket'], client: client)
     end
 
     def s3_prefix

data/lib/egads/version.rb

@@ -1,3 +1,3 @@
 module Egads
-  VERSION = '4.0.0'
+  VERSION = '5.0.0'
 end

data/spec/egads_build_spec.rb

@@ -4,7 +4,7 @@ describe "Egads::Build" do
   subject { Egads::Build }
 
   it 'should run the correct tasks' do
-    subject.commands.keys.must_equal %w(check_build run_before_build_hooks write_revision_file commit_extra_paths make_tarball run_after_build_hooks upload push_seed)
+    subject.commands.keys.must_equal %w(check_build run_before_build_hooks write_revision_file commit_extra_paths make_tarball run_after_build_hooks upload)
   end
 
   it 'takes one argument' do

data/spec/egads_s3_tarball_spec.rb

@@ -3,16 +3,17 @@ require_relative 'spec_helper'
 describe Egads::S3Tarball do
   subject { Egads::S3Tarball.new('sha') }
 
+  after { Aws.config.delete(:s3) }
+
   it('has a sha') { subject.sha.must_equal 'sha' }
   it('has a key') { subject.key.must_equal 'my_project/sha.tar.gz' }
 
   it "has an S3 bucket" do
-    subject.bucket.must_equal Egads::Config.s3_bucket
+    subject.bucket.name.must_equal Egads::Config.s3_bucket.name
   end
 
   it('should not exist') {
-    skip 'Weird stubbing issues with Resource#exists?'
-    Aws.config[:s3] = {stub_responses: { head_object: 'NotFound' }}
+    Aws.config[:s3] = {stub_responses: { head_object: {status_code: 404, headers: {}, body: '', }}}
     subject.exists?.must_equal(false)
   }
 
@@ -22,7 +23,6 @@ describe Egads::S3Tarball do
     end
 
     it('should exist') do
-      skip 'Weird stubbing issues with Resource#exists?'
       subject.exists?.must_equal true
     end
   end

data/spec/spec_helper.rb

@@ -33,5 +33,6 @@ class Minitest::Spec
   after do
     ENV.delete('EGADS_CONFIG')
     ENV.delete('EGADS_REMOTE_CONFIG')
+    Egads::Config.instance_variable_set(:@bucket, nil)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egads
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Aaron Suggs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Extensible Git Archive Deploy Strategy