metaverse 0.2.rc2 → 0.2.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 708f891e0a48058bf390887594a82e99c05bd13e
-  data.tar.gz: 116dce5ac37a3fc4652faea5ed7978bbd89762cb
+  metadata.gz: 738f6848f36bf8aa72bae174a5c44d3cbefc3e62
+  data.tar.gz: 8198b9713f093a8e8c592fcb91fa659c8482c878
 SHA512:
-  metadata.gz: 403699eebdc051b8b59fe60bd93184f19bdc84f548b664e6daec0f273d799d13010628c051d80671062491994ed0aebafbea39bd8c440eaf4eacf2aa5860bc02
-  data.tar.gz: b96456e8d007bc460d197c64f8829c3f03f87b93490aab0b87e6cc137363a97857ffed6d49d15e67b9115d4afc32d5bdadd5808308c1cf35cbf3995808e47298
+  metadata.gz: f162d2957c6edc0e039b96066cfb16ebe5b2091f38f9ae04556a56e589a57c0484f00ca3e38d70f8300532269198c1ae86e656fb387932f933fbad8a67be159c
+  data.tar.gz: c776e871674eb758bb61ec23e33f1b89784cb16e3feebca32995900d9d855317adb3a21d40d51317fd6f5e8b7d6026c390b5d24af502dcedbaeecd6580a306a2

data/Gemfile

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

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,10 +1,10 @@
 #!/usr/bin/env ruby
 require 'colorize'
 require 'yaml'
+require 'transacted'
 require 'metaverse/repo'
 require 'metaverse/iterator'
 require 'metaverse/errors'
-require 'transacted'
 
 module Metaverse
   class Base
@@ -29,8 +29,14 @@ module Metaverse
     def checkout name
       action_options = -> (repo) {
         {
-          up: -> { repo.checkout name },
-          down: -> { repo.checkout repo.pop_previous_branch }
+          up: -> {
+            puts "\n # #{repo.name}".blue
+            repo.checkout name
+          },
+          down: -> {
+            puts "\n # Rolling back in #{repo.name}".blue
+            repo.checkout repo.pop_previous_branch
+          }
         }
       }
 

data/lib/metaverse/repo.rb

@@ -52,10 +52,18 @@ module Metaverse
 
       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"
-        return /[A-Za-z0-9._-]+(?:\/[A-Za-z0-9._-]+)+/.match(branch_name)[0]
+        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

data/lib/metaverse/version.rb

@@ -1,3 +1,3 @@
 module Metaverse
-  VERSION = "0.2.rc2"
+  VERSION = "0.2.rc3"
 end

data/metaverse.gemspec

@@ -29,4 +29,6 @@ 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.2.rc2
+  version: 0.2.rc3
 platform: ruby
 authors:
 - Omar Kamali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,34 @@ 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