gitsflow 0.6.3 → 0.7.4.alfa

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04c67c4563202b190f6486858af820186e7c9e2eb1806d75f1be5c59f2223467
-  data.tar.gz: 853643113dc3d9d09a78958b1e1dd2488251fe16ab0dd50519de6ed2bd2223d0
+  metadata.gz: 6b1671d1ec2c38a62cc6ac0f19c4c7f9e8d815952748978a6fa7700968b2b8fa
+  data.tar.gz: 4df17846f1872382de43a65dffb1f964358769b8adaee469e594170d531b211e
 SHA512:
-  metadata.gz: '008803af2e130b03178420aea6d3155fc24b3a1945d2214a6f4c52ba0f0560c9569f41e07b77fbbd800352787573cfde8b54ea79bfeafc6cbd75e7014942c118'
-  data.tar.gz: ee3294c8a10de03e446816178f6b9c75eb44a7e4e9cc63a30e313259508a1b4aff295651d1e98da5f057e39280d7d4e81f7252c8a8a0ecb0d0bd05bd8a455af3
+  metadata.gz: ca3802ec595ce0c5fcab461c52fcf450e7163178cfad478af7559c99f83495ac89ecd1a396c3e48014745de11ab3254d72766ca61deb0467b07a8672a08ca4c1
+  data.tar.gz: 5047ae95e2f532793b605023e70058710ba827c1549835e62c4acd1514e49b8f46813d2c9f8280340f8b5ef88c6775eee8a2f7885181c7daebc08a8e7ee0d8ca

data/lib/Git/git.rb

@@ -68,7 +68,7 @@ module Git
   end
 
   def self.log_last_changes branch
