git_wrapper 1.0.2 → 1.0.3

data/lib/git_wrapper/commands/git.rb

@@ -1,44 +1,44 @@
-module GitWrapper
-  module Commands
-    class Git
-      attr_reader :location_folder
-      attr_reader :output
-      attr_reader :error
-
-      def initialize(location_folder)
-        @location_folder = location_folder
-      end
-
-      def execute
-        begin
-          @output, @error, status = Shell.execute("git #{command}", :chdir => @location_folder)
-          @success = status.success?
-
-          log = {
-            :command => command,
-            :location_folder => @location_folder,
-            :output => @output,
-            :error => @error
-          }
-          GitWrapper.logger.debug "[GitWrapper] #{log}"
-
-          return result
-        rescue Exception => e
-          GitWrapper.logger.error "[GitWrapper] #{e.message}"
-          @error = e.message
-          return false
-        end
-      end
-
-      def result
-        @success
-      end
-
-      def to_relative_path(file_name)
-        base_folder = location_folder.gsub("\\", "/")
-        file_name.gsub("\\", "/").gsub(base_folder + "/", "")
-      end
-
-    end
-  end
+module GitWrapper
+  module Commands
+    class Git
+      attr_reader :location_folder
+      attr_reader :output
+      attr_reader :error
+
+      def initialize(location_folder)
+        @location_folder = location_folder
+      end
+
+      def execute
+        begin
+          @output, @error, status = Shell.execute("git #{command}", :chdir => @location_folder)
+          @success = status.success?
+
+          log = {
+            :command => command,
+            :location_folder => @location_folder,
+            :output => @output,
+            :error => @error
+          }
+          GitWrapper.logger.debug "[GitWrapper] #{log}"
+
+          return result
+        rescue Exception => e
+          GitWrapper.logger.error "[GitWrapper] #{e.message}"
+          @error = e.message
+          return false
+        end
+      end
+
+      def result
+        @success
+      end
+
+      def to_relative_path(file_name)
+        base_folder = location_folder.gsub("\\", "/")
+        file_name.gsub("\\", "/").gsub(base_folder + "/", "")
+      end
+
+    end
+  end
 end

data/lib/git_wrapper/commands/init.rb

@@ -1,16 +1,16 @@
-module GitWrapper
-  module Commands
-    class Init < Git
-
-      def bare
-        @bare = true
-        self
-      end
-
-      def command
-        "init#{@bare ? ' --bare' : ''}"
-      end
-
-    end
-  end
+module GitWrapper
+  module Commands
+    class Init < Git
+
+      def bare
+        @bare = true
+        self
+      end
+
+      def command
+        "init#{@bare ? ' --bare' : ''}"
+      end
+
+    end
+  end
 end

data/lib/git_wrapper/commands/log.rb

@@ -1,82 +1,82 @@
-module GitWrapper
-  module Commands
-    class Log < Git
-      ATTRIBUTES = {
-          :commit_hash => 'H',
-          :abbreviated_commit_hash => 'h',
-          :tree_hash => 'T',
-          :abbreviated_tree_hash => 't',
-          :parent_hashes => 'P',
-          :abbreviated_parent_hashes => 'p',
-          :author_name => 'an',
-          :author_name_mailmap => 'aN',
-          :author_email => 'ae',
-          :author_email_mailmap => 'aE',
-          :author_date => 'ad',
-          :author_date_rfc2822 => 'aD',
-          :author_date_relative => 'aR',
-          :author_date_unix => 'at',
-          :author_date_iso => 'ai',
-          :commiter_name => 'cn',
-          :commiter_name_mailmap => 'cN',
-          :commiter_email => 'ce',
-          :commiter_email_mailmap => 'cE',
-          :commiter_date => 'cd',
-          :commiter_date_rfc2822 => 'cD',
-          :commiter_date_relative => 'cR',
-          :commiter_date_unix => 'ct',
-          :commiter_date_iso => 'ci',
-          :ref_names => 'd',
-          :encoding => 'e',
-          :subject => 's',
-          :sanitized_subject_line => 'f',
-          :body => 'b',
-          :raw_body => 'B',
-          :commit_notes => 'N',
-          :reflog_selector => 'gD',
-          :shortened_reflog_selector => 'gd',
-          :reflog_subject => 'gs'
-      }
-
-      def file(file_name)
-        @file = to_relative_path(file_name)
-        self
-      end
-
-      def commit(commit)
-        @commit = commit
-        self
-      end
-
-      def command
-        command = "log --format=\"<log>#{xml_structure}</log>\""
-        command += " #{@commit}" if @commit
-        command += " \"#{@file}\"" if @file
-        command
-      end
-
-      def result
-        if output.nil?
-          return nil if @commit
-          return []
-        end
-
-        results = Nokogiri::XML("<logs>#{output}</logs>").xpath('logs/log').map do |element|
-          Results::LogInfo.new(Hash[*element.children.map { |node| [node.name.to_sym, node.text] }.flatten])
-        end
-
-        return results.first if @commit
-        results
-      end
-
-      private
-
-      def xml_structure
-        ATTRIBUTES.map { |attribute, placeholder|
-          "<#{attribute}>%#{placeholder}</#{attribute}>"
-        }.join
-      end
-
-    end
-  end
+module GitWrapper
+  module Commands
+    class Log < Git
+      ATTRIBUTES = {
+          :commit_hash => 'H',
+          :abbreviated_commit_hash => 'h',
+          :tree_hash => 'T',
+          :abbreviated_tree_hash => 't',
+          :parent_hashes => 'P',
+          :abbreviated_parent_hashes => 'p',
+          :author_name => 'an',
+          :author_name_mailmap => 'aN',
+          :author_email => 'ae',
+          :author_email_mailmap => 'aE',
+          :author_date => 'ad',
+          :author_date_rfc2822 => 'aD',
+          :author_date_relative => 'aR',
+          :author_date_unix => 'at',
+          :author_date_iso => 'ai',
+          :commiter_name => 'cn',
+          :commiter_name_mailmap => 'cN',
+          :commiter_email => 'ce',
+          :commiter_email_mailmap => 'cE',
+          :commiter_date => 'cd',
+          :commiter_date_rfc2822 => 'cD',
+          :commiter_date_relative => 'cR',
+          :commiter_date_unix => 'ct',
+          :commiter_date_iso => 'ci',
+          :ref_names => 'd',
+          :encoding => 'e',
+          :subject => 's',
+          :sanitized_subject_line => 'f',
+          :body => 'b',
+          :raw_body => 'B',
+          :commit_notes => 'N',
+          :reflog_selector => 'gD',
+          :shortened_reflog_selector => 'gd',
+          :reflog_subject => 'gs'
+      }
+
+      def file(file_name)
+        @file = to_relative_path(file_name)
+        self
+      end
+
+      def commit(commit)
+        @commit = commit
+        self
+      end
+
+      def command
+        command = "log --format=\"<log>#{xml_structure}</log>\""
+        command += " #{@commit}" if @commit
+        command += " \"#{@file}\"" if @file
+        command
+      end
+
+      def result
+        if output.nil?
+          return nil if @commit
+          return []
+        end
+
+        results = Nokogiri::XML("<logs>#{output}</logs>").xpath('logs/log').map do |element|
+          Results::LogInfo.new(Hash[*element.children.map { |node| [node.name.to_sym, node.text] }.flatten])
+        end
+
+        return results.first if @commit
+        results
+      end
+
+      private
+
+      def xml_structure
+        ATTRIBUTES.map { |attribute, placeholder|
+          "<#{attribute}>%#{placeholder}</#{attribute}>"
+        }.join
+      end
+
+    end
+  end
 end

data/lib/git_wrapper/commands/merge.rb

@@ -1,16 +1,16 @@
-module GitWrapper
-  module Commands
-    class Merge < Git
-
-      def commit(commit)
-        @commit = commit
-        self
-      end
-
-      def command
-        "merge #{@commit}"
-      end
-
-    end
-  end
+module GitWrapper
+  module Commands
+    class Merge < Git
+
+      def commit(commit)
+        @commit = commit
+        self
+      end
+
+      def command
+        "merge #{@commit}"
+      end
+
+    end
+  end
 end

data/lib/git_wrapper/commands/pull.rb

@@ -1,21 +1,21 @@
-module GitWrapper
-  module Commands
-    class Pull < Git
-
-      def remote(remote)
-        @remote = remote
-        self
-      end
-
-      def branch(branch)
-        @branch = branch
-        self
-      end
-
-      def command
-        "pull #{@remote} #{@branch}"
-      end
-
-    end
-  end
+module GitWrapper
+  module Commands
+    class Pull < Git
+
+      def remote(remote)
+        @remote = remote
+        self
+      end
+
+      def branch(branch)
+        @branch = branch
+        self
+      end
+
+      def command
+        "pull #{@remote} #{@branch}"
+      end
+
+    end
+  end
 end

data/lib/git_wrapper/commands/push.rb

@@ -1,27 +1,27 @@
-module GitWrapper
-  module Commands
-    class Push < Git
-
-      def remote(remote)
-        @remote = remote
-        self
-      end
-
-      def branch(branch)
-        @branch = branch
-        @mode = :branch
-        self
-      end
-
-      def tags
-        @mode = :tags
-        self
-      end
-
-      def command
-        "push #{@remote} #{@mode == :branch ? @branch : '--tags'}"
-      end
-
-    end
-  end
+module GitWrapper
+  module Commands
+    class Push < Git
+
+      def remote(remote)
+        @remote = remote
+        self
+      end
+
+      def branch(branch)
+        @branch = branch
+        @mode = :branch
+        self
+      end
+
+      def tags
+        @mode = :tags
+        self
+      end
+
+      def command
+        "push #{@remote} #{@mode == :branch ? @branch : '--tags'}"
+      end
+
+    end
+  end
 end

