metaverse 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16a16d6aa3128a72012365e90dc57f3bdd82ec08
-  data.tar.gz: 31fa51d1f81da1f724ad5e1040a18dd66ea5774b
+  metadata.gz: 69efcf0bc6d8443154da8f032a5f86442cf98da7
+  data.tar.gz: c60b16984a090cb2fb1508f902cb55db3994bd0d
 SHA512:
-  metadata.gz: 138410c47d4d78ca106ecf2583a410ba4d894b3ace9a09791dd36b0cbb31fada4c436ffd66fb6d03fd0751f0dc7f835781394810a2281c876378d5a1ca1239d1
-  data.tar.gz: 78e2cc25d28aa65a59fff90811e1235eb438f90533b42151a61ccb62fe7bcea4c97f96f90e9f4043c109dd2eef274f8f1fc47a0c803c48d004e8cf426e1de5b8
+  metadata.gz: 85da87fd9f3f070243eb859a55bf56f97250853830f3df18c62eb5d98bd36465e05fa07b3b1f7a69ffdd5ac4bf25340d4f4bb8d765283b7d6a2542be77980c69
+  data.tar.gz: 24f9fbcb26df13afea52723773765a8cf3d5df6bd8cf8aaa7a1a154d0262e2f07d3591793b2eb46a20ce93167b3851091ed6a1dfd749753d2d647a82e602b8a8

data/Gemfile

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

data/README.md

@@ -1,39 +1,126 @@
 # Metaverse
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/metaverse`. To experiment with that code, run `bin/console` for an interactive prompt.
+Metaverse multirepo management revolves around two main axes of functionality:
 
-TODO: Delete this and the text above, and describe your gem
+* Workflow related functionality
+* State Management
 
-## Installation
+# Installation
 
-Add this line to your application's Gemfile:
+Metaverse requires `rugged` which in turns relies on a bundled `libgit2` which 
+is a Ruby native extension.
 
-```ruby
-gem 'metaverse'
-```
+### 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
+`meta checkout REF_OR_SHA`
+
+Checks out every repo to `REF_OR_SHA` - similar to `git checkout REF_OR_SHA`
+### Develop
+`meta develop`
+
+Checks out every repo to `develop` - ( shortcut for `meta checkout develop` )
+### Update
+`meta update REMOTE_NAME`
+
+Fetches from `REMOTE_NAME` in every repo - similar to `git remote update REMOTE_NAME`
+If `REMOTE_NAME` is omitted, defaults to fetching from all the remotes
+
+### Pull
+`meta pull`
+
+Pulls the changes from the main remote in every repo - similar to `git pull origin`
+
+### Branches
+`meta branches`
+
+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`
 
-And then execute:
+Creates a feature branch named `feature/FEATURE_NAME` on every repo managed by metaverse.
 
-    $ bundle
+### Load
+`meta feature load FEATURE_NAME REMOTE_NAME`
 
-Or install it yourself as:
+Checks out every repo to `feature/FEATURE_NAME` in a **detached HEAD** mode.
+If the remote is set, tries to load the feature from that specific remote. Else, defaults to local features.
 
-    $ gem install metaverse
+### Send
+`meta feature send FEATURE_NAME REMOTE_NAME`
 
-## Usage
+Pushes the feature branch of the repos that have changes to the specified remote.
+It also automatically delete the branches that have no changes compared to develop. 
 
-TODO: Write usage instructions here
+## Releases and bugfixes
 
-## Development
+Releases and bugfixes follow the same structure than the features, except that they are executed respectively using `meta release` and `meta bugtfix`. 
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
+# 2 - State Management
+## Sanity checks
+meta can be used to perform some sanity checks on the state of the system.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+### Dirtiness
+`meta check dirtiness`
 
-## Contributing
+Checks if the system is dirty. 
+The system is considered dirty if a repo contains unstaged or uncommitted changes ( think about updating your `.gitignore`s :) )
+In such a case, it displays the list of affected repos.
 
