tidy_reset 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d28a126f7d7b56a27d485c498c618e0cc73c5d91
-  data.tar.gz: 81867ef490d7ea404691209bdd4d918007454906
+  metadata.gz: 73885e339b07c70af26560c7b256e6fd17b4e937
+  data.tar.gz: d61e6423158502650ca76258cd6539a15be2b5c4
 SHA512:
-  metadata.gz: 8e159ee713c84cafc7621675da4393e8dbb80e50e0f96a1b644dd38450f1b2af8adac2583d07a91a0b569d9845bdfc6d1574c6a70572a9f13ead644ac8a8aebf
-  data.tar.gz: adcd84e83ed8ba8c765086f2049ae0b42269fa28daaddeb833c4652097dffacb87647cbf8f4db3e754270e1ad7de8fb98ba385c906e7da2e2a8fc7820f1e47de
+  metadata.gz: f35fc0fe77197dc0c4e3c0e0dadcfc96e70b4cda7cb03e5703ac5f50d5e996ab6ca29d404a6119d1d2fb359df14067b6800388bf41adcaefeb06bb52fad9d453
+  data.tar.gz: ebb8c94763b5bde67a9e83387e2c75ecc27bcd322729c0df3251990302d7ed1df16c004766cd00c611749ebee8abb7859a19e6d496598c3255f92b93d3738cb7

data/VERSION

@@ -1 +1 @@
-0.1.20
+0.1.21

data/lib/tidy_reset/tasks/tidy.rake

@@ -4,10 +4,11 @@ namespace :tidy do
     # Executes all tasks
   end
 
+  ACCEPTED_ENVIRONMENTS = ['test', 'sandbox', 'integration']
   # Prevents mistakes. Raises an error for stages not test or sandbox. 
   # All tidy tasks should :validate as a task dependency.
   task :validate, [:stage] => [:environment] do |t, args|
-    if (args.stage && !['test', 'sandbox'].include?(args.stage)) || !['test', 'sandbox'].include?(STAGE)
+    if (args.stage && !ACCEPTED_ENVIRONMENTS.include?(args.stage)) || !ACCEPTED_ENVIRONMENTS.include?(STAGE)
       raise "ERROR: tasks are meant for 'test' and 'sandbox' ONLY."
     end
   end
@@ -49,8 +50,8 @@ namespace :tidy do
   task :db, [:stage] => [:validate] do |t, args|
     app = TidyReset.app_name(args.stage)
     TidyReset.execute("heroku run rake tidy:db:purge --app #{app}")
-    TidyReset.execute("heroku run rake db:migrate --app #{app}")
-    TidyReset.execute("heroku run rake db:seed --app #{app}")
+    TidyReset.execute("heroku run rake tidy:db:migrate --app #{app}")
+    TidyReset.execute("heroku run rake tidy:db:seed --app #{app}")
   end
 
   namespace :db do
@@ -58,8 +59,19 @@ namespace :tidy do
     task :purge => [:validate, :environment] do |t, args|
       TidyReset.configuration.databases.each do |database|
         TidyReset.database_purge(database)
+        puts "Tidy task done."
       end
     end
+
+    task :migrate => [:validate, :environment] do |t, args|
+      Rake::Task['db:migrate'].invoke
+      puts "Tidy task done."
+    end
+
+    task :seed => [:validate, :environment] do |t, args|
+      Rake::Task['db:seed'].invoke
+      puts "Tidy task done."
+    end
   end
 
   desc "Clears the Rails.cache on a remote application."

data/lib/tidy_reset.rb

@@ -3,6 +3,10 @@ require 'tidy_reset/version'
 require 'open3'
 
 module TidyReset
+  class RakeExecuteException < StandardError; end
+  class RakeStatusException < StandardError; end
+  class RakeCompletedException < StandardError; end
+ 
   class << self
     attr_accessor :configuration
 
@@ -14,38 +18,29 @@ module TidyReset
       yield(configuration)
     end
 
+    def process(line)
+      puts line
+      @execute_error = RakeExecuteException if line =~ /rake aborted/
+      @rake_completed = true if line =~ /Tidy task done./
+    end
+
     def execute(command)
       Bundler.with_clean_env do 
         begin
           tries ||= 3
-          rake_error = false
-          db_seed_completed = false
+          @execute_error = false
+          @rake_completed = false
           puts "running: #{command}"
+          
           Open3.popen3(command) do |stdin, stdout, stderr, wait_thr| 
-            while line = stdout.gets
-              puts line
-              rake_error = true if line =~ /rake aborted/
-              db_seed_completed = true if line =~ /The rake task db:seed finished successfully./
-            end
-            
-            while line = stderr.gets
-              puts line
-              rake_error = true if line =~ /rake aborted/
-            end
-            
-            if db_seed_completed == false && command =~ /db:seed/
-              raise RuntimeError, "ERROR: rake db:seed failed!"
-            end
-            
-            unless wait_thr.value.success?
-              raise RuntimeError, wait_thr.value
-            end
+            process(line) while line = stdout.gets
+            process(line) while line = stderr.gets
             
-            if rake_error
-              raise RuntimeError, "rake aborted"
-            end
+            raise RakeStatusException, "Non-zero Exit Code: #{wait_thr.value}" unless wait_thr.value.success?
+            raise RakeCompletedException if (@rake_completed == false && command =~ /heroku run rake tidy:db:/ )
+            raise @execute_error if @execute_error
           end
-        rescue RuntimeError => e
+        rescue => e
           if (tries -= 1) > 0
             puts "Failed running command. Waiting 10s before next retry. Error: #{e}"
             sleep(10)

data/tidy_reset.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: tidy_reset 0.1.20 ruby lib
+# stub: tidy_reset 0.1.21 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tidy_reset"
-  s.version = "0.1.20"
+  s.version = "0.1.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Thinknear"]
-  s.date = "2014-10-02"
+  s.date = "2014-11-06"
   s.description = "Reset dynos, environment variables, deploys master git branch, and purges the database."
   s.email = "software@thinknear.com"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tidy_reset
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Thinknear
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler