git-scripts 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a1119c836117b011632b31726b5b6e8c5c29b35cd1116a5905e129daeb6a5c4
-  data.tar.gz: f41b0e6cc259fd44241fbd6c8d2eab83910c526c49a773ef0641d011baf0e276
+  metadata.gz: ca7a07fad736def34f5e2331b252ac72a796dee71947c4e5335037228c9d6707
+  data.tar.gz: 45d9dc64adf34ecabb851267ca347c7f4cd550859666f4acfc50f0f0e8527245
 SHA512:
-  metadata.gz: 816fb65294f67a13f1d9ffd82f72274e721311f8ff8330e4f64cd4d11922866ef9401f3e9446dd496ce84377673449adafe9fd94a0d275b9736f3f5d95a8f263
-  data.tar.gz: b958978ea60381ded89b618eebe3a3d05d9461f7d06afb3f621fb73d5fc31c2f948fad6328eb8f0878460479b5a42b0fc73119ab9ba03f7af2bb5a0407966da9
+  metadata.gz: dbae689c36738b248565eba9d7dbfeb045f543bda1367f6340eede24eff9a0bdaf1ff39826509e6c1fa684abb8726702b1eb7eae8b90666f8a55d6f20ddc0655
+  data.tar.gz: 1cf62bf2b3a69d7f540e11f5cd26a1d3bf58711cf5e2049536ae05f5031f3f7b2eb8d80eeb11289144aeaecabf6aff60758645accdf403195c4da7fac9df7815

data/lib/git.rb

@@ -91,7 +91,7 @@ module Git
    # Returns an array of all branch names that have have been merged into the
    # specified branch
    def self.merged_branches(into_branch='master')
-      `git branch --merged #{into_branch} -a`.
+      `git branch --merged #{into_branch.shellescape} -a`.
          split("\n").
          map {|branch| branch.gsub('*','').strip.sub('remotes/','')}
    end
@@ -107,8 +107,7 @@ module Git
 
    # Returns the name of the currently checked out branch, or nil if detached.
    def self.current_branch()
-      ref = `git symbolic-ref -q HEAD`.strip
-      ref.split('/').last
+      `git symbolic-ref -q --short HEAD`.strip
    end
 
    # Deletes the current branch. For cleaning up after errors.
@@ -123,12 +122,12 @@ module Git
 
       Git::switch_branch(devBranch)
 
-      `git branch -d #{branch}`.strip
+      `git branch -d #{branch.shellescape}`.strip
    end
 
    # Returns the SHA1 hash that the specified branch or symbol points to
    def self.branch_hash(branch)
-      `git rev-parse --verify --quiet "#{branch}" 2>/dev/null`.strip
+      `git rev-parse --verify --quiet #{branch.shellescape} 2>/dev/null`.strip
    end
 
    # Returns formatted string containing:
@@ -139,7 +138,7 @@ module Git
    def self.branch_info(branch)
       # branch info format: hash author (relative date)
       format = "%h %an %Cgreen(%ar)%Creset"
-      branch_info = `git show -s --pretty="#{format}" #{branch}`.strip
+      branch_info = `git show -s --pretty=#{format.shellescape} #{branch.shellescape}`.strip
       simple_branch = branch.sub('origin/', '')
       sprintf "%-30s %s", simple_branch, branch_info
    end
@@ -149,7 +148,7 @@ module Git
          safe_command = command.gsub(/[^[:print:]]+/,' ')
          puts "> " + safe_command
          unless system(command)
-            puts highlight("\nERROR: failed on #{safe_command}`.")
+            puts highlight("\nERROR: failed on #{safe_command}.")
             puts "\nWould have run:"
             commands.each do |command|
                puts "# " + command.gsub(/[^[:print:]]+/,' ')
@@ -244,7 +243,7 @@ module Git
    def self.submodules_update(mode = "")
       # capture only the path, not the newline
       basedir = `git rev-parse --show-toplevel`.split("\n").first
-      command = "cd #{basedir} && git submodule --quiet update --init --recursive"
+      command = "cd #{basedir.shellescape} && git submodule --quiet update --init --recursive"
 
       if mode == "get"
          return command
@@ -257,7 +256,7 @@ module Git
    # Returns the commit message from the given commit hash or branch name
    #
    def self.commit_message(ref)
-      `git log -1 --format="%B" #{ref}`.strip
+      `git log -1 --format="%B" #{ref.shellescape}`.strip
    end
 
    def self.git_dir()

data/lib/helpers.rb

@@ -104,10 +104,6 @@ def require_argument(program, command = nil, min = 2, max = 2)
    if (ARGV.length < min)
       help.call "Missing argument. This command requires exactly #{min} arguments."
    end
-
-   if (ARGV.last !~ /^[a-zA-z0-9-]+$/)
-      help.call "Invalid branch name: '#{ARGV.last}'"
-   end
 end
 
 ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-scripts
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Daniel Beardsley
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -35,14 +35,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.13'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.13'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement