lib/my_scripts/scripts/gitto.rb in my_scripts-0.1.0 vs lib/my_scripts/scripts/gitto.rb in my_scripts-0.1.3

@@ -6,19 +6,34 @@
   class Gitto < Script
     def run
       usage "[0.1.2 - version, 100/10/1 - bump major/minor/patch, .patch - add patch] Commit message goes here" if @argv.empty?
 
       # First Arg may indicate version command if it matches pattern
-      ver = @argv[0] =~ /^(\d+\.\d+\.\d+(?:\.(.*?))?|\.(.*?)|\d{1}0{0,2})$/ ? @argv.shift : nil
+      version_command = @argv[0] =~ /^(\d+\.\d+\.\d+(?:\.(.*?))?|\.(.*?)|\d{1}0{0,2})$/ ? @argv.shift : nil
 
       # All the other args lumped into message, or default message
-      message = @argv.empty? ?  "Commit #{Time.now.to_s[0..-6]}" : @argv.join(' ')
+      if @argv.empty?
+        commit_message = "Commit #{Time.now.to_s[0..-6]}"
+        history_message = nil
+      else
+        commit_message = history_message = @argv.join(' ')
+      end
 
-      puts "Committing #{ ver ? "(version = #{ver}) " : ""}with message: #{message}"
+      # Updating version if version command set
+      if version_command
+        puts "Updating version with #{version_command}"
+        if history_message
+          system %Q{rake "version[#{version_command},#{history_message}]"}
+        else
+          system %Q{rake version[#{version_command}]}
+        end
+      end
 
-      system %Q{rake version[#{ver}]} if ver
+      puts "Committing with message: #{commit_message}"
       system %Q{git add --all}
-      system %Q{git commit -a -m "#{message}" --author arvicco}
+      system %Q{git commit -a -m "#{commit_message}" --author arvicco}
+
+      puts "Pushing to remote(s)"
       system %Q{git push}
     end
   end
 end