metaverse 0.1.10 → 0.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2d767be2dd06813f70ace425fb96ff5bcba44e6
-  data.tar.gz: 698bf620e3f6ea42d43670139ec74bf2edcdc27e
+  metadata.gz: 728ccb915c07d528cb4aa047d5cbfe124921733a
+  data.tar.gz: 8b29aa1a599b73554f73730be8a66905de367af9
 SHA512:
-  metadata.gz: 0dd93efd641a8d88bd0e021a3f546ae8fb02d051296d442e12038d4dfed3cadd0bc8d675c244836ad2d5209811b0ea31243a59a42b9cb4eb3f4a8abee9712418
-  data.tar.gz: c8b01e18a74b9563c34278a54a15493ab3a0cf785eb502dcddc18bbea537bd8b39d543823106993bac82d1e262896a9671546d00109af5336effe6e4804377bd
+  metadata.gz: eb818e909547acce5e08080770f4675148a9397770fc437fa61fe3edb35db96f6cdae82f2705317ee7dd9b688da6894fca09f46de840c852f0a14078c69eb72d
+  data.tar.gz: 0ded1e37a022419ddc622f0e0497350ed4c06c38d5e8fcd3fe176c13b2e9d1fa006c89a2b04f0cfbe3cfdc603f1c81fdcc83ff5abbec12655e53ab9ce019b5d1

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in metaverse.gemspec
-gemspec
+gemspec
+gem 'iniparse', git: "git://github.com/dejitaiza/iniparse.git"

data/README.md

@@ -5,17 +5,6 @@ Metaverse multirepo management revolves around two main axes of functionality:
 * Workflow related functionality
 * State Management
 
-# Installation
-
-Metaverse requires `rugged` which in turns relies on a bundled `libgit2` which 
-is a Ruby native extension.
-
-### OSX
-
-You need Cmake and pkg-config. If you have brew you can install by running :
-
-`brew install cmake pkg-config`
-
 # 1 - Workflow
 ## Utilities
 ### Checkout
@@ -42,12 +31,6 @@ Pulls the changes from the main remote in every repo - similar to `git pull orig
 
 Displays the branch at which every repo is.
 
-### Exec
-`meta exec COMMAND`
-
-Runs the specified shell command in every repo's working directory. Also passes
-the ENV used to invoke it to the shell command.
-
 ## Features
 ### New
 `meta feature new FEATURE_NAME`

data/bin/meta

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
 
 begin
-  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'metaverse'))
+  require "bundler/setup"
+  require 'metaverse'
 rescue LoadError
+  require "bundler/setup"
   require 'rubygems'
-  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'metaverse'))
+  require 'metaverse'
 end
 
 Metaverse::Cli.start

data/lib/metaverse/base.rb

@@ -1,60 +1,26 @@
 #!/usr/bin/env ruby
 require 'colorize'
 require 'yaml'
-require 'transacted'
 require 'metaverse/repo'
 require 'metaverse/iterator'
-require 'metaverse/errors'
 
 module Metaverse
   class Base
     def initialize path
       @logger = Logger.new STDOUT
-      @base_path = path
       read_config "#{path}/.meta.yml"
-      @repos_paths = Metaverse::Iterator.new path, @ignored_repos, @repos_paths
-      if @repos_paths.empty?
-        @repos_paths.build 
-        save_config "#{path}/.meta.yml"
-        puts "Repos cache built.".green
-      end      
+      @repos_paths = Metaverse::Iterator.new path, @ignored_repos
+      @repos_paths.build
       @repos = @repos_paths.map {|repo| Metaverse::Repo.new repo}
     end
 
     def status
       check_dirtiness
-      check_consistency
     end
 
 
     def checkout name
-      action_options = -> (repo) {
-        {
-          up: -> {
-            puts "\n # #{repo.name}".blue
-            repo.checkout name
-          },
-          down: -> {
-            puts "\n # Rolling back in #{repo.name}".blue
-            repo.checkout repo.pop_previous_branch
-          }
-        }
-      }
-
-      if check_dirtiness and check_consistency
-        actions = @repos.map {|repo| 
-          puts "\n # #{repo.name}".blue
-          Transacted::Action.new action_options.call(repo)
-        }
-
-        checkout_transaction = Transacted::Transaction.new actions
-        case checkout_transaction.execute
-        when :execution_success then puts "Checkout successful".green
-        when :rollback_success then raise "An error prevented checking out the system. Rolled back successfully".yellow
-        when :rollback_failure then raise "An error was encountered during the checkout. In addition, an error happened while trying to rollback the system. Please fix the state of your system manually.".red
-        end
-      end
-        
+      @repos.each { |repo| repo.checkout name } if check_dirtiness
     end
 
     def create_state prefix, state
@@ -62,47 +28,24 @@ module Metaverse
         puts "\n # #{repo.name}".blue
         repo.create_state prefix, state
         repo.checkout "#{prefix}/#{state}" if not prefix == "snapshot"
-      } if check_dirtiness and check_consistency
+      }
     end
 
 
-    def load_state prefix, state, remote = nil, should_create_branch = false
-      action_options = -> (repo) {
-        {
-          up: -> { 
-            puts "\n # #{repo.name}".blue
-            repo.load_state prefix, state, remote, should_create_branch
-          },
-          down: -> { 
-            puts "\n # Rolling back in #{repo.name}".blue
-            repo.checkout repo.peek_previous_branch
-            repo.delete_branch repo.pop_previous_branch if should_create_branch
-          }
-        }
+    def load_state prefix, state, remote = nil
+      @repos.each { |repo|
+        puts "\n # #{repo.name}".blue
+        repo.load_state prefix, state, remote
       }
-
-      if check_dirtiness and check_consistency
-        
-        actions = @repos.map { |repo|
-          Transacted::Action.new action_options.call repo
-        }
-
-        load_state_transaction = Transacted::Transaction.new actions
-        case load_state_transaction.execute
-        when :execution_success then puts "Loading state successful".green
-        when :rollback_success then raise "An error prevented loading the state of the system. Rolled back successfully".yellow
-        when :rollback_failure then raise "An error was encountered during the loading of the state. In addition, an error happened while trying to rollback the system. Please fix the state of your system manually.".red
-        end
-      end
     end
 
 
-    def send_state prefix, state, remote, should_clean = false
+    def send_state prefix, state, remote
       @repos.each { |repo|
         puts "\n # #{repo.name}".blue
         is_branch = repo.current_branch.match /refs\/heads\/(.*)/
-        repo.send_state prefix, state, remote, should_clean
-      } if check_dirtiness and check_consistency
+        repo.send_state prefix, state, remote, !!is_branch
+      }
     end
 
 
@@ -110,7 +53,7 @@ module Metaverse
       @repos.each { |repo|
         puts "\n # #{repo.name}".blue
         repo.update remote
-      } if check_dirtiness and check_consistency
+      }
     end
 
 
@@ -140,67 +83,15 @@ 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
-
       config = YAML.load File.open(path)
-      @repos_paths = config['repos'] || []
       @origin_remote = config['remotes']['main']
       @own_remote = config['remotes']['own']
       @ignored_repos = config['ignore'] || []
     end
 
-    def save_config path
-      config = {
-        'repos' => @repos_paths.map{ |repo| repo },
-        'remotes'=> {
-          'main' => @origin_remote,
-          'own' => @own_remote
-        },
-        'ignore' => @ignored_repos
-      }
-      File.open(path, 'w') {|f| f.write config.to_yaml }
-    end
-
-    def clear_repos
-      @repos_paths = []
-      save_config "#{@base_path}/.meta.yml"
-      puts "Repos cache cleared.".green
-    end
-
     def pull
-      @repos.each { |repo|
-        puts "\n # #{repo.name}".blue
-        repo.pull @origin_remote
-      } if check_dirtiness and check_consistency
-    end
-
-    def add_remote name, base_url
-      @repos.each { |repo|
-        puts "\n # #{repo.name}".blue
-        repo.add_remote name, "#{base_url}/#{repo.name}"
-      }
-    end
-
-    def exec env, command
-      @repos.each { |repo|
-        puts "\n # #{repo.name}".blue
-        repo.exec env, command
-      }
+      @repos.each { |repo| repo.pull @origin_remote }
     end
   end
 end

data/lib/metaverse/cli.rb

@@ -8,12 +8,6 @@ module Metaverse
       @meta = Base.new Dir.pwd
     end
 
-    desc "reset", "Empties the repos cache"
-    def reset
-      init
-      @meta.clear_repos
-    end
-
     desc "branches", "Displays the branch in which each repo is"
     def branches
       init
@@ -31,40 +25,34 @@ module Metaverse
     end
 
     desc "feature [COMMAND] [FEATURE_NAME]", "Creates a new feature branch or loads a previous one"
-    option :branch, type: :boolean, aliases: '-b'
     def feature command, name, remote = nil
       init
       case command
         when 'new' then @meta.create_state 'feature', name
-        when 'load' then @meta.load_state 'feature', name, remote, options[:branch]
+        when 'load' then @meta.load_state 'feature', name, remote
         when 'send' then @meta.send_state 'feature', name, remote
-        when 'close' then @meta.send_state 'feature', name, remote, true
       end
     end
 
 
     desc "release [COMMAND] [FEATURE_NAME]", "Creates a new release branch or loads a previous one"
-    option :branch, type: :boolean, aliases: '-b'
     def release command, name, remote = nil
       init
       case command
         when 'new' then @meta.create_state 'release', name
-        when 'load' then @meta.load_state 'release', name, remote, options[:branch]
+        when 'load' then @meta.load_state 'release', name, remote
         when 'send' then @meta.send_state 'release', name, remote
-        when 'close' then @meta.send_state 'release', name, remote, true
       end
     end
 
 
     desc "bugfix [COMMAND] [FEATURE_NAME]", "Creates a new bugfix branch or loads a previous one"
-    option :branch, type: :boolean, aliases: '-b'
     def bugfix command, name, remote = nil
       init
       case command
         when 'new' then @meta.create_state 'bugfix', name
-        when 'load' then @meta.load_state 'bugfix', name, remote, options[:branch]
+        when 'load' then @meta.load_state 'bugfix', name, remote
         when 'send' then @meta.send_state 'bugfix', name, remote
-        when 'close' then @meta.send_state 'bugfix', name, remote, true
       end
     end
 
@@ -98,7 +86,6 @@ module Metaverse
       init
       case command
       when 'dirtiness' then @meta.check_dirtiness
-      when 'consistency' then @meta.check_consistency
       end
     end
 
@@ -107,19 +94,5 @@ module Metaverse
       init
       @meta.pull
     end
-
-    desc "remote [COMMAND]", "manages repos remotes such as adding new ones"
-    def remote command, name, url
-      init
-      case command
-      when 'add' then @meta.add_remote name, url
-      end
-    end
-
-    desc "exec [COMMAND]", "runs the specified shell command in every repo"
-    def exec *command
-      init
-      @meta.exec ENV, command.join(' ')
-    end
   end
 end

data/lib/metaverse/iterator.rb

@@ -37,9 +37,5 @@ module Metaverse
     def map &block
       @repos.send(:map, &block)
     end
-
-    def empty?
-      @repos.count == 0
-    end
   end
 end

data/lib/metaverse/repo.rb

@@ -1,5 +1,4 @@
-require 'rugged'
-require 'iniparse'
+require 'metaverse/git'
 
 module Metaverse
   class Repo
@@ -9,7 +8,6 @@ module Metaverse
 
     def initialize path
       load path
-      @previous_branches = []
     end
 
 
@@ -28,54 +26,16 @@ module Metaverse
       File.basename @repo.workdir
     end
 
-    def workdir
-      @repo.workdir
-    end
 
     def checkout ref
-      if @repo.branches[ref].nil?
-        is_reference = false 
-        if Rugged::Reference.valid_name?(ref) and @repo.references[ref].nil?
-          raise Errors::ref_not_found ref
-        end
-      end
-
-      @previous_branches.push current_branch
-      Dir.chdir(@repo.workdir) do
-        `git checkout #{ref}`#TODO: find out what's going on, check out a branch
-      end
+      @repo.checkout ref
     end
 
 
     def current_branch
