roger 0.12.3 → 0.12.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDNkNDAwZjFmOTYxZWVmYjE5MDYwYmFmZWQ5OTU2YmU4Zjc1NzczZg==
+    YjNlMzQ3MzBkN2E0NmY4NjhkYTEwMDllMTVjMDFlYWU3OThmZGM1YQ==
   data.tar.gz: !binary |-
-    MjExZDc0NjVhMGYwNzYzNTM2ZTFhMjFlZGZmMTY5MjE3MWUxZDQ3ZQ==
+    ZmUzNTYzMzE3YjIxMzUxY2YwMjBiMDE2NWQyMjYyYjM3YjlmMjQ4Nw==
 SHA512:
   metadata.gz: !binary |-
-    N2UxNjZmMDJjOGVlMmQxOGQ3ODhiYzVhNjMzOGI2ZjYyOGM0YThhMDE1YjUz
-    OWEwYWMwYjBhNDk4MGU0MTEzMGRlMDYxNDVlNjJjY2UwYjkxNmRkMmQ2ZjA5
-    NDZjNmRhNmNhNWZhNDhkMjBhYjg1NzkwNjBhZjg5YTI1ZTkyYjQ=
+    YThjMmRmZGZjOGM2MmUwNjhiMGIwMTRlOWVlNjc4Y2QxYjhmM2YyNjg0NmFj
+    MGEwNTQwM2Q1NTE5Yzg0ZjY4YmE1OWZmYmZjMDI1OTc2ZWNiOGE5N2Y0NTY5
+    NDRlY2QzMWFmYTQ2MjMxOTE5NmI2Mzk0YzE3MDVkYTAwMjA1YWQ=
   data.tar.gz: !binary |-
-    YjMzZDJjZDM0YWRhZDcwNGIyNmM5ZDUzOTc0OWE3ZmM1ZWUzMWRjMTYxNDA5
-    OTYxYTgwMzJlNmQ2MjY4MDcxOWZmNDgxZDYyMTk2NzM0ZmE4MTc0NDJlODhl
-    MTAxZGQ5NGZmOWU1NDNjMmVmNTEzN2M5NjBjZjUzMWYzZTUwZjY=
+    OTA0MTNkYmZlNGZiYzI0ZmFlOTlkYjliMjVjZGFhZTkwOWQzYmJmODU1MDI2
+    YTc4NzljY2JmNDE0ZmZiNDlhZDI5NzBiODUyNzQ4OGRjNmE0ZjdlNWQzNTg5
+    YjM5OWY4NzUwZTgyODBjNWEyOTE3MjI1YWE0OTkyNDkyODQ0ZDA=

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 0.12.4
+* Change upload prompt to conform to the [y/N] convention
+* Fix git SCM to properly shell escape arguments so it works with special chars in paths
+
 ## Version 0.12.3
 * Allow release cleaner to work with arrays of globs/paths
 

data/lib/roger/release/finalizers/rsync.rb

@@ -31,7 +31,7 @@ module Roger::Release::Finalizers
       # Validate options
       validate_options!(release, options)
       
-      if !options[:ask] || (prompt("Do you wish to upload to #{options[:host]}? Type y[es]: ")) =~ /\Ay(es)?\Z/
+      if !options[:ask] || (prompt("Do you wish to upload to #{options[:host]}? [y/N]: ")) =~ /\Ay(es)?\Z/
         begin
           `#{@options[:rsync]} --version`
         rescue Errno::ENOENT

data/lib/roger/release/scm/git.rb

@@ -34,11 +34,11 @@ module Roger::Release::Scm
     def get_previous_tag_name
       # Get list of SHA1 that have a ref
       begin
-        sha1s = `git --git-dir=#{git_dir} log --pretty='%H' --simplify-by-decoration`.split("\n")
+        sha1s = `git --git-dir=#{safe_git_dir} log --pretty='%H' --simplify-by-decoration`.split("\n")
         tags = []
         while tags.size < 2 && sha1s.any?
           sha1 = sha1s.shift
-          tag = `git --git-dir=#{git_dir} describe --tags --exact-match #{sha1} 2>/dev/null`.strip
+          tag = `git --git-dir=#{safe_git_dir} describe --tags --exact-match #{sha1} 2>/dev/null`.strip
           tags << tag if !tag.empty?
         end
         tags.last
@@ -51,17 +51,22 @@ module Roger::Release::Scm
       @git_dir ||= find_git_dir(@config[:path])
     end
 
+    # Safely escaped git dir
+    def safe_git_dir
+      Shellwords.escape(self.git_dir.to_s)
+    end
+
     # Some hackery to determine if we're on a tagged version or not
     def get_scm_data(ref = @config[:ref])
       @_version = ""
       @_date = Time.now
       begin
         if File.exist?(git_dir)
-          @_version = `git --git-dir=#{git_dir} describe --tags #{ref} 2>&1`
+          @_version = `git --git-dir=#{safe_git_dir} describe --tags #{ref} 2>&1`
           
           if $?.to_i > 0
             # HEAD is not a tagged verison, get the short SHA1 instead            
-            @_version = `git --git-dir=#{git_dir} show #{ref} --format=format:"%h" -s 2>&1` 
+            @_version = `git --git-dir=#{safe_git_dir} show #{ref} --format=format:"%h" -s 2>&1` 
           else
             # HEAD is a tagged version, if version is prefixed with "v" it will be stripped off
             @_version.gsub!(/^v/,"")
@@ -69,7 +74,7 @@ module Roger::Release::Scm
           @_version.strip!
     
           # Get the date in epoch time
-          date = `git --git-dir=#{git_dir} show #{ref} --format=format:"%ct" -s 2>&1`
+          date = `git --git-dir=#{safe_git_dir} show #{ref} --format=format:"%ct" -s 2>&1`
           if date =~ /\d+/
             @_date = Time.at(date.to_i)
           else

data/roger.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "roger"
-  s.version = "0.12.3"
+  s.version = "0.12.4"
   
   s.authors = ["Flurin Egger", "Edwin van der Graaf", "Joran Kapteijns"]
   s.email = ["info@digitpaint.nl", "flurin@digitpaint.nl"]  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor