zewo-dev 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1fce2b95a2225f242cf7a04a289bc52f9f658a4
-  data.tar.gz: 185fef6e048f6e6eaf6a0b256b19fcb4becea201
+  metadata.gz: 8eebbdadabfe94b2f519bf3009ae8497333858c0
+  data.tar.gz: 0db9baf3c3a4696e9609397d57443a7a588c244c
 SHA512:
-  metadata.gz: c1b89e01a06efaa73a4919648d0a86e77385f3c9a2ddad2107fa35953080852211d37e23d5c05cd4292a9ccb7cf7486f32e9c78627ffeee076cbd939f10ed191
-  data.tar.gz: 84c117c5ff55372ee4e87aab088b80a811046a1a84cb8a50febfdabfeb3339623dbb601dde38c28041d02695a2f03e1c8e6d2af503c95e18279809d39d9cfdf8
+  metadata.gz: fbc6393f9a8dd82d591498d7617c0c21408e2feb3be8421c4103d5ee529c25a70b4af2734273e5026d9a6172912b8036be860ca601c922d756d71c44ec80bc35
+  data.tar.gz: f730684bc8a6195aa367443dadb459c18bdf6dbff93505cd93196bbfb594866bfaa98f046ea4f48a393af2f8d8b01e358941382ac784b5b8f9d9cf3dc2d6e531

data/lib/zewo/version.rb

@@ -1,3 +1,3 @@
 module Zewo
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/zewo.rb

@@ -49,6 +49,19 @@ module Zewo
         end
       end
 
+      def verify_branches
+        last_branch_name = nil
+        each_repo do |repo|
+          branch_name = `cd #{repo.name}; git rev-parse --abbrev-ref HEAD`.gsub("\n", "")
+          if !last_branch_name.nil? && branch_name != last_branch_name
+            puts "Branch mismatch. Branch of #{repo.name} does not match previous branch #{branch_name}".red
+            return false
+          end
+          last_branch_name = branch_name
+        end
+        true
+      end
+
       def prompt(question)
         printf "#{question} -  press 'y' to continue: "
         p = STDIN.gets.chomp
@@ -99,6 +112,8 @@ module Zewo
 
     desc :push, 'git push on all repos'
     def push
+      verify_branches
+
       each_repo do |repo|
         if uncommited_changes?(repo.name)
           puts "Uncommitted changes in #{repo.name}. Skipping.."
@@ -119,6 +134,7 @@ module Zewo
       end
     end
 
+
     desc :build, 'Clones all Zewo repositories'
     def build
       each_repo do |repo|
@@ -134,7 +150,10 @@ module Zewo
     desc 'commit MESSAGE', 'Commits changes to all repos with the same commit message'
     def commit(message)
 
+      return unless verify_branches
+
       each_repo do |repo|
+
         next unless uncommited_changes?(repo.name)
         puts repo.name
         puts '--------------------------------------------------------------'
@@ -142,19 +161,18 @@ module Zewo
           puts 'Status:'.yellow
           system("cd #{repo.name}; git status")
           return unless prompt("Proceed with #{repo.name}?")
-          puts 'Diff (press q to exit):'.yellow
-          system("cd #{repo.name}; git diff")
         end
 
-        puts "Warning. You're not in the master branch".yellow unless master_branch?(repo.name)
-        puts "\n"
 
-        return unless prompt('Changes look ok?')
         system("cd #{repo.name}; git add --all; git commit -am #{message}")
         puts "Commited #{repo.name}\n".green
         
       end
-      self.push if prompt('Push changes?')
+      if prompt('Pull & push changes?'.red)
+        self.push
+        self.push
+      end
+      
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zewo-dev
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - David Ask