-1. Fork it ( https://github.com/[my-github-username]/metaverse/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+### Status
+` meta status`
+
+Checks the status of the system by running a dirtiness check, displays the output and the current state of the system.
+The branch at which the system is is deduced by counting the occurrences of every branch and picking the most frequent one.
+
+## System state
+meta provides a set of features aimed toward taking a snapshot of the system, and reloading it afterwards.
+
+### How does it work ?
+Snapshots are stored in a separate ref namespace in order to avoid collision with branches. Snapshots' refs in particular follow this refspec : `refs/meta/local/snapshot/SNAPSHOT_NAME`
+Similarly, refs are also used in addition to branches, to load features, releases, and bugfixes.
+
+### New
+`meta snapshot new SNAPSHOT_NAME`
+
+Take a snapshot of the system. The system stays in the same branch where it was before.
+
+### Load
+`meta snapshot load SNAPSHOT_NAME`
+
+Loads a previous snapshot of the system in a git **detached HEAD** mode. A good practice would be to create a feature, a release or a bugfix branch after loading a snapshot, prior to any modification on it.
+
+### Send
+`meta snapshot send SNAPSHOT_NAME REMOTE_NAME`
+
+Pushes a snapshot to the specified remote.
+
+# Configuration
+
+meta stores it's configuration in a file named .meta.yml in the root folder of your workspace.
+
+This is an example of a `.meta.yml` file :
+
+```
+  remotes:
+    own: YOUR_OWN_REMOTE
+    main: YOUR_MAIN_REMOTE
+  ignore:
+    - A_REPO_TO_IGNORE
+    - A_REPO_TO_IGNORE
+    - ..
+```

data/bin/meta

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

data/lib/metaverse/base.rb

@@ -1,140 +1,190 @@
 #!/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
-      readConfig "#{path}/.meta.yml"
-      @reposPaths = Metaverse::Iterator.new path, @ignoredRepos
-      @reposPaths.build
-      @repos = @reposPaths.map {|repo| Metaverse::Repo.new repo}
+      @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 = @repos_paths.map {|repo| Metaverse::Repo.new repo}
     end
 
     def status
-      checkConsistency
-      checkDirtiness
+      check_dirtiness
     end
 
-    def repos
-      @repos
-    end
 
     def checkout name
-      @repos.each { |repo| repo.checkout name } if checkConsistency && checkDirtiness
-    end
-
-    def createSnapshot name
-      @repos.each { |repo| repo.tag name } if checkConsistency &&  checkDirtiness
-    end
-
-    def loadSnapshot name
-      @repos.each { |repo| repo.checkout "tags/#{name}" } if checkConsistency &&  checkDirtiness
+      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
+        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 puts "An error prevented checking out the system. Rolled back successfully".yellow
+        when :rollback_failure then puts "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
+        
     end
 
-    def createFeature name
-      branchName = "feature/#{name}"
+    def create_state prefix, state
       @repos.each { |repo|
         puts "\n # #{repo.name}".blue
-        repo.branch branchName
-        repo.checkout branchName
-        } if checkConsistency && checkDirtiness
+        repo.create_state prefix, state
+        repo.checkout "#{prefix}/#{state}" if not prefix == "snapshot"
+      } if check_dirtiness
+    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
+            puts repo.checkout repo.pop_previous_branch
+          }
+        }
+      }
+
+      if check_dirtiness
+        
+        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 puts "An error prevented loading the state of the system. Rolled back successfully".yellow
+        when :rollback_failure then puts "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 loadFeature name
-      @repos.each { |repo|
-        puts "\n # #{repo.name}".blue
-        repo.checkout "feature/#{name}"
-      } if checkConsistency && checkDirtiness
-    end
 
