RubyGems - git_wrapper - Versions diffs - 1.0.2 → 1.0.3 - Mend

git_wrapper 1.0.2 → 1.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (36) hide show

data/README.md +74 -74
data/git_wrapper.gemspec +21 -21
data/lib/git_wrapper/commands/add.rb +20 -20
data/lib/git_wrapper/commands/branch.rb +72 -72
data/lib/git_wrapper/commands/checkout.rb +20 -20
data/lib/git_wrapper/commands/commit.rb +20 -20
data/lib/git_wrapper/commands/config.rb +25 -25
data/lib/git_wrapper/commands/diff.rb +27 -27
data/lib/git_wrapper/commands/fetch.rb +20 -20
data/lib/git_wrapper/commands/git.rb +43 -43
data/lib/git_wrapper/commands/init.rb +15 -15
data/lib/git_wrapper/commands/log.rb +81 -81
data/lib/git_wrapper/commands/merge.rb +15 -15
data/lib/git_wrapper/commands/pull.rb +20 -20
data/lib/git_wrapper/commands/push.rb +26 -26
data/lib/git_wrapper/commands/remote.rb +48 -48
data/lib/git_wrapper/commands/remove.rb +15 -15
data/lib/git_wrapper/commands/reset.rb +35 -35
data/lib/git_wrapper/commands/revert.rb +22 -22
data/lib/git_wrapper/commands/shell.rb +66 -66
data/lib/git_wrapper/commands/show.rb +39 -39
data/lib/git_wrapper/commands/status.rb +16 -16
data/lib/git_wrapper/commands/tag.rb +53 -53
data/lib/git_wrapper/repository.rb +208 -208
data/lib/git_wrapper/results/diff_name_status.rb +27 -27
data/lib/git_wrapper/results/file_status.rb +21 -21
data/lib/git_wrapper/results/log_info.rb +22 -22
data/lib/git_wrapper/results/status_porcelain.rb +39 -39
data/lib/git_wrapper/version.rb +3 -3
data/lib/git_wrapper.rb +46 -44
data/spec/repository_spec.rb +888 -888
data/spec/spec_helper.rb +9 -9
data/spec/status_porcelain_parser_spec.rb +86 -86
data/spec/support/helpers/file_helper.rb +40 -36
data/spec/support/matchers/git_status_matchers.rb +39 -39
metadata +17 -7

data/lib/git_wrapper/commands/shell.rb CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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