data/lib/git_wrapper/commands/remote.rb

@@ -1,49 +1,49 @@
-module GitWrapper
-  module Commands
-    class Remote < Git
-
-      def name(name)
-        @name = name
-        self
-      end
-
-      def add(url)
-        @url = url
-        @mode = :add
-        self
-      end
-
-      def remove
-        @mode = :remove
-        self
-      end
-
-      def list
-        @mode = :list
-        self
-      end
-
-      def command
-        command = "remote "
-
-        if @mode == :add
-          command += "add #{@name} \"#{@url}\""
-        elsif @mode == :remove
-          command += "rm #{@name}"
-        elsif @mode == :list
-          command += "show"
-        else
-          raise "Unespecified remote mode"
-        end
-
-        command
-      end
-
-      def result
-        return @output.split(/\n/) if @mode == :list
-        super
-      end
-
-    end
-  end
+module GitWrapper
+  module Commands
+    class Remote < Git
+
+      def name(name)
+        @name = name
+        self
+      end
+
+      def add(url)
+        @url = url
+        @mode = :add
+        self
+      end
+
+      def remove
+        @mode = :remove
+        self
+      end
+
+      def list
+        @mode = :list
+        self
+      end
+
+      def command
+        command = "remote "
+
+        if @mode == :add
+          command += "add #{@name} \"#{@url}\""
+        elsif @mode == :remove
+          command += "rm #{@name}"
+        elsif @mode == :list
+          command += "show"
+        else
+          raise "Unespecified remote mode"
+        end
+
+        command
+      end
+
+      def result
+        return @output.split(/\n/) if @mode == :list
+        super
+      end
+
+    end
+  end
 end

data/lib/git_wrapper/commands/remove.rb

@@ -1,16 +1,16 @@
-module GitWrapper
-  module Commands
-    class Remove < Git
-
-      def file(file_name)
-        @file = to_relative_path(file_name)
-        self
-      end
-
-      def command
-        "rm \"#{@file}\""
-      end
-
-    end
-  end
+module GitWrapper
+  module Commands
+    class Remove < Git
+
+      def file(file_name)
+        @file = to_relative_path(file_name)
+        self
+      end
+
+      def command
+        "rm \"#{@file}\""
+      end
+
+    end
+  end
 end

data/lib/git_wrapper/commands/reset.rb

@@ -1,36 +1,36 @@
-module GitWrapper
-  module Commands
-    class Reset < Git
-
-      def commit(commit)
-        @commit = commit
-        self
-      end
-
-      def soft
-        @mode = :soft
-        self
-      end
-
-      def hard
-        @mode = :hard
-        self
-      end
-
-      def merge
-        @mode = :merge
-        self
-      end
-
-      def keep
-        @mode = :keep
-        self
-      end
-
-      def command
-        "reset #{@mode ? "--#{@mode}" : ''} #{@commit}"
-      end
-
-    end
-  end
+module GitWrapper
+  module Commands
+    class Reset < Git
+
+      def commit(commit)
+        @commit = commit
+        self
+      end
+
+      def soft
+        @mode = :soft
+        self
+      end
+
+      def hard
+        @mode = :hard
+        self
+      end
+
+      def merge
+        @mode = :merge
+        self
+      end
+
+      def keep
+        @mode = :keep
+        self
+      end
+
+      def command
+        "reset #{@mode ? "--#{@mode}" : ''} #{@commit}"
+      end
+
+    end
+  end
 end

data/lib/git_wrapper/commands/revert.rb

@@ -1,23 +1,23 @@
-module GitWrapper
-  module Commands
-    class Revert < Git
-
-      def commit(commit)
-        @commit = commit
-        @merge = false
-        self
-      end
-
-      def merge(commit)
-        @commit = commit
-        @merge = true
-        self
-      end
-
-      def command
-        "revert#{@merge ? ' -m 1' : ''} --no-edit #{@commit}"
-      end
-
-    end
-  end
+module GitWrapper
+  module Commands
+    class Revert < Git
+
+      def commit(commit)
+        @commit = commit
+        @merge = false
+        self
+      end
+
+      def merge(commit)
+        @commit = commit
+        @merge = true
+        self
+      end
+
+      def command
+        "revert#{@merge ? ' -m 1' : ''} --no-edit #{@commit}"
+      end
+
+    end
+  end
 end