-    def pushFeature name
+    def send_state prefix, state, remote, should_clean = false
       @repos.each { |repo|
         puts "\n # #{repo.name}".blue
-        repo.push @ownRemote, "feature/#{name}"
-      } if checkConsistency && checkDirtiness
+        is_branch = repo.current_branch.match /refs\/heads\/(.*)/
+        repo.send_state prefix, state, remote, !!is_branch, should_clean
+      } if check_dirtiness
     end
 
-    def getBranches
-      @repos.each { |repo| repo.branch }
-    end
 
-    def update remote
+    def update remote = nil
       @repos.each { |repo|
         puts "\n # #{repo.name}".blue
-        repo.fetch "#{remote || @originRemote}"
-        repo.reset "#{remote || @originRemote}/#{systemState[0]}"
-      } if checkConsistency && checkDirtiness
-    end
-
-    def deploy state = nil
-      @repos.each { |repo|
-        if state === nil
-          state = repo.currentBranch
-        end
-        repo.checkout state
-        repo.deploy state
-      }  if checkConsistency && checkDirtiness
+        repo.update remote
+      } if check_dirtiness
     end
 
-    def diff branch = nil
-      if branch === nil
-        branch = 'develop'
-      end
-
-      @repos.each { |repo| repo.countDiffBranches branch, repo.currentBranch}
-    end
 
     def branches
-      @repos.each { |repo| puts "#{repo.name}@#{repo.currentBranch}" }
+      @repos.each { |repo| puts "#{repo.name}@#{repo.current_branch}" }
     end
 
-    def systemState
+    def system_state
       branches = Hash.new 0
-      @repos.each {|repo| branches[repo.currentBranch] += 1}
+      @repos.each {|repo| branches[repo.current_branch] += 1}
 
       state = branches.max{|a,b| a[1] <=> b[1]}
       state[0] = state.first.strip
       state
     end
 
-    def checkConsistency
-      currentBranch = systemState
-      if currentBranch.last != @repos.length
-        branchName = currentBranch.first
-        inconsistentRepos = @repos.reject { |repo|
-          repo.currentBranch == branchName
-        }.map &:name
-
-        puts 'The system is in an inconsistent state. Please check the following repos :'.red, inconsistentRepos
-        return false
-      end
-      puts 'The system is consistent'.green
-      true
-
-    end
-
-    def checkDirtiness
-      dirtyRepos = @repos.reject { |repo|
+    def check_dirtiness
+      dirty_repos = @repos.reject { |repo|
         !repo.dirty?
       }.map &:name
 
-      if dirtyRepos.length == 0
+      if dirty_repos.length == 0
         puts 'The system is clean'.green
       else
-        puts 'The system is dirty. Please check the following repos :'.red , dirtyRepos
+        puts 'The system is dirty. Please check the following repos :'.red , dirty_repos
       end
-      dirtyRepos.length == 0 
+      dirty_repos.length == 0 
     end
 
-    def readConfig path
+    def read_config path
+      Errors::config_not_found! if not File.exist? path
+
       config = YAML.load File.open(path)
-      @originRemote = config['remotes']['main']
-      @ownRemote = config['remotes']['own']
-      @ignoredRepos = config['ignore'] || []
+      @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
+    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
+      }
     end
   end
 end

data/lib/metaverse/cli.rb

@@ -8,6 +8,12 @@ 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
@@ -15,34 +21,61 @@ module Metaverse
     end
 
     desc "snapshot [COMMAND] [SNAPSHOT_NAME]", "Creates or loads a snapshot of the system"
-    def snapshot command, name
+    def snapshot command, name, remote = nil
       init
       case command
-        when 'new' then @meta.createSnapshot name
-        when 'load' then @meta.loadSnapshot name
-        when 'deploy' then @meta.deploy "tags/#{name}"
+        when 'new' then @meta.create_state 'snapshot', name
+        when 'load' then @meta.load_state 'snapshot', name, remote
+        when 'send' then @meta.send_state 'snapshot', name, remote
       end
     end
 
     desc "feature [COMMAND] [FEATURE_NAME]", "Creates a new feature branch or loads a previous one"
