prima-twig 0.2.27 → 0.3.0

data/bin/twig-open-pr

@@ -79,7 +79,7 @@ class OpenPR
       exit 0
     end
 
-    pr = create_pull_request(choose_base_branch)
+    pr = create_pull_request('master')
     puts "Pull Request ##{ pr.number } creata".green
     cmd = %{ twig pr "#{ pr.number }"}
     exec(cmd)
@@ -89,16 +89,6 @@ class OpenPR
     exit 0
   end
 
-  def choose_base_branch
-    choose do |menu|
-      menu.prompt = 'Su quale branch vuoi effettuare la PR? '.cyan
-      menu.shell  = true
-
-      menu.choice('dev') {'dev'}
-      menu.choice('master') {'master'}
-    end
-  end
-
   def is_on_github?
     begin
       @prima.gh.branch @prima.repo_name, @prima.current_branch_name

data/bin/twig-pick-issue

@@ -4,6 +4,7 @@ require 'rubygems'
 require_relative '../lib/prima_twig.rb'
 require 'colorize'
 require 'highline/import'
+require 'pp'
 
 def help_content
   <<-HELP
@@ -45,14 +46,24 @@ class PickIssue
     end
 
     issues = @prima.list_issues
-    issues.delete_if do |issue|
-      issue.pull_request?
+
+    issue_number = nil
+    if args[0] && args[0].to_i > 0
+      issues.keep_if do |issue|
+        issue.number == args[0].to_i
+      end
+      stop_if issue.empty? "Issue #{args[0].to_i} non trovata!"
+      issue_number = args[0].to_i
+    else
+      issues.delete_if do |issue|
+        issue.pull_request?
+      end
+      issue_number = choose_issue issues
     end
 
-    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)
+    issue_type =  'feature'
+    base_branch_name_default = 'master'
+    branch_name = ask('Inserisci il nome del branch (puoi omettere feature/): '.cyan)
     if branch_name.length == 0
       puts 'Devi inserire il nome del branch'.red
       exit 1
@@ -75,6 +86,10 @@ class PickIssue
   end
 
   def choose_issue(issues)
+
+    pp issues
+    exit
+
     choose do |menu|
       menu.prompt = 'Pick an issue: '.cyan
       menu.shell  = true
@@ -89,29 +104,6 @@ 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

@@ -16,9 +16,16 @@ class Prima
   attr_reader :gh, :twig, :config, :rugged, :aws
 
   def initialize
-    @twig = Twig.new(:read_options => true)
+    @twig = Twig.new(:read_options => true, :max_days_old => 30)
     unless has_config?
-      generate_config
+      if File.exist?('../prima/twig.yml')
+         `cp ../prima/twig.yml .`
+      else
+        generate_config
+      end
+      if File.exist?('./projects/prima')
+         `git submodule init && git submodule update`
+      end
     end
     unless has_latest_config?
       update_config
@@ -119,7 +126,7 @@ class Prima
   def clean_branch_name(branch_name)
     branch_name.gsub! /[^a-zA-Z0-9\-_]/, '_'
     branch_name.gsub! /_+/, '_'
-    branch_name
+    branch_name.downcase
   end
 
   # proxy di tutti i metodi a rugged

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.2.27
+  version: 0.3.0
 platform: ruby
 authors:
 - Matteo Giachino
@@ -11,132 +11,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twig
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.22'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
 description: Our tools to manage git and github
@@ -149,7 +149,6 @@ executables:
 - twig-hotfix
 - twig-deploy
 - twig-feature
-- twig-release
 extensions: []
 extra_rdoc_files: []
 files:
@@ -160,7 +159,6 @@ files:
 - bin/twig-hotfix
 - bin/twig-deploy
 - bin/twig-feature
-- bin/twig-release
 - lib/command.rb
 - lib/prima_twig.rb
 homepage: http://rubygems.org/gems/prima-twig
@@ -173,12 +171,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/bin/twig-release

@@ -1,227 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'redcarpet'
-require 'mail'
-require_relative '../lib/prima_twig.rb'
-
-class Release
-  include Command
-
-  def initialize
-    @prima = Prima.new
-  end
-
-  def execute! args
-    possible_args = ["start", "finish"]
-    stop_if args.empty?, [:wrong_args, possible_args]
-    stop_if args.length > 1, [:wrong_args, possible_args]
-
-    stop_if @prima.head_detached?, :detached_head
-    stop_unless @prima.is_clean?, :clean
-
-    case args[0]
-    when "start"
-      start_release!
-    when "finish"
-      finish_release!
-    else
-      stop_if true, [:wrong_args, possible_args]
-    end
-  end
-
-  def start_release!
-
-    release_name = @prima.clean_branch_name(ask('Inserisci il nome della release (senza prefisso release/): '.cyan))
-
-    branch_name = "release/#{release_name}/#{Time.now.strftime('%Y%m%d')}"
-
-    output "Il nome del branch sarà #{branch_name.yellow}"
-
-    exec_step "git checkout dev"
-    exec_step "git pull origin dev"
-    exec_step "git checkout -b #{branch_name}"
-    exec_step "git push -u origin #{branch_name}"
-
-    pr = @prima.create_pull_request('master', branch_name, branch_name, '')
-    @prima.twig.set_branch_property(branch_name, 'pr', pr.number)
-    @prima.twig.set_branch_property(branch_name, 'diff-branch', 'dev')
-
-    commits = get_commits(pr.number)
-    issues = get_issues(pr.number)
-
-    issues.each do |issue|
-      @prima.delete_label_from_issue(issue.number, Prima::LABEL_NEXT_RELEASE)
-      @prima.update_issue_with_label(issue.number, Prima::LABEL_IN_STAGING)
-    end
-
-    pr_body = build_pr_body(issues, commits)
-    @prima.update_pr pr.number, {:body => pr_body}
-
-    mail = Mail.new do
-      from     'deploy@prima.it'
-      to       'deploy@prima.it'
-      subject  "#{`git config user.name`} ha iniziato la creazione della release #{branch_name}"
-    end
-
-    htmlBody = build_pr_body(issues, commits, 'html')
-
-    html_part = Mail::Part.new do
-      content_type 'text/html; charset=UTF-8'
-      body htmlBody
-    end
-    text_part = Mail::Part.new do
-      body htmlBody.gsub(/<br\s?\/?>/, "\r\n").gsub(/<\/?[^>]*>/, '')
-    end
-
-    mail.html_part = html_part
-    mail.text_part = text_part
-
-    opts = {address: 'smtp.mandrillapp.com', port: '587'}
-    opts[:user_name] = 'deploy@prima.it'
-    opts[:password] = @prima.config['mandrill']
-
-    mail.delivery_method(:smtp, opts)
-    mail.deliver
-  end
-
-  def finish_release!
-    current_branch_name = @prima.twig.current_branch_name
-    stop_unless (current_branch_name =~ /^release\//), "Non sei su un branch di release, non posso mergiare nulla"
-
-    # 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 --no-ff #{current_branch_name}"
-
-    exec_step 'git push origin dev' if @prima.yesno 'Vuoi effettuare il push di dev?'.blue
-
-    # Aggiorno le issue
-    issues = get_issues(pr.number)
-    issues.each do |issue|
-      @prima.delete_label_from_issue(issue.number, Prima::LABEL_IN_STAGING)
-      @prima.close_issue issue.number
-    end
-
-    # Rimuove il branch remoto
-    exec_step "git push origin :#{current_branch_name}" if @prima.yesno "Vuoi eliminare il branch remoto #{current_branch_name}?".blue
-
-    # Crea il tag e la release con la description figa
-    exec_step 'git checkout master'
-    exec_step 'git pull'
-    res = @prima.rugged.tags.create(current_branch_name, @prima.rugged.head.target_id)
-
-    exec_step 'git push --tags'
-
-    commits = get_commits(pr.number)
-    pr_body = build_pr_body(issues, commits)
-
-    @prima.create_release(current_branch_name, {:name => current_branch_name, :body => pr_body})
-
-    output 'Release creata con successo!'.green
-  end
-
-  def get_commits(pr_number)
-    commits = []
-
-    @prima.get_pr_commits(pr_number).each do |item|
-      commits << item
-    end
-
-    commits
-  end
-
-  def get_issues(pr_number)
-    issues = []
-    issues_ids = []
-
-    self.get_commits(pr_number).each do |item|
-      if item.commit.message =~ /^\[*#(\d+)\]*\s-/
-        issue_id = item.commit.message.match(/^\[*#(\d+)\]*\s-/).captures.first
-        issues_ids << issue_id unless issues_ids.include? issue_id
-      end
-    end
-
-    issues_ids.each do |id|
-      issues << @prima.get_issue(id)
-    end
-
-    issues
-  end
-
-  def build_pr_body(issues, commits, output_format = 'markdown')
-    body = ''
-
-    body << "# Issues\n\n"
-
-    issues.each do |issue|
-      body << "### [##{issue.number} - #{issue.title.gsub(/\n/,' ')}](#{get_issue_url(issue.number)})\n\n"
-      body << "#{issue.body}\n\n"
-    end
-
-    body << "# Commits\n\n"
-
-    commits.each do |commit|
-      body << "* [#{commit.commit.message.gsub(/\n/,' ')}](#{get_commit_url(commit.sha)})\n"
-    end
-
-    if output_format == 'html'
-      markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new)
-      body = markdown.render body
-    end
-
-    body
-
-  end
-
-  def get_commit_url(sha)
-    "https://github.com/#{@prima.repo_name}/commit/#{sha}"
-  end
-
-  def get_issue_url(number)
-    "https://github.com/#{@prima.repo_name}/issues/#{number}"
-  end
-end
-
-def help_content
-  <<-HELP
-
-twig-release
-===========
-
-Manage release creation
-
-Synopsis
---------
-
-  twig release start
-  twig release finish
-
-Description
------------
-
-  start   creates an release from dev branch
-  finish  finishes the actual release by merging to dev and master
-
-Subcommand for Twig: <http://rondevera.github.io/twig/>
-Author: Andrea Usuelli <https://github.com/andreausu>
-
-  HELP
-end
-
-args = ARGV.dup
-
-if args.include?('--help')
-  puts help_content
-  exit
-end
-
-Release.new.execute!(args)