prima-twig 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e51f7efbdc4ff239cee91b356d534a1391a4f25
-  data.tar.gz: 736f2ba291557033b81b25c7f138b0b2ae347269
+  metadata.gz: 5445337413d58fbcf02c22ab2788cb65cb14e8d3
+  data.tar.gz: d4f11fb373e5cd1813d80e2cab574658ebb5b6fa
 SHA512:
-  metadata.gz: 4f0181052d4055ce05f6b10365ab75fb213b5de0a8c5c0136808d66c56f9e0ad2d6e74d65d2238d71b8211513223c9df0f0d476d44026869e348181829f8e871
-  data.tar.gz: 539f4b2935e092ee7bbb6789cbb6399c0d6d6696473b8d9a21e4a04d35e11ce31179b3f166a1df15bb4b001650db31dbcf95182e1f594bcd98fb2e58181c8df9
+  metadata.gz: c9f3af6a05272eb8de9d7e3426abf5a8e573ec8ed1f7c62807d2843d166fbec58ad6cfc8ff861d0d22da17fb2b3634795c7dcac5c28f3abe67166df0a438ae13
+  data.tar.gz: bd86d90fcf01550207125ade6b2b4d6e7406eca2ca7fb49cd0714b42cd85f27417da7f348f2f089379f095a3efabcf55c5d4254acc165bef23e6a431567a34eb

data/bin/twig-deploy

@@ -0,0 +1,83 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require_relative '../lib/prima_twig.rb'
+require 'colorize'
+require 'highline/import'
+
+
+def help_content
+  <<-HELP
+
+twig-deploy
+===========
+
+Updates master and push to origin
+
+Synopsis
+--------
+
+  twig deploy
+
+Description
+-----------
+
+  Merges dev in master and push dev and master to origin, than returns to the actual branch
+
+Subcommand for Twig: <http://rondevera.github.io/twig/>
+Author: Matteo Giachino <https://github.com/matteosister>
+
+  HELP
+end
+
+args = ARGV.dup
+
+if args.include?('--help')
+  puts help_content
+  exit
+end
+
+class Review
+  def initialize
+    @prima = Prima.new
+  end
+
+  def execute
+    if @prima.head_detached?
+      puts 'Head detached'.red
+      exit(1)
+    end
+
+    unless @prima.is_clean?
+      puts 'hai dei file non committati...non posso continuare'.red
+      #exit(1)
+    end
+
+    actual_branch = @prima.current_branch_name
+    puts actual_branch.green
+
+    step 'git fetch'
+    step 'git checkout dev'
+    step 'git merge origin/dev'
+    step 'git checkout master'
+    step 'git merge origin/master'
+    step 'git merge --ff-only dev'
+    step 'git push origin master'
+    step "git checkout #{actual_branch}"
+
+    #puts "Il branch #{ @prima.current_branch_name } è ora in review".green
+    exit 0
+  end
+
+  def step command, output = nil
+    if output
+      puts output
+    else
+      puts command
+    end
+    `#{command}`
+    exit($?.exitstatus) unless 0 === $?.exitstatus
+  end
+end
+
+Review.new.execute

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Matteo Giachino
@@ -95,28 +95,16 @@ dependencies:
     - - "~>"
       - !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.21'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
 description: Our tools to manage git, github and trello
 email: matteo.giachino@prima.it
 executables:
+- twig-deploy
 - twig-open-pr
 - twig-review
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/twig-deploy
 - bin/twig-open-pr
 - bin/twig-review
 - lib/prima_twig.rb
@@ -140,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: The Prima twig toolbelt