-    def feature command, name
+    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 '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 '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.createFeature name
-        when 'load' then @meta.loadFeature name
-        when 'push' then @meta.pushFeature name
-        when 'deploy' then @meta.deploy "feature/#{name}"
+        when 'new' then @meta.create_state 'bugfix', name
+        when 'load' then @meta.load_state 'bugfix', name, remote, options[:branch]
+        when 'send' then @meta.send_state 'bugfix', name, remote
+        when 'close' then @meta.send_state 'bugfix', name, remote, true
       end
     end
 
     desc "status", "Displays the status of the system"
     def status
       init
-      puts "System is at #{@meta.systemState.first}"
+      puts "System is at #{@meta.system_state.first}"
       @meta.status
     end
 
-    desc "update [REMOTE_NAME]", "Pulls the latest code corresponding to the current branch. Remote is optional"
+    desc "update [REMOTE_NAME]", "Fetches the latest code corresponding to the current branch. Remote is optional"
     def update remote = nil
       init
       @meta.update remote
@@ -64,9 +97,28 @@ module Metaverse
     def check command
       init
       case command
-      when 'consistency' then @meta.checkConsistency
-      when 'dirtiness' then @meta.checkDirtiness
+      when 'dirtiness' then @meta.check_dirtiness
       end
     end
+
+    desc "pull", "Pulls the latest changes from the main origin"
+    def pull
+      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/errors.rb

@@ -0,0 +1,21 @@
+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

data/lib/metaverse/iterator.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby 
-
 require 'find'
 require 'logger'
 
@@ -39,5 +37,9 @@ module Metaverse
     def map &block
       @repos.send(:map, &block)
     end
+
+    def empty?
+      @repos.count == 0
+    end
   end
 end

data/lib/metaverse/repo.rb

@@ -1,18 +1,224 @@
-require 'metaverse/git'
+require 'rugged'
+require 'iniparse'
 
 module Metaverse
   class Repo
-    include Git
-  
+
+    # Initialize a git repository 
+    # path - An absolute path to the repo root folder
+
     def initialize path
       load path
+      @previous_branches = []
+    end
+
+
+    def load path
+      @repo = Rugged::Repository.new(path)
+      @repo.remotes.each_name do |remote|
+        fetch_refspec = "+refs/meta/local/*:refs/meta/remotes/#{remote}/*"
+        push_refspec = "+refs/meta/local/*:refs/meta/local/*"
+        add_option_to_remote remote, fetch_refspec, 'fetch'
+        add_option_to_remote remote, push_refspec, 'push'
+      end
+    end
+
+
+    def name
+      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
+    end
+
+
+    def current_branch
+      branch_name = ''
+
+      Dir.chdir(@repo.workdir) do
+        branch_name = `git branch | sed -n '/\* /s///p'`
+      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
+    end
+
+    def peek_previous_branch
+      @previous_branches.last
+    end
+
+    def pop_previous_branch
+      @previous_branches.pop
+    end
+
+    def head
+      @repo.head
+    end
+
+
+    def branches
+      @repo.branches
+    end
+
+
+    def create_ref ref_name, ref_target
+      @repo.references.create ref_name, ref_target.target_id
+    end
+
+
+    def update_ref ref_name, ref_target
+      @repo.references.update ref_name, ref_target.target_id
+    end
+
+
+    def create_state prefix, state
+      ref_target = @repo.head
+      if not prefix == 'snapshot'
+        branch_name = "#{prefix}/#{state}"
+        ref_target = @repo.create_branch branch_name
+      end
+      ref_name = "refs/meta/local/#{prefix}/#{state}"
+      create_ref ref_name, ref_target
     end
 