-      branch_name = ''
-
-      Dir.chdir(@repo.workdir) do
-        branch_name = `git branch | sed -n '/\* /s///p'`
-        #TODO Look into why the command returns an empty string in a new repo
-        if branch_name == ''
-          branch_name = 'master'
-        end
-      end
-
-      if branch_name.include? "detached"
-        match = /[A-Za-z0-9._-]+(?:\/[A-Za-z0-9._-]+)+/.match(branch_name) 
-        if not match.nil?
-          return match[0]
-        end
-        return 'HEAD'
-      end
-
-      branch_name.strip
+      @repo.head.name
     end
 
-    def peek_previous_branch
-      @previous_branches.last
-    end
-
-    def pop_previous_branch
-      @previous_branches.pop
-    end
 
     def head
       @repo.head
@@ -108,84 +68,48 @@ module Metaverse
     end
 
 
-    def load_state prefix, state, remote = nil, should_create_branch = false
-      ref_name = "refs/meta"
-      ref_name += remote.nil? ? "/local" : "/remotes/#{remote}"
-      ref_name += "/#{prefix}/#{state}"
-      if should_create_branch
-        branch_name = "#{prefix}/#{state}"
-        # TODO: Decide what to do when a branch exists previous. Should we :
-        # - Replace it's ref by the saved state ? ( We lose the previous branch reference)
-        # - Load it as it is ( We may get an inconsistent state since the branch could point to a different commit than the state reference )
-        if @repo.branches[branch_name].nil?
-          puts "Creating branch #{branch_name} based on #{ref_name}"
-          @repo.create_branch branch_name, ref_name
-        end
-        return checkout branch_name
-      end
-      checkout ref_name
+    def load_state prefix, state, remote = nil
+      path_prefix = "refs/meta"
+      path_prefix += "/local" if remote.nil?
+      path_prefix += "/remotes/#{remote}" if not remote.nil?
+      ref_name = "/#{prefix}/#{state}"
+      @repo.checkout path_prefix + ref_name
     end
 
 
