jumpup 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff68a671a142a27009322cfb38911217cf84f588
-  data.tar.gz: 691e3f44c7dcfbf8f6c30145b7605bb54a973722
+  metadata.gz: 7769036c4d2de1cc20f9746aa4959172d1ebb9e5
+  data.tar.gz: 8aff067d48d1cfc08fa3412a7433ec4bd0523e9c
 SHA512:
-  metadata.gz: 47dd5dd1d4dfd1f973e10143b65a5c5b0aed496a4b5166c205a09d6ef3340e6f5bd6d30ebbf10f97499b8eea2e7d22801905f7016524afc7e919b7020678b7d9
-  data.tar.gz: 33ba51c18acbe2b644e35c704333f17fb1610ea8c705e48e7376b3a1286a8fc9e8168e7a3b61aa965823f425397f8a3d0233d2e5042215f4e268e3e726d8e2b9
+  metadata.gz: 662e5d2a05e59552bab8745f9c9ded9447280893bb02e83f89c3daa02664977db7d928e0e0ed7373519196bc4a45d4ecbb870cd31169b55db5918f8079041f37
+  data.tar.gz: 84ba7ea29f818342ecbf007a9c7889078ca2f94282371465102628e1efaa96f9aa94d0a4dd9a3dba780166a38129ef3a0cea036f70468977ae1939f54ee97199

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.0.8 (November 28, 2014)
+
+### features
+- Abort integration if a new commit appears between spec and push tasks. You can use it running `git:store_last_commit_hash` on the beginning of integration (already on `jumpup:start`) and `git:check_last_commit_change` before pushing.
+
+### improvements
+
+### bug fixes
+
 ## 0.0.7 (September 15, 2014)
 
 ### features

data/README.mkdn

@@ -28,6 +28,7 @@ INTEGRATION_TASKS = %w(
   jumpup:bundle_install
   db:migrate
   spec
+  jumpup:git:check_last_commit_change
   jumpup:finish
 )
 ```
@@ -44,6 +45,7 @@ For more information, please have a look at the "[Integration Steps](#integratio
 
 * [jumpup-heroku][jumpup-heroku]
 * [jumpup-hipchat][jumpup-hipchat]
+* [jumpup-deis][jumpup-deis]
 
 ## Dependencies
 
@@ -70,19 +72,21 @@ The integration process is composed of several Rake tasks that are explained bel
 
 | Rake Task | Description |
 | --------- | ----------- |
-| `jumpup:integration:check`   | Check if other user is already integrating, to avoid reject message from git after runing all tests. |
-| `jumpup:integration:lock`    | Lock the integration to current user. |
-| `git:status_check`           | Check if all local files have been commited to the local git repository. |
-| `log:clear`                  | Remove log files. |
-| `tmp:clear`                  | Remove temporary files. |
-| `git:pull`                   | Update local files from the remote git repository. |
-| `jumpup:start`               | Run all the previous tasks on this order |
-| `jumpup:bundle_install`      | Run `bundle install` on quiet mode |
-| `db:migrate`                 | Execute any new database migration created by other team members since the last integration. |
-| `test` or `spec`             | Set the rake task your test/spec suite needs to run. Use a command that generate the coverage files. |
-| `git:push`                   | Push your changes. If any of the previous tasks break, because one test failed, for instance, the script won't push. Actually this task runs only if every checking done before work well. |
-| `jumpup:integration:unlock`  | Unlock the integration to current user. |
-| `jumpup:finish`              | Run tasks: `git:push` and `jumpup:integration:unlock` |
+| `jumpup:integration:check`     | Check if other user is already integrating, to avoid reject message from git after runing all tests. |
+| `jumpup:integration:lock`      | Lock the integration to current user. |
+| `git:status_check`             | Check if all local files have been commited to the local git repository. |
+| `log:clear`                    | Remove log files. |
+| `tmp:clear`                    | Remove temporary files. |
+| `git:pull`                     | Update local files from the remote git repository. |
+| `git:store_last_commit_hash`   | Store last commit hash to be checked before git push. |
+| `jumpup:start`                 | Run all the previous tasks on this order. |
+| `jumpup:bundle_install`        | Run `bundle install` on quiet mode. |
+| `db:migrate`                   | Execute any new database migration created by other team members since the last integration. |
+| `test` or `spec`               | Set the rake task your test/spec suite needs to run. Use a command that generate the coverage files. |
+| `git:check_last_commit_change` | Stop integration if a new commit is created since `git:store_last_commit_hash`. |
+| `git:push`                     | Push your changes. If any of the previous tasks break, because one test failed, for instance, the script won't push. Actually this task runs only if every checking done before work well. |
+| `jumpup:integration:unlock`    | Unlock the integration to current user. |
+| `jumpup:finish`                | Run tasks: `git:push` and `jumpup:integration:unlock`. |
 
 Using this almost paranoid sequence of steps it will be hard to check in bad code in your repository, which is good, very good. The idea is that you should treat your repository as a sacred place, where only good code should ever enter.
 
@@ -97,6 +101,7 @@ INTEGRATION_TASKS = %w(
   jumpup:start
   jumpup:bundle_install
   db:migrate
+  jumpup:git:check_last_commit_change
   jumpup:finish
 )
 ```
@@ -113,6 +118,7 @@ INTEGRATION_TASKS = %w(
   jumpup:bundle_install
   db:migrate
   spec
+  jumpup:git:check_last_commit_change
   jumpup:finish
 )
 ```
@@ -128,6 +134,12 @@ SimpleCov.start 'rails' do
 end
 ```
 
