git_wrapper 1.0.2 → 1.0.3

data/lib/git_wrapper/commands/shell.rb

@@ -1,67 +1,67 @@
-module GitWrapper
-  module Commands
-
-    module Shell
-
-      def self.execute(command, options={})
-        if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-          jruby_execute(command, options)
-        else
-          ruby_execute(command, options)
-        end
-      end
-
-      def self.ruby_execute(command, options={})
-        location_folder = options[:chdir] || '.'
-        result = nil
-
-        Open3.popen3(command, :chdir => location_folder) do |stdin, stdout, stderr, wait_thr|
-          output = stdout.readlines.join
-          error = stderr.readlines.join
-          status = wait_thr.value
-
-          if block_given?
-            result = status
-            yield(output, error, wait_thr.pid)
-          else
-            result = [output, error, status]
-          end
-        end
-
-        return result
-      end
-
-      def self.jruby_execute(command, options={})
-        location_folder = options[:chdir] || '.'
-
-        prev_stdout = $stdout
-        prev_stderr = $stderr
-
-        $stdout = StringIO.new
-        $stderr = StringIO.new
-
-        begin
-          Dir.chdir location_folder do
-            system(command)
-          end
-          status = $?
-          $stdout.rewind
-          $stderr.rewind
-          if block_given?
-            yield($stdout.readlines.join.force_encoding('UTF-8'), $stderr.readlines.join.force_encoding('UTF-8'), status.pid)
-            result = status
-          else
-            result = $stdout.readlines.join.force_encoding('UTF-8'), $stderr.readlines.join.force_encoding('UTF-8'), status
-          end
-        ensure
-          $stdout = prev_stdout
-          $stderr = prev_stderr
-        end
-
-        return result
-      end
-
-    end
-
-  end
+module GitWrapper
+  module Commands
+
+    module Shell
+
+      def self.execute(command, options={})
+        if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+          jruby_execute(command, options)
+        else
+          ruby_execute(command, options)
+        end
+      end
+
+      def self.ruby_execute(command, options={})
+        location_folder = options[:chdir] || '.'
+        result = nil
+
+        Open3.popen3(command, :chdir => location_folder) do |stdin, stdout, stderr, wait_thr|
+          output = stdout.readlines.join
+          error = stderr.readlines.join
+          status = wait_thr.value
+
+          if block_given?
+            result = status
+            yield(output, error, wait_thr.pid)
+          else
+            result = [output, error, status]
+          end
+        end
+
+        return result
+      end
+
+      def self.jruby_execute(command, options={})
+        location_folder = options[:chdir] || '.'
+
+        prev_stdout = $stdout
+        prev_stderr = $stderr
+
+        $stdout = StringIO.new
+        $stderr = StringIO.new
+
+        begin
+          Dir.chdir location_folder do
+            system(command)
+          end
+          status = $?
+          $stdout.rewind
+          $stderr.rewind
+          if block_given?
+            yield($stdout.readlines.join.force_encoding('UTF-8'), $stderr.readlines.join.force_encoding('UTF-8'), status.pid)
+            result = status
+          else
+            result = $stdout.readlines.join.force_encoding('UTF-8'), $stderr.readlines.join.force_encoding('UTF-8'), status
+          end
+        ensure
+          $stdout = prev_stdout
+          $stderr = prev_stderr
+        end
+
+        return result
+      end
+
+    end
+
+  end
 end

data/lib/git_wrapper/commands/show.rb

@@ -1,40 +1,40 @@
-module GitWrapper
-  module Commands
-    class Show < Git
-
-      def file(file_name)
-        @file = to_relative_path(file_name)
-        self
-      end
-
-      def commit(commit)
-        @version = "#{commit}:"
-        self
-      end
-
-      def base
-        @version = ':1:'
-        self
-      end
-
-      def mine
-        @version = ':2:'
-        self
-      end
-
-      def theirs
-        @version = ':3:'
-        self
-      end
-
-      def command
-        "show #{@version ? @version : 'HEAD:'}\"#{@file}\""
-      end
-
-      def result
-        output
-      end
-
-    end
-  end
+module GitWrapper
+  module Commands
+    class Show < Git
+
+      def file(file_name)
+        @file = to_relative_path(file_name)
+        self
+      end
+
+      def commit(commit)
+        @version = "#{commit}:"
+        self
+      end
+
+      def base
+        @version = ':1:'
+        self
+      end
+
+      def mine
+        @version = ':2:'
+        self
+      end
+
+      def theirs
+        @version = ':3:'
+        self
+      end
+
+      def command
+        "show #{@version ? @version : 'HEAD:'}\"#{@file}\""
+      end
+
+      def result
+        output
+      end
+
+    end
+  end
 end

data/lib/git_wrapper/commands/status.rb

@@ -1,17 +1,17 @@
-module GitWrapper
-  module Commands
-    class Status < Git
-
-      def command
-        'status --porcelain'
-      end
-
-      def result
-        output.split(/\n/).map do |line|
-          Results::StatusPorcelain.parse(line)
-        end
-      end
-
-    end
-  end
+module GitWrapper
+  module Commands
+    class Status < Git
+
+      def command
+        'status --porcelain'
+      end
+
+      def result
+        output.split(/\n/).map do |line|
+          Results::StatusPorcelain.parse(line)
+        end
+      end
+
+    end
+  end
 end

data/lib/git_wrapper/commands/tag.rb

@@ -1,54 +1,54 @@
-module GitWrapper
-  module Commands
-    class Tag < Git
-
-      def create(name)
-        @mode = :create
-        @name = name
-        self
-      end
-
-      def from(commit)
-        @commit = commit
-        self
-      end
-
-      def remove(name)
-        @mode = :remove
-        @name = name
-        self
-      end
-
-      def list
-        @mode = :list
-        self
-      end
-
-      def command
-        command = 'tag '
-
-        if @mode == :create
-          command += "#{@name} #{@commit.nil? ? '' : @commit}"
-        elsif @mode == :remove
-          command += "-d #{@name}"
-        elsif @mode == :list
-          #Nothing to add
-        else
-          raise 'Unespecified tag mode'
-        end
-
-        command
-      end
-
-      def result
-        return result_list if @mode == :list
-        super
-      end
-
-      def result_list
-        output.split("\n")
-      end
-
-    end
-  end
+module GitWrapper
+  module Commands
+    class Tag < Git
+
+      def create(name)
+        @mode = :create
+        @name = name
+        self
+      end
+
+      def from(commit)
+        @commit = commit
+        self
+      end
+
+      def remove(name)
+        @mode = :remove
+        @name = name
+        self
+      end
+
+      def list
+        @mode = :list
+        self
+      end
+
+      def command
+        command = 'tag '
+
+        if @mode == :create
+          command += "#{@name} #{@commit.nil? ? '' : @commit}"
+        elsif @mode == :remove
+          command += "-d #{@name}"
+        elsif @mode == :list
+          #Nothing to add
+        else
+          raise 'Unespecified tag mode'
+        end
+
+        command
+      end
+
+      def result
+        return result_list if @mode == :list
+        super
+      end
+
+      def result_list
+        output.split("\n")
+      end
+
+    end
+  end
 end