-    def send_state prefix, state, remote, should_clean = false
+    def send_state prefix, state, remote, is_branch
       refs = ["refs/meta/local/#{prefix}/#{state}"]
-      branch_name = "#{prefix}/#{state}"
-      branch = @repo.branches[branch_name]
-      develop = @repo.branches['develop']
-
-      if branch.nil?
-        Errors::ref_not_found branch_name
-        return false
-      end
-
-      if develop.nil?
-        Errors::ref_not_found 'develop'
-        return false
+      if (not prefix == 'snapshot') and is_branch and clean_branch prefix, state
+          refs << "#{prefix}/#{state}"
+          update_ref refs[0], @repo.head
       end
-
-      if (not prefix == 'snapshot') and ahead_of_develop? branch
-          refs << branch_name
-          update_ref refs[0], @repo.branches[branch_name]
-      end
-
-      clean_branch branch if should_clean
-
       Dir.chdir(@repo.workdir) do
         `git push #{remote} #{refs.join(' ')}`
       end
     end
 
 
-    def clean_branch branch
+    def clean_branch prefix, state
+      target_branch = @repo.branches["#{prefix}/#{state}"]
 
-      changed = ahead_of_develop? branch
+      changed = has_changes? target_branch, @repo.branches['develop']
       if not changed