+#### Skip spec
+
+Sometimes we have to change some configuration and deploy as fast as possible. It is possible setting the environment variable `SKIP_SPEC=1` to skip specs.
+
+```SKIP_SPEC=1 rake integrate```
+
 ## Versioning
 
 Jumpup follows the [Semantic Versioning](http://semver.org/).
@@ -198,5 +210,6 @@ This gem was created and is maintained by [HE:labs](https://github.com/Helabs).
 [helabs]: http://helabs.com.br/en/
 [jumpup-heroku]: https://github.com/Helabs/jumpup-heroku
 [jumpup-hipchat]: https://github.com/Helabs/jumpup-hipchat
+[jumpup-deis]: https://github.com/Helabs/jumpup-deis
 [travis]: https://travis-ci.org/Helabs/jumpup
 [travis_badge]: https://travis-ci.org/Helabs/jumpup.svg?branch=master

data/lib/jumpup.rb

@@ -35,11 +35,16 @@ module Jumpup
 
     def invoke_tasks
       INTEGRATION_TASKS.each do |subtask|
+        next if skip_spec?(subtask)
         Jumpup::UI.header("--> Executing #{subtask}...".white) do
           Rake::Task[subtask].invoke
         end
       end
     end
+
+    def skip_spec?(task)
+      task == 'spec' && ENV['SKIP_SPEC'] == '1'
+    end
   end
 end
 

data/lib/jumpup/commands/git_command.rb

@@ -20,6 +20,23 @@ module Jumpup
         sh 'git push --quiet'
       end
 
+      def store_last_commit_hash
+        Jumpup::UI.say '  --> Storing last commit hash...'.yellow
+        @@last_commit_hash = last_commit_hash
+      end
+
+      def check_last_commit_change
+        Jumpup::UI.say '  --> Checking if last commit changed since integration started...'.yellow
+        if last_commit_hash != stored_commit_hash
+          Jumpup::UI.say "  --> Last commit changed since integration started. Halting!".red
+          exit
+        end
+      end
+
+      def reset_commit_hash!
+        @@last_commit_hash = ''
+      end
+
       def check_integration
         Jumpup::UI.say "  --> Checking if there's someone integrating...".yellow
         Jumpup::UI.say `git tag -d integrating`
@@ -59,6 +76,14 @@ module Jumpup
       def user
         @user = `git config --get user.name`.strip
       end
+
+      def last_commit_hash
+        `git rev-parse HEAD`.strip
+      end
+
+      def stored_commit_hash
+        @@last_commit_hash ||= ''
+      end
     end
   end
 end

data/lib/jumpup/version.rb

@@ -1,3 +1,3 @@
 module Jumpup
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/tasks/integrate.rake

@@ -15,6 +15,16 @@ namespace :jumpup do
     task :push do
       Jumpup::GitCommand.push
     end
+
+    desc 'Stores last commit hash'
+    task :store_last_commit_hash do
+      Jumpup::GitCommand.store_last_commit_hash
+    end
+
+    desc 'Verifies if last commit changed'
+    task :check_last_commit_change do
+      Jumpup::GitCommand.check_last_commit_change
+    end
   end
 
   namespace :integration do
@@ -34,7 +44,7 @@ namespace :jumpup do
     end
   end
 
-  task start: ['integration:check', 'integration:lock', 'git:status_check', 'log:clear', 'tmp:clear', 'git:pull'] do
+  task start: ['integration:check', 'integration:lock', 'git:status_check', 'log:clear', 'tmp:clear', 'git:pull', 'git:store_last_commit_hash'] do
     ENV['coverage'] = 'on'
   end
   task finish: ['git:push', 'integration:unlock']

data/spec/jumpup/commands/git_command_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+RSpec.describe Jumpup::GitCommand do
+  include_examples 'capture stdout'
+
+  context '.store_last_commit_hash' do
+    it 'stores the last commit GitCommand.stored_commit_hash' do
+      subject.reset_commit_hash!
+
+      expect {
+        subject.store_last_commit_hash
+      }.to change(subject, :stored_commit_hash).from('')
+    end
+  end
+
+  context '.check_last_commit_change' do
+    it 'halts if last commit changes' do
+      subject.store_last_commit_hash
+      allow(subject).to receive(:last_commit_hash).and_return('new_hash')
+
+      expect {
+        subject.check_last_commit_change
+      }.to raise_exception(SystemExit)
+    end
+
+    it 'goes on if last commit is the same' do
+      subject.store_last_commit_hash
+
+      expect {
+        subject.check_last_commit_change
+      }.to_not raise_exception
+    end
+  end
+
+  context '.reset_commit_hash!' do
+    it 'change commit hash to empty string' do
+      subject.store_last_commit_hash
+      expect {
+        subject.reset_commit_hash!
+      }.to change(subject, :stored_commit_hash).to('')
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jumpup
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - HE:labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,6 +128,7 @@ files:
 - lib/jumpup/version.rb
 - lib/tasks/integrate.rake
 - spec/fixtures/integration.rake
+- spec/jumpup/commands/git_command_spec.rb
 - spec/jumpup/integration_spec.rb
 - spec/spec_helper.rb
 - spec/support/rake_helpers.rb
@@ -165,6 +166,7 @@ test_files:
 - features/step_definitions/setup_git_repo.rb
 - features/support/env.rb
 - spec/fixtures/integration.rake
+- spec/jumpup/commands/git_command_spec.rb
 - spec/jumpup/integration_spec.rb
 - spec/spec_helper.rb
 - spec/support/rake_helpers.rb