-    def deploy feature
-      Dir.chdir(@path) do
-        puts `FEATURE_DOMAIN=#{feature} gulp deploy:testing`
+
+    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
+    end
+
+
+    def send_state prefix, state, remote, is_branch, should_clean = false
+      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
+      end
+
+      if (not prefix == 'snapshot') and is_branch 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
+
+      changed = ahead_of_develop? branch
+      if not changed
+        checkout 'develop'
+        @repo.branches.delete branch
+      end
+      changed
+    end
+
+    def dirty?
+      is_dirty = false
+      @repo.status { |file, data|
+        next if data == [:ignored]
+        is_dirty = true
+      }
+      is_dirty
+    end
+
+
+    def update remote = nil
+      if @repo.remotes[remote].nil?
+        return Errors::remote_not_found remote
+      end
+      Dir.chdir(@repo.workdir) do
+        `git remote update #{remote}`
+      end
+    end
+
+
+    def add_option_to_remote remote, value, key
+      config_path = "#{@repo.path}config"
+      cfg = IniParse.parse(File.read(config_path))
+      if not [*cfg["remote \"#{remote}\""][key]].include? value
+        cfg["remote \"#{remote}\""][key] = [*cfg["remote \"#{remote}\""][key], value]
+        cfg.save config_path
+      end
+    end
+
+
+    def has_changes? ref1, ref2
+      not ref1.target_id == ref2.target_id
+    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
+    end
   end
 end

data/lib/metaverse/version.rb

@@ -1,3 +1,3 @@
 module Metaverse
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/metaverse.rb

@@ -1,3 +1,4 @@
+require 'bundler/setup'
 require "metaverse/version"
 require "metaverse/base"
 require "metaverse/cli"

data/metaverse.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   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 "transacted", "~> 0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metaverse
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Omar Kamali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
+- !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'
+- !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
@@ -101,7 +129,7 @@ files:
 - lib/metaverse.rb
 - lib/metaverse/base.rb
 - lib/metaverse/cli.rb
-- lib/metaverse/git.rb
+- lib/metaverse/errors.rb
 - lib/metaverse/iterator.rb
 - lib/metaverse/repo.rb
 - lib/metaverse/version.rb

data/lib/metaverse/git.rb

@@ -1,84 +0,0 @@
-#!/usr/bin/env ruby
-require 'find'
-
-module Metaverse
-  module Git
-    def load path
-      if !File.directory? path + '/.git'
-        raise "#{path} is not a git repo"
-      end
-      @path = path
-    end
-
-    def name
-      File.basename @path
-    end
-
-    def checkout branch
-      Dir.chdir(@path) do
-        puts `git checkout #{branch}`
-      end
-    end
-
-    def currentBranch
-      Dir.chdir(@path) do
-        branchName = `git rev-parse --abbrev-ref HEAD`;
-        branchName.strip
-      end
-    end
-
-    def branch branch
-      Dir.chdir(@path) do
-        puts `git branch #{branch}`
-      end
-    end
-
-    def status
-      Dir.chdir(@path) do
-        puts `git status`
-      end
-    end
-
-    def tag name
-      Dir.chdir(@path) do
-        puts `git tag #{name}`
-      end
-    end
-
-    def pull remote
-      Dir.chdir(@path) do
-        `git pull #{remote} #{currentBranch}:#{currentBranch}`
-      end
-    end
-
-    def push remote, branch
-      Dir.chdir(@path) do
-        puts `git push #{remote} #{branch}:#{branch}`
-      end
-    end
-
-    def fetch remote
-      Dir.chdir(@path) do
-        `git fetch #{remote}`
-      end
-    end
-
-    def reset branch
-      Dir.chdir(@path) do
-        puts `git reset --hard #{branch}`
-      end
-    end
-
-    def countDiffBranches branch1, branch2
-      Dir.chdir(@path) do
-        `git rev-list --count #{branch1}..#{branch2}`
-      end
-    end
-
-    def dirty?
-      Dir.chdir(@path) do
-        `git status --porcelain`.length != 0
-      end
-    end
-  end
-end