jumpup-heroku 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf991ff339b56efcc4409daa1ac095316681651b
-  data.tar.gz: 90f2a0d694367ac749ff7185d6132e27e3d79c56
+  metadata.gz: 118a1d1cc65a278d3ec2a5c3b74ffaf3a67a8209
+  data.tar.gz: 9dcc7fb2c844f5499f70ef72516be88a1b436e4a
 SHA512:
-  metadata.gz: 33d61d74d911d8debbdfa11f5cb8e4929ee7ff462cc1388deea4d39a7db36347b5b6c8b63b448581cb6c5b3ff7a40e02d266335384fb95016b9e4d0af595c008
-  data.tar.gz: 3e41ca498967a2dbfd875936a346c33a899db1b73355c52ed9e7b98b588a6ff6b4936dca021a52c49fa58ec729c95d04a71e306d97a78062c7c96f0ac6a229c3
+  metadata.gz: d4e8cc321ff6d3be90ebbaed0528ba24b7031ec8bceed934c2943e8b30e73ead58dc2100f6e7fae0b5a8dd6a49c04019e3bafced352d5541553f841f98c8fa20
+  data.tar.gz: d4f9ad4f84115ca9abef1d6f1dcc85cfae9e23b290912c1f6c03bceed48680c91668651fa429b329ac10e34e2f3bb96ab91c0f7c21aeec9397db96b99a8c7f42

data/CHANGELOG.md

@@ -1,6 +1,43 @@
 # Changelog
 
