capistrano-gitflow 1.5.0 → 1.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8d000bf44f50e77b3dbea01aabc5e3bd14d0cbf2
4
- data.tar.gz: 6c4f309adee905011a3334d0884aac076b143bab
3
+ metadata.gz: 6864a99076896323f18e33a1cef9253919ec7f30
4
+ data.tar.gz: 47665aff85e4804fc5b4762b3cfd85e30541714b
5
5
  SHA512:
6
- metadata.gz: 564c7e7815e3b5e1081aac04648af129f3e86a17cdcc32ac10c7354088d030f702c7ebbe1ec06a107172e9d49062a5951e5dc5ce58b503e04a7550c3768a62a4
7
- data.tar.gz: ccc62ab240bbfdd691f053690618d7ede6eef579a7ee84b6ae872fd2847e975bcc15dabd7433d877dfb35769b82668811c97aba1f915898a2651e163d4b52cda
6
+ metadata.gz: 7284435bc9832d84c1a39dde01c11aa71d5465ec0bec790f43533af09023b06ef3e8eb4df8e0414504b85a01d88515db80281aca0db85a5e584fab782937f84c
7
+ data.tar.gz: 302e7069403e0a75e6a4e1e8ceb589213c5c246a724da384bbe0ffd3660ebea5348733a9d84f4fc654349c49e0da542d45681c539c5f1713e49c2122f934dc4e
@@ -6,9 +6,12 @@ require 'capistrano/version'
6
6
  self.extend CapistranoGitFlow::Helper
7
7
  include CapistranoGitFlow::Helper
8
8
 
9
-
10
- if gitflow_using_cap3?
11
- require File.join(File.dirname(__FILE__), 'tasks', 'gitflow')
12
- else
13
- require File.join(File.dirname(__FILE__), 'gitflow','legacy', 'gitflow')
9
+ unless defined?(Sinatra)
10
+ if gitflow_using_cap3?
11
+ require 'capistrano/all'
12
+ require File.join(File.dirname(__FILE__), 'tasks', 'gitflow')
13
+ else
14
+ require 'capistrano'
15
+ require File.join(File.dirname(__FILE__), 'gitflow','legacy', 'gitflow')
16
+ end
14
17
  end
@@ -6,7 +6,7 @@ module CapistranoGitFlow # Returns the version of the currently loaded Rails as
6
6
  module VERSION
7
7
  MAJOR = 1
8
8
  MINOR = 5
9
- TINY = 0
9
+ TINY = 1
10
10
  PRE = nil
11
11
 
12
12
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -25,13 +25,13 @@ namespace :gitflow do
25
25
  gitflow_tag_production
26
26
  end
27
27
 
28
- gitflow_callbacks unless defined?(Sinatra)
28
+ gitflow_callbacks
29
29
  end
30
30
 
31
31
  namespace :deploy do
32
32
  namespace :pending do
33
33
  task :compare do
34
- gitflow_execute_task("gitflow:commit_log")
34
+ gitflow_execute_task("gitflow:commit_log")
35
35
  end
36
36
  end
37
37
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: capistrano-gitflow
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.0
4
+ version: 1.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Joshua Nichols