evilchelu-braid 0.3.7 → 0.3.8

data/braid.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{braid}
-  s.version = "0.3.7"
+  s.version = "0.3.8"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 

data/lib/braid.rb

@@ -13,6 +13,7 @@ module Braid
   MIRROR_TYPES = %w[git svn]
   WORK_BRANCH = "braid/track"
   CONFIG_FILE = ".braids"
+  REQUIRED_GIT_VERSION = "1.5.4.5"
 end
 
 require 'braid/version'

data/lib/braid/command.rb

@@ -3,15 +3,31 @@ module Braid
     include Operations::Mirror
     include Operations::Helpers
 
-    def self.run(command, *args)
-      klass = Braid::Commands.const_get(command.to_s.capitalize)
-      klass.new.run(*args)
-    rescue => e
-      # FIXME
-    end
+    class << self
+      include Operations::Helpers
+      include Operations::Git
+
+      def run(command, *args)
+        raise Braid::Git::VersionTooLow unless verify_git_version(REQUIRED_GIT_VERSION)
+
+        klass = Braid::Commands.const_get(command.to_s.capitalize)
+        klass.new.run(*args)
+
+      rescue Braid::Git::LocalChangesPresent => e
+        msg "Local changes are present. You have to commit or stash them before running braid commands."
+        msg "Exiting."
+
+      rescue Braid::Git::VersionTooLow => e
+        msg "This version of braid requires at least git #{REQUIRED_GIT_VERSION}. You have #{extract_git_version}."
+        msg "Exiting."
 
-    def self.msg(str)
-      puts str
+      rescue => e
+        # FIXME
+      end
+
+      def msg(str)
+        puts str
+      end
     end
 
     def config

data/lib/braid/commands/add.rb

@@ -2,6 +2,8 @@ module Braid
   module Commands
     class Add < Command
       def run(remote, options = {})
+        raise Braid::Git::LocalChangesPresent if invoke(:local_changes?)
+
         in_work_branch do
           mirror, params = config.add_from_options(remote, options)
           local_branch = get_local_branch_name(mirror, params)

data/lib/braid/commands/remove.rb

@@ -2,6 +2,8 @@ module Braid
   module Commands
     class Remove < Command
       def run(mirror)
+        raise Braid::Git::LocalChangesPresent if invoke(:local_changes?)
+
         in_work_branch do
           params = config.get(mirror)
           unless params

data/lib/braid/commands/setup.rb

@@ -2,9 +2,7 @@ module Braid
   module Commands
     class Setup < Command
       def run(mirror)
-        in_work_branch do
-          mirror ? setup_one(mirror) : setup_all
-        end
+        mirror ? setup_one(mirror) : setup_all
       end
 
       protected

data/lib/braid/commands/update.rb

@@ -2,6 +2,8 @@ module Braid
   module Commands
     class Update < Command
       def run(mirror, options = {})
+        raise Braid::Git::LocalChangesPresent if invoke(:local_changes?)
+
         in_work_branch do
           mirror ? update_one(mirror, options) : update_all
         end

data/lib/braid/exceptions.rb

@@ -23,6 +23,8 @@ module Braid
 
   class Git
     class UnknownRevision < Braid::Exception; end
+    class VersionTooLow < Braid::Exception; end
+    class LocalChangesPresent < Braid::Exception; end
   end
 
   class Svn

data/lib/braid/operations.rb

@@ -73,6 +73,11 @@ module Braid
         exec!("git rm -r #{path}")
         true
       end
+
+      def local_changes?
+        status, out, err = exec("git status")
+        out.split("\n").grep(/nothing to commit \(working directory clean\)/).empty?
+      end
     end
 
     module Svn
@@ -111,6 +116,32 @@ module Braid
         end
       end
 
+      def extract_git_version
+        status, out, err = exec!("git --version")
+        return out.sub(/^git version/, "").strip
+      end
+
+      def verify_git_version(required)
+        required_version = required.split(".")
+        actual_version   = extract_git_version.split(".")
+        actual_version.each_with_index do |actual_piece, idx|
+          required_piece = required_version[idx]
+
+          return true unless required_piece
+
+          case (actual_piece <=> required_piece)
+            when -1
+              return false
+            when 1
+              return true
+            when 0
+              next
+          end
+        end
+
+        return actual_version.length >= required_version.length
+      end
+
       def find_git_revision(commit)
         invoke(:git_rev_parse, commit)
       rescue Braid::Commands::ShellExecutionError

data/lib/braid/version.rb

@@ -2,7 +2,7 @@ module Braid #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 7
+    TINY  = 8
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/operations_spec.rb

@@ -19,3 +19,30 @@ describe "Braid::Operations::Mirror#find_remote" do
     find_remote("N/A").should == false
   end
 end
+
+describe Braid::Operations::Helpers, "extract_git_version" do
+  it "should extract from git --version output" do
+    self.stub!(:exec!).and_return([0, "git version 1.5.5.1.98.gf0ec4\n", ""])
+    extract_git_version.should == "1.5.5.1.98.gf0ec4"
+  end
+end
+
+describe Braid::Operations::Helpers, "verify_git_version against 1.5.4.5" do
+  required_version = "1.5.4.5"
+  should_pass      = %w(1.5.4.6 1.5.5 1.6 1.5.4.5.2 1.5.5.1.98.gf0ec4)
+  should_not_pass  = %w(1.5.4.4 1.5.4 1.5.3 1.4.5.6)
+
+  should_pass.each do |actual_version|
+    it "should be true for #{actual_version}" do
+      self.stub!(:extract_git_version).and_return(actual_version)
+      verify_git_version("1.5.4.5").should == true
+    end
+  end
+
+  should_not_pass.each do |actual_version|
+    it "should be false for #{actual_version}" do
+      self.stub!(:extract_git_version).and_return(actual_version)
+      verify_git_version("1.5.4.5").should == false
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: evilchelu-braid
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Cristi Balan