sti_deploy 0.1.0rc1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 928e039c280f04e44a90c5553aa702437d90dffd
-  data.tar.gz: 2852110951a268b5d48e28a42471c8a169899a92
+  metadata.gz: 88608439dca40b9d416ed6a0e1acb8fe7b18dff8
+  data.tar.gz: b308e3f846a885bd3ab439765737fdc673235ce5
 SHA512:
-  metadata.gz: 29c54da5bfdc68d032e699d910a09bda9d9e7b2b45365de56673c2acc8f2e0e8c91a812e99d26d16fc5759b10af01c4457648992bd87159b472408d3fa55cd74
-  data.tar.gz: d4472b475724f665af41d04a25e01e35aa1852e545df4b73c1da95d406497d82fc9f20401389ad2d4106cd68aed49996a6c10bb411c6c339a5d98215168799cf
+  metadata.gz: 6a7e573e0b4255522ad3169a56d744cb9ebc889a4ae5b20c41e350b96c0824248a83579434400ee79b567aa82c11279780f5d9574c6c59318735a1a7091c7454
+  data.tar.gz: 1c6bdf9ea4e300dfa7f30eeee5179f5f457fe0c7624b082566b34b5a4a3b875c0a8f228c7659935d4012e7aa9eff3320fc268733e38c053c6d4be0393b564a21

data/lang/en.yml

@@ -14,5 +14,9 @@ en:
     git:
       by: by
       preparing: Setting up for deploy.
+      committing: "\nCommiting the new version number..."
+      merging: "\nMerging from \"%{origin}\" to \"%{target}\"..."
+      tagging: "\nCreating a new tag..."
     system:
       interrupted: "\n\nDeploy aborted. Bye-bye."
+      finished: "\nThe deploy init process has finished!"

data/lang/pt-BR.yml

@@ -14,5 +14,9 @@ pt-BR:
     git:
       by: por
       preparing: Preparando para deploy.
+      committing: "\nComitando a nova versão..."
+      merging: "\nFazendo merge de \"%{origin}\" para \"%{target}\"..."
+      tagging: "\nCriando uma nova tag..."
     system:
       interrupted: "\n\nDeploy abortado. Bye-bye."
+      finished: "\nO processo de início do deploy está terminado!"

data/lib/sti_deploy/deploy.rb

@@ -16,7 +16,7 @@ module StiDeploy
 
     def commit_merge_and_tag!
       git_commit!
-      git_merge!
+      git_merge! unless same_origin_target_branches?
       git_tag!
     end
 
@@ -40,20 +40,24 @@ module StiDeploy
 
     def git_commit!
       read_release_message
+      Messages.puts('git.committing', color: :yellow)
       Git.add_version
       Git.commit(message: commit_message)
-      Git.push(branch: Configuration.origin_branch(type))
+      Git.push(branch: origin_branch)
     end
 
     def git_merge!
-      Git.checkout(branch: Configuration.target_branch(type))
-      Git.pull(branch:     Configuration.target_branch(type))
-      Git.merge(branch:    Configuration.origin_branch(type))
-      Git.push(branch:     Configuration.target_branch(type))
-      Git.checkout(branch: Configuration.origin_branch(type))
+      Messages.puts('git.merging', origin: origin_branch, target: target_branch,
+                    color: :yellow)
+      Git.checkout(branch: target_branch)
+      Git.pull(branch:     target_branch)
+      Git.merge(branch:    origin_branch)
+      Git.push(branch:     target_branch)
+      Git.checkout(branch: origin_branch)
     end
 
     def git_tag!
+      Messages.puts('git.tagging', color: :yellow)
       Git.tag(version: version.to_s, message: message)
       Git.push_tags
     end
@@ -64,5 +68,17 @@ module StiDeploy
       return "#{preparing} #{message}" if git_user.nil? || git_user.empty?
       "#{by} #{git_user}: #{preparing} #{message}"
     end
+
+    def same_origin_target_branches?
+      origin_branch == target_branch
+    end
+
+    def origin_branch
+      Configuration.origin_branch(type)
+    end
+
+    def target_branch
+      Configuration.target_branch(type)
+    end
   end
 end

data/lib/sti_deploy/version.rb

@@ -49,7 +49,7 @@ module StiDeploy
     def bump(deploy_type)
       old = to_s
       send("bump_#{deploy_type}")
-      Messages.puts('version.increment', old: old, new: to_s)
+      Messages.puts('version.increment', old: old, new: to_s, color: :green)
       to_s
     end
 

data/lib/sti_deploy.rb

@@ -23,6 +23,7 @@ module StiDeploy
       deploy = Deploy.new
       deploy.update_version!
       deploy.commit_merge_and_tag!
+      Messages.puts 'system.finished', color: :green
     rescue Interrupt
       Messages.puts 'system.interrupted', color: :red
       exit(-3)

data/lib/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-VERSION = '0.1.0rc1'
+VERSION = '0.1.4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sti_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.0rc1
+  version: 0.1.4
 platform: ruby
 authors:
 - Rodrigo Castro Azevedo
@@ -117,9 +117,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13