-        checkout 'develop'
-        @repo.branches.delete branch
+        @repo.checkout 'develop'
+        @repo.branches.delete target_branch
       end
       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|
-        next if data == [:ignored]
-        is_dirty = true
+        is_dirty = !(data.include? :ignored) or is_dirty
       }
       is_dirty
     end
 
 
     def update remote = nil
-      if not remote.nil? and @repo.remotes[remote].nil?
-        return Errors::remote_not_found remote
-      end
       Dir.chdir(@repo.workdir) do
         `git remote update #{remote}`
       end
@@ -193,11 +117,10 @@ module Metaverse
 
 
     def add_option_to_remote remote, value, key
-      config_path = "#{@repo.path}config"
-      cfg = IniParse.parse(File.read(config_path))
+      cfg = IniParse.parse(File.read("#{@repo.path}/config"))
       if not [*cfg["remote \"#{remote}\""][key]].include? value
         cfg["remote \"#{remote}\""][key] = [*cfg["remote \"#{remote}\""][key], value]
-        cfg.save config_path
+        cfg.save "#{@path}/config"
       end
     end
 
@@ -207,28 +130,8 @@ module Metaverse
     end
 
 
-    def ahead_of_develop? branch
-      has_changes? branch, @repo.branches['develop']
-    end
-
     def pull remote
-      if @repo.remotes[remote].nil?
-        return Errors::remote_not_found remote
-      end
-      Dir.chdir(@repo.workdir) do
-        `git pull #{remote} #{current_branch}`
-      end
-    end
-
-    def add_remote name, url
-      return Errors::remote_exists name if not @repo.remotes[name].nil?
-      @repo.remotes.create name, url
-    end
-
-    def exec env, command
-      Dir.chdir(@repo.workdir) do
-        system env, command
-      end
+      `git pull #{remote}`
     end
   end
 end

data/lib/metaverse/version.rb

@@ -1,3 +1,3 @@
 module Metaverse
-  VERSION = "0.1.10"
+  VERSION = "0.2.rc1"
 end

data/metaverse.gemspec

@@ -29,6 +29,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "thor", "~> 0.19"
   spec.add_runtime_dependency "colorize", "~> 0.7"
   spec.add_runtime_dependency "rugged", "~> 0.21"
-  spec.add_runtime_dependency "iniparse", "~> 1.4.0"
-  spec.add_runtime_dependency "transacted", "~> 0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metaverse
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.rc1
 platform: ruby
 authors:
 - Omar Kamali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,34 +94,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.21'
-- !ruby/object:Gem::Dependency
-  name: iniparse
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: transacted
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
 description: 
 email:
 - okamali@productivemobile.com
@@ -143,7 +115,6 @@ files:
 - lib/metaverse.rb
 - lib/metaverse/base.rb
 - lib/metaverse/cli.rb
-- lib/metaverse/errors.rb
 - lib/metaverse/iterator.rb
 - lib/metaverse/repo.rb
 - lib/metaverse/version.rb
@@ -165,9 +136,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14

data/lib/metaverse/errors.rb

@@ -1,21 +0,0 @@
-require 'colorize'
-
-module Metaverse
-  class Errors
-    def self.config_not_found!
-      abort ".meta.yml file was not found in the current working directory. Exiting ...".red
-    end
-
-    def self.ref_not_found ref
-      return Exception.new "Reference '#{ref}' does not exist.".red
-    end
-
-    def self.remote_not_found remote
-      puts "Remote '#{remote}' does not exist. Skipping ...".red
-    end
-
-    def self.remote_exists remote
-      puts "Remote '#{remote}' exists already. Skipping ...".red
-    end
-  end
-end