capistrano-gitflow 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d000bf44f50e77b3dbea01aabc5e3bd14d0cbf2
-  data.tar.gz: 6c4f309adee905011a3334d0884aac076b143bab
+  metadata.gz: 6864a99076896323f18e33a1cef9253919ec7f30
+  data.tar.gz: 47665aff85e4804fc5b4762b3cfd85e30541714b
 SHA512:
-  metadata.gz: 564c7e7815e3b5e1081aac04648af129f3e86a17cdcc32ac10c7354088d030f702c7ebbe1ec06a107172e9d49062a5951e5dc5ce58b503e04a7550c3768a62a4
-  data.tar.gz: ccc62ab240bbfdd691f053690618d7ede6eef579a7ee84b6ae872fd2847e975bcc15dabd7433d877dfb35769b82668811c97aba1f915898a2651e163d4b52cda
+  metadata.gz: 7284435bc9832d84c1a39dde01c11aa71d5465ec0bec790f43533af09023b06ef3e8eb4df8e0414504b85a01d88515db80281aca0db85a5e584fab782937f84c
+  data.tar.gz: 302e7069403e0a75e6a4e1e8ceb589213c5c246a724da384bbe0ffd3660ebea5348733a9d84f4fc654349c49e0da542d45681c539c5f1713e49c2122f934dc4e

data/lib/capistrano/gitflow.rb

@@ -6,9 +6,12 @@ require 'capistrano/version'
 self.extend CapistranoGitFlow::Helper
 include CapistranoGitFlow::Helper
 
-
-if gitflow_using_cap3?
-  require  File.join(File.dirname(__FILE__), 'tasks', 'gitflow')
-else
-  require File.join(File.dirname(__FILE__), 'gitflow','legacy', 'gitflow')
+unless defined?(Sinatra)
+  if gitflow_using_cap3?
+    require 'capistrano/all'
+    require  File.join(File.dirname(__FILE__), 'tasks', 'gitflow')
+  else
+    require 'capistrano'
+    require File.join(File.dirname(__FILE__), 'gitflow','legacy', 'gitflow')
+  end
 end

data/lib/capistrano/gitflow/version.rb

@@ -6,7 +6,7 @@ module  CapistranoGitFlow # Returns the version of the currently loaded Rails as
   module VERSION
     MAJOR = 1
     MINOR = 5
-    TINY = 0
+    TINY = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/capistrano/tasks/gitflow.rb

@@ -25,13 +25,13 @@ namespace :gitflow do
     gitflow_tag_production
   end
 
-  gitflow_callbacks unless defined?(Sinatra)
+  gitflow_callbacks 
 end
 
 namespace :deploy do
   namespace :pending do
     task :compare do
-       gitflow_execute_task("gitflow:commit_log")
+      gitflow_execute_task("gitflow:commit_log")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-gitflow
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Joshua Nichols