prima-twig 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39893567ec05dd93e8792337c10983031d770899
-  data.tar.gz: 659ad8ba77f0a8be66b6ec4db0121b1d71b6b526
+  metadata.gz: c7b49a95c43b880947a37b296a3ff8b6be29047e
+  data.tar.gz: 76da46ef24f1ff4ef4e32fb438346b61d26054c7
 SHA512:
-  metadata.gz: 01f1bd379d93d0c8d0123d256d09a3da39510fdaa7953bc459960641702a480706aaca05de276d5a44566509bb1ac573bb0db33dc11716a4267af53da51af5eb
-  data.tar.gz: b523a35adec9db583f1da36946e33c69f1c998e11cbcd109375fa03d99c6f722398e27a035b370598b8ea804d20e9b78fd60b5812922421a7c9f972a16bc1d9e
+  metadata.gz: 2abbb30d0b36d3b6347b815850ac3cb8da00217558320d9d391621e9d9beaca68edcd9525dbcdcdf4540bebb454810071d2259560a1253f105fc2d8c4042229a
+  data.tar.gz: f4d092aca806c4eb20363fa77358aba72be4df27e62be51a7f48a45211826d418d929c2d10777d096fdb700e3f3e6f750c00b8a8e91a54d0e3f45e18e1c9aae6

data/bin/twig-hotfix

@@ -11,7 +11,7 @@ class Hotfix
   end
 
   def execute! args
-    possible_args = ["start", "stop"]
+    possible_args = ["start", "finish"]
     stop_if args.empty?, [:wrong_args, possible_args]
     stop_if args.length > 1, [:wrong_args, possible_args]
 
@@ -21,7 +21,7 @@ class Hotfix
     case args[0]
     when "start"
       start_hotfix!
-    when "stop"
+    when "finish"
       merge_hotfix!
     else
       stop_if true, [:wrong_args, possible_args]
@@ -29,35 +29,42 @@ class Hotfix
   end
 
   def start_hotfix!
-    branch_name = @prima.clean_branch_name(ask('Nome del branch: '.blue))
-    branch_name = "hotfix/" + branch_name
+
+    branch_name = @prima.clean_branch_name(ask('Inserisci il nome del branch (puoi omettere hotfix/): '.cyan))
+    stop_if branch_name.length, 'Devi inserire il nome del branch'
+    branch_name.prepend issue_type + '/' unless branch_name.include? issue_type
+
     output "Il nome del branch sarà " + branch_name.yellow
 
     exec_step "git checkout master"
+    exec_step "git pull origin master"
     exec_step "git checkout -b " + branch_name
   end
 
   def merge_hotfix!
     current_branch_name = @prima.twig.current_branch_name
     stop_unless (current_branch_name =~ /^hotfix\//), "Non sei su un branch di hotfix, non posso mergiare nulla"
-    exec_step "git fetch"
-    exec_step "git checkout master"
-    exec_step "git rebase origin/master"
-    exec_step "git merge #{current_branch_name}"
-    exec_step "git checkout dev"
-    exec_step "git rebase origin/dev"
+
+    # Mergia la PR
+    pr = @prima.get_pr
+    stop_unless pr, 'Pull Request not found'
+    @prima.merge_pull_request pr
+
+    output "La Pull Request e' stata mergiata!".green
+
+    # Mergia il branch su dev e pusha
+    exec_step 'git fetch'
+    exec_step 'git checkout dev'
+    exec_step 'git merge origin/dev'
     exec_step "git merge #{current_branch_name}"
-    delete_local = @prima.yesno "elimino il branch #{current_branch_name}".blue
-    if delete_local
-      exec_step "git branch -d #{current_branch_name}"
-    end
-    push = @prima.yesno 'vuoi effettuare il push di dev e master'.blue
-    if push
-      exec_step "git checkout master"
-      exec_step "git push origin master"
-      exec_step "git checkout dev"
-      exec_step "git push origin dev"
-    end
+
+    exec_step 'git push origin dev' if @prima.yesno 'Vuoi effettuare il push di dev?'.blue
+
+    # Chiude la issue
+    @prima.close_issue(@prima.twig.get_branch_property(current_branch_name, 'issue'))
+
+    # Rimuove il branch remoto
+    exec_step "git push origin :#{current_branch_name}" if @prima.yesno "Vuoi eliminare il branch remoto #{current_branch_name}?".blue
   end
 end
 

data/bin/twig-pick-issue

@@ -49,12 +49,18 @@ class PickIssue
       issue.pull_request?
     end
 
-    issue_number = choose_issue(issues)
-    branch_name = ask('branch name: '.cyan)
+    issue_number = choose_issue issues
+    issue_type =  select_issue_type issue_number
+    base_branch_name_default = issue_type == 'hotfix' ? 'master' : 'dev'
+    branch_name = ask('Inserisci il nome del branch (puoi omettere feature/ o hotfix/): '.cyan)
+    if branch_name.length == 0
+      puts 'Devi inserire il nome del branch'.red
+      exit 1
+    end
+    branch_name.prepend issue_type + '/' unless branch_name.include? issue_type
     branch_name << "-#{issue_number}"
-    branch_name = @prima.clean_branch_name branch_name
 
-    base_branch_name = ask('from which branch?'.cyan) { |q| q.default = 'dev' }
+    base_branch_name = ask('from which branch?'.cyan) { |q| q.default = base_branch_name_default }
 
     puts "creo branch con nome #{branch_name} partendo da #{base_branch_name}"
     @prima.rugged.branches.create(branch_name, base_branch_name)
@@ -83,6 +89,29 @@ class PickIssue
       end
     end
   end
+
+  def select_issue_type(issue_number)
+    has_hotfix_label = @prima.issue_has_label?(issue_number, Prima::LABEL_HOTFIX)
+
+    if has_hotfix_label
+      continue_hotfix = @prima.yesno 'La issue ha la label hotfix, sei sicuro di procedere come hotfix?'.cyan # ask('La issue ha la label hotfix, sei sicuro di procedere come hotfix? (y/n)'.cyan) { |q| q.default = 'y' }
+      issue_type = continue_hotfix ? 'hotfix' : 'feature'
+    else
+      issue_type = choose do |menu|
+        menu.prompt = 'Seleziona se la issue dev\'essere trattata come feature oppure hotfix'.cyan
+        menu.shell  = true
+
+        menu.choice('feature') {'feature'}
+        menu.choice('hotfix') {'hotfix'}
+      end
+
+      if issue_type == 'hotfix'
+        puts "Aggiungo la label #{Prima::LABEL_HOTFIX} alla issue".green
+        @prima.update_issue_with_label issue_number, Prima::LABEL_HOTFIX
+      end
+    end
+    issue_type
+  end
 end
 
 PickIssue.new.execute!

data/lib/prima_twig.rb

@@ -1,7 +1,6 @@
 require_relative 'command.rb'
 require 'twig'
 require 'octokit'
-require 'trello'
 require 'yaml'
 require 'rugged'
 require 'highline/import'
@@ -9,8 +8,8 @@ require 'highline/import'
 class Prima
   LABEL_REVIEW='review'
   LABEL_WIP='wip'
+  LABEL_HOTFIX='hotfix'
   GITHUB='github'
-  TRELLO='trello'
   attr_reader :gh, :twig, :config, :rugged
 
   def initialize
@@ -31,10 +30,8 @@ class Prima
     puts 'Progetto non inizializzato'.red
     puts 'Creazione del file di configurazione'.yellow
     github_token = ask 'github token: '
-    trello_token = ask 'trello token: '
     conf = {
-        GITHUB => github_token.to_s,
-        TRELLO => trello_token.to_s
+        GITHUB => github_token.to_s
     }
     File.open('twig.yml', 'w') { |file|
       file.write conf.to_yaml
@@ -74,8 +71,13 @@ class Prima
     `git config --get remote.origin.url`.split(':').last.chomp.chomp('.git')
   end
 
+  def repo_user
+    repo_url.chomp.split(':').last.split('/').first
+  end
+
   def current_branch_ref
-    "primait:#{ current_branch_name }"
+    repo = repo_user
+    "#{repo}:#{current_branch_name}"
   end
 
   def clean_branch_name(branch_name)
@@ -163,6 +165,20 @@ class Prima
     results
   end
 
+  def merge_pull_request(pr, commit_message='')
+    raise "Invalid Pull Request" unless pr
+    pr_number = pr[:number]
+    @gh.merge_pull_request(repo_name, pr_number, commit_message)
+  end
+
+  def close_issue(issue_number)
+    @gh.close_issue(repo_name, issue_number)
+  end
+
+  def repo_url
+    `git config remote.origin.url`
+  end
+
   def yesno(prompt = 'Continue?', default = true)
     a = ''
     s = default ? '[Y/n]' : '[y/N]'

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Matteo Giachino
 - Antonio Murdaca
 - Alessandro Nuzzo
+- Andrea Usuelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twig
@@ -68,20 +69,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: ruby-trello
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +97,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.22'
-description: Our tools to manage git, github and trello
+description: Our tools to manage git and github
 email: matteo.giachino@prima.it
 executables:
 - twig-circle