egads 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37e1fd020a9d28870ef833d93bd276c14550c0f8
-  data.tar.gz: ecaa1a3ffd459bde6121a6cab1a2d74c1abbf75c
+  metadata.gz: 528b9ad77f674b120f2e3d8b64a72e24a4d16f59
+  data.tar.gz: db4985e423a4d2d265f259c4e457423264ed3dd0
 SHA512:
-  metadata.gz: ae11430a823ac2e4d0d3e25d6d9a780027f731914632c0680586fec49d82f91c1df2a024786878556261724a05e37f8372176e03e37ecd075ad987c8cc52f17c
-  data.tar.gz: 030626a7e708937b55f1f81d63f1f9899fc9245f34692c657abe5c45479104d5066c62759ea24129c6ca04b69ceecc77dda7bdc450f642b9f7a9b78a2d6c9bb9
+  metadata.gz: 14506e0b510f897e04de81aa7805719675a79456d933f1bdf59ae3f0b5e9e5dcaca4fdc2416e1f40d48d2c397213e64b5c3a62b70e87125a9f00018a7a70d958
+  data.tar.gz: e4c504af004f30c2bdc69f6f8a883a7c66b865f79f77f2a844019078afbc43d47fe9a3c7f95874fcffe8a0e9b2bcca7a2b79e00bde2f8ae1b7cdd21480b25899

data/README.md

@@ -31,8 +31,9 @@ Commands are either *porcelain* commands that you should call directly as part o
 
 ### Local commands
 
+* `egads check [SHA]` - checks if a deployable tarball of the current commit exists on S3.
 * `egads build [SHA]` - makes a deployable tarball of the current commit and upload it to S3 (if missing).
-* `egads upload SHA` - (plumbing, called by `build`) Uploads a pre-built tarball
+* `egads upload SHA` - (plumbing, called by `build`) Uploads a pre-built tarball.
 
 ### Remote commands
 

data/lib/egads/capistrano.rb

@@ -9,7 +9,7 @@ Capistrano::Configuration.instance.load do
   namespace :deploy do
     desc "Deploy"
     task :default do
-      deploy.upload
+      deploy.check
       deploy.stage
       deploy.release
     end
@@ -32,9 +32,12 @@ Capistrano::Configuration.instance.load do
     end
 
     desc "Checks that a deployable tarball is on S3; creates it if missing"
-    task :upload do
-      `bundle exec egads build #{full_sha}`
-      abort "Failed to upload build" if $?.exitstatus != 0
+    task :check do
+      logger.info "Checking tarball for #{full_sha}"
+      logger.info "To build the tarball locally, run `bundle exec egads build #{full_sha}"
+      logger.info "Waiting for tarball..."
+      `bundle exec egads check --wait #{full_sha}`
+      abort "Failed to check build" if $?.exitstatus != 0
     end
   end
 end

data/lib/egads/command.rb

@@ -1,5 +1,7 @@
 module Egads
   class Command < Thor
+    require 'egads/local_helpers'
+    require 'egads/command/check'
     require 'egads/command/build'
     require 'egads/command/upload'
     require 'egads/command/extract'
@@ -7,6 +9,7 @@ module Egads
     require 'egads/command/release'
     require 'egads/command/trim'
 
+    register(Check, 'check', 'check [REV]', '[local] Checks if a deployable tarball of the current commit already exists on S3')
     register(Build, 'build', 'build [REV]', '[local] Compiles a deployable tarball of the current commit and uploads it to S3')
     register(Upload, 'upload', 'upload SHA', '[local, plumbing] Uploads a tarball for SHA to S3')
     register(Extract, 'extract', 'extract SHA', '[remote, plumbing] Downloads tarball for SHA from S3 and extracts it to the filesystem')

data/lib/egads/command/build.rb

@@ -1,17 +1,16 @@
 module Egads
   class Build < Group
     include Thor::Actions
+    include Egads::LocalHelpers
 
     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 :wait, type: :boolean, aliases: '-w', default: false, banner: "Wait for the build to exist. Poll S3 every 2 seconds."
     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'
 
     def check_build
       say_status :rev, "#{rev} parsed to #{sha}"
 
-      wait_for_build if options[:wait]
       unless should_build?
         say_status :done, "Tarball for #{sha} already exists. Pass --force to rebuild."
         exit 0
@@ -52,18 +51,6 @@ module Egads
     end
 
     module BuildHelpers
-      def sha
-        @sha ||= run_with_code("git rev-parse --verify #{rev}").strip
-      end
-
-      def short_sha
-        sha[0,7]
-      end
-
-      def tarball
-        @tarball ||= S3Tarball.new(sha)
-      end
-
       def should_build?
         options[:force] || !tarball.exists?
       end
@@ -97,17 +84,6 @@ module Egads
         false
       end
 
