prima-twig 0.2.26 → 0.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6278b63cf06b6222d97d8361d6140f0b2d8c26c4
-  data.tar.gz: d32044141830548df13275f4ddbd1d219260a5ea
+  metadata.gz: 8ae2b2439b1eea4e4aab608aec6dc9ead04561c7
+  data.tar.gz: 160d6f697d55a16b005eed9d10e7cbdb51554091
 SHA512:
-  metadata.gz: bdb6e1319e2e2565a87b4f02d80b103927ea91f53c2df273446c1407bd1d231f830463a8aed8e7c9cd2e138da6cc5b4328a82a815883fd114cc87c13f024c780
-  data.tar.gz: f386ea23696b1a9e4f3a5a72b2ddcae068b8471974cb5c5ae4b2a17afa52e72ff60fbd66bacd68851d06d4a56a98e0e76ed5572f7431d97ebc0e94dab63d8c51
+  metadata.gz: 09da201f05deca5428bca7546e0303ec002ecf3f9c4154d74ed5b833a09ed5acc0edceb8a9b3e0ac447e07cd46d8a0826f1bdef729e724f08c5eddc2205f20fe
+  data.tar.gz: 8d4b87e6d48cfb33df31cf21f41e265032cff01b34b2d2ebc6ee87cefed6eb2f8fbeff1c010249f98912df92145489ac3c9bfd398595417b9b491c3657e7a2d3

data/bin/twig-deploy

@@ -73,8 +73,8 @@ class Review
     artifact = artifacts.select {|v| v[:rev] ==  artifact_rev}.first
 
     mail = Mail.new do
-      from     'developers@prima.it'
-      to       'developers@prima.it'
+      from     'deploy@prima.it'
+      to       'deploy@prima.it'
       subject  "#{user} ha effettuato il deploy della revision #{artifact[:rev]}"
     end
 
@@ -98,7 +98,7 @@ class Review
     mail.text_part = text_part
 
     opts = {address: 'smtp.mandrillapp.com', port: '587'}
-    opts[:user_name] = 'developers@prima.it'
+    opts[:user_name] = 'deploy@prima.it'
     opts[:password] = @prima.config['mandrill']
 
     mail.delivery_method(:smtp, opts)

data/bin/twig-hotfix

@@ -56,7 +56,7 @@ class Hotfix
     exec_step 'git fetch'
     exec_step 'git checkout dev'
     exec_step 'git merge origin/dev'
-    exec_step "git merge #{current_branch_name}"
+    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
 

data/bin/twig-open-pr

@@ -117,7 +117,8 @@ class OpenPR
     unless @prima.twig.get_branch_property(current_branch_name, 'issue').nil?
       body << " close ##{@prima.twig.get_branch_property(current_branch_name, 'issue')}"
     end
-    @prima.gh.create_pull_request @prima.repo_name, base_branch, head, title, body
+    pr = @prima.create_pull_request base_branch, head, title, body
+    @prima.assign_pull_request_to_me(pr.number)
   end
 end
 

data/bin/twig-release

@@ -59,8 +59,8 @@ class Release
     @prima.update_pr pr.number, {:body => pr_body}
 
     mail = Mail.new do
-      from     'developers@prima.it'
-      to       'developers@prima.it'
+      from     'deploy@prima.it'
+      to       'deploy@prima.it'
       subject  "#{`git config user.name`} ha iniziato la creazione della release #{branch_name}"
     end
 
@@ -78,7 +78,7 @@ class Release
     mail.text_part = text_part
 
     opts = {address: 'smtp.mandrillapp.com', port: '587'}
-    opts[:user_name] = 'developers@prima.it'
+    opts[:user_name] = 'deploy@prima.it'
     opts[:password] = @prima.config['mandrill']
 
     mail.delivery_method(:smtp, opts)

data/lib/prima_twig.rb

@@ -196,6 +196,10 @@ class Prima
     @gh.update_issue(repo_name, issue, :assignee => user_login)
   end
 
+  def assign_pull_request_to_me(pr_number)
+    @gh.update_pull_request(repo_name, pr_number, :assignee => user_login)
+  end
+
   def list_issues
     results = @gh.list_issues repo_name, state: :open, :per_page => 20, :page => 1
     unless @gh.last_response.rels[:last].nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.2.26
+  version: 0.2.27
 platform: ruby
 authors:
 - Matteo Giachino
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twig