heroku-tagged-deploy 0.0.2.8 → 0.0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a5787c18e48b8d457c96709a3e6f4ac554057cc
-  data.tar.gz: 8d2ea91fe57942ef060bad8c1ff3f7228b1fe65e
+  metadata.gz: ba946db40d2aaeb1be1cbdb4a2e0cf9e01e5e592
+  data.tar.gz: 29f0bfcecf76a2ab5bf0ca0231ba40a186ff92da
 SHA512:
-  metadata.gz: 02400b2f96c1fcc4c3f5702dd27303e7707e1f850ce9ff3660a382c18c35244954caabd3c496caf24e0f26634c9a8aa895da5abe47abaee2fab4cfe1dbda32f0
-  data.tar.gz: f7406e88b8b8fa0cbd96f29f5832714f231cfd02e315f5d48453a0591f1d75b4bf9286e56ca8646a52a668a903e25c5972e1a150548f28451869a97fad87d632
+  metadata.gz: 3076b8a457f9222f3b32f1d43c3027c0436ce2707b81963914c593466dd8ee74947dd07fe9af07769198066e95a7064105138c20f526099e54b71631a8b1dce3
+  data.tar.gz: 6e5fead9de92cc96b0d04bde53802f58f6232c17e96ea5a1a6c788b84877de2719102f77ab1bec726809e3ee7c90e796d3e4872fbd83ad00276ed2f6be682d3f

data/heroku-tagged-deploy.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "heroku_san", "~> 4.3.2"
+  # spec.add_runtime_dependency "heroku_san", "~> 4.3.2"
   spec.add_runtime_dependency 'auto_tagger', '~> 0.2.8'
 
   spec.add_development_dependency "bundler", "~> 1.10"

data/lib/heroku/tagged/deploy/version.rb

@@ -1,7 +1,7 @@
 module Heroku
   module Tagged
     module Deploy
-      VERSION = "0.0.2.8"
+      VERSION = "0.0.6.0"
     end
   end
 end

data/lib/heroku/tagged/tagged_deploy.rb

@@ -1,73 +1,106 @@
 module HerokuSan
   module Deploy
     class Tagged < Base
-
       def get_changes
-        puts "Getting current tags..."
-        sh "git fetch --tags"
-        puts "[#{@stage.name}] Fetching current state."
-        sh "git fetch #{@stage.name}"
-        puts "[#{@stage.name}] Deploying..."
+        say 'Getting current tags...'
+        `git fetch --tags`
+        say 'Fetching current state.'
+        `git fetch #{@stage.name}`
         previous_sha_commit = `git rev-parse HEAD`.strip
-        puts "[#{@stage.name}] Deploying these changes:"
+        say 'Deploying these changes:'
         puts `git log --pretty=format:"* %s" #{@stage.name}/master..#{previous_sha_commit}`
-        puts ""
         @file_changes = `git diff --name-only #{previous_sha_commit} #{@stage.name}/master`
       end
 
       def enable_maintenance_if_needed
-        if @file_changes.index("db/migrate") || @file_changes.index("db/seeds.rb")
-          puts "[#{@stage.name}] Migrations found -- enabling maintenance mode..."
-          @stage.maintenance(:on)
+        if @file_changes.index('db/migrate') || @file_changes.index('db/seeds.rb')
+          say 'Migrations found -- enabling maintenance mode...'
+          heroku("maintenance:on -a #{@stage.app}")
+        end
+      end
+
+      def deploying_assets?
+        if @file_changes.index('app/assets')
+          true
+        else
+          false
         end
       end
 
       def post_changes
-        if @file_changes.index("db/migrate")
-          puts "[#{@stage.name}] Running migrations, as there are new ones added."
-          @stage.migrate
+        if @file_changes.index('db/migrate')
+          say 'Running migrations, as there are new ones added.'
+          heroku("run rake db:migrate -a #{@stage.app}")
         end
-        if @file_changes.index("db/seeds.rb")
-          puts "[#{@stage.name}] It looks like you adjusted or created the seeds.rb file."
-          puts "[#{@stage.name}] Running the rake db:seed command now..."
-          @stage.run('rake db:seed')
+        if @file_changes.index('db/seeds.rb')
+          say 'It looks like you adjusted or created the seeds.rb file.'
+          say 'Running the rake db:seed command now...'
+          heroku("run rake db:seed -a #{@stage.app}")
         end
-        if @file_changes.index("db/migrate") || @file_changes.index("db/seeds.rb")
-          puts "[#{@stage.name}] Disabling the maintenance mode."
-          @stage.maintenance(:off)
-          puts "[#{@stage.name}] Restarting..."
-          @stage.restart
+        if @file_changes.index('db/migrate') || @file_changes.index('db/seeds.rb')
+          say 'Disabling the maintenance mode.'
+          heroku("maintenance:off -a #{@stage.app}")
+          say 'Restarting...'
+          heroku("restart -a #{@stage.app}")
         end
       end
 
       def precompile_assets
-        sh 'rake RAILS_ENV=production RAILS_GROUP=assets assets:precompile'
-        sh 'rake RAILS_GROUP=assets assets:clean_expired'
+        `rake RAILS_ENV=production RAILS_GROUP=assets assets:precompile`
+        `rake assets:clean_expired` if in_gemfile?('turbo-sprockets-rails3')
         if system('git diff --cached --exit-code') == false || system('git diff --exit-code') == false
-          sh 'git add -A .'
-          sh 'git gc'
-          sh "git commit -m 'assets precompiled'"
-          sh 'git push'
+          `git add -A .`
+          `git gc`
+          `git commit -m 'assets precompiled'`
+          `git push`
         else
-          puts "No assets changed, no extra commit needed."
+          say 'No assets changed, no extra commit needed.'
         end
       end
 
+      def say(text)
+        puts "[#{Time.now.strftime('%H:%M:%S')}][#{@stage.name}] #{text}"
+      end
+
       def deploy
+        get_changes
+        say 'Checking for precompiled assets'
         if File.exist?(::Rails.root.join('public/assets/manifest.yml'))
-          precompile_assets
+          say 'Found manifest.yml. Precompile assets.'
+          say 'Checking if we need to precompile'
+          if deploying_assets?
+            say 'Deploying new assets, precompiling...'
+            precompile_assets
+          else
+            say 'Not deploying new assets, skipped precompile.'
+          end
         end
 
-        get_changes
         enable_maintenance_if_needed
-        
+
         # Do the deploy
         super
-        
+
         post_changes
 
         @stage.tag_repo
+
+        say 'Warming up the Heroku dynos'
+        sh "curl -o /dev/null http://#{@stage.app}.herokuapp.com"
+      end
+
+      private
+
+      def in_gemfile?(reg)
+        content = File.read(::Rails.root.join('Gemfile'))
+
+        !content.index(reg).nil?
+      end
+
+      # Executes a command in the Heroku Toolbelt
+      def heroku(command)
+        system("GEM_HOME='' BUNDLE_GEMFILE='' GEM_PATH='' RUBYOPT='' /usr/local/heroku/bin/heroku #{command}")
       end
     end
   end
-end
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: heroku-tagged-deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.2.8
+  version: 0.0.6.0
 platform: ruby
 authors:
 - David Westerink
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: heroku_san
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.2
 - !ruby/object:Gem::Dependency
   name: auto_tagger
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Have a deploy be tagged with the stage name and a date