-    execute {"git log origin/#{branch}..HEAD --oneline --format='%ad - %B'"}
+    execute {%{git log origin/#{branch}..HEAD --oneline --format="%ad - %B}}
   end
 
   def self.pull branch
@@ -99,7 +99,7 @@ module Git
   private
 
   def self.execute
-    processs, stderr , stdout= Open3.popen3(yield) do |i, o, stderr, wait_thr|
+    processs, stderr , stdout= Open3.popen3(yield.encode('UTF-8')) do |i, o, stderr, wait_thr|
       [wait_thr.value, stderr.read, o.read] 
     end
     if processs.success?

data/lib/GitLab/gitlab.rb

@@ -56,7 +56,7 @@ module GitLab
 
   def self.create_labels
     url = "projects/#{$GITLAB_PROJECT_ID}/labels"
-    params = [ 
+    params = [
       {name: 'feature', color: "#5CB85C"},
       {name: 'default_branch', color: "#34495E"},
       {name: 'version', color: "#34495E"},

data/lib/config.rb

@@ -4,14 +4,15 @@ begin
   rescue LoadError
   # Gem loads as it should
 end
-$GITLAB_PROJECT_ID = ENV['GITLAB_PROJECT_ID']
-$GITLAB_TOKEN = ENV['GITLAB_TOKEN']
-$GITLAB_URL_API = ENV['GITLAB_URL_API']
-$GITLAB_EMAIL = ENV['GITLAB_EMAIL'].to_s.empty? ? Open3.popen3("git config --local user.email") { |i, o| o.read }.chomp : ENV['GITLAB_EMAIL']
-$GITLAB_LISTS = ENV['GITLAB_LISTS'].split(',') rescue nil
-$GITLAB_NEXT_RELEASE_LIST = ENV['GITLAB_NEXT_RELEASE_LIST']
-$GIT_BRANCH_MASTER= ENV["GIT_BRANCH_MASTER"]
-$GIT_BRANCH_DEVELOP= ENV["GIT_BRANCH_DEVELOP"]
-$GIT_BRANCHES_STAGING= ENV["GIT_BRANCHES_STAGING"].split(',') rescue nil
-$SFLOW_TEMPLATE_RELEASE= ENV["SFLOW_TEMPLATE_RELEASE"].to_s.empty? ? "Release version {version} - {date}" : ENV["SFLOW_TEMPLATE_RELEASE"]
-$SFLOW_TEMPLATE_RELEASE_DATE_FORMAT= ENV['SFLOW_TEMPLATE_RELEASE_DATE_FORMAT'].to_s.empty? ? 'Y/m/d': ENV['SFLOW_TEMPLATE_RELEASE_DATE_FORMAT'] 
+
+$GITLAB_PROJECT_ID = ENV['GITLAB_PROJECT_ID'].encode("UTF-8") rescue ''
+$GITLAB_TOKEN = ENV['GITLAB_TOKEN'].encode("UTF-8") rescue ''
+$GITLAB_URL_API = ENV['GITLAB_URL_API'].encode("UTF-8") rescue ''
+$GITLAB_EMAIL = ENV['GITLAB_EMAIL'].to_s.empty? ? Open3.popen3("git config --local user.email") { |i, o| o.read }.chomp : ENV['GITLAB_EMAIL'].encode("UTF-8")
+$GITLAB_LISTS = ENV['GITLAB_LISTS'].encode("UTF-8").split(',') rescue nil
+$GITLAB_NEXT_RELEASE_LIST = ENV['GITLAB_NEXT_RELEASE_LIST'].encode("UTF-8") rescue ''
+$GIT_BRANCH_MASTER= ENV["GIT_BRANCH_MASTER"].encode("UTF-8") rescue ''
+$GIT_BRANCH_DEVELOP= ENV["GIT_BRANCH_DEVELOP"].encode("UTF-8") rescue ''
+$GIT_BRANCHES_STAGING= ENV["GIT_BRANCHES_STAGING"].encode("UTF-8").split(',')rescue nil
+$SFLOW_TEMPLATE_RELEASE= ENV["SFLOW_TEMPLATE_RELEASE"].to_s.empty? ? "Release version {version} - {date}" : ENV["SFLOW_TEMPLATE_RELEASE"].encode("UTF-8")
+$SFLOW_TEMPLATE_RELEASE_DATE_FORMAT= ENV['SFLOW_TEMPLATE_RELEASE_DATE_FORMAT'].to_s.empty? ? 'Y/m/d': ENV['SFLOW_TEMPLATE_RELEASE_DATE_FORMAT'].encode("UTF-8") 

data/lib/sflow/version.rb

@@ -0,0 +1,3 @@
+module SFlow
+  VERSION = '0.8.0'
+end

data/lib/sflow.rb

@@ -1,3 +1,4 @@
+
 #!/usr/bin/ruby
 begin
   require 'pry'
@@ -18,12 +19,14 @@ load 'Git/git.rb'
 # require './lib/gitlab/issue.rb'
 # require './lib/gitlab/merge_request.rb'
 class SFlow
-  VERSION = "0.6.3"
-  $TYPE   = ARGV[0]
-  $ACTION = ARGV[1]
+  Encoding.default_external = 'utf-8'
+  Encoding.default_internal = Encoding::UTF_8
+  VERSION = "0.7.4.alfa"
+  $TYPE   = ARGV[0]&.encode("UTF-8")
+  $ACTION = ARGV[1]&.encode("UTF-8")
 
-  $PARAM1 = ARGV[2]
-  $PARAM2 = ARGV[3..-1]&.join(' ')
+  $PARAM1 = ARGV[2]&.encode("UTF-8")
+  $PARAM2 = ARGV[3..-1]&.join(' ')&.encode("UTF-8")
 
   def self.call
     begin
@@ -175,7 +178,7 @@ class SFlow
     begin
 
       Git.delete_branch(release_branch)
-      Git.checkout 'develop'
+      Git.checkout $GIT_BRANCH_DEVELOP
       Git.new_branch release_branch
       
       print "Issue(s) title(s): \n".yellow
@@ -240,11 +243,12 @@ class SFlow
       sleep 2
 
       system('touch CHANGELOG')
-      file_changelog = IO.read 'CHANGELOG'
-      IO.write 'CHANGELOG', version_header + msgs_changelog.join('') + file_changelog
-        
+
+      line = version_header + "  " + msgs_changelog.join('')
+      File.write("CHANGELOG",line + File.open('CHANGELOG').read.encode('UTF-8') , mode: "w")
+
       system('git add CHANGELOG')
-      system("git commit -m 'update CHANGELOG version #{version}'")
+      system(%{git commit -m "update CHANGELOG version #{version}"})
       Git.push release_branch
 
       issue_release.description = "#{changelogs.join("")}\n"
@@ -304,8 +308,8 @@ class SFlow
     release_branch = "-release/#{version}"
     issue_release = GitLab::Issue.find_by_branch(release_branch)
     
-    Git.merge issue_release.branch, 'develop'
-    Git.push 'develop'
+    Git.merge issue_release.branch, $GIT_BRANCH_DEVELOP
+    Git.push $GIT_BRANCH_DEVELOP
 
     type =  issue_release.labels.include?('hotfix') ? 'hotfix' : nil
     mr_master = GitLab::MergeRequest.new(
@@ -321,7 +325,7 @@ class SFlow
     # end
     # mr_develop = GitLab::MergeRequest.new(
     #   source_branch: issue_release.branch,
-    #   target_branch: 'develop',
+    #   target_branch: $GIT_BRANCH_DEVELOP,
     #   issue_iid: issue_release.iid,
     #   title: "##{issue_release.iid} - #{version} - Reintegration  #{issue_release.branch} into develop",
     #   type: 'hotfix'
@@ -362,7 +366,7 @@ class SFlow
     print " (instaling...) \r".yellow
     GitLab.create_labels
     sleep 2
-    system("git config --local alias.sflow '!sh -c \" sflow $1 $2 $3 $4\" - '")
+    system(%{git config --local alias.sflow \'!sh -c " sflow $1 $2 $3 $4" - \'})
     print "    \u{1F601}\  git sflow alias"
     print " (instaled) \u{2714}     ".green
     print "\n\n"
@@ -521,7 +525,7 @@ class SFlow
     # Setting Changelog
     print "Title: #{issue.title}\n\n"
     print "CHANGELOG message:\n--> ".yellow
-    message_changelog = STDIN.gets.chomp
+    message_changelog = STDIN.gets.chomp.to_s.encode('UTF-8')
     print "\n ok!\n\n".green
     new_labels = []
     if (type == 'hotfix')
@@ -561,7 +565,7 @@ class SFlow
     
   end
 
-  def self.start branch, issue, ref_branch = "develop"
+  def self.start branch, issue, ref_branch = $GIT_BRANCH_DEVELOP
     Git.checkout ref_branch
     description = "* ~default_branch #{branch}"
     issue.description = description
@@ -574,13 +578,13 @@ class SFlow
   end
 
   def self.codereview
-    Git.checkout "develop"
+    Git.checkout $GIT_BRANCH_DEVELOP
     source_branch = $PARAM1
     issue = GitLab::Issue.find_by_branch(source_branch)
     # issue.move
     mr = GitLab::MergeRequest.new(
       source_branch: source_branch,
-      target_branch: 'develop',
+      target_branch: $GIT_BRANCH_DEVELOP,
       issue_iid: issue.iid
       )
     mr.create_code_review

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitsflow
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.4.alfa
 platform: ruby
 authors:
 - Carlos Wherbet
@@ -120,6 +120,7 @@ files:
 - lib/GitLab/user.rb
 - lib/config.rb
 - lib/sflow.rb
+- lib/sflow/version.rb
 - lib/string.rb
 - src/common/images/get_token.gif
 homepage: https://github.com/carloswherbet/GitSFlow
@@ -138,9 +139,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: