my_scripts 0.1.7 → 0.1.8

data/HISTORY

@@ -39,3 +39,7 @@
 == 0.1.7 / 2010-04-29
 
 * Msdn helper extracted - for RubyMine script
+
+== 0.1.8 / 2010-05-07
+
+* Gitto refactored

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/my_scripts/scripts/gitto.rb

@@ -4,11 +4,16 @@ module MyScripts
   # optionally bumps project version and pushes changes to remote repo
   #
   class Gitto < Script
+    VERSION_PATTERN = /^(\d+\.\d+\.\d+    # either explicit version (1.2.3)
+                        (?:\.(.*?))?      # possibly followed by .build
+                        |\.(.*?)          # or, just .build
+                        |\d{1}0{0,2})$/x  # or, one digit followed by 0-2 zeroes (100/10/1 - bump major/minor/patch)
+
     def run
-      usage "[0.1.2 - version, 100/10/1 - bump major/minor/patch, .patch - add patch] Commit message goes here" if @argv.empty?
+      usage "[0.1.2 - version, 100/10/1 - bump major/minor/patch, .build - add build] Commit message goes here" if @argv.empty?
 
       # First Arg may indicate version command if it matches pattern
-      version_command = @argv[0] =~ /^(\d+\.\d+\.\d+(?:\.(.*?))?|\.(.*?)|\d{1}0{0,2})$/ ? @argv.shift : nil
+      version_command = @argv[0] =~ VERSION_PATTERN ? @argv.shift : nil
 
       # All the other args lumped into message, or default message
       if @argv.empty?
@@ -18,7 +23,7 @@ module MyScripts
         commit_message = history_message = @argv.join(' ')
       end
 
-      # Updating version if version command set
+      # Updating version only if version command set
       if version_command
         puts "Updating version with #{version_command}"
         if history_message
@@ -28,11 +33,15 @@ module MyScripts
         end
       end
 
-      puts "Committing with message: #{commit_message}"
+
+      puts "Adding all the changes"
       system %Q{git add --all}
+
+      puts "Committing everything with message: #{commit_message}"
       system %Q{git commit -a -m "#{commit_message}" --author arvicco}
 
-      puts "Pushing to remote(s)"
+      current_branch = `git branch`.strip
+      puts "Pushing to (default) remote for branch: #{current_branch}"
       system %Q{git push}
     end
   end

data/spec/my_scripts/scripts/gitto_spec.rb

@@ -15,8 +15,9 @@ module MyScriptsTest
     context 'No version command' do
       it 'Commits with message, pushes to remote' do
         message = 'This is bomb!'
-        stdout_should_receive "Committing with message: #{message}",
-                              "Pushing to remote(s)"
+        stdout_should_receive "Adding all the changes",
+                              "Committing everything with message: #{message}",
+                              "Pushing to (default) remote for branch: * master"
         system_should_receive "git add --all",
                               %Q{git commit -a -m "#{message}" --author arvicco},
                               "git push"
@@ -28,8 +29,9 @@ module MyScriptsTest
           VERSION_COMMANDS.each do |command|
             message = 'This is bomb!'
 
-            stdout_should_receive "Committing with message: #{message}",
-                                  "Pushing to remote(s)"
+            stdout_should_receive "Adding all the changes",
+                                  "Committing everything with message: #{message}",
+                                  "Pushing to (default) remote for branch: * master"
             system_should_receive %Q{rake "version[#{command},#{message}]"},
                                   "git add --all",
                                   %Q{git commit -a -m "#{message}" --author arvicco},
@@ -40,8 +42,9 @@ module MyScriptsTest
 
         it 'Commits and pushes with default timestamped message if no message' do
           VERSION_COMMANDS.each do |command|
-            stdout_should_receive "Committing with message: Commit #{Time.now.to_s[0..-6]}",
-                                  "Pushing to remote(s)"
+            stdout_should_receive "Adding all the changes",
+                                  "Committing everything with message: Commit #{Time.now.to_s[0..-6]}",
+                                  "Pushing to (default) remote for branch: * master"
             system_should_receive "rake version[#{command}]",
                                   "git add --all",
                                   %Q{git commit -a -m "Commit #{Time.now.to_s[0..-6]}" --author arvicco},

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - arvicco
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 +04:00
+date: 2010-05-08 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency