gitsflow 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab581d802ba36fbbe4d333b427d5d2edfb2f94a17a7751a0c39e007653a7e5c4
-  data.tar.gz: 7a37a86e9265ab26a6e21f432610ca28dcd4d568a87d474f969a32832d218d24
+  metadata.gz: fe575dd9c530a6bf10754a8f7752fe02236bdd5104e36f59bbe1a4cfdff9e055
+  data.tar.gz: 7636dedd2b259c7334474331f5ed38f16bd8443ba76f3ec4607a4dc864fae63c
 SHA512:
-  metadata.gz: 8ad1d35eb966e4a404ece60ebea38261c55c949332bb3f7810efccfd02fe0a750fb3091bd6e85f000030aca6f6b38540347026c085e4e52fb1b95ce00beb09c8
-  data.tar.gz: f0e49b3325438b976178cf0bbe32cdba57ae8299f755b8f369817d375cebf8221ab584c08fc0910a4e433dbce24af5b7534eb719ef6133d91f80362ae836b094
+  metadata.gz: 84b5f060d9e6e88fd15376bd32f543303e7b540ee576707a34b63fce5b3403a7505efb2f753e18f10945feead332cf35627f64cd83ccc5ad9835074172867049
+  data.tar.gz: 4e6fd8ab6dd39332a1664767b55ea7f7ca60930a09def06cfd1fad54a65537cc7d65b19b90a7ce15325909139fa8711a7e34cd9f48b3407c3a2093b72b5d7384

data/.travis.yml

@@ -0,0 +1,7 @@
+---
+language: ruby
+# cache: bundler
+rvm:
+  - 2.7.0
+before_install:
+  - gem install bundler -v 2.1.4

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+# git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in SFlow.gemspec
 gemspec

data/Gemfile.lock

@@ -1,21 +1,19 @@
 PATH
   remote: .
   specs:
-    gitsflow (0.1.0)
-      dotenv (~> 0)
+    gitsflow (0.4.0)
+      dotenv (~> 2.7.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.2)
     diff-lcs (1.3)
-    dotenv (0.11.1)
-      dotenv-deployment (~> 0.0.2)
-    dotenv-deployment (0.0.2)
-    method_source (1.0.0)
-    pry (0.13.0)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
+    dotenv (2.7.5)
+    method_source (0.9.2)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rake (12.3.3)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -35,11 +33,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.1.4)
+  dotenv (~> 2.7.5)
   gitsflow!
-  pry (~> 0)
+  pry (~> 0.12.2)
   rake (~> 12.3)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.1
+   2.1.4

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/gitsflow.svg)](https://badge.fury.io/rb/gitsflow)
+[![Build Status](https://travis-ci.org/carloswherbet/GitSFlow.svg?branch=master)](https://travis-ci.org/carloswherbet/GitSFlow)
 # GitSFlow
 GitSFlow is a tool that integrate Git custom commands with GitLab and it's inspired GitFlow
 ## Installation
@@ -67,7 +69,7 @@ List of commands:
 10. git sflow hotfix [reintegration|finish] HOTFIX_BRANCH
 11. git sflow release start RELEASE
 12. git sflow release finish RELEASE
-13. git sflow push BRANCH
+13. git sflow push origin BRANCH
 
 
 

data/gitsflow.gemspec

@@ -1,7 +1,6 @@
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.push(lib)
-
-require "sflow"
+require_relative "lib/sflow"
 
 Gem::Specification.new do |s|
     s.name          = %q{gitsflow}
@@ -12,7 +11,7 @@ Gem::Specification.new do |s|
     s.summary       = %q{GitSFlow is a tool that integrate Git custom commands with GitLab and it's inspired GitFlow}
     s.authors       = ["Carlos Wherbet"]
     s.email         = 'carloswherbet@gmail.com'
-    s.required_ruby_version = '>= 2.0.0'
+    s.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
     s.license       = "MIT"
     # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
     # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -28,10 +27,11 @@ Gem::Specification.new do |s|
     s.files =  `git ls-files -z`.split("\x0").reject do |f|
       f.match(%r{^(test|spec|features)/})
     end
-    s.add_dependency  "dotenv", "~> 0"
-    s.add_development_dependency  "pry", "~> 0"
-    s.add_development_dependency "bundler", "~> 1.16"
+    s.add_development_dependency "bundler", "~> 2.1.4"
+    s.add_development_dependency  "dotenv", "~> 2.7.5"
+    s.add_development_dependency  "pry",  '~> 0.12.2'
     s.add_development_dependency "rake", "~> 12.3"
     s.add_development_dependency "rspec", "~> 3.0"
+    s.add_dependency  "dotenv", "~> 2.7.5"
   end
   

data/lib/Git/git.rb

@@ -37,6 +37,10 @@ module Git
     execute {"git push origin #{branch}"}
   end
 
+  def self.log_last_changes branch
+    execute {"git log origin/#{branch}..HEAD --oneline --format='%ad - %B'"}
+  end
+
   def self.pull branch
     print "Pull: ".yellow
     print "#{branch}\n\n".green
@@ -65,11 +69,11 @@ module Git
   private
 
   def self.execute
-    processs, stderr = Open3.popen3(yield) do |i, o, stderr, wait_thr|
-        [wait_thr.value, stderr.read] 
+    processs, stderr , stdout= Open3.popen3(yield) do |i, o, stderr, wait_thr|
+        [wait_thr.value, stderr.read, o.read] 
     end
     if processs.success?
-      # print "Success!\n\n".green
+      return stdout
     else
         raise "#{stderr}"
     end

data/lib/GitLab/comment.rb

@@ -0,0 +1,20 @@
+class GitLab::Comment 
+  attr_accessor :id, :issue_iid, :body
+
+  def initialize(params = {})
+    @issue_iid = params[:issue_iid]
+    @body = params[:body]
+  end
+
+
+  def create
+    url = "projects/#{$GITLAB_PROJECT_ID}/issues/#{@issue_iid}/notes"
+    params = {
+        issue_iid: @issue_iid,
+        body: @body
+    }
+    GitLab.request_post(url, params)
+  end
+
+
+end

data/lib/GitLab/gitlab.rb

@@ -4,7 +4,9 @@ module GitLab
   autoload :User, 'GitLab/user.rb'
   autoload :Issue, 'GitLab/issue.rb'
   autoload :MergeRequest, 'GitLab/merge_request.rb'
+  autoload :Comment, 'GitLab/comment.rb'
   autoload :List, 'GitLab/list.rb'
+
   def self.request_post url, params 
     request = "#{$GITLAB_URL_API}/#{url}" 
     uri = URI(request) 

data/lib/GitLab/issue.rb

@@ -1,12 +1,23 @@
+
 class GitLab::Issue 
   attr_accessor :title, :labels, :assignee_id, :description, :branch, :iid, :obj_gitlab, :status
-  @labels = []
+  @comments = [] 
+  @labels = [] 
+
+  def comments
+    @comments
+  end
+
+  def comments=obj
+    @comments << obj
+  end
 
   def initialize(params = {})
     @title = params[:title]
     @labels = params[:labels] || [] 
     @description = params[:description]
     @branch = params[:branch]
+    @comments = []
     @assignee_id = GitLab::User.me["id"]
   end
 
@@ -85,7 +96,6 @@ class GitLab::Issue
     GitLab.request_get(url)
   end
 
-
   def self.from_list(list_name)
     url = "projects/#{$GITLAB_PROJECT_ID}/issues?labels=#{list_name}&state=opened"
     issues = []
@@ -109,6 +119,12 @@ class GitLab::Issue
     description.match(/\* \~changelog .*\n?/).to_s.gsub('* ~changelog ', '') rescue nil
   end
 
+  def add_comment note
+    comment = GitLab::Comment.new(issue_iid: @iid, body: note)
+    @comments << comment
+    comment.create
+  end
+
   def set_data obj
     @iid          = obj["iid"]
     @title        = obj["title"]

data/lib/config.rb

@@ -1,9 +1,14 @@
-require 'dotenv'
-Dotenv.load(File.join( Dir.pwd, ".env"))
+
+begin
+  require 'dotenv'
+  Dotenv.load(File.join( Dir.pwd, ".env"))
+  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'] == "" ? Open3.popen3("git config --global user.email") { |i, o| o.read }.chomp : ENV['GITLAB_EMAIL']
+$GITLAB_EMAIL = ENV['GITLAB_EMAIL'] == "" ? 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"]

data/lib/sflow.rb

@@ -1,8 +1,9 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
 #!/usr/bin/ruby
-require 'pry'
+begin
+  require 'pry'
+rescue LoadError
+  # Gem loads as it should
+end
 
 require 'net/http'
 require "open3"
@@ -15,7 +16,7 @@ load 'Git/git.rb'
 # require './lib/gitlab/issue.rb'
 # require './lib/gitlab/merge_request.rb'
 class SFlow
-  VERSION = "0.2.1"
+  VERSION = "0.4.0"
   $TYPE   = ARGV[0]
   $ACTION = ARGV[1]
   $PARAM1 = ARGV[2]
@@ -275,7 +276,6 @@ class SFlow
       issue_release.labels = ['ready_to_deploy', 'Next Release']
       issue_release.set_default_branch(release_branch)
       issue_release.update
-      Git.push release_branch
       issues.each do |issue|
         issue.labels  = (issue.labels + new_labels).uniq
         issue.close
@@ -302,12 +302,16 @@ class SFlow
     release_branch = "-release/#{version}"
     issue_release = GitLab::Issue.find_by_branch(release_branch)
     
+    Git.merge issue_release.branch, 'develop'
+    Git.push 'develop'
+
+
     type =  issue_release.labels.include?('hotfix') ? 'hotfix' : nil
     mr_master = GitLab::MergeRequest.new(
       source_branch: issue_release.branch,
       target_branch: 'master',
       issue_iid: issue_release.iid,
-      title: "Closes ##{issue_release.iid} - #{version} - Reintegration  #{issue_release.branch} into master",
+      title: "Reintegration release #{version}: #{issue_release.branch} into master",
       description: "Closes ##{issue_release.iid}",
       type: type
       )
@@ -323,7 +327,7 @@ class SFlow
     # )
     # mr_develop.create
 
-    Git.merge issue_release.branch, 'develop'
+  
 
     # remove_labels = [$GITLAB_NEXT_RELEASE_LIST]
     remove_labels = []
@@ -331,6 +335,8 @@ class SFlow
     old_labels.delete_if{|label| remove_labels.include? label} 
     issue_release.labels = (old_labels + new_labels).uniq
     issue_release.update
+    print "\nRelease #{version} finished with success!\n\n".yellow
+
 
   end
   
@@ -361,15 +367,30 @@ class SFlow
     print "\n\n"
     print "git sflow help\n\n"
     print "git sflow config\n\n"
-    print "Sucesso!\n\n".green
+    print "GitSFlow installed with success!\n\n".green
     # self.help_
     # self.config_
 
   end
 
 
-  def push_
+  def self.push_origin
+    branch = $PARAM1
+    log_messages = Git.log_last_changes branch
+    issue = GitLab::Issue.find_by_branch branch
+    Git.push branch 
+    if (log_messages != "")
+      print "Send messages commit for issue\n".yellow
+      issue.add_comment(log_messages)
+    end
 
+    remove_labels = $GIT_BRANCHES_STAGING + ['Staging', $GITLAB_NEXT_RELEASE_LIST]
+    old_labels = issue.obj_gitlab["labels"]
+    old_labels.delete_if{|label| remove_labels.include? label} 
+
+    issue.labels = old_labels +  ['Doing']
+    issue.update
+    print "Success!\n\n".yellow
   end
 
   private
@@ -433,7 +454,7 @@ class SFlow
     print "10 - git sflow hotfix [reintegration|finish] HOTFIX_BRANCH\n".yellow
     print "11 - git sflow release start RELEASE\n".yellow
     print "12 - git sflow release finish RELEASE\n".yellow
-    print "13 - git sflow push BRANCH\n".yellow
+    print "13 - git sflow push origin BRANCH\n".yellow
 
     choice = -1
     question = "Choice a number for show a example or 0 for exit:\n\n".light_blue

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitsflow
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Carlos Wherbet
@@ -11,47 +11,47 @@ cert_chain: []
 date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 2.1.4
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.5
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 0.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.5
 description: 
 email: carloswherbet@gmail.com
 executables:
@@ -88,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -97,6 +112,7 @@ files:
 - bin/sflow
 - gitsflow.gemspec
 - lib/Git/git.rb
+- lib/GitLab/comment.rb
 - lib/GitLab/gitlab.rb
 - lib/GitLab/issue.rb
 - lib/GitLab/list.rb
@@ -119,15 +135,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: GitSFlow is a tool that integrate Git custom commands with GitLab and it's