-      def wait_for_build
-        say_status :wait, "Waiting for tarball to exist...", :yellow
-        loop do
-          start = Time.now
-          break if tarball.exists?
-          printf '.'
-          sleep [2 - (Time.now - start), 0].max
-        end
-        printf "\n"
-      end
-
     end
     include BuildHelpers
   end

data/lib/egads/command/check.rb

@@ -0,0 +1,37 @@
+module Egads
+  class Check < Group
+    include Thor::Actions
+    include Egads::LocalHelpers
+
+    desc "[local] Checks if a deployable tarball of the current commit already exists on S3"
+    class_option :wait, type: :boolean, aliases: '-w', default: false, banner: "Wait for the build to exist. Poll S3 every 2 seconds."
+    argument :rev, type: :string, default: 'HEAD', desc: 'git revision to check'
+
+    def check
+      say_status :rev, "#{rev} parsed to #{sha}"
+
+      wait_for_build if options[:wait]
+
+      if tarball.exists?
+        say_status :exists, "Tarball for #{sha} exists"
+        exit 0
+      else
+        say_status :missing, "Tarball for #{sha} does not exist", :red
+        exit 1
+      end
+    end
+
+    protected
+    def wait_for_build
+      say_status :wait, "Waiting for tarball to exist...", :yellow
+      loop do
+        start = Time.now
+        break if tarball.exists?
+        printf '.'
+        sleep [1 - (Time.now - start), 0].max
+      end
+      printf "\n"
+    end
+
+  end
+end

data/lib/egads/local_helpers.rb

@@ -0,0 +1,17 @@
+module Egads
+  # Some helper methods for `check` and `upload`
+  module LocalHelpers
+    def sha
+      @sha ||= run_with_code("git rev-parse --verify #{rev}").strip
+    end
+
+    def short_sha
+      sha[0,7]
+    end
+
+    def tarball
+      @tarball ||= S3Tarball.new(sha)
+    end
+
+  end
+end

data/lib/egads/version.rb

@@ -1,3 +1,3 @@
 module Egads
-  VERSION = '1.0.1'
+  VERSION = '2.0.0'
 end

data/spec/egads_build_spec.rb

@@ -9,21 +9,21 @@ describe "Egads::Build" do
   end
 
   it 'takes one argument' do
-  	subject.arguments.size.must_equal 1
+    subject.arguments.size.must_equal 1
   end
 
   it 'has a rev argument' do
-  	rev = subject.arguments.detect{|arg| arg.name == 'rev'}
-  	rev.default.must_equal 'HEAD'
-  	rev.required.must_equal false
+    rev = subject.arguments.detect{|arg| arg.name == 'rev'}
+    rev.default.must_equal 'HEAD'
+    rev.required.must_equal false
   end
 
 end
 
 describe "Egags::Build instance" do
-	subject { Egads::Build.new }
-	
-	it "has rev HEAD" do
-		subject.rev.must_equal 'HEAD'
-	end
-end
+  subject { Egads::Build.new }
+
+  it "has rev HEAD" do
+    subject.rev.must_equal 'HEAD'
+  end
+end

data/spec/egads_check_spec.rb

@@ -0,0 +1,29 @@
+require_relative 'spec_helper'
+
+describe "Egads::Check" do
+  setup_configs!
+  subject { Egads::Check }
+
+  it 'should run the correct tasks' do
+    subject.commands.keys.must_equal %w(check)
+  end
+
+  it 'takes one argument' do
+    subject.arguments.size.must_equal 1
+  end
+
+  it 'has a rev argument' do
+    rev = subject.arguments.detect{|arg| arg.name == 'rev'}
+    rev.default.must_equal 'HEAD'
+    rev.required.must_equal false
+  end
+
+end
+
+describe "Egags::Build instance" do
+  subject { Egads::Check.new }
+
+  it "has rev HEAD" do
+    subject.rev.must_equal 'HEAD'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egads
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Aaron Suggs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -92,6 +92,7 @@ files:
 - lib/egads/capistrano.rb
 - lib/egads/command.rb
 - lib/egads/command/build.rb
+- lib/egads/command/check.rb
 - lib/egads/command/extract.rb
 - lib/egads/command/release.rb
 - lib/egads/command/stage.rb
@@ -99,9 +100,11 @@ files:
 - lib/egads/command/upload.rb
 - lib/egads/config.rb
 - lib/egads/group.rb
+- lib/egads/local_helpers.rb
 - lib/egads/s3_tarball.rb
 - lib/egads/version.rb
 - spec/egads_build_spec.rb
+- spec/egads_check_spec.rb
 - spec/egads_config_spec.rb
 - spec/egads_extract_spec.rb
 - spec/egads_release_spec.rb
@@ -136,6 +139,7 @@ specification_version: 4
 summary: Extensible Git Archive Deploy Strategy
 test_files:
 - spec/egads_build_spec.rb
+- spec/egads_check_spec.rb
 - spec/egads_config_spec.rb
 - spec/egads_extract_spec.rb
 - spec/egads_release_spec.rb