-## 0.0.1 (Unreleased)
+## 0.0.4 (February 21, 2014)
+
+### features
+
+### improvements
+- `rake integrate` now fails if a push to heroku fails [[GH-21](https://github.com/Helabs/jumpup-heroku/pull/21)]
+- Make integrate:production as an alias to jumpup:heroku:deploy:production
+- Add info about how release the gem
+- Add info about best practices
+- More info on README
+- Do not set INTEGRATING_BY again if you're already there
+- Add info about current branch when git push
+- Make sure that git name is setup
+
+### bug fixes
+
+## 0.0.3 (January 20, 2014)
+
+### features
+
+### improvements
+
+### bug fixes
+- Fix bug on heroku-account
+
+## 0.0.2 (January 16, 2014)
+
+### features
+
+### improvements
+- Better README
+- Make Rake spec as default Rake
+- Compacted some tasks into start and finish tasks
+- Add heroku-accounts support
+
+### bug fixes
+
+## 0.0.1 (January 07, 2014)
 
 ### features
 

data/CONTRIBUTING.md

@@ -27,21 +27,5 @@ At this point you're waiting on us. We like to at least comment on, if not
 accept, pull requests within three business days (and, typically, one business
 day). We may suggest some changes or improvements or alternatives.
 
-Some things that will increase the chance that your pull request is accepted,
-taken straight from the Ruby on Rails guide:
+Some things that will increase the chance that your pull request is accepted is to follow the practices described on [Ruby style guide](https://github.com/bbatsov/ruby-style-guide), [Rails style guide](https://github.com/bbatsov/rails-style-guide) and [Better Specs](http://betterspecs.org/).
 
-* Use Rails idioms and helpers
-* Include tests that fail without your code, and pass with it
-* Update the documentation, the surrounding one, examples elsewhere, guides,
-  whatever is affected by your contribution
-
-Syntax:
-
-* Two spaces, no tabs.
-* No trailing whitespace. Blank lines should not have any space.
-* Prefer &&/|| over and/or.
-* my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
-* a = b and not a=b.
-* Follow the conventions you see used in the source already.
-
-And in case we didn't emphasize it enough: we love tests!

data/README.md

@@ -1,4 +1,5 @@
 # Jumpup-heroku
+[![RubyGems][gem_version_badge]][ruby_gems]
 
 Rake tasks to deploy any Rails application on [Heroku](http://heroku.com) using [Jumpup](https://github.com/Helabs/jumpup).
 
@@ -7,7 +8,7 @@ Rake tasks to deploy any Rails application on [Heroku](http://heroku.com) using
 Add to your gem file.
 
 ```ruby
-gem 'jumpup-heroku', github: 'Helabs/jumpup-heroku'
+gem 'jumpup-heroku'
 ```
 
 Without groups on Gemfile, because of initializer.
@@ -20,7 +21,7 @@ Without groups on Gemfile, because of initializer.
   # config/initializers/jumpup-heroku.rb
   Jumpup::Heroku.configure do |config|
     config.app = 'myapp'
-  end
+  end if Rails.env.development?
   ```
 
 	If you use [Heroku Accounts](https://github.com/ddollar/heroku-accounts)
@@ -35,7 +36,7 @@ Without groups on Gemfile, because of initializer.
       account2.app = 'myapp2'
       account2.run_database_tasks = false # Default: true
     end
-  end
+  end if Rails.env.development?
   ```
 
   Have production and staging app? Do like this:
@@ -44,7 +45,7 @@ Without groups on Gemfile, because of initializer.
   Jumpup::Heroku.configure do |config|
     config.staging_app = 'myapp-staging'
     config.production_app = 'myapp'
-  end
+  end if Rails.env.development?
   ```
 
   If you need to disable remote database tasks (backup, migrate and seed):
@@ -53,7 +54,7 @@ Without groups on Gemfile, because of initializer.
   Jumpup::Heroku.configure do |config|
     config.app = 'myapp'
     config.run_database_tasks = false # Default: true
-  end
+  end if Rails.env.development?
   ```
 
 2. Add to the tasks on jumpup.rake the tasks to deploy on Heroku:
@@ -73,6 +74,10 @@ Without groups on Gemfile, because of initializer.
   )
   ```
 
+### Deploy to production
+
+Run ```rake jumpup:heroku:deploy:production``` or as an alias ```rake integrate:production```
+
 ## Versioning
 
 Jumpup-heroku follow the [Semantic Versioning](http://semver.org/).
@@ -85,6 +90,17 @@ If you have problems, please create a [Github Issue](https://github.com/Helabs/j
 
 Please see [CONTRIBUTING.md](https://github.com/Helabs/jumpup-heroku/blob/master/CONTRIBUTING.md) for details.
 
+## Release
+
+Follow this steps to release a new version of the gem.
+
+1. Test if everything is running ok;
+1. Change version of the gem on `VERSION` constant;
+1. Add the release date on the `CHANGELOG`;
+1. Do a commit "Bump version x.x.x", follow the semantic version;
+1. Run `$ rake release`, this will send the gem to the rubygems;
+1. Check if the gem is on the rubygems and the tags are correct on the github;
+
 ## Credits
 
 Jumpup-heroku is maintained and funded by [HE:labs](http://helabs.com.br/opensource/).
@@ -92,4 +108,7 @@ Thank you to all the [contributors](https://github.com/Helabs/jumpup-heroku/grap
 
 ## License
 
-Jumpup-heroku is Copyright © 2013-2014 HE:labs. It is free software, and may be redistributed under the terms specified in the LICENSE file.
+Jumpup-heroku is Copyright © 2013-2014 HE:labs. It is free software, and may be redistributed under the terms specified in the LICENSE file.
+
+[gem_version_badge]: https://badge.fury.io/rb/jumpup-heroku.png
+[ruby_gems]: http://rubygems.org/gems/jumpup-heroku

data/jumpup-heroku.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "jumpup-heroku"
   spec.version       = Jumpup::Heroku::VERSION
   spec.authors       = ["HE:labs"]
-  spec.email         = ["contato@helabs.com.br"]
+  spec.email         = ["tech@helabs.com.br"]
   spec.description   = %q{Rake tasks to deploy on heroku}
   spec.summary       = %q{Rake tasks to deploy on heroku}
   spec.homepage      = "https://github.com/Helabs/jumpup-heroku"

data/lib/jumpup/heroku.rb

@@ -9,9 +9,5 @@ module Jumpup
   end
 end
 
-def gem_path
-  Gem::Specification.find_by_name('jumpup-heroku').full_gem_path
-end
-
+gem_path = Gem::Specification.find_by_name('jumpup-heroku').full_gem_path
 Dir["#{gem_path}/lib/tasks/*.rake"].each { |ext| load ext } if defined?(Rake)
-

data/lib/jumpup/heroku/integrate.rb

@@ -40,6 +40,12 @@ module Jumpup
       end
 
       def deploy
+        if run_database_tasks?
+          run_with_clean_env('git fetch heroku')
+          check_if_migration_is_needed
+          check_if_seed_is_needed
+        end
+
         backup
         push
         migrate
@@ -48,6 +54,12 @@ module Jumpup
       end
 
       def deploy_to_production
+        if run_database_tasks?
+          run_with_clean_env('git fetch heroku')
+          check_if_migration_is_needed
+          check_if_seed_is_needed
+        end
+
         confirm_deploy
         spec
         confirm_maintenance
@@ -63,43 +75,79 @@ module Jumpup
 
       def add_remote
         puts "--> Adding Heroku git remotes for app #{app}"
-        remote = run_with_clean_env("git remote | grep heroku", true).strip
-        run_with_clean_env("git remote add heroku git@heroku.com:#{app}.git") if remote.blank?
+        remote = run_with_clean_env("git remote | grep heroku").strip
+        exec_with_clean_env("git remote add heroku git@heroku.com:#{app}.git") if remote.blank?
       end
 
       def check
         puts "--> Checking if there's already someone integrating to #{app}"
 
-        var = run_with_clean_env("heroku config -s --app #{app} | grep INTEGRATING_BY", true).strip
-        integrating_by = var.split('=')[1]
+        return if can_start_integration?(user)
 
-        integrating_by.strip! unless integrating_by.blank?
-
-        if integrating_by != user and not integrating_by.blank?
-          puts "--> Project is already being integrated by '#{integrating_by}', halting"
-          exit
-        end
+        puts "--> Project is already being integrated by '#{integrating_by}', halting"
+        exit 1
       end
 
       def lock
+        return if integrating_by?(user)
+
         puts "--> Locking Heroku integration for you (#{user})"
-        run_with_clean_env("heroku config:set INTEGRATING_BY='#{user}' --app #{app}")
+        exec_with_clean_env("heroku config:set INTEGRATING_BY='#{user}' --app #{app}")
       end
 
       def unlock
         puts "--> Unlocking Heroku integration"
-        run_with_clean_env("heroku config:unset INTEGRATING_BY --app #{app}")
+        exec_with_clean_env("heroku config:unset INTEGRATING_BY --app #{app}")
       end
 
       private
         attr_reader :app, :envs, :maintenance_mode
 
+        def check_if_migration_is_needed
+          files_changed       = run_with_clean_env("git diff HEAD heroku/master --name-only -- db/migrate | wc -l").strip.to_i
+          @migrations_changed = files_changed > 0
+        end
+
+        def check_if_seed_is_needed
+          files_changed  = run_with_clean_env("git diff HEAD heroku/master --name-only -- db/seeds* | wc -l").strip.to_i
+          @seeds_changed = files_changed > 0
+        end
+
+        def can_start_integration?(user)
+          integrating_by.blank? || integrating_by?(user)
+        end
+
+        def integrating_by?(user)
+          integrating_by == user
+        end
+
+        def integrating_by
+          @integrating_by ||= run_with_clean_env("heroku config:get INTEGRATING_BY --app #{app}").strip
+        end
+
         def user
-          @user ||= run_with_clean_env("git config --get user.name", true).strip
+          @user ||= validate_username
+        end
+
+        def validate_username
+          user = run_with_clean_env("git config --get user.name").strip
+          if user.blank?
+            puts "--> You must setup your git user name. Use: git config --global user.name 'your name'"
+            exit 1
+          end
+          user
+        end
+
+        def run_with_clean_env(command)
+          Bundler.with_clean_env { `#{command}` }
         end
 
-        def run_with_clean_env(command, capture_output = false)
-          Bundler.with_clean_env { capture_output ? `#{command}` : system(command) }
+        def exec_with_clean_env(command)
+          Bundler.with_clean_env do
+            unless system(command)
+              raise "Error while running #{command}"
+            end
+          end
         end
 
         def confirm(message)
@@ -114,33 +162,43 @@ module Jumpup
         def backup
           return unless run_database_tasks?
           puts "--> [#{app}] Backing up database"
-          run_with_clean_env("heroku pgbackups:capture --expire --app #{app}")
+          exec_with_clean_env("heroku pgbackups:capture --expire --app #{app}")
         end
 
         def migrate
           return unless run_database_tasks?
-          puts "--> [#{app}] Migrating"
-          run_with_clean_env("heroku run rake db:migrate --app #{app}")
+
+          if @migrations_changed
+            puts "--> [#{app}] Migrating"
+            exec_with_clean_env("heroku run rake db:migrate --app #{app}")
+          else
+            puts "--> [#{app}] Skipping migrations"
+          end
         end
 
         def seed
           return unless run_database_tasks?
-          puts "--> [#{app}] Seeding"
-          run_with_clean_env("heroku run rake db:seed --app #{app}")
+
+          if @seeds_changed
+            puts "--> [#{app}] Seeding"
+            exec_with_clean_env("heroku run rake db:seed --app #{app}")
+          else
+            puts "--> [#{app}] Skipping seeds"
+          end
         end
 
         def restart
           puts "--> [#{app}] Restarting"
-          run_with_clean_env("heroku restart --app #{app}")
+          exec_with_clean_env("heroku restart --app #{app}")
         end
 
         def push
-          puts "--> [#{app}] Pushing to #{host}"
-          run_with_clean_env("git push git@#{host}:#{app}.git HEAD:master")
+          puts "--> [#{app}] Pushing to #{host} from branch [#{actual_branch}]"
+          exec_with_clean_env("git push git@#{host}:#{app}.git HEAD:master")
         end
 
         def confirm_deploy
-          confirm("Going deploy to production [#{app}]...")
+          confirm("[#{app}] Deploying to production using brach [#{actual_branch}]")
         end
 
         def spec
@@ -160,7 +218,7 @@ module Jumpup
         def maintenance
           if maintenance?
             puts "--> [#{app}] Setting Maintenance on"
-            run_with_clean_env("heroku maintenance:on --app #{app}")
+            exec_with_clean_env("heroku maintenance:on --app #{app}")
             restart
             puts "--> [#{app}] Waiting 20 seconds to app come back (in maintenance mode)"
             sleep(20)
@@ -172,22 +230,26 @@ module Jumpup
           tag_name = "production-#{iso_date}"
 
           puts "--> Tagging as #{tag_name}"
-          run_with_clean_env("git tag #{tag_name} master")
+          exec_with_clean_env("git tag #{tag_name} master")
 
           puts "--> Pushing to origin"
-          run_with_clean_env("git push origin #{tag_name}")
+          exec_with_clean_env("git push origin #{tag_name}")
         end
 
         def close_maintenance
           if maintenance?
             puts "Setting Maintenance off"
-            run_with_clean_env("heroku maintenance:off --app #{app}")
+            exec_with_clean_env("heroku maintenance:off --app #{app}")
           end
         end
 
         def host
           Env.all[:host]
         end
+
+        def actual_branch
+          run_with_clean_env("git rev-parse --abbrev-ref HEAD").strip
+        end
     end
   end
 end

data/lib/jumpup/heroku/version.rb

@@ -1,5 +1,5 @@
 module Jumpup
   module Heroku
-    VERSION = "0.0.3"
+    VERSION = '0.0.4'
   end
 end

data/lib/tasks/integrate.rake

@@ -30,7 +30,6 @@ namespace :jumpup do
     end
 
     namespace :deploy do
-
       desc "Deploy to production"
       task production: :environment do
         Jumpup::Heroku::Integrate.deploy_to_production
@@ -39,3 +38,10 @@ namespace :jumpup do
   end
 end
 
+namespace :integrate do
+  desc 'Alias to jumpup:heroku:deploy:production'
+  task production: :environment do
+    Rake.application.invoke_task('jumpup:heroku:deploy:production')
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jumpup-heroku
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - HE:labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,7 +68,7 @@ dependencies:
         version: 0.9.12.4
 description: Rake tasks to deploy on heroku
 email:
-- contato@helabs.com.br
+- tech@helabs.com.br
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Rake tasks to deploy on heroku