metaverse 0.1.8.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86d2e75dc1394345af03324e91e1d9e314860221
-  data.tar.gz: 2fda511ed66e095df3f476af10c87011be868617
+  metadata.gz: 3e05af7356cbdcb5593e140a14bb0729bce9f58d
+  data.tar.gz: fdf0413fff4d96a459ddf57150a4d40ab42215bf
 SHA512:
-  metadata.gz: fda6270756829036d172d9b219b74de58f3ae4c5da514c4532043b4c86f6bad71b5e45a8885a92483e49e10232890b4c2e6fa16e285d33c782190f47db6e1fa1
-  data.tar.gz: 11e3fc0ae3c9ac12d2a533eeebca2933d053215ba82d0503fae7e0ea0be4330af20a74f3051c63049a064199e33ec5256f32f1dd66e6f8106e096d9a0a4d1529
+  metadata.gz: c2f73d9bf92d9e66e966a4170487644b8512396115fd40b8939b71d8b05364de1c7707dfcead2a6a0d5c7811307b616c032fc6988c651580a20bf00611012c35
+  data.tar.gz: c9ccc42a19f3a9fe5617a3d2bf156883f1c7946539814be2813dcb2eb05c779c4af702090a228eb9b313180f5aac1f7b92eca5446543f04ccdaa338f96f5c582

data/lib/metaverse/base.rb

@@ -23,6 +23,7 @@ module Metaverse
 
     def status
       check_dirtiness
+      check_consistency
     end
 
 
@@ -40,7 +41,7 @@ module Metaverse
         }
       }
 
-      if check_dirtiness
+      if check_dirtiness and check_consistency
         actions = @repos.map {|repo| 
           puts "\n # #{repo.name}".blue
           Transacted::Action.new action_options.call(repo)
@@ -61,7 +62,7 @@ module Metaverse
         puts "\n # #{repo.name}".blue
         repo.create_state prefix, state
         repo.checkout "#{prefix}/#{state}" if not prefix == "snapshot"
-      } if check_dirtiness
+      } if check_dirtiness and check_consistency
     end
 
 
@@ -74,12 +75,13 @@ module Metaverse
           },
           down: -> { 
             puts "\n # Rolling back in #{repo.name}".blue
-            puts repo.checkout repo.pop_previous_branch
+            repo.checkout repo.peek_previous_branch
+            repo.delete_branch repo.pop_previous_branch if should_create_branch
           }
         }
       }
 
-      if check_dirtiness
+      if check_dirtiness and check_consistency
         
         actions = @repos.map { |repo|
           Transacted::Action.new action_options.call repo
@@ -99,8 +101,8 @@ module Metaverse
       @repos.each { |repo|
         puts "\n # #{repo.name}".blue
         is_branch = repo.current_branch.match /refs\/heads\/(.*)/
-        repo.send_state prefix, state, remote, !!is_branch, should_clean
-      } if check_dirtiness
+        repo.send_state prefix, state, remote, should_clean
+      } if check_dirtiness and check_consistency
     end
 
 
@@ -108,7 +110,7 @@ module Metaverse
       @repos.each { |repo|
         puts "\n # #{repo.name}".blue
         repo.update remote
-      } if check_dirtiness
+      } if check_dirtiness and check_consistency
     end
 
 
@@ -138,6 +140,20 @@ module Metaverse
       dirty_repos.length == 0 
     end
 
+    def check_consistency
+      branch_name = system_state.first
+      inconsistent_repos = @repos.reject { |repo|
+        repo.current_branch == branch_name
+      }.map &:name
+
+      if inconsistent_repos.length == 0
+        puts 'The system is consistent'.green
+      else
+        puts 'The system is inconsistent. Please check the following repos :'.red , inconsistent_repos
+      end
+      inconsistent_repos.length == 0 
+    end
+
     def read_config path
       Errors::config_not_found! if not File.exist? path
 
@@ -170,7 +186,7 @@ module Metaverse
       @repos.each { |repo|
         puts "\n # #{repo.name}".blue
         repo.pull @origin_remote
-      } if check_dirtiness
+      } if check_dirtiness and check_consistency
     end
 
     def add_remote name, base_url

data/lib/metaverse/cli.rb

@@ -98,6 +98,7 @@ module Metaverse
       init
       case command
       when 'dirtiness' then @meta.check_dirtiness
+      when 'consistency' then @meta.check_consistency
       end
     end
 

data/lib/metaverse/repo.rb

@@ -127,7 +127,7 @@ module Metaverse
     end
 
 
-    def send_state prefix, state, remote, is_branch, should_clean = false
+    def send_state prefix, state, remote, should_clean = false
       refs = ["refs/meta/local/#{prefix}/#{state}"]
       branch_name = "#{prefix}/#{state}"
       branch = @repo.branches[branch_name]
@@ -143,7 +143,7 @@ module Metaverse
         return false
       end
 
-      if (not prefix == 'snapshot') and is_branch and ahead_of_develop? branch
+      if (not prefix == 'snapshot') and ahead_of_develop? branch
           refs << branch_name
           update_ref refs[0], @repo.branches[branch_name]
       end
@@ -166,6 +166,12 @@ module Metaverse
       changed
     end
 
+    def delete_branch branch
+      if not @repo.branches[branch].nil?
+        @repo.branches.delete branch
+      end
+    end
+
     def dirty?
       is_dirty = false
       @repo.status { |file, data|
@@ -177,7 +183,7 @@ module Metaverse
 
 
     def update remote = nil
-      if @repo.remotes[remote].nil?
+      if not remote.nil? and @repo.remotes[remote].nil?
         return Errors::remote_not_found remote
       end
       Dir.chdir(@repo.workdir) do

data/lib/metaverse/version.rb

@@ -1,3 +1,3 @@
 module Metaverse
-  VERSION = "0.1.8.5"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metaverse
 version: !ruby/object:Gem::Version
-  version: 0.1.8.5
+  version: 0.1.9
 platform: ruby
 authors:
 - Omar Kamali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler